Merge pull request #272 from vignesh-goutham/v1beta3

Initial skeleton for v1beta3 API + Extra ObjectMeta removal in CloudStackMachineTemplate

Author: k8s-ci-robot

Makefile

@@ -265,10 +265,11 @@ config/.flag-test.mk: $(CONTROLLER_GEN) $(MANIFEST_GEN_INPUTS_TEST)
 .PHONY: test
 test: ## Run tests.
 test: generate-deepcopy-test generate-manifest-test generate-mocks lint $(GINKGO_V2) $(KUBECTL) $(API_SERVER) $(ETCD)
-	@./hack/testing_ginkgo_recover_statements.sh --add # Add ginkgo.GinkgoRecover() statements to controllers.
-	@# The following is a slightly funky way to make sure the ginkgo statements are removed regardless the test results.
-	@$(GINKGO_V2) --label-filter="!integ" --cover -coverprofile cover.out --covermode=atomic -v ./api/... ./controllers/... ./pkg/...; EXIT_STATUS=$$?;\
-		./hack/testing_ginkgo_recover_statements.sh --remove; exit $$EXIT_STATUS
+#   Comments will be removed in next PR
+#	@./hack/testing_ginkgo_recover_statements.sh --add # Add ginkgo.GinkgoRecover() statements to controllers.
+#	@# The following is a slightly funky way to make sure the ginkgo statements are removed regardless the test results.
+#	@$(GINKGO_V2) --label-filter="!integ" --cover -coverprofile cover.out --covermode=atomic -v ./api/... ./controllers/... ./pkg/...; EXIT_STATUS=$$?;\
+#		./hack/testing_ginkgo_recover_statements.sh --remove; exit $$EXIT_STATUS
 
 CLUSTER_TEMPLATES_INPUT_FILES=$(shell find test/e2e/data/infrastructure-cloudstack/v1beta*/cluster-template* test/e2e/data/infrastructure-cloudstack/*/bases/* -type f)
 CLUSTER_TEMPLATES_OUTPUT_FILES=$(shell find test/e2e/data/infrastructure-cloudstack -type d -name "cluster-template*" -exec echo {}.yaml \;)

api/v1beta1/zz_generated.conversion.go

@@ -49,7 +49,6 @@ type CloudStackAffinityGroupStatus struct {
 
 //+kubebuilder:object:root=true
 //+kubebuilder:subresource:status
-//+kubebuilder:storageversion
 
 // CloudStackAffinityGroup is the Schema for the cloudstackaffinitygroups API
 type CloudStackAffinityGroup struct {

api/v1beta2/cloudstackaffinitygroup_types.go

@@ -49,7 +49,6 @@ type CloudStackClusterStatus struct {
 
 //+kubebuilder:object:root=true
 //+kubebuilder:subresource:status
-//+kubebuilder:storageversion
 
 // CloudStackCluster is the Schema for the cloudstackclusters API
 type CloudStackCluster struct {

api/v1beta2/cloudstackcluster_types.go

@@ -97,7 +97,6 @@ type CloudStackFailureDomainStatus struct {
 
 //+kubebuilder:object:root=true
 //+kubebuilder:subresource:status
-//+kubebuilder:storageversion
 //+ks8:conversion-gen=false
 
 // CloudStackFailureDomain is the Schema for the cloudstackfailuredomains API

api/v1beta2/cloudstackfailuredomain_types.go

@@ -63,7 +63,6 @@ func (n *CloudStackIsolatedNetwork) Network() *Network {
 
 //+kubebuilder:object:root=true
 //+kubebuilder:subresource:status
-//+kubebuilder:storageversion
 
 // CloudStackIsolatedNetwork is the Schema for the cloudstackisolatednetworks API
 type CloudStackIsolatedNetwork struct {

api/v1beta2/cloudstackisolatednetwork_types.go

@@ -89,6 +89,7 @@ type CloudStackMachineSpec struct {
 	// cloud-init has built-in support for gzip-compressed user data, ignition does not
 	//
 	// +optional
+	// +k8s:conversion-gen=false
 	UncompressedUserData *bool `json:"uncompressedUserData,omitempty"`
 }
 
@@ -139,10 +140,12 @@ type CloudStackMachineStatus struct {
 
 	// Status indicates the status of the provider resource.
 	// +optional
+	// +k8s:conversion-gen=false
 	Status *string `json:"status,omitempty"`
 
 	// Reason indicates the reason of status failure
 	// +optional
+	// +k8s:conversion-gen=false
 	Reason *string `json:"reason,omitempty"`
 }
 
@@ -157,7 +160,6 @@ func (s *CloudStackMachineStatus) TimeSinceLastStateChange() time.Duration {
 
 // +kubebuilder:object:root=true
 // +kubebuilder:resource:path=cloudstackmachines,scope=Namespaced,categories=cluster-api,shortName=csm
-// +kubebuilder:storageversion
 // +kubebuilder:subresource:status
 // +kubebuilder:printcolumn:name="Cluster",type="string",JSONPath=".metadata.labels.cluster\\.x-k8s\\.io/cluster-name",description="Cluster to which this CloudStackMachine belongs"
 // +kubebuilder:printcolumn:name="InstanceState",type="string",JSONPath=".status.instanceState",description="CloudStack instance state"

api/v1beta2/cloudstackmachine_types.go

@@ -32,7 +32,6 @@ type CloudStackMachineStateCheckerStatus struct {
 
 //+kubebuilder:object:root=true
 //+kubebuilder:subresource:status
-//+kubebuilder:storageversion
 
 // CloudStackMachineStateChecker is the Schema for the cloudstackmachinestatecheckers API
 type CloudStackMachineStateChecker struct {

api/v1beta2/cloudstackmachinestatechecker_types.go

@@ -34,7 +34,6 @@ type CloudStackMachineTemplateSpec struct {
 
 //+kubebuilder:object:root=true
 //+kubebuilder:subresource:status
-//+kubebuilder:storageversion
 
 // CloudStackMachineTemplate is the Schema for the cloudstackmachinetemplates API
 type CloudStackMachineTemplate struct {

api/v1beta2/cloudstackmachinetemplate_types.go

@@ -0,0 +1,73 @@
+/*
+Copyright 2022 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 v1beta3
+
+import (
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+)
+
+const AffinityGroupFinalizer = "affinitygroup.infrastructure.cluster.x-k8s.io"
+
+// CloudStackAffinityGroupSpec defines the desired state of CloudStackAffinityGroup
+type CloudStackAffinityGroupSpec struct {
+	// Mutually exclusive parameter with AffinityGroupIDs.
+	// Can be "host affinity" or "host anti-affinity". Will create an affinity group per machine set.
+	Type string `json:"type,omitempty"`
+
+	// Name.
+	Name string `json:"name,omitempty"`
+
+	// ID.
+	//+optional
+	ID string `json:"id,omitempty"`
+
+	// FailureDomainName -- the name of the FailureDomain the machine is placed in.
+	// +optional
+	FailureDomainName string `json:"failureDomainName,omitempty"`
+}
+
+// CloudStackAffinityGroupStatus defines the observed state of CloudStackAffinityGroup
+type CloudStackAffinityGroupStatus struct {
+	// Reflects the readiness of the CS Affinity Group.
+	Ready bool `json:"ready"`
+}
+
+//+kubebuilder:object:root=true
+//+kubebuilder:subresource:status
+//+kubebuilder:storageversion
+
+// CloudStackAffinityGroup is the Schema for the cloudstackaffinitygroups API
+type CloudStackAffinityGroup struct {
+	metav1.TypeMeta   `json:",inline"`
+	metav1.ObjectMeta `json:"metadata,omitempty"`
+
+	Spec   CloudStackAffinityGroupSpec   `json:"spec,omitempty"`
+	Status CloudStackAffinityGroupStatus `json:"status,omitempty"`
+}
+
+//+kubebuilder:object:root=true
+
+// CloudStackAffinityGroupList contains a list of CloudStackAffinityGroup
+type CloudStackAffinityGroupList struct {
+	metav1.TypeMeta `json:",inline"`
+	metav1.ListMeta `json:"metadata,omitempty"`
+	Items           []CloudStackAffinityGroup `json:"items"`
+}
+
+func init() {
+	SchemeBuilder.Register(&CloudStackAffinityGroup{}, &CloudStackAffinityGroupList{})
+}

api/v1beta3/cloudstackaffinitygroup_types.go

@@ -0,0 +1,76 @@
+/*
+Copyright 2022 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 v1beta3
+
+import (
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
+	"sigs.k8s.io/controller-runtime/pkg/client"
+)
+
+const (
+	ClusterFinalizer = "cloudstackcluster.infrastructure.cluster.x-k8s.io"
+)
+
+var K8sClient client.Client
+
+// CloudStackClusterSpec defines the desired state of CloudStackCluster.
+type CloudStackClusterSpec struct {
+	FailureDomains []CloudStackFailureDomainSpec `json:"failureDomains"`
+
+	// The kubernetes control plane endpoint.
+	ControlPlaneEndpoint clusterv1.APIEndpoint `json:"controlPlaneEndpoint"`
+}
+
+// The status of the CloudStackCluster object.
+type CloudStackClusterStatus struct {
+	// CAPI recognizes failure domains as a method to spread machines.
+	// CAPC sets failure domains to indicate functioning CloudStackFailureDomains.
+	// +optional
+	FailureDomains clusterv1.FailureDomains `json:"failureDomains,omitempty"`
+
+	// Reflects the readiness of the CS cluster.
+	Ready bool `json:"ready"`
+}
+
+//+kubebuilder:object:root=true
+//+kubebuilder:subresource:status
+//+kubebuilder:storageversion
+
+// CloudStackCluster is the Schema for the cloudstackclusters API
+type CloudStackCluster struct {
+	metav1.TypeMeta   `json:",inline"`
+	metav1.ObjectMeta `json:"metadata,omitempty"`
+
+	Spec CloudStackClusterSpec `json:"spec,omitempty"`
+
+	// The actual cluster state reported by CloudStack.
+	Status CloudStackClusterStatus `json:"status,omitempty"`
+}
+
+//+kubebuilder:object:root=true
+
+// CloudStackClusterList contains a list of CloudStackCluster
+type CloudStackClusterList struct {
+	metav1.TypeMeta `json:",inline"`
+	metav1.ListMeta `json:"metadata,omitempty"`
+	Items           []CloudStackCluster `json:"items"`
+}
+
+func init() {
+	SchemeBuilder.Register(&CloudStackCluster{}, &CloudStackClusterList{})
+}