Merge branch 'master' into update_service_account

Author: bhismnarayan

.bazelrc

@@ -1,2 +1,2 @@
 build --workspace_status_command hack/build/print-workspace-status.sh
-test --test_output=errors --test_timeout=-1,-1,-1,2400
+test --test_output=all --test_timeout=-1,-1,-1,2400

.github/workflows/e2e-kind-create.yaml

@@ -1,4 +1,4 @@
-# Copyright 2023 The Cockroach Authors
+# Copyright 2025 The Cockroach Authors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

.github/workflows/e2e-kind-decommission.yaml

@@ -1,4 +1,4 @@
-# Copyright 2023 The Cockroach Authors
+# Copyright 2025 The Cockroach Authors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

.github/workflows/e2e-kind-upgrades.yaml

@@ -1,4 +1,4 @@
-# Copyright 2023 The Cockroach Authors
+# Copyright 2025 The Cockroach Authors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -26,7 +26,7 @@ on:
 
 jobs:
   e2e-kind-upgrades:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-latest-4-core
     strategy:
       fail-fast: false
     steps:

.github/workflows/e2e-kind-upgradessha256.yaml

@@ -1,4 +1,4 @@
-# Copyright 2023 The Cockroach Authors
+# Copyright 2025 The Cockroach Authors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

.github/workflows/e2e-kind-versionchecker.yaml

@@ -1,4 +1,4 @@
-# Copyright 2023 The Cockroach Authors
+# Copyright 2025 The Cockroach Authors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

.github/workflows/nightly-smoketest.yaml

@@ -1,4 +1,4 @@
-# Copyright 2023 The Cockroach Authors
+# Copyright 2025 The Cockroach Authors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

.github/workflows/templates.yaml

@@ -1,4 +1,4 @@
-# Copyright 2023 The Cockroach Authors
+# Copyright 2025 The Cockroach Authors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

.github/workflows/tests.yaml

@@ -1,4 +1,4 @@
-# Copyright 2023 The Cockroach Authors
+# Copyright 2025 The Cockroach Authors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

.github/workflows/update-crdb-versions.yaml

@@ -1,4 +1,4 @@
-# Copyright 2023 The Cockroach Authors
+# Copyright 2025 The Cockroach Authors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -31,13 +31,17 @@ jobs:
         with:
           path: "~/.cache/bazel"
           key: bazel
-      - name: Update CRDB versions
-        uses: technote-space/create-pr-action@v2
+      - name: Update CRDB version
+        run: make release/gen-templates
+      - name: Create PR
+        uses: peter-evans/create-pull-request@v5
         with:
-          EXECUTE_COMMANDS: |
-            make release/gen-templates
-          COMMIT_MESSAGE: 'Update CRDB versions'
-          COMMIT_NAME: 'GitHub Actions'
-          COMMIT_EMAIL: '[email protected]'
-          PR_BRANCH_NAME: 'crdb-update-${PR_ID}'
-          PR_TITLE: 'Update CRDB versions'
+          base: "master"
+          branch: 'crdb-version-update'
+          title: "Update CRDB versions"
+          author: "CRL Release bot <[email protected]>"
+          body: |
+            Update supported CRDB versions.
+          commit-message: |
+            Update supported CRDB versions.
+          delete-branch: true

.golangci.yaml

@@ -1,4 +1,4 @@
-# Copyright 2023 The Cockroach Authors
+# Copyright 2025 The Cockroach Authors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

BUILD.bazel

@@ -2,7 +2,12 @@
 # gazelle:proto disable_global
 # gazelle:exclude docs/generated/reference/generate/json_swagger
 
-load("@io_bazel_rules_docker//container:container.bzl", "container_push")
+load("@aspect_bazel_lib//lib:expand_template.bzl", "expand_template")
+
+# TODO
+load("@bazel_gazelle//:def.bzl", "gazelle")
+load("@bazel_skylib//rules:native_binary.bzl", "native_binary")
+load("@rules_oci//oci:defs.bzl", "oci_push")
 
 # export WORKSPACE so workspace_binary rules can be used outside the root
 exports_files([
@@ -12,18 +17,22 @@ exports_files([
     "go.sum",
 ])
 
-# TODO
-load("@bazel_gazelle//:def.bzl", "gazelle")
-
 gazelle(name = "gazelle")
 
-container_push(
+expand_template(
+    name = "tags",
+    stamp_substitutions = {
+        "APP_VERSION": "{{STABLE_DOCKER_TAG}}",
+    },
+    template = ["APP_VERSION"],
+)
+
+oci_push(
     name = "push_operator_image",
-    format = "Docker",
-    image = "//cmd/cockroach-operator:operator_image",
-    registry = "{STABLE_DOCKER_REGISTRY}",
-    repository = "{STABLE_IMAGE_REPOSITORY}",
-    tag = "{STABLE_DOCKER_TAG}",
+    image = "//cmd/cockroach-operator:index",
+    remote_tags = ":tags",
+    repository = "${DOCKER_REGISTRY}/${DOCKER_IMAGE_REPOSITORY}",
+    visibility = ["//visibility:public"],
 )
 
 filegroup(

CHANGELOG.md

@@ -5,7 +5,35 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres
 to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-# [Unreleased](https://github.com/cockroachdb/cockroach-operator/compare/v2.11.0...master)
+# [Unreleased](https://github.com/cockroachdb/cockroach-operator/compare/v2.18.1...master)
+
+# [v2.18.1](https://github.com/cockroachdb/cockroach-operator/compare/v2.18.0...v2.18.1)
+* Added support for openshift 4.19
+
+# [v2.18.0](https://github.com/cockroachdb/cockroach-operator/compare/v2.17.0...v2.18.0)
+* Added support for skipping innovative releases post 24.x
+* Added support for QoS on init containers.
+
+# [v2.17.0](https://github.com/cockroachdb/cockroach-operator/compare/v2.16.1...v2.17.0)
+* Added support for linux/arm64 images.
+* Added support for TerminationGracePeriodSeconds in statefulset.
+* Upgraded underlying dependencies for cockroach-operator.
+
+# [v2.16.1](https://github.com/cockroachdb/cockroach-operator/compare/v2.16.0...v2.16.1)
+* Increased memory limits for the version checker job
+
+# [v2.16.0](https://github.com/cockroachdb/cockroach-operator/compare/v2.15.1...v2.16.0)
+
+# [v2.15.1](https://github.com/cockroachdb/cockroach-operator/compare/v2.15.0...v2.15.1)
+* Bug fix, removing deprecated cluster setting `kv.snapshot_recovery.max_rate` from being checked during decommission.
+
+# [v2.15.0](https://github.com/cockroachdb/cockroach-operator/compare/v2.14.0...v2.15.0)
+
+# [v2.14.0](https://github.com/cockroachdb/cockroach-operator/compare/v2.13.0...v2.14.0)
+
+# [v2.13.0](https://github.com/cockroachdb/cockroach-operator/compare/v2.12.0...v2.13.0)
+
+# [v2.12.0](https://github.com/cockroachdb/cockroach-operator/compare/v2.11.0...v2.12.0)
 
 # [v2.11.0](https://github.com/cockroachdb/cockroach-operator/compare/v2.10.0...v2.11.0)
 

DEVELOPER.md

@@ -44,6 +44,13 @@ since there's no need to set up a remote GKE/OpenShift cluster.
 
 **make dev/up**
 
+Pre-requisite: The command sets up a k3d registry, and to push an image to it, the registry name must resolve to 
+localhost or 127.0.0.1. Please add the following line to your /etc/hosts file:
+
+```shell
+127.0.0.1 registry.localhost
+```
+
 This command will get everything set up for you to begin testing out the operator. Specifically it will:
 
 * Start a k3d cluster named test (context=k3d-test) with a managed docker registry
@@ -56,6 +63,18 @@ This command will get everything set up for you to begin testing out the operato
 
 Tears down the k3d cluster.
 
+[Existing Cluster & Repo]:
+
+export DEV_REGISTRY="Your_Registry"
+**make k8s/apply**
+
+This command will deploy the operator to an existing cluster. It will build the operator image and push it to the DEV_REGISTRY.
+This newly built image will be used to deploy the operator.
+
+**make k8s/delete**
+
+Tears down the cockroach operator deployment applied on the cluster.
+
 ## Testing CR Database
 
 Notes on how to test an existing CR Database.
@@ -71,6 +90,9 @@ SELECT * FROM bank.accounts;
 
 ## Developer Install Instructions
 
+Pre-requisite: 
+1. Install kustomize
+
 These instructions are for developers only. If you want to try the alpha please use the instructions in the next
 section.
 
@@ -79,13 +101,18 @@ Install the operator
 ```console
 $ git clone https://github.com/cockroachdb/cockroach-operator.git
 $ export CLUSTER=test
+$ export APP_VERSION=v$(cat version.txt)
+$ export DEV_REGISTRY=us.gcr.io/$(gcloud config get-value project)
 # create a gke cluster
 $ ./hack/create-gke-cluster.sh -c $CLUSTER
 
-$ DEV_REGISTRY=us.gcr.io/$(gcloud config get-value project) \
+$ bazel run //hack/crdbversions:crdbversions -- -operator-image ${DEV_REGISTRY}/cockroach-operator \
+-operator-version ${APP_VERSION} -crdb-versions $(PWD)/crdb-versions.yaml -repo-root $(PWD)
+ 
+$ DEV_REGISTRY=${DEV_REGISTRY} \
 K8S_CLUSTER=$(kubectl config view --minify -o=jsonpath='{.contexts[0].context.cluster}') \
 bazel run --stamp --platforms=@io_bazel_rules_go//go/toolchain:linux_amd64 \
-                 //manifests:install_operator.apply
+                 --define APP_VERSION=${APP_VERSION} //config/default:install.apply
 ```
 
 There are various examples that can be installed. The files are located in the examples directory.

Makefile

@@ -1,4 +1,4 @@
-# Copyright 2023 The Cockroach Authors
+# Copyright 2025 The Cockroach Authors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -59,7 +59,7 @@ test/pkg:
 # takes a bit of time.
 .PHONY: test/verify
 test/verify:
-	bazel test //hack/...
+	bazel test --test_output=all //hack/...
 
 .PHONY: test/lint
 test/lint:
@@ -94,7 +94,7 @@ test/e2e-short:
 test/e2e/testrunner-k3d-%: PACKAGE=$*
 test/e2e/testrunner-k3d-%:
 	bazel run //hack/k8s:k8s -- -type k3d
-	bazel test --stamp //e2e/$(PACKAGE)/... --test_arg=-test.v --test_arg=-test.parallel=4 --test_arg=parallel=true
+	bazel test --test_output=all --stamp //e2e/$(PACKAGE)/... --test_arg=-test.v --test_arg=-test.parallel=4 --test_arg=parallel=true
 
 # Use this target to run e2e tests using a k3d k8s cluster.
 # This target uses k3d to start a k8s cluster  and runs the e2e tests
@@ -221,7 +221,7 @@ test/preflight-%: release/generate-bundle
 #
 .PHONY: dev/build
 dev/build: dev/syncdeps
-	bazel build //...
+	bazel build //... --define APP_VERSION=$(APP_VERSION)
 
 .PHONY: dev/fmt
 dev/fmt:
@@ -280,17 +280,15 @@ dev/down:
 #
 .PHONY: k8s/apply
 k8s/apply:
-	K8S_CLUSTER=gke_$(GCP_PROJECT)_$(GCP_ZONE)_$(CLUSTER_NAME) \
 	DEV_REGISTRY=$(DEV_REGISTRY) \
 	bazel run --stamp --platforms=@io_bazel_rules_go//go/toolchain:linux_amd64 \
 		//config/default:install.apply \
 		--define APP_VERSION=$(APP_VERSION)
 
 .PHONY: k8s/delete
 k8s/delete:
-	K8S_CLUSTER=gke_$(GCP_PROJECT)_$(GCP_ZONE)_$(CLUSTER_NAME) \
 	DEV_REGISTRY=$(DEV_REGISTRY) \
-	bazel run --stamp --platforms=@io_bazel_rules_go//go/toolchain:linux_amd64 \
+	bazel run --stamp --incompatible_use_cc_configure_from_rules_cc \
 		//config/default:install.delete \
 		--define APP_VERSION=$(APP_VERSION)
 
@@ -332,7 +330,7 @@ release/image:
 	DOCKER_REGISTRY=$(DOCKER_REGISTRY) \
 	DOCKER_IMAGE_REPOSITORY=$(DOCKER_IMAGE_REPOSITORY) \
 	APP_VERSION=$(APP_VERSION) \
-	bazel run --stamp --platforms=@io_bazel_rules_go//go/toolchain:linux_amd64 \
+	bazel run --stamp \
 		//:push_operator_image
 
 #