Remove --http-port and --port from the cockroach operator

prafull01 · prafull01 · commit a3078de62988 · 2024-10-22T00:50:29.000+05:30
diff --git a/Makefile b/Makefile
@@ -59,7 +59,7 @@ test/pkg:
 # takes a bit of time.
 .PHONY: test/verify
 test/verify:
-	bazel test //hack/...
+	bazel test --test_timeout=1200 //hack/...
 
 .PHONY: test/lint
 test/lint:
diff --git a/apis/v1alpha1/cluster_types.go b/apis/v1alpha1/cluster_types.go
@@ -40,11 +40,11 @@ type CrdbClusterSpec struct {
 	// +operator-sdk:csv:customresourcedefinitions:type=spec,displayName="Cockroach Database Image"
 	// +optional
 	Image *PodImage `json:"image,omitempty"`
-	// (Optional) The database port (`--port` CLI parameter when starting the service)
+	// (Optional) The database port (`--listen-addr` CLI parameter when starting the service)
 	// Default: 26258
 	// +optional
 	GRPCPort *int32 `json:"grpcPort,omitempty"`
-	// (Optional) The web UI port (`--http-port` CLI parameter when starting the service)
+	// (Optional) The web UI port (`--http-addr` CLI parameter when starting the service)
 	// Default: 8080
 	// +optional
 	HTTPPort *int32 `json:"httpPort,omitempty"`
diff --git a/config/crd/bases/crdb.cockroachlabs.com_crdbclusters.yaml b/config/crd/bases/crdb.cockroachlabs.com_crdbclusters.yaml
@@ -1086,12 +1086,12 @@ spec:
                     type: boolean
                 type: object
               grpcPort:
-                description: '(Optional) The database port (`--port` CLI parameter
+                description: '(Optional) The database port (`--listen-addr` CLI parameter
                   when starting the service) Default: 26258'
                 format: int32
                 type: integer
               httpPort:
-                description: '(Optional) The web UI port (`--http-port` CLI parameter
+                description: '(Optional) The web UI port (`--http-addr` CLI parameter
                   when starting the service) Default: 8080'
                 format: int32
                 type: integer
diff --git a/config/manager/patches/image.yaml b/config/manager/patches/image.yaml
@@ -328,3 +328,5 @@ spec:
               value: cockroachdb/cockroach:v24.2.2
             - name: RELATED_IMAGE_COCKROACH_v24_2_3
               value: cockroachdb/cockroach:v24.2.3
+            - name: RELATED_IMAGE_COCKROACH_v24_2_4
+              value: cockroachdb/cockroach:v24.2.4
diff --git a/config/manifests/bases/cockroach-operator.clusterserviceversion.yaml b/config/manifests/bases/cockroach-operator.clusterserviceversion.yaml
@@ -501,6 +501,8 @@ spec:
     name: RELATED_IMAGE_COCKROACH_v24_2_2
   - image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:acc083f7dde1fbc557d858d03fc26b68b2056997fc1a457e4695650214d5b303
     name: RELATED_IMAGE_COCKROACH_v24_2_3
+  - image: registry.connect.redhat.com/cockroachdb/cockroach@sha256:226d7f1c3f0d70ac6532ad9490bebcdef44a40959b6aa7c11b0f2d1383a46217
+    name: RELATED_IMAGE_COCKROACH_v24_2_4
   - image: RH_COCKROACH_OP_IMAGE_PLACEHOLDER
     name: RELATED_IMAGE_COCKROACH_OPERATOR
   version: 0.0.0
diff --git a/config/manifests/patches/deployment_patch.yaml b/config/manifests/patches/deployment_patch.yaml
@@ -337,4 +337,6 @@ spec:
               value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:08cec123813304ab03bd66d72a09949667a874a42320bedafda391ebcdb2e56c
             - name: RELATED_IMAGE_COCKROACH_v24_2_3
               value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:acc083f7dde1fbc557d858d03fc26b68b2056997fc1a457e4695650214d5b303
+            - name: RELATED_IMAGE_COCKROACH_v24_2_4
+              value: registry.connect.redhat.com/cockroachdb/cockroach@sha256:226d7f1c3f0d70ac6532ad9490bebcdef44a40959b6aa7c11b0f2d1383a46217
           image: RH_COCKROACH_OP_IMAGE_PLACEHOLDER
diff --git a/config/samples/crdb-tls-example.yaml b/config/samples/crdb-tls-example.yaml
@@ -19,7 +19,7 @@ kind: CrdbCluster
 metadata:
   name: crdb-tls-example
 spec:
-  cockroachDBVersion: v24.2.3
+  cockroachDBVersion: v24.2.4
   dataStore:
     pvc:
       spec:
diff --git a/crdb-versions.yaml b/crdb-versions.yaml
@@ -475,3 +475,6 @@ CrdbVersions:
 - image: cockroachdb/cockroach:v24.2.3
   redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:acc083f7dde1fbc557d858d03fc26b68b2056997fc1a457e4695650214d5b303
   tag: v24.2.3
+- image: cockroachdb/cockroach:v24.2.4
+  redhatImage: registry.connect.redhat.com/cockroachdb/cockroach@sha256:226d7f1c3f0d70ac6532ad9490bebcdef44a40959b6aa7c11b0f2d1383a46217
+  tag: v24.2.4
diff --git a/examples/client-secure-operator.yaml b/examples/client-secure-operator.yaml
@@ -23,7 +23,7 @@ spec:
   serviceAccountName: cockroachdb-sa
   containers:
   - name: cockroachdb-client-secure
-    image: cockroachdb/cockroach:v24.2.3
+    image: cockroachdb/cockroach:v24.2.4
     imagePullPolicy: IfNotPresent
     volumeMounts:
     - name: client-certs
diff --git a/examples/example.yaml b/examples/example.yaml
@@ -40,9 +40,9 @@ spec:
       memory: 8Gi
   tlsEnabled: true
 # You can set either a version of the db or a specific image name
-# cockroachDBVersion: v24.2.3
+# cockroachDBVersion: v24.2.4
   image:
-    name: cockroachdb/cockroach:v24.2.3
+    name: cockroachdb/cockroach:v24.2.4
   # nodes refers to the number of crdb pods that are created
   # via the statefulset
   nodes: 3
diff --git a/examples/smoketest.yaml b/examples/smoketest.yaml
@@ -39,5 +39,5 @@ spec:
       memory: 300Mi
   tlsEnabled: true
   image:
-    name: cockroachdb/cockroach:v24.2.3
+    name: cockroachdb/cockroach:v24.2.4
   nodes: 3
diff --git a/hack/build/repos.bzl b/hack/build/repos.bzl
@@ -5336,8 +5336,8 @@ def _go_dependencies():
         build_file_generation = "on",
         build_file_proto_mode = "disable",
         importpath = "gopkg.in/yaml.v3",
-        sum = "h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo=",
-        version = "v3.0.0-20210107192922-496545a6307b",
+        sum = "h1:hjy8E9ON/egN1tAYqKb61G10WtihqetD4sz2H+8nIeA=",
+        version = "v3.0.0",
     )
     go_repository(
         name = "io_etcd_go_bbolt",
diff --git a/install/crds.yaml b/install/crds.yaml
@@ -1084,12 +1084,12 @@ spec:
                     type: boolean
                 type: object
               grpcPort:
-                description: '(Optional) The database port (`--port` CLI parameter
+                description: '(Optional) The database port (`--listen-addr` CLI parameter
                   when starting the service) Default: 26258'
                 format: int32
                 type: integer
               httpPort:
-                description: '(Optional) The web UI port (`--http-port` CLI parameter
+                description: '(Optional) The web UI port (`--http-addr` CLI parameter
                   when starting the service) Default: 8080'
                 format: int32
                 type: integer
diff --git a/install/operator.yaml b/install/operator.yaml
@@ -686,6 +686,8 @@ spec:
           value: cockroachdb/cockroach:v24.2.2
         - name: RELATED_IMAGE_COCKROACH_v24_2_3
           value: cockroachdb/cockroach:v24.2.3
+        - name: RELATED_IMAGE_COCKROACH_v24_2_4
+          value: cockroachdb/cockroach:v24.2.4
         - name: OPERATOR_NAME
           value: cockroachdb
         - name: POD_NAME
diff --git a/pkg/resource/statefulset.go b/pkg/resource/statefulset.go
@@ -362,7 +362,7 @@ func (b StatefulSetBuilder) dbArgs() []string {
 		fmt.Sprintf("--advertise-host=$(POD_NAME).%s.%s",
 			b.Cluster.DiscoveryServiceName(), b.Cluster.Namespace()),
 		b.Cluster.SecureMode(),
-		"--http-port=" + fmt.Sprint(*b.Spec().HTTPPort),
+		"--http-addr=:" + fmt.Sprint(*b.Spec().HTTPPort),
 		"--sql-addr=:" + fmt.Sprint(*b.Spec().SQLPort),
 		"--listen-addr=:" + fmt.Sprint(*b.Spec().GRPCPort),
 	}
diff --git a/pkg/resource/testdata/TestStatefulSetBuilder/automount_sa.golden b/pkg/resource/testdata/TestStatefulSetBuilder/automount_sa.golden
@@ -31,7 +31,7 @@ spec:
         - /bin/bash
         - -ecx
         - 'exec /cockroach/cockroach.sh start --advertise-host=$(POD_NAME).test-cluster.test-ns
-          --certs-dir=/cockroach/cockroach-certs/ --http-port=8080 --sql-addr=:26257
+          --certs-dir=/cockroach/cockroach-certs/ --http-addr=:8080 --sql-addr=:26257
           --listen-addr=:26258 --log="{sinks: {stderr: {channels: [OPS, HEALTH], redact:
           true}}}" --cache $(expr $MEMORY_LIMIT_MIB / 4)MiB --max-sql-memory $(expr
           $MEMORY_LIMIT_MIB / 4)MiB --join=test-cluster-0.test-cluster.test-ns:26258'
diff --git a/pkg/resource/testdata/TestStatefulSetBuilder/default_insecure_statefulset.golden b/pkg/resource/testdata/TestStatefulSetBuilder/default_insecure_statefulset.golden
@@ -29,7 +29,7 @@ spec:
         - /bin/bash
         - -ecx
         - 'exec /cockroach/cockroach.sh start --advertise-host=$(POD_NAME).test-cluster.test-ns
-          --insecure --http-port=8080 --sql-addr=:26257 --listen-addr=:26258 --log="{sinks:
+          --insecure --http-addr=:8080 --sql-addr=:26257 --listen-addr=:26258 --log="{sinks:
           {stderr: {channels: [OPS, HEALTH], redact: true}}}" --cache $(expr $MEMORY_LIMIT_MIB
           / 4)MiB --max-sql-memory $(expr $MEMORY_LIMIT_MIB / 4)MiB --join=test-cluster-0.test-cluster.test-ns:26258'
         env:
diff --git a/pkg/resource/testdata/TestStatefulSetBuilder/default_secure.golden b/pkg/resource/testdata/TestStatefulSetBuilder/default_secure.golden
@@ -31,7 +31,7 @@ spec:
         - /bin/bash
         - -ecx
         - 'exec /cockroach/cockroach.sh start --advertise-host=$(POD_NAME).test-cluster.test-ns
-          --certs-dir=/cockroach/cockroach-certs/ --http-port=8080 --sql-addr=:26257
+          --certs-dir=/cockroach/cockroach-certs/ --http-addr=:8080 --sql-addr=:26257
           --listen-addr=:26258 --log="{sinks: {stderr: {channels: [OPS, HEALTH], redact:
           true}}}" --cache $(expr $MEMORY_LIMIT_MIB / 4)MiB --max-sql-memory $(expr
           $MEMORY_LIMIT_MIB / 4)MiB --join=test-cluster-0.test-cluster.test-ns:26258'
diff --git a/pkg/resource/testdata/TestStatefulSetBuilder/insecure_statefulset_cli_args.golden b/pkg/resource/testdata/TestStatefulSetBuilder/insecure_statefulset_cli_args.golden
@@ -44,7 +44,7 @@ spec:
         - /bin/bash
         - -ecx
         - 'exec /cockroach/cockroach.sh start --advertise-host=$(POD_NAME).test-cluster.test-ns
-          --insecure --http-port=8080 --sql-addr=:26257 --listen-addr=:26258 --log="{sinks:
+          --insecure --http-addr=:8080 --sql-addr=:26257 --listen-addr=:26258 --log="{sinks:
           {stderr: {channels: [OPS, HEALTH], redact: true}}}" --cache=30% --max-sql-memory=2GB
           --temp-dir=/tmp --join=test-cluster-0.test-cluster.test-ns:26258'
         env:
diff --git a/pkg/resource/testdata/TestStatefulSetBuilder/insecure_statefulset_cli_args_with_join.golden b/pkg/resource/testdata/TestStatefulSetBuilder/insecure_statefulset_cli_args_with_join.golden
@@ -44,7 +44,7 @@ spec:
         - /bin/bash
         - -ecx
         - 'exec /cockroach/cockroach.sh start --advertise-host=$(POD_NAME).test-cluster.test-ns
-          --insecure --http-port=8080 --sql-addr=:26257 --listen-addr=:26258 --log="{sinks:
+          --insecure --http-addr=:8080 --sql-addr=:26257 --listen-addr=:26258 --log="{sinks:
           {stderr: {channels: [OPS, HEALTH], redact: true}}}" --cache=30% --max-sql-memory=2GB
           --join=test-cluster-1.new-test-cluster.new-test-ns:26258'
         env:
diff --git a/pkg/resource/testdata/TestStatefulSetBuilder/insecure_statefulset_with_resources.golden b/pkg/resource/testdata/TestStatefulSetBuilder/insecure_statefulset_with_resources.golden
@@ -29,7 +29,7 @@ spec:
         - /bin/bash
         - -ecx
         - exec /cockroach/cockroach.sh start --advertise-host=$(POD_NAME).test-cluster.test-ns
-          --insecure --http-port=8080 --sql-addr=:26257 --listen-addr=:26258 --logtostderr=INFO
+          --insecure --http-addr=:8080 --sql-addr=:26257 --listen-addr=:26258 --logtostderr=INFO
           --cache $(expr $MEMORY_LIMIT_MIB / 4)MiB --max-sql-memory $(expr $MEMORY_LIMIT_MIB
           / 4)MiB --join=test-cluster-0.test-cluster.test-ns:26258
         env:
diff --git a/pkg/scale/drainer.go b/pkg/scale/drainer.go
@@ -195,7 +195,7 @@ func (d *CockroachNodeDrainer) makeDrainStatusChecker(id uint) func(ctx context.
 
 func (d *CockroachNodeDrainer) executeDrainCmd(ctx context.Context, id uint, gRPCPort int32) error {
 	cmd := []string{
-		"./cockroach", "node", "decommission", fmt.Sprintf("%d", id), "--wait=none", fmt.Sprintf("--port=%d", gRPCPort),
+		"./cockroach", "node", "decommission", fmt.Sprintf("%d", id), "--wait=none", fmt.Sprintf("--host=:%d", gRPCPort),
 	}
 
 	if d.Secure {
@@ -215,7 +215,7 @@ func (d *CockroachNodeDrainer) executeDrainCmd(ctx context.Context, id uint, gRP
 // a node which will transition it from `decommissioning` to `decommissioned`. This should be executed
 // after it's confirmed that there are 0 replicas on the node.
 func (d *CockroachNodeDrainer) markNodeAsDecommissioned(ctx context.Context, id uint, gRPCPort int32) error {
-	cmd := []string{"./cockroach", "node", "decommission", fmt.Sprintf("%d", id), fmt.Sprintf("--port=%d", gRPCPort)}
+	cmd := []string{"./cockroach", "node", "decommission", fmt.Sprintf("%d", id), fmt.Sprintf("--host=:%d", gRPCPort)}
 
 	if d.Secure {
 		cmd = append(cmd, "--certs-dir=cockroach-certs")
