Merge branch 'main' into cespo/eks-provisioned-control-plane

Author: cespo

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

@@ -28,7 +28,7 @@ jobs:
  - name: golangci-lint
  uses: golangci/golangci-lint-action@0a35821d5c230e903fcfe077583637dea1b27b47 # tag=v9.0.0
  with:
- version: v2.1.0
+ version: v2.7.0
  working-directory: ${{matrix.working-directory}}
  - name: Lint API
  run: make lint-api

.golangci.yml

@@ -297,6 +297,38 @@ linters:
  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"
+ - linters:
+ - revive
+ path: 'exp/utils/*'
+ text: 'var-naming: avoid meaningless package names'
+ - linters:
+ - revive
+ path: 'cmd/clusterawsadm/cmd/ami/common'
+ text: 'var-naming: avoid meaningless package names'
+ - linters:
+ - revive
+ path: 'cmd/clusterawsadm/cmd/util'
+ text: 'var-naming: avoid meaningless package names'
+ - linters:
+ - revive
+ path: 'pkg/utils'
+ text: 'var-naming: avoid meaningless package names'
+ - linters:
+ - revive
+ path: 'pkg/cloud/services/common/'
+ text: 'var-naming: avoid meaningless package names'
+ - linters:
+ - revive
+ path: 'test/e2e/shared/'
+ text: 'var-naming: avoid meaningless package names'
+ - linters:
+ - revive
+ text: 'avoid package names that conflict with Go standard library package names'
+ path: 'pkg/internal/bytes/'
+ - linters:
+ - revive
+ text: 'avoid package names that conflict with Go standard library package names'
+ path: 'pkg/hash/'
  - linters:
  - unparam
  text: always receives
@@ -330,6 +362,9 @@ linters:
  - 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.'
+ - linters:
+ - staticcheck
+ text: "s.scope.ControlPlaneLoadBalancer is deprecated"
  paths:
  - third_party$
  - builtin$

api/v1beta1/types.go

@@ -32,6 +32,7 @@ type AWSResourceReference struct {
 
 // ARN of resource.
 // +optional
+//
 // Deprecated: This field has no function and is going to be removed in the next release.
 ARN *string `json:"arn,omitempty"`
 

config/crd/bases/infrastructure.cluster.x-k8s.io_awsmachines.yaml

@@ -80,6 +80,7 @@ spec:
  arn:
  description: |-
  ARN of resource.
+
  Deprecated: This field has no function and is going to be removed in the next release.
  type: string
  filters:
@@ -344,6 +345,7 @@ spec:
  arn:
  description: |-
  ARN of resource.
+
  Deprecated: This field has no function and is going to be removed in the next release.
  type: string
  filters:

config/crd/bases/infrastructure.cluster.x-k8s.io_awsmachinetemplates.yaml

@@ -91,6 +91,7 @@ spec:
  arn:
  description: |-
  ARN of resource.
+
  Deprecated: This field has no function and is going to be removed in the next release.
  type: string
  filters:
@@ -360,6 +361,7 @@ spec:
  arn:
  description: |-
  ARN of resource.
+
  Deprecated: This field has no function and is going to be removed in the next release.
  type: string
  filters:

controllers/awsmachine_annotations.go

@@ -18,6 +18,7 @@ package controllers
 
 import (
 "encoding/json"
+"maps"
 
 infrav1 "sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
 )
@@ -40,13 +41,14 @@ func (r *AWSMachineReconciler) updateMachineAnnotationJSON(machine *infrav1.AWSM
 // `content`.
 func (r *AWSMachineReconciler) updateMachineAnnotation(machine *infrav1.AWSMachine, annotation, content string) {
 // Get the annotations
-annotations := machine.GetAnnotations()
+annotations := maps.Clone(machine.GetAnnotations())
 
-// Set our annotation to the given content.
-if annotations != nil {
-annotations[annotation] = content
+if annotations == nil {
+annotations = map[string]string{}
 }
 
+annotations[annotation] = content
+
 // Update the machine object with these annotations
 machine.SetAnnotations(annotations)
 }

hack/tools/.custom-gcl.yaml

@@ -1,4 +1,4 @@
-version: v2.1.0
+version: v2.7.0
 name: golangci-lint-kube-api-linter
 destination: ./bin
 plugins:

pkg/cloud/converters/eks.go

@@ -189,11 +189,11 @@ func NodegroupUpdateconfigToSDK(updateConfig *expinfrav1.UpdateConfig) (*ekstype
 
 converted := &ekstypes.NodegroupUpdateConfig{}
 if updateConfig.MaxUnavailable != nil {
-//nolint:gosec,G115 // Added golint exception as there is a kubebuilder validation configured
+//nolint:G115 // Added golint exception as there is a kubebuilder validation configured
 converted.MaxUnavailable = aws.Int32(int32(*updateConfig.MaxUnavailable))
 }
 if updateConfig.MaxUnavailablePercentage != nil {
-//nolint:gosec,G115 // Added golint exception as there is a kubebuilder validation configured
+//nolint:G115 // Added golint exception as there is a kubebuilder validation configured
 converted.MaxUnavailablePercentage = aws.Int32(int32(*updateConfig.MaxUnavailablePercentage))
 }
 

pkg/cloud/scope/cluster.go

@@ -209,6 +209,7 @@ func (s *ClusterScope) ControlPlaneLoadBalancers() []*infrav1.AWSLoadBalancerSpe
 }
 
 // ControlPlaneLoadBalancerScheme returns the Classic ELB scheme (public or internal facing).
+//
 // Deprecated: This method is going to be removed in a future release. Use LoadBalancer.Scheme.
 func (s *ClusterScope) ControlPlaneLoadBalancerScheme() infrav1.ELBScheme {
 if s.ControlPlaneLoadBalancer() != nil && s.ControlPlaneLoadBalancer().Scheme != nil {

pkg/cloud/scope/elb.go

@@ -39,10 +39,12 @@ type ELBScope interface {
 VPC() *infrav1.VPCSpec
 
 // ControlPlaneLoadBalancer returns the AWSLoadBalancerSpec
+//
 // Deprecated: Use ControlPlaneLoadBalancers()
 ControlPlaneLoadBalancer() *infrav1.AWSLoadBalancerSpec
 
 // ControlPlaneLoadBalancerScheme returns the Classic ELB scheme (public or internal facing)
+//
 // Deprecated: This method is going to be removed in a future release. Use LoadBalancer.Scheme.
 ControlPlaneLoadBalancerScheme() infrav1.ELBScheme