Update golangci lint version

cockroachdb · Nov 5, 2024 · fe6b18c · fe6b18c
1 parent 239607f
commit fe6b18c
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 13 deletions.
diff --git a/config/manager/patches/image.yaml b/config/manager/patches/image.yaml
@@ -312,6 +312,8 @@ spec:
               value: cockroachdb/cockroach:v23.2.12
             - name: RELATED_IMAGE_COCKROACH_v23_2_13
               value: cockroachdb/cockroach:v23.2.13
+            - name: RELATED_IMAGE_COCKROACH_v23_2_14
+              value: cockroachdb/cockroach:v23.2.14
             - name: RELATED_IMAGE_COCKROACH_v24_1_0
               value: cockroachdb/cockroach:v24.1.0
             - name: RELATED_IMAGE_COCKROACH_v24_1_1

diff --git a/config/manifests/bases/cockroach-operator.clusterserviceversion.yaml b/config/manifests/bases/cockroach-operator.clusterserviceversion.yaml
@@ -485,6 +485,8 @@ spec:
     name: RELATED_IMAGE_COCKROACH_v23_2_12
   - image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:e0f21abea34825e55622c432a306f2e8aafd64d913eb78f2f601c51dc878a1da
     name: RELATED_IMAGE_COCKROACH_v23_2_13
+  - image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:6366ba29f301a82215c05e60d78e1de66bcee85440ce2fc3c692712d4da32685
+    name: RELATED_IMAGE_COCKROACH_v23_2_14
   - image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:5240f9f591263569fad7ee934e81fa8a1617de3c25da94ddd59ee5b2b3407f90
     name: RELATED_IMAGE_COCKROACH_v24_1_0
   - image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:1374cbdc4ecf38e4b4226328f532e830b8932b34d9449bf2fbb36e60d0310521

diff --git a/config/manifests/patches/deployment_patch.yaml b/config/manifests/patches/deployment_patch.yaml
@@ -321,6 +321,8 @@ spec:
               value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:a0faa52a999289b308dc4caf050c6d9fe2f42e112aa30e4af282ed1f21c5c346
             - name: RELATED_IMAGE_COCKROACH_v23_2_13
               value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:e0f21abea34825e55622c432a306f2e8aafd64d913eb78f2f601c51dc878a1da
+            - name: RELATED_IMAGE_COCKROACH_v23_2_14
+              value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:6366ba29f301a82215c05e60d78e1de66bcee85440ce2fc3c692712d4da32685
             - name: RELATED_IMAGE_COCKROACH_v24_1_0
               value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:5240f9f591263569fad7ee934e81fa8a1617de3c25da94ddd59ee5b2b3407f90
             - name: RELATED_IMAGE_COCKROACH_v24_1_1

diff --git a/crdb-versions.yaml b/crdb-versions.yaml
@@ -451,6 +451,9 @@ CrdbVersions:
 - image: cockroachdb/cockroach:v23.2.13
   redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:e0f21abea34825e55622c432a306f2e8aafd64d913eb78f2f601c51dc878a1da
   tag: v23.2.13
+- image: cockroachdb/cockroach:v23.2.14
+  redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:6366ba29f301a82215c05e60d78e1de66bcee85440ce2fc3c692712d4da32685
+  tag: v23.2.14
 - image: cockroachdb/cockroach:v24.1.0
   redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:5240f9f591263569fad7ee934e81fa8a1617de3c25da94ddd59ee5b2b3407f90
   tag: v24.1.0

diff --git a/hack/bin/deps.bzl b/hack/bin/deps.bzl
@@ -142,8 +142,8 @@ def install_integration_test_dependencies():
     http_file(
         name = "kube-apiserver_linux_amd64",
         executable = 1,
-        sha256 = "b4505b838b27b170531afbdef5e7bfaacf83da665f21b0e3269d1775b0defb7a",
-        urls = ["https://storage.googleapis.com/kubernetes-release/release/v1.17.3/bin/linux/amd64/kube-apiserver"],
+        sha256 = "a70a704835450130f8feeac9d42617d527e269c25a5aa92590e54533c2d4f776",
+        urls = ["https://storage.googleapis.com/cockroach-operator-testing-assets/kube-apiserver-1.24.2_linux_amd64"],
     )
 
     http_archive(
@@ -220,14 +220,14 @@ def install_k3d():
 def install_golangci_lint():
     http_archive(
         name = "golangci_lint_darwin",
-        sha256 = "15c4d19a2c85a04f67779047dbb9467ba176c71fff762a0d514a21bb75e4b42c",
-        urls = ["https://github.com/golangci/golangci-lint/releases/download/v1.56.2/golangci-lint-1.56.2-darwin-amd64.tar.gz"],
+        sha256 = "5c280ef3284f80c54fd90d73dc39ca276953949da1db03eb9dd0fbf868cc6e55",
+        urls = ["https://github.com/golangci/golangci-lint/releases/download/v1.61.0/golangci-lint-1.61.0-darwin-amd64.tar.gz"],
         build_file_content =
          """
 filegroup(
      name = "file",
      srcs = [
-        "golangci-lint-1.56.2-darwin-amd64/golangci-lint",
+        "golangci-lint-1.61.0-darwin-amd64/golangci-lint",
      ],
      visibility = ["//visibility:public"],
 )
@@ -236,14 +236,14 @@ filegroup(
 
     http_archive(
             name = "golangci_lint_m1",
-            sha256 = "5f9ecda712c7ae08fbf872336fae3db866720e5865903d4c53903184b2a2c2dc",
-            urls = ["https://github.com/golangci/golangci-lint/releases/download/v1.56.2/golangci-lint-1.56.2-darwin-arm64.tar.gz"],
+            sha256 = "544334890701e4e04a6e574bc010bea8945205c08c44cced73745a6378012d36",
+            urls = ["https://github.com/golangci/golangci-lint/releases/download/v1.61.0/golangci-lint-1.61.0-darwin-arm64.tar.gz"],
             build_file_content =
              """
 filegroup(
     name = "file",
     srcs = [
-       "golangci-lint-1.56.2-darwin-arm64/golangci-lint",
+       "golangci-lint-1.61.0-darwin-arm64/golangci-lint",
     ],
     visibility = ["//visibility:public"],
 )
@@ -252,14 +252,14 @@ filegroup(
 
     http_archive(
         name = "golangci_lint_linux",
-        sha256 = "e1c313fb5fc85a33890fdee5dbb1777d1f5829c84d655a47a55688f3aad5e501",
-        urls = ["https://github.com/golangci/golangci-lint/releases/download/v1.56.2/golangci-lint-1.56.2-linux-amd64.tar.gz"],
+        sha256 = "77cb0af99379d9a21d5dc8c38364d060e864a01bd2f3e30b5e8cc550c3a54111",
+        urls = ["https://github.com/golangci/golangci-lint/releases/download/v1.61.0/golangci-lint-1.61.0-linux-amd64.tar.gz"],
         build_file_content =
          """
 filegroup(
      name = "file",
      srcs = [
-        "golangci-lint-1.56.2-linux-amd64/golangci-lint",
+        "golangci-lint-1.61.0-linux-amd64/golangci-lint",
      ],
      visibility = ["//visibility:public"],
 )

diff --git a/install/operator.yaml b/install/operator.yaml
@@ -670,6 +670,8 @@ spec:
           value: cockroachdb/cockroach:v23.2.12
         - name: RELATED_IMAGE_COCKROACH_v23_2_13
           value: cockroachdb/cockroach:v23.2.13
+        - name: RELATED_IMAGE_COCKROACH_v23_2_14
+          value: cockroachdb/cockroach:v23.2.14
         - name: RELATED_IMAGE_COCKROACH_v24_1_0
           value: cockroachdb/cockroach:v24.1.0
         - name: RELATED_IMAGE_COCKROACH_v24_1_1

diff --git a/pkg/resource/statefulset.go b/pkg/resource/statefulset.go
@@ -232,7 +232,7 @@ func (b StatefulSetBuilder) makePodTemplate() corev1.PodTemplateSpec {
 		pod.Spec.TopologySpreadConstraints = b.Spec().TopologySpreadConstraints
 	}
 
-	if b.Spec().NodeSelector != nil && len(b.Spec().NodeSelector) > 0 {
+	if len(b.Spec().NodeSelector) > 0 {
 		pod.Spec.NodeSelector = b.Spec().NodeSelector
 	}
 

diff --git a/pkg/testutil/require.go b/pkg/testutil/require.go
@@ -660,7 +660,7 @@ func RequireClusterInFailedState(t *testing.T, sb testenv.DiffingSandbox, b Clus
 		},
 	}
 
-	wErr := wait.Poll(10*time.Second, 2*time.Minute, func() (bool, error) {
+	wErr := wait.Poll(10*time.Second, 5*time.Minute, func() (bool, error) {
 		if err := sb.Get(&crdbCluster); err != nil {
 			return false, err
 		}
@@ -672,6 +672,7 @@ func RequireClusterInFailedState(t *testing.T, sb testenv.DiffingSandbox, b Clus
 		return false, nil
 	})
 
+	t.Logf("CRDB Cluster status: %s", crdbCluster.Status.ClusterStatus)
 	require.NoError(t, wErr)
 }