chore: update golang x tools version

Signed-off-by: Rory Z <[email protected]>
emqx · Apr 8, 2024 · ee1f91f · ee1f91f
1 parent a761bf3
commit ee1f91f
Show file tree

Hide file tree

Showing 36 changed files with 487 additions and 1,323 deletions.
diff --git a/.github/workflows/cts.yaml b/.github/workflows/cts.yaml
@@ -37,7 +37,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-go@v3
         with:
-          go-version: '1.20'
+          go-version: '1.21'
       - name: install kubebuilder
         run: |
           OS=$(uname -s | tr '[:upper:]' '[:lower:]')
@@ -127,7 +127,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-go@v3
         with:
-          go-version: '1.20'
+          go-version: '1.21'
       - name: Deploy operator
         timeout-minutes: 5
         uses: ./.github/actions/deploy-operator

diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml
@@ -46,7 +46,7 @@ jobs:
             --set installCRDs=true
       - uses: actions/setup-go@v3
         with:
-          go-version: '1.20'
+          go-version: '1.21'
       - uses: actions/checkout@v3
       - name: Build image
         env:

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -21,11 +21,9 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-go@v3
         with:
-          go-version: '1.20'
+          go-version: '1.21'
       - uses: golangci/golangci-lint-action@v3
         with:
-          ## TODO: https://github.com/golangci/golangci-lint-action/issues/759
-          version: v1.52.2
           args: --timeout=5m
       - run: go install github.com/google/go-licenses@latest
       - run: $(go env GOPATH)/bin/go-licenses check . --disallowed_types forbidden,restricted,unknown
@@ -80,7 +78,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-go@v3
         with:
-          go-version: '1.20'
+          go-version: '1.21'
       - run: go install github.com/onsi/ginkgo/v2/ginkgo@latest
       - name: Install Telepresence
         env:
@@ -110,7 +108,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-go@v3
         with:
-          go-version: '1.20'
+          go-version: '1.21'
       - run: make test
       - uses: actions/upload-artifact@v3
         with:

diff --git a/.github/workflows/upgrade.yaml b/.github/workflows/upgrade.yaml
@@ -34,7 +34,7 @@ jobs:
             --set installCRDs=true
       - uses: actions/setup-go@v3
         with:
-          go-version: '1.20'
+          go-version: '1.21'
       - uses: actions/checkout@v3
         with:
           fetch-depth: 0

diff --git a/apis/apps/v1beta3/emqxbroker_conversion_test.go b/apis/apps/v1beta3/emqxbroker_conversion_test.go
@@ -25,7 +25,7 @@ import (
 	"k8s.io/apimachinery/pkg/api/resource"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/intstr"
-	"k8s.io/utils/pointer"
+	"k8s.io/utils/ptr"
 )
 
 var v1bete3EmqxBroker = &EmqxBroker{
@@ -40,7 +40,7 @@ var v1bete3EmqxBroker = &EmqxBroker{
 		},
 	},
 	Spec: EmqxBrokerSpec{
-		Replicas: pointer.Int32(3),
+		Replicas: ptr.To(int32(3)),
 		Env: []corev1.EnvVar{
 			{
 				Name:  "foo",
@@ -77,7 +77,7 @@ var v1bete3EmqxBroker = &EmqxBroker{
 			},
 		},
 		Persistent: corev1.PersistentVolumeClaimSpec{
-			StorageClassName: pointer.String("foo"),
+			StorageClassName: ptr.To("foo"),
 		},
 		InitContainers: []corev1.Container{
 			{
@@ -97,9 +97,9 @@ var v1bete3EmqxBroker = &EmqxBroker{
 			ACL:             []string{"allow, all."},
 			ImagePullPolicy: corev1.PullIfNotPresent,
 			SecurityContext: &corev1.PodSecurityContext{
-				RunAsUser:           pointer.Int64(1000),
-				RunAsGroup:          pointer.Int64(1000),
-				FSGroup:             pointer.Int64(1000),
+				RunAsUser:           ptr.To(int64(1000)),
+				RunAsGroup:          ptr.To(int64(1000)),
+				FSGroup:             ptr.To(int64(1000)),
 				FSGroupChangePolicy: &[]corev1.PodFSGroupChangePolicy{corev1.FSGroupChangeAlways}[0],
 			},
 			ExtraVolumes: []corev1.Volume{
@@ -202,10 +202,10 @@ var v1beta4EmqxBroker = &v1beta4.EmqxBroker{
 		},
 	},
 	Spec: v1beta4.EmqxBrokerSpec{
-		Replicas: pointer.Int32(3),
+		Replicas: ptr.To(int32(3)),
 		Persistent: &corev1.PersistentVolumeClaimTemplate{
 			Spec: corev1.PersistentVolumeClaimSpec{
-				StorageClassName: pointer.String("foo"),
+				StorageClassName: ptr.To("foo"),
 			},
 		},
 		Template: v1beta4.EmqxTemplate{
@@ -333,9 +333,9 @@ var v1beta4EmqxBroker = &v1beta4.EmqxBroker{
 					},
 				},
 				PodSecurityContext: &corev1.PodSecurityContext{
-					RunAsUser:           pointer.Int64(1000),
-					RunAsGroup:          pointer.Int64(1000),
-					FSGroup:             pointer.Int64(1000),
+					RunAsUser:           ptr.To(int64(1000)),
+					RunAsGroup:          ptr.To(int64(1000)),
+					FSGroup:             ptr.To(int64(1000)),
 					FSGroupChangePolicy: &[]corev1.PodFSGroupChangePolicy{corev1.FSGroupChangeAlways}[0],
 				},
 			},

diff --git a/apis/apps/v1beta3/emqxenterprise_conversion_test.go b/apis/apps/v1beta3/emqxenterprise_conversion_test.go
@@ -25,7 +25,7 @@ import (
 	"k8s.io/apimachinery/pkg/api/resource"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/intstr"
-	"k8s.io/utils/pointer"
+	"k8s.io/utils/ptr"
 )
 
 var v1bete3EmqxEnterprise = &EmqxEnterprise{
@@ -40,7 +40,7 @@ var v1bete3EmqxEnterprise = &EmqxEnterprise{
 		},
 	},
 	Spec: EmqxEnterpriseSpec{
-		Replicas: pointer.Int32(3),
+		Replicas: ptr.To(int32(3)),
 		Env: []corev1.EnvVar{
 			{
 				Name:  "foo",
@@ -77,7 +77,7 @@ var v1bete3EmqxEnterprise = &EmqxEnterprise{
 			},
 		},
 		Persistent: corev1.PersistentVolumeClaimSpec{
-			StorageClassName: pointer.String("foo"),
+			StorageClassName: ptr.To("foo"),
 		},
 		InitContainers: []corev1.Container{
 			{
@@ -100,9 +100,9 @@ var v1bete3EmqxEnterprise = &EmqxEnterprise{
 			ACL:             []string{"allow, all."},
 			ImagePullPolicy: corev1.PullIfNotPresent,
 			SecurityContext: &corev1.PodSecurityContext{
-				RunAsUser:           pointer.Int64(1000),
-				RunAsGroup:          pointer.Int64(1000),
-				FSGroup:             pointer.Int64(1000),
+				RunAsUser:           ptr.To(int64(1000)),
+				RunAsGroup:          ptr.To(int64(1000)),
+				FSGroup:             ptr.To(int64(1000)),
 				FSGroupChangePolicy: &[]corev1.PodFSGroupChangePolicy{corev1.FSGroupChangeAlways}[0],
 			},
 			ExtraVolumes: []corev1.Volume{
@@ -205,13 +205,13 @@ var v1beta4EmqxEnterprise = &v1beta4.EmqxEnterprise{
 		},
 	},
 	Spec: v1beta4.EmqxEnterpriseSpec{
-		Replicas: pointer.Int32(3),
+		Replicas: ptr.To(int32(3)),
 		License: v1beta4.EmqxLicense{
 			SecretName: "fake-license-secret",
 		},
 		Persistent: &corev1.PersistentVolumeClaimTemplate{
 			Spec: corev1.PersistentVolumeClaimSpec{
-				StorageClassName: pointer.String("foo"),
+				StorageClassName: ptr.To("foo"),
 			},
 		},
 		Template: v1beta4.EmqxTemplate{
@@ -339,9 +339,9 @@ var v1beta4EmqxEnterprise = &v1beta4.EmqxEnterprise{
 					},
 				},
 				PodSecurityContext: &corev1.PodSecurityContext{
-					RunAsUser:           pointer.Int64(1000),
-					RunAsGroup:          pointer.Int64(1000),
-					FSGroup:             pointer.Int64(1000),
+					RunAsUser:           ptr.To(int64(1000)),
+					RunAsGroup:          ptr.To(int64(1000)),
+					FSGroup:             ptr.To(int64(1000)),
 					FSGroupChangePolicy: &[]corev1.PodFSGroupChangePolicy{corev1.FSGroupChangeAlways}[0],
 				},
 			},

diff --git a/apis/apps/v1beta4/emqxbroker_webhook.go b/apis/apps/v1beta4/emqxbroker_webhook.go
@@ -31,6 +31,7 @@ import (
 	ctrl "sigs.k8s.io/controller-runtime"
 	logf "sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/webhook"
+	"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
 )
 
 // log is for logging in this package.
@@ -64,19 +65,19 @@ func (r *EmqxBroker) Default() {
 var _ webhook.Validator = &EmqxBroker{}
 
 // ValidateCreate implements webhook.Validator so a webhook will be registered for the type
-func (r *EmqxBroker) ValidateCreate() error {
+func (r *EmqxBroker) ValidateCreate() (admission.Warnings, error) {
 	emqxbrokerlog.Info("validate create", "name", r.Name)
 
 	if err := validateImageVersion(r, nil); err != nil {
 		emqxbrokerlog.Error(err, "validate create failed")
-		return err
+		return nil, err
 	}
 
-	return nil
+	return nil, nil
 }
 
 // ValidateUpdate implements webhook.Validator so a webhook will be registered for the type
-func (r *EmqxBroker) ValidateUpdate(old runtime.Object) error {
+func (r *EmqxBroker) ValidateUpdate(old runtime.Object) (admission.Warnings, error) {
 	emqxbrokerlog.Info("validate update", "name", r.Name)
 
 	callbacks := []func(new, old Emqx) error{
@@ -88,17 +89,17 @@ func (r *EmqxBroker) ValidateUpdate(old runtime.Object) error {
 	for _, cb := range callbacks {
 		if err := cb(r, old.(*EmqxBroker)); err != nil {
 			emqxbrokerlog.Error(err, "validate create failed")
-			return err
+			return nil, err
 		}
 	}
-	return nil
+	return nil, nil
 }
 
 // ValidateDelete implements webhook.Validator so a webhook will be registered for the type
-func (r *EmqxBroker) ValidateDelete() error {
+func (r *EmqxBroker) ValidateDelete() (admission.Warnings, error) {
 	emqxbrokerlog.Info("validate delete", "name", r.Name)
 
-	return nil
+	return nil, nil
 }
 
 func defaultLabelsAndAnnotations(r Emqx) {