Merge remote-tracking branch 'upstream/main'

Author: rajeeshckr

.github/workflows/pr-golangci-lint.yaml

@@ -26,7 +26,7 @@ jobs:
         with:
           go-version: ${{ steps.vars.outputs.go_version }}
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@4afd733a84b1f43292c63897423277bb7f4313a9 # tag=v8.0.0
+        uses: golangci/golangci-lint-action@0a35821d5c230e903fcfe077583637dea1b27b47 # tag=v9.0.0
         with:
           version: v2.1.0
           working-directory: ${{matrix.working-directory}}

.golangci.yml

@@ -139,8 +139,6 @@ linters:
           alias: runtimeserializer
         - pkg: k8s.io/apimachinery/pkg/runtime/serializer/yaml
           alias: yamlserializer
-        - pkg: sigs.k8s.io/cluster-api/api/v1beta1
-          alias: clusterv1
         - pkg: sigs.k8s.io/cluster-api/util/defaulting
           alias: utildefaulting
         - pkg: sigs.k8s.io/controller-runtime
@@ -169,8 +167,14 @@ linters:
           alias: crclient
         - pkg: k8s.io/apimachinery/pkg/types
           alias: apimachinerytypes
-        - pkg: sigs.k8s.io/cluster-api/exp/api/v1beta1
-          alias: expclusterv1
+        - pkg: "sigs.k8s.io/cluster-api/api/core/v1beta2"
+          alias: clusterv1
+        - pkg: "sigs.k8s.io/cluster-api/api/core/v1beta1"
+          alias: clusterv1beta1
+        - pkg: "sigs.k8s.io/cluster-api/util/deprecated/v1beta1/patch"
+          alias: v1beta1patch
+        - pkg: "sigs.k8s.io/cluster-api/util/deprecated/v1beta1/conditions"
+          alias: v1beta1conditions
       no-unaliased: false
     nolintlint:
       require-specific: true
@@ -212,16 +216,16 @@ linters:
       #   - errcheck
       #   text: Error return value of `outputPrinter.Print` is not checked
       - linters:
-        - gosec
-        text: 'G103: Use of unsafe calls should be audited'
+          - gosec
+        text: "G103: Use of unsafe calls should be audited"
         path: .*(api|types|test)\/.*\/.*conversion.*\.go$
       - linters:
           - staticcheck
-        text: 'QF1008: could remove embedded field .*'
+        text: "QF1008: could remove embedded field .*"
       # TODO: change to use time.Time.Equal
       - linters:
           - staticcheck
-        text: 'QF1009: probably want to use time.Time.Equal instead'
+        text: "QF1009: probably want to use time.Time.Equal instead"
       - linters:
           - revive
         # Ignoring stylistic checks for generated code
@@ -233,13 +237,13 @@ linters:
         # Ignoring stylistic checks for generated code
         path: .*(api|types)\/.*\/.*conversion.*\.go$
         # By convention, receiver names in a method should reflect their identity.
-        text: 'receiver-naming: receiver name (.+) should be consistent with previous receiver name (.+)'
+        text: "receiver-naming: receiver name (.+) should be consistent with previous receiver name (.+)"
       - linters:
           - revive
         # Ignoring stylistic checks for generated code
         path: .*(api|types|test)\/.*\/.*conversion.*\.go$
         # Checking if an error is nil to just after return the error or nil is redundant
-        text: 'if-return: redundant if ...; err != nil check, just return error instead'
+        text: "if-return: redundant if ...; err != nil check, just return error instead"
       - linters:
           - revive
         text: 'exported: exported method .*\.(Reconcile|SetupWithManager|SetupWebhookWithManager) should have comment or be unexported'
@@ -268,7 +272,7 @@ linters:
         text: Error return value of (.+) is not checked
       - linters:
           - gosec
-        text: 'G108: Profiling endpoint is automatically exposed on /debug/pprof'
+        text: "G108: Profiling endpoint is automatically exposed on /debug/pprof"
       - linters:
           - godot
         path: (.*)/(v1beta1|v1beta2)/(.*)types.go
@@ -282,17 +286,17 @@ linters:
       - linters:
           - revive
         path: .*/defaults.go
-        text: 'var-naming: don''t use underscores in Go names; func (.+) should be (.+)'
+        text: "var-naming: don't use underscores in Go names; func (.+) should be (.+)"
       - linters:
           - revive
         path: .*/.*(mock|gc_).*/.+\.go
-        text: 'var-naming: don''t use an underscore in package name'
+        text: "var-naming: don't use an underscore in package name"
       - linters:
           - revive
         # Ignoring stylistic checks for generated code
         path: .*(api|types|test)\/.*\/.*conversion.*\.go$
         # This rule warns when initialism, variable or package naming conventions are not followed.
-        text: 'var-naming: don''t use underscores in Go names'
+        text: "var-naming: don't use underscores in Go names"
       - linters:
           - unparam
         text: always receives
@@ -309,20 +313,23 @@ linters:
         text: cyclomatic complexity
       - linters:
           - gocritic
-        text: 'appendAssign: append result not assigned to the same slice'
+        text: "appendAssign: append result not assigned to the same slice"
       - path: (.+)\.go$
         text: (Expect directory permissions to be 0750 or less|Expect file permissions to be 0600 or less)
       - path: (.+)\.go$
-        text: 'exported: (func|type) name will be used as (.+) by other packages, and that stutters; consider calling this (.+)'
+        text: "exported: (func|type) name will be used as (.+) by other packages, and that stutters; consider calling this (.+)"
       - path: (.+)\.go$
         text: (G104|G107|G404|G505|ST1000)
       - path: (.+)\.go$
-        text: 'G108: Profiling endpoint is automatically exposed on /debug/pprof'
+        text: "G108: Profiling endpoint is automatically exposed on /debug/pprof"
       - path: (.+)\.go$
         text: net/http.Get must not be called
       - linters:
           - goconst
         path: (.+)_test\.go
+      - linters:
+          - staticcheck
+        text: 'SA1019: "sigs.k8s.io/cluster-api/(.*)" is deprecated: This package is deprecated and is going to be removed when support for v1beta1 will be dropped.'
     paths:
       - third_party$
       - builtin$

Makefile

@@ -21,6 +21,7 @@ include $(ROOT_DIR_RELATIVE)/common.mk
 
 # Go
 GO_VERSION ?=1.24.7
+GO_DIRECTIVE_VERSION ?= 1.24.0
 GO_CONTAINER_IMAGE ?= golang:$(GO_VERSION)
 
 # Directories.
@@ -204,7 +205,7 @@ endif
 .PHONY: defaulters
 defaulters: $(DEFAULTER_GEN) ## Generate all Go types
 	$(DEFAULTER_GEN) \
-		--extra-peer-dirs=sigs.k8s.io/cluster-api/api/v1beta1 \
+		--extra-peer-dirs=sigs.k8s.io/cluster-api/api/core/v1beta2 \
 		--v=0 \
 		--go-header-file=./hack/boilerplate/boilerplate.generatego.txt \
 		--output-file=zz_generated.defaults.go \
@@ -262,36 +263,36 @@ generate-go-apis: ## Alias for .build/generate-go-apis
 	$(MAKE) defaulters
 
 	$(CONVERSION_GEN) \
-		--extra-peer-dirs=sigs.k8s.io/cluster-api/api/v1beta1 \
+		--extra-peer-dirs=sigs.k8s.io/cluster-api/api/core/v1beta2 \
 		--output-file=zz_generated.conversion.go \
 		--go-header-file=./hack/boilerplate/boilerplate.generatego.txt \
 		./api/v1beta1 \
 		./cmd/clusterawsadm/api/bootstrap/v1alpha1
 
 	$(CONVERSION_GEN) \
 		--extra-peer-dirs=sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta1 \
-		--extra-peer-dirs=sigs.k8s.io/cluster-api/api/v1beta1 \
+		--extra-peer-dirs=sigs.k8s.io/cluster-api/api/core/v1beta2 \
 		--output-file=zz_generated.conversion.go \
 		--go-header-file=./hack/boilerplate/boilerplate.generatego.txt \
 		./$(EXP_DIR)/api/v1beta1
 
 	$(CONVERSION_GEN) \
 		--extra-peer-dirs=sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta1 \
-		--extra-peer-dirs=sigs.k8s.io/cluster-api/api/v1beta1 \
+		--extra-peer-dirs=sigs.k8s.io/cluster-api/api/core/v1beta2 \
 		--output-file=zz_generated.conversion.go \
 		--go-header-file=./hack/boilerplate/boilerplate.generatego.txt \
 		./bootstrap/eks/api/v1beta1
 
 	$(CONVERSION_GEN) \
 		--extra-peer-dirs=sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta1 \
-		--extra-peer-dirs=sigs.k8s.io/cluster-api/api/v1beta1 \
+		--extra-peer-dirs=sigs.k8s.io/cluster-api/api/core/v1beta2 \
 		--output-file=zz_generated.conversion.go \
 		--go-header-file=./hack/boilerplate/boilerplate.generatego.txt \
 		./controlplane/eks/api/v1beta1
 
 	$(CONVERSION_GEN) \
 		--extra-peer-dirs=sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta1 \
-		--extra-peer-dirs=sigs.k8s.io/cluster-api/api/v1beta1 \
+		--extra-peer-dirs=sigs.k8s.io/cluster-api/api/core/v1beta2 \
 		--output-file=zz_generated.conversion.go \
 		--go-header-file=./hack/boilerplate/boilerplate.generatego.txt \
 		./controlplane/rosa/api/v1beta2
@@ -329,7 +330,7 @@ modules: ## Runs go mod to ensure proper vendoring.
 	cd $(TOOLS_DIR); go mod tidy
 
 .PHONY: verify ## Verify ties together the rest of the verification targets into one target
-verify: verify-boilerplate verify-modules verify-gen verify-conversions verify-shellcheck verify-book-links release-manifests
+verify: verify-boilerplate verify-modules verify-gen verify-conversions verify-shellcheck verify-book-links release-manifests verify-go-directive
 
 .PHONY: verify-boilerplate
 verify-boilerplate: ## Verify boilerplate
@@ -367,6 +368,12 @@ verify-gen: generate ## Verify generated files
 verify-container-images: ## Verify container images
 	TRACE=$(TRACE) ./hack/verify-container-images.sh
 
+.PHONY: verify-go-directive
+verify-go-directive:
+	# use the core Cluster API script directly to verify the go directive matches the desired one.
+	# ref: https://github.com/kubernetes-sigs/cluster-api/blob/v1.10.7/hack/verify-go-directive.sh
+	curl --retry 3 -fsL https://raw.githubusercontent.com/kubernetes-sigs/cluster-api/refs/tags/v1.10.7/hack/verify-go-directive.sh | bash -s -- -g $(GO_DIRECTIVE_VERSION)
+
 .PHONY: apidiff
 apidiff: APIDIFF_OLD_COMMIT ?= $(shell git rev-parse origin/main)
 apidiff: $(GO_APIDIFF) ## Check for API differences

api/v1beta1/awscluster_conversion.go

@@ -67,6 +67,9 @@ func (src *AWSCluster) ConvertTo(dstRaw conversion.Hub) error {
 		dst.Status.Bastion.HostID = restored.Status.Bastion.HostID
 		dst.Status.Bastion.CapacityReservationPreference = restored.Status.Bastion.CapacityReservationPreference
 		dst.Status.Bastion.CPUOptions = restored.Status.Bastion.CPUOptions
+		if restored.Status.Bastion.DynamicHostAllocation != nil {
+			dst.Status.Bastion.DynamicHostAllocation = restored.Status.Bastion.DynamicHostAllocation
+		}
 	}
 	dst.Spec.Partition = restored.Spec.Partition
 

api/v1beta1/awscluster_types.go

@@ -19,7 +19,7 @@ package v1beta1
 import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
-	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
+	clusterv1beta1 "sigs.k8s.io/cluster-api/api/core/v1beta1"
 )
 
 const (
@@ -45,7 +45,7 @@ type AWSClusterSpec struct {
 
 	// ControlPlaneEndpoint represents the endpoint used to communicate with the control plane.
 	// +optional
-	ControlPlaneEndpoint clusterv1.APIEndpoint `json:"controlPlaneEndpoint"`
+	ControlPlaneEndpoint clusterv1beta1.APIEndpoint `json:"controlPlaneEndpoint"`
 
 	// AdditionalTags is an optional set of tags to add to AWS resources managed by the AWS provider, in addition to the
 	// ones added by default.
@@ -200,11 +200,11 @@ type AWSLoadBalancerSpec struct {
 // AWSClusterStatus defines the observed state of AWSCluster.
 type AWSClusterStatus struct {
 	// +kubebuilder:default=false
-	Ready          bool                     `json:"ready"`
-	Network        NetworkStatus            `json:"networkStatus,omitempty"`
-	FailureDomains clusterv1.FailureDomains `json:"failureDomains,omitempty"`
-	Bastion        *Instance                `json:"bastion,omitempty"`
-	Conditions     clusterv1.Conditions     `json:"conditions,omitempty"`
+	Ready          bool                          `json:"ready"`
+	Network        NetworkStatus                 `json:"networkStatus,omitempty"`
+	FailureDomains clusterv1beta1.FailureDomains `json:"failureDomains,omitempty"`
+	Bastion        *Instance                     `json:"bastion,omitempty"`
+	Conditions     clusterv1beta1.Conditions     `json:"conditions,omitempty"`
 }
 
 // S3Bucket defines a supporting S3 bucket for the cluster, currently can be optionally used for Ignition.
@@ -254,12 +254,12 @@ type AWSClusterList struct {
 }
 
 // GetConditions returns the observations of the operational state of the AWSCluster resource.
-func (r *AWSCluster) GetConditions() clusterv1.Conditions {
+func (r *AWSCluster) GetConditions() clusterv1beta1.Conditions {
 	return r.Status.Conditions
 }
 
-// SetConditions sets the underlying service state of the AWSCluster to the predescribed clusterv1.Conditions.
-func (r *AWSCluster) SetConditions(conditions clusterv1.Conditions) {
+// SetConditions sets the underlying service state of the AWSCluster to the predescribed clusterv1beta1.Conditions.
+func (r *AWSCluster) SetConditions(conditions clusterv1beta1.Conditions) {
 	r.Status.Conditions = conditions
 }
 

api/v1beta1/awsclustertemplate_types.go

@@ -19,7 +19,7 @@ package v1beta1
 import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
-	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
+	clusterv1beta1 "sigs.k8s.io/cluster-api/api/core/v1beta1"
 )
 
 // AWSClusterTemplateSpec defines the desired state of AWSClusterTemplate.
@@ -58,6 +58,6 @@ type AWSClusterTemplateResource struct {
 	// Standard object's metadata.
 	// More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata
 	// +optional
-	ObjectMeta clusterv1.ObjectMeta `json:"metadata,omitempty"`
-	Spec       AWSClusterSpec       `json:"spec"`
+	ObjectMeta clusterv1beta1.ObjectMeta `json:"metadata,omitempty"`
+	Spec       AWSClusterSpec            `json:"spec"`
 }

api/v1beta1/awsmachine_conversion.go

@@ -49,6 +49,9 @@ func (src *AWSMachine) ConvertTo(dstRaw conversion.Hub) error {
 	dst.Spec.CapacityReservationPreference = restored.Spec.CapacityReservationPreference
 	dst.Spec.NetworkInterfaceType = restored.Spec.NetworkInterfaceType
 	dst.Spec.CPUOptions = restored.Spec.CPUOptions
+	if restored.Spec.DynamicHostAllocation != nil {
+		dst.Spec.DynamicHostAllocation = restored.Spec.DynamicHostAllocation
+	}
 	if restored.Spec.ElasticIPPool != nil {
 		if dst.Spec.ElasticIPPool == nil {
 			dst.Spec.ElasticIPPool = &infrav1.ElasticIPPool{}
@@ -61,6 +64,7 @@ func (src *AWSMachine) ConvertTo(dstRaw conversion.Hub) error {
 		}
 	}
 
+	dst.Status.DedicatedHost = restored.Status.DedicatedHost
 	return nil
 }
 
@@ -117,6 +121,9 @@ func (r *AWSMachineTemplate) ConvertTo(dstRaw conversion.Hub) error {
 	dst.Spec.Template.Spec.CapacityReservationPreference = restored.Spec.Template.Spec.CapacityReservationPreference
 	dst.Spec.Template.Spec.NetworkInterfaceType = restored.Spec.Template.Spec.NetworkInterfaceType
 	dst.Spec.Template.Spec.CPUOptions = restored.Spec.Template.Spec.CPUOptions
+	if restored.Spec.Template.Spec.DynamicHostAllocation != nil {
+		dst.Spec.Template.Spec.DynamicHostAllocation = restored.Spec.Template.Spec.DynamicHostAllocation
+	}
 	if restored.Spec.Template.Spec.ElasticIPPool != nil {
 		if dst.Spec.Template.Spec.ElasticIPPool == nil {
 			dst.Spec.Template.Spec.ElasticIPPool = &infrav1.ElasticIPPool{}
@@ -129,6 +136,10 @@ func (r *AWSMachineTemplate) ConvertTo(dstRaw conversion.Hub) error {
 		}
 	}
 
+	// Restore Status fields that don't exist in v1beta1.
+	dst.Status.NodeInfo = restored.Status.NodeInfo
+	dst.Status.Conditions = restored.Status.Conditions
+
 	return nil
 }
 

api/v1beta1/awsmachine_types.go

@@ -19,7 +19,7 @@ package v1beta1
 import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
-	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
+	clusterv1beta1 "sigs.k8s.io/cluster-api/api/core/v1beta1"
 )
 
 const (
@@ -207,7 +207,7 @@ type AWSMachineStatus struct {
 	Interruptible bool `json:"interruptible,omitempty"`
 
 	// Addresses contains the AWS instance associated addresses.
-	Addresses []clusterv1.MachineAddress `json:"addresses,omitempty"`
+	Addresses []clusterv1beta1.MachineAddress `json:"addresses,omitempty"`
 
 	// InstanceState is the state of the AWS instance for this machine.
 	// +optional
@@ -253,7 +253,7 @@ type AWSMachineStatus struct {
 
 	// Conditions defines current service state of the AWSMachine.
 	// +optional
-	Conditions clusterv1.Conditions `json:"conditions,omitempty"`
+	Conditions clusterv1beta1.Conditions `json:"conditions,omitempty"`
 }
 
 // +kubebuilder:object:root=true
@@ -276,12 +276,12 @@ type AWSMachine struct {
 }
 
 // GetConditions returns the observations of the operational state of the AWSMachine resource.
-func (r *AWSMachine) GetConditions() clusterv1.Conditions {
+func (r *AWSMachine) GetConditions() clusterv1beta1.Conditions {
 	return r.Status.Conditions
 }
 
-// SetConditions sets the underlying service state of the AWSMachine to the predescribed clusterv1.Conditions.
-func (r *AWSMachine) SetConditions(conditions clusterv1.Conditions) {
+// SetConditions sets the underlying service state of the AWSMachine to the predescribed clusterv1beta1.Conditions.
+func (r *AWSMachine) SetConditions(conditions clusterv1beta1.Conditions) {
 	r.Status.Conditions = conditions
 }
 

api/v1beta1/awsmachinetemplate_types.go

@@ -20,7 +20,7 @@ import (
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
-	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
+	clusterv1beta1 "sigs.k8s.io/cluster-api/api/core/v1beta1"
 )
 
 // AWSMachineTemplateStatus defines a status for an AWSMachineTemplate.
@@ -65,7 +65,7 @@ type AWSMachineTemplateResource struct {
 	// Standard object's metadata.
 	// More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata
 	// +optional
-	ObjectMeta clusterv1.ObjectMeta `json:"metadata,omitempty"`
+	ObjectMeta clusterv1beta1.ObjectMeta `json:"metadata,omitempty"`
 
 	// Spec is the specification of the desired behavior of the machine.
 	Spec AWSMachineSpec `json:"spec"`