Merge pull request #1207 from ykakarap/vsphereclustertemplate

add VSphereClusterTemplate type

PROJECT

@@ -40,4 +40,7 @@ resources:
 - group: infrastructure
   kind: VSphereFailureDomain
   version: v1alpha4
+- group: infrastructure
+  kind: VSphereClusterTemplate
+  version: v1alpha4
 version: "2"

api/v1alpha4/vspherecluster_webhook.go

@@ -20,6 +20,7 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/util/validation/field"
 	ctrl "sigs.k8s.io/controller-runtime"
+	"sigs.k8s.io/controller-runtime/pkg/webhook"
 )
 
 func (c *VSphereCluster) SetupWebhookWithManager(mgr ctrl.Manager) error {
@@ -30,15 +31,14 @@ func (c *VSphereCluster) SetupWebhookWithManager(mgr ctrl.Manager) error {
 
 // +kubebuilder:webhook:verbs=create;update,path=/validate-infrastructure-cluster-x-k8s-io-v1alpha4-vspherecluster,mutating=false,failurePolicy=fail,matchPolicy=Equivalent,groups=infrastructure.cluster.x-k8s.io,resources=vsphereclusters,versions=v1alpha4,name=validation.vspherecluster.infrastructure.x-k8s.io,sideEffects=None,admissionReviewVersions=v1beta1
 
+var _ webhook.Validator = &VSphereCluster{}
+
 // ValidateCreate implements webhook.Validator so a webhook will be registered for the type
 func (c *VSphereCluster) ValidateCreate() error {
-	var allErrs field.ErrorList
-	spec := c.Spec
-
-	if spec.Thumbprint != "" && spec.Insecure != nil && *spec.Insecure {
-		allErrs = append(allErrs, field.Invalid(field.NewPath("spec", "Insecure"), spec.Insecure, "cannot be set to true at the same time as .spec.Thumbprint"))
+	allErrs := validateVSphereClusterSpec(c.Spec)
+	if len(allErrs) == 0 {
+		return nil
 	}
-
 	return aggregateObjErrors(c.GroupVersionKind().GroupKind(), c.Name, allErrs)
 }
 
@@ -51,3 +51,11 @@ func (c *VSphereCluster) ValidateUpdate(old runtime.Object) error {
 func (c *VSphereCluster) ValidateDelete() error {
 	return nil
 }
+
+func validateVSphereClusterSpec(s VSphereClusterSpec) field.ErrorList {
+	var allErrs field.ErrorList
+	if s.Thumbprint != "" && s.Insecure != nil && *s.Insecure {
+		allErrs = append(allErrs, field.Invalid(field.NewPath("spec", "Insecure"), s.Insecure, "cannot be set to true at the same time as .spec.Thumbprint"))
+	}
+	return allErrs
+}

api/v1alpha4/vsphereclustertemplate_types.go

@@ -0,0 +1,55 @@
+/*
+Copyright 2021 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package v1alpha4
+
+import (
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+)
+
+// VSphereClusterTemplateSpec defines the desired state of VSphereClusterTemplate
+type VSphereClusterTemplateSpec struct {
+	Template VSphereClusterTemplateResource `json:"template"`
+}
+
+// +kubebuilder:object:root=true
+// +kubebuilder:resource:path=vsphereclustertemplates,scope=Namespaced,categories=cluster-api
+// +kubebuilder:storageversion
+
+// VSphereClusterTemplate is the Schema for the vsphereclustertemplates API
+type VSphereClusterTemplate struct {
+	metav1.TypeMeta   `json:",inline"`
+	metav1.ObjectMeta `json:"metadata,omitempty"`
+
+	Spec VSphereClusterTemplateSpec `json:"spec,omitempty"`
+}
+
+// +kubebuilder:object:root=true
+
+// VSphereClusterTemplateList contains a list of VSphereClusterTemplate.
+type VSphereClusterTemplateList struct {
+	metav1.TypeMeta `json:",inline"`
+	metav1.ListMeta `json:"metadata,omitempty"`
+	Items           []VSphereClusterTemplate `json:"items"`
+}
+
+func init() {
+	SchemeBuilder.Register(&VSphereClusterTemplate{}, &VSphereClusterTemplateList{})
+}
+
+type VSphereClusterTemplateResource struct {
+	Spec VSphereClusterSpec `json:"spec"`
+}

api/v1alpha4/vsphereclustertemplate_webhook.go

@@ -0,0 +1,59 @@
+/*
+Copyright 2019 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package v1alpha4
+
+import (
+	"reflect"
+
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/util/validation/field"
+	ctrl "sigs.k8s.io/controller-runtime"
+	"sigs.k8s.io/controller-runtime/pkg/webhook"
+)
+
+func (r *VSphereClusterTemplate) SetupWebhookWithManager(mgr ctrl.Manager) error {
+	return ctrl.NewWebhookManagedBy(mgr).
+		For(r).
+		Complete()
+}
+
+// +kubebuilder:webhook:verbs=create;update,path=/validate-infrastructure-cluster-x-k8s-io-v1alpha4-vsphereclustertemplate,mutating=false,failurePolicy=fail,matchPolicy=Equivalent,groups=infrastructure.cluster.x-k8s.io,resources=vsphereclustertemplates,versions=v1alpha4,name=validation.vsphereclustertemplate.infrastructure.x-k8s.io,sideEffects=None,admissionReviewVersions=v1beta1
+
+var _ webhook.Validator = &VSphereClusterTemplate{}
+
+// ValidateCreate implements webhook.Validator so a webhook will be registered for the type
+func (r *VSphereClusterTemplate) ValidateCreate() error {
+	allErrs := validateVSphereClusterSpec(r.Spec.Template.Spec)
+	if len(allErrs) == 0 {
+		return nil
+	}
+	return aggregateObjErrors(r.GroupVersionKind().GroupKind(), r.Name, allErrs)
+}
+
+// ValidateUpdate implements webhook.Validator so a webhook will be registered for the type
+func (r *VSphereClusterTemplate) ValidateUpdate(oldRaw runtime.Object) error {
+	old := oldRaw.(*VSphereClusterTemplate)
+	if !reflect.DeepEqual(r.Spec.Template.Spec, old.Spec.Template.Spec) {
+		return field.Forbidden(field.NewPath("spec", "template", "spec"), "VSphereClusterTemplate spec is immutable")
+	}
+	return nil
+}
+
+// ValidateDelete implements webhook.Validator so a webhook will be registered for the type
+func (r *VSphereClusterTemplate) ValidateDelete() error {
+	return nil
+}