From 538f15ee9df929542c7b20b4e3114580aaeac968 Mon Sep 17 00:00:00 2001 From: Techassi Date: Mon, 18 Nov 2024 15:45:42 +0100 Subject: [PATCH 1/6] release 24.11.0 Signed-off-by: Techassi --- CHANGELOG.md | 2 + Cargo.lock | 4 +- Cargo.nix | 4 +- Cargo.toml | 2 +- deploy/helm/zookeeper-operator/Chart.yaml | 4 +- deploy/helm/zookeeper-operator/crds/crds.yaml | 44 +++++++++---------- docs/antora.yml | 3 +- docs/templating_vars.yaml | 12 ++--- tests/release.yaml | 8 ++-- 9 files changed, 43 insertions(+), 40 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1fc97a54..cc63a10c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,8 @@ All notable changes to this project will be documented in this file. ## [Unreleased] +## [24.11.0] - 2024-11-18 + ### Added - The operator can now run on Kubernetes clusters using a non-default cluster domain. diff --git a/Cargo.lock b/Cargo.lock index 883a16f3..ad65fc7c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2173,7 +2173,7 @@ dependencies = [ [[package]] name = "stackable-zookeeper-crd" -version = "0.0.0-dev" +version = "24.11.0" dependencies = [ "serde", "serde_json", @@ -2186,7 +2186,7 @@ dependencies = [ [[package]] name = "stackable-zookeeper-operator" -version = "0.0.0-dev" +version = "24.11.0" dependencies = [ "anyhow", "built", diff --git a/Cargo.nix b/Cargo.nix index 64384414..478935ec 100644 --- a/Cargo.nix +++ b/Cargo.nix @@ -6754,7 +6754,7 @@ rec { }; "stackable-zookeeper-crd" = rec { crateName = "stackable-zookeeper-crd"; - version = "0.0.0-dev"; + version = "24.11.0"; edition = "2021"; src = lib.cleanSourceWith { filter = sourceFilter; src = ./rust/crd; }; libName = "stackable_zookeeper_crd"; @@ -6799,7 +6799,7 @@ rec { }; "stackable-zookeeper-operator" = rec { crateName = "stackable-zookeeper-operator"; - version = "0.0.0-dev"; + version = "24.11.0"; edition = "2021"; crateBin = [ { diff --git a/Cargo.toml b/Cargo.toml index b3d7c737..63687350 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -3,7 +3,7 @@ members = ["rust/crd", "rust/operator-binary"] resolver = "2" [workspace.package] -version = "0.0.0-dev" +version = "24.11.0" authors = ["Stackable GmbH "] license = "OSL-3.0" edition = "2021" diff --git a/deploy/helm/zookeeper-operator/Chart.yaml b/deploy/helm/zookeeper-operator/Chart.yaml index 884bd34c..c814ff37 100644 --- a/deploy/helm/zookeeper-operator/Chart.yaml +++ b/deploy/helm/zookeeper-operator/Chart.yaml @@ -1,8 +1,8 @@ --- apiVersion: v2 name: zookeeper-operator -version: "0.0.0-dev" -appVersion: "0.0.0-dev" +version: "24.11.0" +appVersion: "24.11.0" description: The Stackable Operator for Apache ZooKeeper home: https://github.com/stackabletech/zookeeper-operator maintainers: diff --git a/deploy/helm/zookeeper-operator/crds/crds.yaml b/deploy/helm/zookeeper-operator/crds/crds.yaml index 8c8927f4..8f957ab0 100644 --- a/deploy/helm/zookeeper-operator/crds/crds.yaml +++ b/deploy/helm/zookeeper-operator/crds/crds.yaml @@ -23,7 +23,7 @@ spec: description: Auto-generated derived type for ZookeeperClusterSpec via `CustomResource` properties: spec: - description: A ZooKeeper cluster stacklet. This resource is managed by the Stackable operator for Apache ZooKeeper. Find more information on how to use it and the resources that the operator generates in the [operator documentation](https://docs.stackable.tech/home/nightly/zookeeper/). + description: A ZooKeeper cluster stacklet. This resource is managed by the Stackable operator for Apache ZooKeeper. Find more information on how to use it and the resources that the operator generates in the [operator documentation](https://docs.stackable.tech/home/24.11/zookeeper/). properties: clusterConfig: default: @@ -36,7 +36,7 @@ spec: properties: authentication: default: [] - description: Authentication settings for ZooKeeper like mTLS authentication. Read more in the [authentication usage guide](https://docs.stackable.tech/home/nightly/zookeeper/usage_guide/authentication). + description: Authentication settings for ZooKeeper like mTLS authentication. Read more in the [authentication usage guide](https://docs.stackable.tech/home/24.11/zookeeper/usage_guide/authentication). items: properties: authenticationClass: @@ -62,7 +62,7 @@ spec: * external-unstable: Use a NodePort service - This is a temporary solution with the goal to keep yaml manifests forward compatible. In the future, this setting will control which [ListenerClass](https://docs.stackable.tech/home/nightly/listener-operator/listenerclass.html) will be used to expose the service, and ListenerClass names will stay the same, allowing for a non-breaking change. + This is a temporary solution with the goal to keep yaml manifests forward compatible. In the future, this setting will control which [ListenerClass](https://docs.stackable.tech/home/24.11/listener-operator/listenerclass.html) will be used to expose the service, and ListenerClass names will stay the same, allowing for a non-breaking change. enum: - cluster-internal - external-unstable @@ -71,27 +71,27 @@ spec: default: quorumSecretClass: tls serverSecretClass: tls - description: TLS encryption settings for ZooKeeper (server, quorum). Read more in the [encryption usage guide](https://docs.stackable.tech/home/nightly/zookeeper/usage_guide/encryption). + description: TLS encryption settings for ZooKeeper (server, quorum). Read more in the [encryption usage guide](https://docs.stackable.tech/home/24.11/zookeeper/usage_guide/encryption). nullable: true properties: quorumSecretClass: default: tls description: |- - The [SecretClass](https://docs.stackable.tech/home/nightly/secret-operator/secretclass) to use for internal quorum communication. Use mutual verification between Zookeeper Nodes (mandatory). This setting controls: - Which cert the servers should use to authenticate themselves against other servers - Which ca.crt to use when validating the other server + The [SecretClass](https://docs.stackable.tech/home/24.11/secret-operator/secretclass) to use for internal quorum communication. Use mutual verification between Zookeeper Nodes (mandatory). This setting controls: - Which cert the servers should use to authenticate themselves against other servers - Which ca.crt to use when validating the other server Defaults to `tls` type: string serverSecretClass: default: tls description: |- - The [SecretClass](https://docs.stackable.tech/home/nightly/secret-operator/secretclass) to use for client connections. This setting controls: - If TLS encryption is used at all - Which cert the servers should use to authenticate themselves against the client + The [SecretClass](https://docs.stackable.tech/home/24.11/secret-operator/secretclass) to use for client connections. This setting controls: - If TLS encryption is used at all - Which cert the servers should use to authenticate themselves against the client Defaults to `tls`. nullable: true type: string type: object vectorAggregatorConfigMapName: - description: Name of the Vector aggregator [discovery ConfigMap](https://docs.stackable.tech/home/nightly/concepts/service_discovery). It must contain the key `ADDRESS` with the address of the Vector aggregator. Follow the [logging tutorial](https://docs.stackable.tech/home/nightly/tutorials/logging-vector-aggregator) to learn how to configure log aggregation with Vector. + description: Name of the Vector aggregator [discovery ConfigMap](https://docs.stackable.tech/home/24.11/concepts/service_discovery). It must contain the key `ADDRESS` with the address of the Vector aggregator. Follow the [logging tutorial](https://docs.stackable.tech/home/24.11/tutorials/logging-vector-aggregator) to learn how to configure log aggregation with Vector. nullable: true type: string type: object @@ -99,7 +99,7 @@ spec: default: reconciliationPaused: false stopped: false - description: '[Cluster operations](https://docs.stackable.tech/home/nightly/concepts/operations/cluster_operations) properties, allow stopping the product instance as well as pausing reconciliation.' + description: '[Cluster operations](https://docs.stackable.tech/home/24.11/concepts/operations/cluster_operations) properties, allow stopping the product instance as well as pausing reconciliation.' properties: reconciliationPaused: default: false @@ -120,7 +120,7 @@ spec: description: |- Specify which image to use, the easiest way is to only configure the `productVersion`. You can also configure a custom image registry to pull from, as well as completely custom images. - Consult the [Product image selection documentation](https://docs.stackable.tech/home/nightly/concepts/product_image_selection) for details. + Consult the [Product image selection documentation](https://docs.stackable.tech/home/24.11/concepts/product_image_selection) for details. properties: custom: description: Overwrite the docker image. Specify the full docker image name, e.g. `docker.stackable.tech/stackable/superset:1.4.1-stackable2.1.0` @@ -159,7 +159,7 @@ spec: type: string type: object servers: - description: This struct represents a role - e.g. HDFS datanodes or Trino workers. It has a key-value-map containing all the roleGroups that are part of this role. Additionally, there is a `config`, which is configurable at the role *and* roleGroup level. Everything at roleGroup level is merged on top of what is configured on role level. There is also a second form of config, which can only be configured at role level, the `roleConfig`. You can learn more about this in the [Roles and role group concept documentation](https://docs.stackable.tech/home/nightly/concepts/roles-and-role-groups). + description: This struct represents a role - e.g. HDFS datanodes or Trino workers. It has a key-value-map containing all the roleGroups that are part of this role. Additionally, there is a `config`, which is configurable at the role *and* roleGroup level. Everything at roleGroup level is merged on top of what is configured on role level. There is also a second form of config, which can only be configured at role level, the `roleConfig`. You can learn more about this in the [Roles and role group concept documentation](https://docs.stackable.tech/home/24.11/concepts/roles-and-role-groups). nullable: true properties: cliOverrides: @@ -176,7 +176,7 @@ spec: nodeSelector: null podAffinity: null podAntiAffinity: null - description: These configuration settings control [Pod placement](https://docs.stackable.tech/home/nightly/concepts/operations/pod_placement). + description: These configuration settings control [Pod placement](https://docs.stackable.tech/home/24.11/concepts/operations/pod_placement). properties: nodeAffinity: description: Same as the `spec.affinity.nodeAffinity` field on the Pod, see the [Kubernetes docs](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node) @@ -213,7 +213,7 @@ spec: default: containers: {} enableVectorAgent: null - description: Logging configuration, learn more in the [logging concept documentation](https://docs.stackable.tech/home/nightly/concepts/logging). + description: Logging configuration, learn more in the [logging concept documentation](https://docs.stackable.tech/home/24.11/concepts/logging). properties: containers: additionalProperties: @@ -399,17 +399,17 @@ spec: type: string type: object default: {} - description: The `configOverrides` can be used to configure properties in product config files that are not exposed in the CRD. Read the [config overrides documentation](https://docs.stackable.tech/home/nightly/concepts/overrides#config-overrides) and consult the operator specific usage guide documentation for details on the available config files and settings for the specific product. + description: The `configOverrides` can be used to configure properties in product config files that are not exposed in the CRD. Read the [config overrides documentation](https://docs.stackable.tech/home/24.11/concepts/overrides#config-overrides) and consult the operator specific usage guide documentation for details on the available config files and settings for the specific product. type: object envOverrides: additionalProperties: type: string default: {} - description: '`envOverrides` configure environment variables to be set in the Pods. It is a map from strings to strings - environment variables and the value to set. Read the [environment variable overrides documentation](https://docs.stackable.tech/home/nightly/concepts/overrides#env-overrides) for more information and consult the operator specific usage guide to find out about the product specific environment variables that are available.' + description: '`envOverrides` configure environment variables to be set in the Pods. It is a map from strings to strings - environment variables and the value to set. Read the [environment variable overrides documentation](https://docs.stackable.tech/home/24.11/concepts/overrides#env-overrides) for more information and consult the operator specific usage guide to find out about the product specific environment variables that are available.' type: object podOverrides: default: {} - description: In the `podOverrides` property you can define a [PodTemplateSpec](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.27/#podtemplatespec-v1-core) to override any property that can be set on a Kubernetes Pod. Read the [Pod overrides documentation](https://docs.stackable.tech/home/nightly/concepts/overrides#pod-overrides) for more information. + description: In the `podOverrides` property you can define a [PodTemplateSpec](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.27/#podtemplatespec-v1-core) to override any property that can be set on a Kubernetes Pod. Read the [Pod overrides documentation](https://docs.stackable.tech/home/24.11/concepts/overrides#pod-overrides) for more information. type: object x-kubernetes-preserve-unknown-fields: true roleConfig: @@ -428,7 +428,7 @@ spec: 1. If PodDisruptionBudgets are created by the operator 2. The allowed number of Pods to be unavailable (`maxUnavailable`) - Learn more in the [allowed Pod disruptions documentation](https://docs.stackable.tech/home/nightly/concepts/operations/pod_disruptions). + Learn more in the [allowed Pod disruptions documentation](https://docs.stackable.tech/home/24.11/concepts/operations/pod_disruptions). properties: enabled: default: true @@ -459,7 +459,7 @@ spec: nodeSelector: null podAffinity: null podAntiAffinity: null - description: These configuration settings control [Pod placement](https://docs.stackable.tech/home/nightly/concepts/operations/pod_placement). + description: These configuration settings control [Pod placement](https://docs.stackable.tech/home/24.11/concepts/operations/pod_placement). properties: nodeAffinity: description: Same as the `spec.affinity.nodeAffinity` field on the Pod, see the [Kubernetes docs](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node) @@ -496,7 +496,7 @@ spec: default: containers: {} enableVectorAgent: null - description: Logging configuration, learn more in the [logging concept documentation](https://docs.stackable.tech/home/nightly/concepts/logging). + description: Logging configuration, learn more in the [logging concept documentation](https://docs.stackable.tech/home/24.11/concepts/logging). properties: containers: additionalProperties: @@ -682,17 +682,17 @@ spec: type: string type: object default: {} - description: The `configOverrides` can be used to configure properties in product config files that are not exposed in the CRD. Read the [config overrides documentation](https://docs.stackable.tech/home/nightly/concepts/overrides#config-overrides) and consult the operator specific usage guide documentation for details on the available config files and settings for the specific product. + description: The `configOverrides` can be used to configure properties in product config files that are not exposed in the CRD. Read the [config overrides documentation](https://docs.stackable.tech/home/24.11/concepts/overrides#config-overrides) and consult the operator specific usage guide documentation for details on the available config files and settings for the specific product. type: object envOverrides: additionalProperties: type: string default: {} - description: '`envOverrides` configure environment variables to be set in the Pods. It is a map from strings to strings - environment variables and the value to set. Read the [environment variable overrides documentation](https://docs.stackable.tech/home/nightly/concepts/overrides#env-overrides) for more information and consult the operator specific usage guide to find out about the product specific environment variables that are available.' + description: '`envOverrides` configure environment variables to be set in the Pods. It is a map from strings to strings - environment variables and the value to set. Read the [environment variable overrides documentation](https://docs.stackable.tech/home/24.11/concepts/overrides#env-overrides) for more information and consult the operator specific usage guide to find out about the product specific environment variables that are available.' type: object podOverrides: default: {} - description: In the `podOverrides` property you can define a [PodTemplateSpec](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.27/#podtemplatespec-v1-core) to override any property that can be set on a Kubernetes Pod. Read the [Pod overrides documentation](https://docs.stackable.tech/home/nightly/concepts/overrides#pod-overrides) for more information. + description: In the `podOverrides` property you can define a [PodTemplateSpec](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.27/#podtemplatespec-v1-core) to override any property that can be set on a Kubernetes Pod. Read the [Pod overrides documentation](https://docs.stackable.tech/home/24.11/concepts/overrides#pod-overrides) for more information. type: object x-kubernetes-preserve-unknown-fields: true replicas: @@ -800,7 +800,7 @@ spec: `ZookeeperZnode` is *not* designed to manage the contents of this ZNode. Instead, it should be used to create a chroot for an installation of an application to work inside. Initializing the contents is the responsibility of the application. - You can learn more about this in the [Isolating clients with ZNodes usage guide](https://docs.stackable.tech/home/nightly/zookeeper/usage_guide/isolating_clients_with_znodes). + You can learn more about this in the [Isolating clients with ZNodes usage guide](https://docs.stackable.tech/home/24.11/zookeeper/usage_guide/isolating_clients_with_znodes). properties: clusterRef: default: diff --git a/docs/antora.yml b/docs/antora.yml index d522680b..9db85cad 100644 --- a/docs/antora.yml +++ b/docs/antora.yml @@ -1,3 +1,4 @@ --- name: home -version: "nightly" +version: "24.11" +prerelease: false diff --git a/docs/templating_vars.yaml b/docs/templating_vars.yaml index b711ca78..5f82bd23 100644 --- a/docs/templating_vars.yaml +++ b/docs/templating_vars.yaml @@ -1,9 +1,9 @@ --- helm: - repo_name: stackable-dev - repo_url: https://repo.stackable.tech/repository/helm-dev/ + repo_name: stackable-stable + repo_url: https://repo.stackable.tech/repository/helm-stable/ versions: - commons: 0.0.0-dev - secret: 0.0.0-dev - listener: 0.0.0-dev - zookeeper: 0.0.0-dev + commons: 24.11.0 + secret: 24.11.0 + listener: 24.11.0 + zookeeper: 24.11.0 diff --git a/tests/release.yaml b/tests/release.yaml index f82aac67..c8e7996f 100644 --- a/tests/release.yaml +++ b/tests/release.yaml @@ -7,10 +7,10 @@ releases: description: Integration test products: commons: - operatorVersion: 0.0.0-dev + operatorVersion: 24.11.0 secret: - operatorVersion: 0.0.0-dev + operatorVersion: 24.11.0 listener: - operatorVersion: 0.0.0-dev + operatorVersion: 24.11.0 zookeeper: - operatorVersion: 0.0.0-dev + operatorVersion: 24.11.0 From 23278de4289ef762dfaf9739db6146eb71954441 Mon Sep 17 00:00:00 2001 From: Nick Larsen Date: Tue, 19 Nov 2024 15:50:11 +0100 Subject: [PATCH 2/6] docs: update release version --- .../getting_started/code/getting_started.sh | 20 +++++++++---------- .../getting_started/code/install_output.txt | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/docs/modules/zookeeper/examples/getting_started/code/getting_started.sh b/docs/modules/zookeeper/examples/getting_started/code/getting_started.sh index ee6afc41..d81a07b5 100755 --- a/docs/modules/zookeeper/examples/getting_started/code/getting_started.sh +++ b/docs/modules/zookeeper/examples/getting_started/code/getting_started.sh @@ -31,27 +31,27 @@ case "$1" in "helm") echo "Adding 'stackable-dev' Helm Chart repository" # tag::helm-add-repo[] -helm repo add stackable-dev https://repo.stackable.tech/repository/helm-dev/ +helm repo add stackable-stable https://repo.stackable.tech/repository/helm-stable/ # end::helm-add-repo[] echo "Updating Helm repo" helm repo update echo "Installing Operators with Helm" # tag::helm-install-operators[] -helm install --wait commons-operator stackable-dev/commons-operator --version 0.0.0-dev -helm install --wait secret-operator stackable-dev/secret-operator --version 0.0.0-dev -helm install --wait listener-operator stackable-dev/listener-operator --version 0.0.0-dev -helm install --wait zookeeper-operator stackable-dev/zookeeper-operator --version 0.0.0-dev +helm install --wait commons-operator stackable-stable/commons-operator --version 24.11.0 +helm install --wait secret-operator stackable-stable/secret-operator --version 24.11.0 +helm install --wait listener-operator stackable-stable/listener-operator --version 24.11.0 +helm install --wait zookeeper-operator stackable-stable/zookeeper-operator --version 24.11.0 # end::helm-install-operators[] ;; "stackablectl") echo "installing Operators with stackablectl" # tag::stackablectl-install-operators[] stackablectl operator install \ - commons=0.0.0-dev \ - secret=0.0.0-dev \ - listener=0.0.0-dev \ - zookeeper=0.0.0-dev + commons=24.11.0 \ + secret=24.11.0 \ + listener=24.11.0 \ + zookeeper=24.11.0 # end::stackablectl-install-operators[] ;; *) @@ -80,7 +80,7 @@ zkCli_ls() { # tag::zkcli-ls[] kubectl run my-pod \ --stdin --tty --quiet --restart=Never \ - --image docker.stackable.tech/stackable/zookeeper:3.9.2-stackable0.0.0-dev -- \ + --image docker.stackable.tech/stackable/zookeeper:3.9.2-stackable24.11.0 -- \ bin/zkCli.sh -server simple-zk-server-default:2282 ls / > /dev/null && \ kubectl logs my-pod && \ kubectl delete pods my-pod diff --git a/docs/modules/zookeeper/examples/getting_started/code/install_output.txt b/docs/modules/zookeeper/examples/getting_started/code/install_output.txt index dedac3a2..817686f8 100644 --- a/docs/modules/zookeeper/examples/getting_started/code/install_output.txt +++ b/docs/modules/zookeeper/examples/getting_started/code/install_output.txt @@ -1,4 +1,4 @@ -Installed commons=0.0.0-dev operator -Installed secret=0.0.0-dev operator -Installed listener=0.0.0-dev operator -Installed zookeeper=0.0.0-dev operator +Installed commons=24.11.0 operator +Installed secret=24.11.0 operator +Installed listener=24.11.0 operator +Installed zookeeper=24.11.0 operator From ada1d14bdb84b29ad561077cd06649926e7fd9f1 Mon Sep 17 00:00:00 2001 From: Siegfried Weber Date: Tue, 26 Nov 2024 17:42:22 +0100 Subject: [PATCH 3/6] Update changelog --- CHANGELOG.md | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 60573a86..0524d9c4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,14 @@ All notable changes to this project will be documented in this file. ## [Unreleased] +### Fixed + +- BREAKING: Use distinct ServiceAccounts for the Stacklets, so that multiple Stacklets can be + deployed in one namespace. Existing Stacklets will use the newly created ServiceAccounts after + restart ([#889]). + +[#889]: https://github.com/stackabletech/zookeeper-operator/pull/889 + ## [24.11.0] - 2024-11-18 ### Added @@ -24,13 +32,11 @@ All notable changes to this project will be documented in this file. ### Fixed - Failing to parse one `ZookeeperCluster`/`ZookeeperZnode` should no longer cause the whole operator to stop functioning ([#872]). -- BREAKING: Use distinct ServiceAccounts for the Stacklets, so that multiple Stacklets can be deployed in one namespace. Existing Stacklets will use the newly created ServiceAccounts after restart ([#889]). [#853]: https://github.com/stackabletech/zookeeper-operator/pull/853 [#857]: https://github.com/stackabletech/zookeeper-operator/pull/857 [#870]: https://github.com/stackabletech/zookeeper-operator/pull/870 [#872]: https://github.com/stackabletech/zookeeper-operator/pull/872 -[#889]: https://github.com/stackabletech/zookeeper-operator/pull/889 ## [24.7.0] - 2024-07-24 From 510c00efbc0d39cede9a09660f9d08f7bec097b9 Mon Sep 17 00:00:00 2001 From: Andrew Kenworthy <1712947+adwk67@users.noreply.github.com> Date: Mon, 9 Dec 2024 12:08:20 +0100 Subject: [PATCH 4/6] release-24.11/24.11.1-rc1 (#897) * release 24.11.1-rc1 Signed-off-by: Andrew Kenworthy * initial RC workflow changes * chore: Generated commit to update templated files since the last template run up to stackabletech/operator-templating@2b806e15ac4a6248cad6d47ec58beb9a63e1c52d (#896) Reference-to: stackabletech/operator-templating@2b806e1 (Set PR-suffix on PRs against release branches) * Update .github/workflows/build.yml Co-authored-by: Nick <10092581+NickLarsenNZ@users.noreply.github.com> --------- Signed-off-by: Andrew Kenworthy Co-authored-by: Stacky McStackface <95074132+stackable-bot@users.noreply.github.com> Co-authored-by: Nick <10092581+NickLarsenNZ@users.noreply.github.com> --- .github/workflows/build.yml | 27 ++++++++++++++++--- CHANGELOG.md | 2 ++ Cargo.lock | 4 +-- Cargo.nix | 4 +-- Cargo.toml | 2 +- deploy/helm/zookeeper-operator/Chart.yaml | 4 +-- .../getting_started/code/getting_started.sh | 18 ++++++------- .../getting_started/code/install_output.txt | 8 +++--- docs/templating_vars.yaml | 8 +++--- tests/release.yaml | 8 +++--- 10 files changed, 53 insertions(+), 32 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8f67bc74..4b4abe75 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -14,6 +14,7 @@ on: - "renovate/**" tags: - '[0-9][0-9].[0-9]+.[0-9]+' + - '[0-9][0-9].[0-9]+.[0-9]+-rc[0-9]+' pull_request: merge_group: schedule: @@ -344,9 +345,18 @@ jobs: with: crate: cargo-edit bin: cargo-set-version - - name: Update version if PR - if: ${{ github.event_name == 'pull_request' }} + - name: Update version if PR against main branch + if: ${{ github.event_name == 'pull_request' && github.ref == 'refs/heads/main' }} run: cargo set-version --offline --workspace 0.0.0-pr${{ github.event.pull_request.number }} + - name: Update version if PR against non-main branch + # For PRs to be merged against a release branch, use the version that has already been set in the calling script. + if: ${{ github.event_name == 'pull_request' && github.ref != 'refs/heads/main' }} + env: + PR_NUMBER: ${{ github.event.pull_request.number }} + run: | + MANIFEST_VERSION=$(cargo metadata --format-version 1 --no-deps | jq -r '.packages[0].version') + PR_VERSION="${MANIFEST_VERSION}-pr${PR_NUMBER}" + cargo set-version --offline --workspace "$PR_VERSION" # Recreate charts and publish charts and docker image. The "-e" is needed as we want to override the # default value in the makefile if called from this action, but not otherwise (i.e. when called locally). @@ -410,9 +420,18 @@ jobs: with: crate: cargo-edit bin: cargo-set-version - - name: Update version if PR - if: ${{ github.event_name == 'pull_request' }} + - name: Update version if PR against main branch + if: ${{ github.event_name == 'pull_request' && github.ref == 'refs/heads/main' }} run: cargo set-version --offline --workspace 0.0.0-pr${{ github.event.pull_request.number }} + - name: Update version if PR against non-main branch + # For PRs to be merged against a release branch, use the version that has already been set in the calling script. + if: ${{ github.event_name == 'pull_request' && github.ref != 'refs/heads/main' }} + env: + PR_NUMBER: ${{ github.event.pull_request.number }} + run: | + MANIFEST_VERSION=$(cargo metadata --format-version 1 --no-deps | jq -r '.packages[0].version') + PR_VERSION="${MANIFEST_VERSION}-pr${PR_NUMBER}" + cargo set-version --offline --workspace "$PR_VERSION" - name: Build manifest list run: | # Creating manifest list diff --git a/CHANGELOG.md b/CHANGELOG.md index 0524d9c4..c983b188 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,8 @@ All notable changes to this project will be documented in this file. ## [Unreleased] +## [24.11.1-rc1] - 2024-12-06 + ### Fixed - BREAKING: Use distinct ServiceAccounts for the Stacklets, so that multiple Stacklets can be diff --git a/Cargo.lock b/Cargo.lock index fd95deb4..774f4dae 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2173,7 +2173,7 @@ dependencies = [ [[package]] name = "stackable-zookeeper-crd" -version = "24.11.0" +version = "24.11.1-rc1" dependencies = [ "serde", "serde_json", @@ -2186,7 +2186,7 @@ dependencies = [ [[package]] name = "stackable-zookeeper-operator" -version = "24.11.0" +version = "24.11.1-rc1" dependencies = [ "anyhow", "built", diff --git a/Cargo.nix b/Cargo.nix index 452d42ef..94cf6829 100644 --- a/Cargo.nix +++ b/Cargo.nix @@ -6754,7 +6754,7 @@ rec { }; "stackable-zookeeper-crd" = rec { crateName = "stackable-zookeeper-crd"; - version = "24.11.0"; + version = "24.11.1-rc1"; edition = "2021"; src = lib.cleanSourceWith { filter = sourceFilter; src = ./rust/crd; }; libName = "stackable_zookeeper_crd"; @@ -6799,7 +6799,7 @@ rec { }; "stackable-zookeeper-operator" = rec { crateName = "stackable-zookeeper-operator"; - version = "24.11.0"; + version = "24.11.1-rc1"; edition = "2021"; crateBin = [ { diff --git a/Cargo.toml b/Cargo.toml index 6cb6f372..9431c6b7 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -3,7 +3,7 @@ members = ["rust/crd", "rust/operator-binary"] resolver = "2" [workspace.package] -version = "24.11.0" +version = "24.11.1-rc1" authors = ["Stackable GmbH "] license = "OSL-3.0" edition = "2021" diff --git a/deploy/helm/zookeeper-operator/Chart.yaml b/deploy/helm/zookeeper-operator/Chart.yaml index c814ff37..eed9c818 100644 --- a/deploy/helm/zookeeper-operator/Chart.yaml +++ b/deploy/helm/zookeeper-operator/Chart.yaml @@ -1,8 +1,8 @@ --- apiVersion: v2 name: zookeeper-operator -version: "24.11.0" -appVersion: "24.11.0" +version: "24.11.1-rc1" +appVersion: "24.11.1-rc1" description: The Stackable Operator for Apache ZooKeeper home: https://github.com/stackabletech/zookeeper-operator maintainers: diff --git a/docs/modules/zookeeper/examples/getting_started/code/getting_started.sh b/docs/modules/zookeeper/examples/getting_started/code/getting_started.sh index 20d045e7..914d4a9e 100755 --- a/docs/modules/zookeeper/examples/getting_started/code/getting_started.sh +++ b/docs/modules/zookeeper/examples/getting_started/code/getting_started.sh @@ -28,20 +28,20 @@ helm repo update echo "Installing Operators with Helm" # tag::helm-install-operators[] -helm install --wait commons-operator stackable-stable/commons-operator --version 24.11.0 -helm install --wait secret-operator stackable-stable/secret-operator --version 24.11.0 -helm install --wait listener-operator stackable-stable/listener-operator --version 24.11.0 -helm install --wait zookeeper-operator stackable-stable/zookeeper-operator --version 24.11.0 +helm install --wait commons-operator stackable-stable/commons-operator --version 24.11.1-rc1 +helm install --wait secret-operator stackable-stable/secret-operator --version 24.11.1-rc1 +helm install --wait listener-operator stackable-stable/listener-operator --version 24.11.1-rc1 +helm install --wait zookeeper-operator stackable-stable/zookeeper-operator --version 24.11.1-rc1 # end::helm-install-operators[] ;; "stackablectl") echo "installing Operators with stackablectl" # tag::stackablectl-install-operators[] stackablectl operator install \ - commons=24.11.0 \ - secret=24.11.0 \ - listener=24.11.0 \ - zookeeper=24.11.0 + commons=24.11.1-rc1 \ + secret=24.11.1-rc1 \ + listener=24.11.1-rc1 \ + zookeeper=24.11.1-rc1 # end::stackablectl-install-operators[] ;; *) @@ -70,7 +70,7 @@ zkCli_ls() { # tag::zkcli-ls[] kubectl run my-pod \ --stdin --tty --quiet --restart=Never \ - --image docker.stackable.tech/stackable/zookeeper:3.9.2-stackable24.11.0 -- \ + --image docker.stackable.tech/stackable/zookeeper:3.9.2-stackable24.11.1-rc1 -- \ bin/zkCli.sh -server simple-zk-server-default:2282 ls / > /dev/null && \ kubectl logs my-pod && \ kubectl delete pods my-pod diff --git a/docs/modules/zookeeper/examples/getting_started/code/install_output.txt b/docs/modules/zookeeper/examples/getting_started/code/install_output.txt index 817686f8..e8b09ea8 100644 --- a/docs/modules/zookeeper/examples/getting_started/code/install_output.txt +++ b/docs/modules/zookeeper/examples/getting_started/code/install_output.txt @@ -1,4 +1,4 @@ -Installed commons=24.11.0 operator -Installed secret=24.11.0 operator -Installed listener=24.11.0 operator -Installed zookeeper=24.11.0 operator +Installed commons=24.11.1-rc1 operator +Installed secret=24.11.1-rc1 operator +Installed listener=24.11.1-rc1 operator +Installed zookeeper=24.11.1-rc1 operator diff --git a/docs/templating_vars.yaml b/docs/templating_vars.yaml index 5f82bd23..1ad91bfc 100644 --- a/docs/templating_vars.yaml +++ b/docs/templating_vars.yaml @@ -3,7 +3,7 @@ helm: repo_name: stackable-stable repo_url: https://repo.stackable.tech/repository/helm-stable/ versions: - commons: 24.11.0 - secret: 24.11.0 - listener: 24.11.0 - zookeeper: 24.11.0 + commons: 24.11.1-rc1 + secret: 24.11.1-rc1 + listener: 24.11.1-rc1 + zookeeper: 24.11.1-rc1 diff --git a/tests/release.yaml b/tests/release.yaml index c8e7996f..2a729986 100644 --- a/tests/release.yaml +++ b/tests/release.yaml @@ -7,10 +7,10 @@ releases: description: Integration test products: commons: - operatorVersion: 24.11.0 + operatorVersion: 24.11.1-rc1 secret: - operatorVersion: 24.11.0 + operatorVersion: 24.11.1-rc1 listener: - operatorVersion: 24.11.0 + operatorVersion: 24.11.1-rc1 zookeeper: - operatorVersion: 24.11.0 + operatorVersion: 24.11.1-rc1 From 359500593bed467d7236af2bcdde99c7d2ed078a Mon Sep 17 00:00:00 2001 From: Andrew Kenworthy <1712947+adwk67@users.noreply.github.com> Date: Fri, 13 Dec 2024 12:31:22 +0100 Subject: [PATCH 5/6] release: 24.11.1-rc2 (#900) release 24.11.1-rc2 Signed-off-by: Andrew Kenworthy --- CHANGELOG.md | 2 ++ Cargo.lock | 4 ++-- Cargo.nix | 4 ++-- Cargo.toml | 2 +- deploy/helm/zookeeper-operator/Chart.yaml | 4 ++-- .../getting_started/code/getting_started.sh | 18 +++++++++--------- .../getting_started/code/install_output.txt | 8 ++++---- docs/templating_vars.yaml | 8 ++++---- tests/release.yaml | 8 ++++---- 9 files changed, 30 insertions(+), 28 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c983b188..73888992 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,8 @@ All notable changes to this project will be documented in this file. ## [Unreleased] +## [24.11.1-rc2] - 2024-12-12 + ## [24.11.1-rc1] - 2024-12-06 ### Fixed diff --git a/Cargo.lock b/Cargo.lock index 774f4dae..d8549750 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2173,7 +2173,7 @@ dependencies = [ [[package]] name = "stackable-zookeeper-crd" -version = "24.11.1-rc1" +version = "24.11.1-rc2" dependencies = [ "serde", "serde_json", @@ -2186,7 +2186,7 @@ dependencies = [ [[package]] name = "stackable-zookeeper-operator" -version = "24.11.1-rc1" +version = "24.11.1-rc2" dependencies = [ "anyhow", "built", diff --git a/Cargo.nix b/Cargo.nix index 94cf6829..ae8ddf4f 100644 --- a/Cargo.nix +++ b/Cargo.nix @@ -6754,7 +6754,7 @@ rec { }; "stackable-zookeeper-crd" = rec { crateName = "stackable-zookeeper-crd"; - version = "24.11.1-rc1"; + version = "24.11.1-rc2"; edition = "2021"; src = lib.cleanSourceWith { filter = sourceFilter; src = ./rust/crd; }; libName = "stackable_zookeeper_crd"; @@ -6799,7 +6799,7 @@ rec { }; "stackable-zookeeper-operator" = rec { crateName = "stackable-zookeeper-operator"; - version = "24.11.1-rc1"; + version = "24.11.1-rc2"; edition = "2021"; crateBin = [ { diff --git a/Cargo.toml b/Cargo.toml index 9431c6b7..5f118158 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -3,7 +3,7 @@ members = ["rust/crd", "rust/operator-binary"] resolver = "2" [workspace.package] -version = "24.11.1-rc1" +version = "24.11.1-rc2" authors = ["Stackable GmbH "] license = "OSL-3.0" edition = "2021" diff --git a/deploy/helm/zookeeper-operator/Chart.yaml b/deploy/helm/zookeeper-operator/Chart.yaml index eed9c818..a6e6054f 100644 --- a/deploy/helm/zookeeper-operator/Chart.yaml +++ b/deploy/helm/zookeeper-operator/Chart.yaml @@ -1,8 +1,8 @@ --- apiVersion: v2 name: zookeeper-operator -version: "24.11.1-rc1" -appVersion: "24.11.1-rc1" +version: "24.11.1-rc2" +appVersion: "24.11.1-rc2" description: The Stackable Operator for Apache ZooKeeper home: https://github.com/stackabletech/zookeeper-operator maintainers: diff --git a/docs/modules/zookeeper/examples/getting_started/code/getting_started.sh b/docs/modules/zookeeper/examples/getting_started/code/getting_started.sh index 914d4a9e..641969d6 100755 --- a/docs/modules/zookeeper/examples/getting_started/code/getting_started.sh +++ b/docs/modules/zookeeper/examples/getting_started/code/getting_started.sh @@ -28,20 +28,20 @@ helm repo update echo "Installing Operators with Helm" # tag::helm-install-operators[] -helm install --wait commons-operator stackable-stable/commons-operator --version 24.11.1-rc1 -helm install --wait secret-operator stackable-stable/secret-operator --version 24.11.1-rc1 -helm install --wait listener-operator stackable-stable/listener-operator --version 24.11.1-rc1 -helm install --wait zookeeper-operator stackable-stable/zookeeper-operator --version 24.11.1-rc1 +helm install --wait commons-operator stackable-stable/commons-operator --version 24.11.1-rc2 +helm install --wait secret-operator stackable-stable/secret-operator --version 24.11.1-rc2 +helm install --wait listener-operator stackable-stable/listener-operator --version 24.11.1-rc2 +helm install --wait zookeeper-operator stackable-stable/zookeeper-operator --version 24.11.1-rc2 # end::helm-install-operators[] ;; "stackablectl") echo "installing Operators with stackablectl" # tag::stackablectl-install-operators[] stackablectl operator install \ - commons=24.11.1-rc1 \ - secret=24.11.1-rc1 \ - listener=24.11.1-rc1 \ - zookeeper=24.11.1-rc1 + commons=24.11.1-rc2 \ + secret=24.11.1-rc2 \ + listener=24.11.1-rc2 \ + zookeeper=24.11.1-rc2 # end::stackablectl-install-operators[] ;; *) @@ -70,7 +70,7 @@ zkCli_ls() { # tag::zkcli-ls[] kubectl run my-pod \ --stdin --tty --quiet --restart=Never \ - --image docker.stackable.tech/stackable/zookeeper:3.9.2-stackable24.11.1-rc1 -- \ + --image docker.stackable.tech/stackable/zookeeper:3.9.2-stackable24.11.1-rc2 -- \ bin/zkCli.sh -server simple-zk-server-default:2282 ls / > /dev/null && \ kubectl logs my-pod && \ kubectl delete pods my-pod diff --git a/docs/modules/zookeeper/examples/getting_started/code/install_output.txt b/docs/modules/zookeeper/examples/getting_started/code/install_output.txt index e8b09ea8..8722c2b5 100644 --- a/docs/modules/zookeeper/examples/getting_started/code/install_output.txt +++ b/docs/modules/zookeeper/examples/getting_started/code/install_output.txt @@ -1,4 +1,4 @@ -Installed commons=24.11.1-rc1 operator -Installed secret=24.11.1-rc1 operator -Installed listener=24.11.1-rc1 operator -Installed zookeeper=24.11.1-rc1 operator +Installed commons=24.11.1-rc2 operator +Installed secret=24.11.1-rc2 operator +Installed listener=24.11.1-rc2 operator +Installed zookeeper=24.11.1-rc2 operator diff --git a/docs/templating_vars.yaml b/docs/templating_vars.yaml index 1ad91bfc..197c9522 100644 --- a/docs/templating_vars.yaml +++ b/docs/templating_vars.yaml @@ -3,7 +3,7 @@ helm: repo_name: stackable-stable repo_url: https://repo.stackable.tech/repository/helm-stable/ versions: - commons: 24.11.1-rc1 - secret: 24.11.1-rc1 - listener: 24.11.1-rc1 - zookeeper: 24.11.1-rc1 + commons: 24.11.1-rc2 + secret: 24.11.1-rc2 + listener: 24.11.1-rc2 + zookeeper: 24.11.1-rc2 diff --git a/tests/release.yaml b/tests/release.yaml index 2a729986..ee77c573 100644 --- a/tests/release.yaml +++ b/tests/release.yaml @@ -7,10 +7,10 @@ releases: description: Integration test products: commons: - operatorVersion: 24.11.1-rc1 + operatorVersion: 24.11.1-rc2 secret: - operatorVersion: 24.11.1-rc1 + operatorVersion: 24.11.1-rc2 listener: - operatorVersion: 24.11.1-rc1 + operatorVersion: 24.11.1-rc2 zookeeper: - operatorVersion: 24.11.1-rc1 + operatorVersion: 24.11.1-rc2 From 7397a502c177b1ec09fa5d2c625fc3cebf513b40 Mon Sep 17 00:00:00 2001 From: Andrew Kenworthy <1712947+adwk67@users.noreply.github.com> Date: Wed, 15 Jan 2025 10:37:32 +0100 Subject: [PATCH 6/6] release: 24.11.1 (#903) * release 24.11.1 Signed-off-by: Andrew Kenworthy * fix build action: replace cargo set-version with sed for release PRs --------- Signed-off-by: Andrew Kenworthy --- .github/workflows/build.yml | 8 ++++++-- CHANGELOG.md | 2 ++ Cargo.lock | 4 ++-- Cargo.nix | 4 ++-- Cargo.toml | 2 +- deploy/helm/zookeeper-operator/Chart.yaml | 4 ++-- .../getting_started/code/getting_started.sh | 18 +++++++++--------- .../getting_started/code/install_output.txt | 8 ++++---- docs/templating_vars.yaml | 8 ++++---- tests/release.yaml | 8 ++++---- 10 files changed, 36 insertions(+), 30 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4b4abe75..9217c8ce 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -350,13 +350,15 @@ jobs: run: cargo set-version --offline --workspace 0.0.0-pr${{ github.event.pull_request.number }} - name: Update version if PR against non-main branch # For PRs to be merged against a release branch, use the version that has already been set in the calling script. + # We can't rely on cargo set-version here as we will break semver rules when changing the version to make it + # specific to this PR e.g. 1.2.0 --> 1.2.0-pr678, so set it manually. if: ${{ github.event_name == 'pull_request' && github.ref != 'refs/heads/main' }} env: PR_NUMBER: ${{ github.event.pull_request.number }} run: | MANIFEST_VERSION=$(cargo metadata --format-version 1 --no-deps | jq -r '.packages[0].version') PR_VERSION="${MANIFEST_VERSION}-pr${PR_NUMBER}" - cargo set-version --offline --workspace "$PR_VERSION" + sed -i "s/version = \"${MANIFEST_VERSION}\"/version = \"${PR_VERSION}\"/" Cargo.toml # Recreate charts and publish charts and docker image. The "-e" is needed as we want to override the # default value in the makefile if called from this action, but not otherwise (i.e. when called locally). @@ -425,13 +427,15 @@ jobs: run: cargo set-version --offline --workspace 0.0.0-pr${{ github.event.pull_request.number }} - name: Update version if PR against non-main branch # For PRs to be merged against a release branch, use the version that has already been set in the calling script. + # We can't rely on cargo set-version here as we will break semver rules when changing the version to make it + # specific to this PR e.g. 1.2.0 --> 1.2.0-pr678, so set it manually. if: ${{ github.event_name == 'pull_request' && github.ref != 'refs/heads/main' }} env: PR_NUMBER: ${{ github.event.pull_request.number }} run: | MANIFEST_VERSION=$(cargo metadata --format-version 1 --no-deps | jq -r '.packages[0].version') PR_VERSION="${MANIFEST_VERSION}-pr${PR_NUMBER}" - cargo set-version --offline --workspace "$PR_VERSION" + sed -i "s/version = \"${MANIFEST_VERSION}\"/version = \"${PR_VERSION}\"/" Cargo.toml - name: Build manifest list run: | # Creating manifest list diff --git a/CHANGELOG.md b/CHANGELOG.md index 73888992..4fba2ad0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,8 @@ All notable changes to this project will be documented in this file. ## [Unreleased] +## [24.11.1] - 2025-01-10 + ## [24.11.1-rc2] - 2024-12-12 ## [24.11.1-rc1] - 2024-12-06 diff --git a/Cargo.lock b/Cargo.lock index d8549750..6b4a3f68 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2173,7 +2173,7 @@ dependencies = [ [[package]] name = "stackable-zookeeper-crd" -version = "24.11.1-rc2" +version = "24.11.1" dependencies = [ "serde", "serde_json", @@ -2186,7 +2186,7 @@ dependencies = [ [[package]] name = "stackable-zookeeper-operator" -version = "24.11.1-rc2" +version = "24.11.1" dependencies = [ "anyhow", "built", diff --git a/Cargo.nix b/Cargo.nix index ae8ddf4f..21b04145 100644 --- a/Cargo.nix +++ b/Cargo.nix @@ -6754,7 +6754,7 @@ rec { }; "stackable-zookeeper-crd" = rec { crateName = "stackable-zookeeper-crd"; - version = "24.11.1-rc2"; + version = "24.11.1"; edition = "2021"; src = lib.cleanSourceWith { filter = sourceFilter; src = ./rust/crd; }; libName = "stackable_zookeeper_crd"; @@ -6799,7 +6799,7 @@ rec { }; "stackable-zookeeper-operator" = rec { crateName = "stackable-zookeeper-operator"; - version = "24.11.1-rc2"; + version = "24.11.1"; edition = "2021"; crateBin = [ { diff --git a/Cargo.toml b/Cargo.toml index 5f118158..9bb8ae61 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -3,7 +3,7 @@ members = ["rust/crd", "rust/operator-binary"] resolver = "2" [workspace.package] -version = "24.11.1-rc2" +version = "24.11.1" authors = ["Stackable GmbH "] license = "OSL-3.0" edition = "2021" diff --git a/deploy/helm/zookeeper-operator/Chart.yaml b/deploy/helm/zookeeper-operator/Chart.yaml index a6e6054f..72eaf309 100644 --- a/deploy/helm/zookeeper-operator/Chart.yaml +++ b/deploy/helm/zookeeper-operator/Chart.yaml @@ -1,8 +1,8 @@ --- apiVersion: v2 name: zookeeper-operator -version: "24.11.1-rc2" -appVersion: "24.11.1-rc2" +version: "24.11.1" +appVersion: "24.11.1" description: The Stackable Operator for Apache ZooKeeper home: https://github.com/stackabletech/zookeeper-operator maintainers: diff --git a/docs/modules/zookeeper/examples/getting_started/code/getting_started.sh b/docs/modules/zookeeper/examples/getting_started/code/getting_started.sh index 641969d6..0db45a36 100755 --- a/docs/modules/zookeeper/examples/getting_started/code/getting_started.sh +++ b/docs/modules/zookeeper/examples/getting_started/code/getting_started.sh @@ -28,20 +28,20 @@ helm repo update echo "Installing Operators with Helm" # tag::helm-install-operators[] -helm install --wait commons-operator stackable-stable/commons-operator --version 24.11.1-rc2 -helm install --wait secret-operator stackable-stable/secret-operator --version 24.11.1-rc2 -helm install --wait listener-operator stackable-stable/listener-operator --version 24.11.1-rc2 -helm install --wait zookeeper-operator stackable-stable/zookeeper-operator --version 24.11.1-rc2 +helm install --wait commons-operator stackable-stable/commons-operator --version 24.11.1 +helm install --wait secret-operator stackable-stable/secret-operator --version 24.11.1 +helm install --wait listener-operator stackable-stable/listener-operator --version 24.11.1 +helm install --wait zookeeper-operator stackable-stable/zookeeper-operator --version 24.11.1 # end::helm-install-operators[] ;; "stackablectl") echo "installing Operators with stackablectl" # tag::stackablectl-install-operators[] stackablectl operator install \ - commons=24.11.1-rc2 \ - secret=24.11.1-rc2 \ - listener=24.11.1-rc2 \ - zookeeper=24.11.1-rc2 + commons=24.11.1 \ + secret=24.11.1 \ + listener=24.11.1 \ + zookeeper=24.11.1 # end::stackablectl-install-operators[] ;; *) @@ -70,7 +70,7 @@ zkCli_ls() { # tag::zkcli-ls[] kubectl run my-pod \ --stdin --tty --quiet --restart=Never \ - --image docker.stackable.tech/stackable/zookeeper:3.9.2-stackable24.11.1-rc2 -- \ + --image docker.stackable.tech/stackable/zookeeper:3.9.2-stackable24.11.1 -- \ bin/zkCli.sh -server simple-zk-server-default:2282 ls / > /dev/null && \ kubectl logs my-pod && \ kubectl delete pods my-pod diff --git a/docs/modules/zookeeper/examples/getting_started/code/install_output.txt b/docs/modules/zookeeper/examples/getting_started/code/install_output.txt index 8722c2b5..bc3061af 100644 --- a/docs/modules/zookeeper/examples/getting_started/code/install_output.txt +++ b/docs/modules/zookeeper/examples/getting_started/code/install_output.txt @@ -1,4 +1,4 @@ -Installed commons=24.11.1-rc2 operator -Installed secret=24.11.1-rc2 operator -Installed listener=24.11.1-rc2 operator -Installed zookeeper=24.11.1-rc2 operator +Installed commons=24.11.1 operator +Installed secret=24.11.1 operator +Installed listener=24.11.1 operator +Installed zookeeper=24.11.1 operator diff --git a/docs/templating_vars.yaml b/docs/templating_vars.yaml index 197c9522..0bf8e408 100644 --- a/docs/templating_vars.yaml +++ b/docs/templating_vars.yaml @@ -3,7 +3,7 @@ helm: repo_name: stackable-stable repo_url: https://repo.stackable.tech/repository/helm-stable/ versions: - commons: 24.11.1-rc2 - secret: 24.11.1-rc2 - listener: 24.11.1-rc2 - zookeeper: 24.11.1-rc2 + commons: 24.11.1 + secret: 24.11.1 + listener: 24.11.1 + zookeeper: 24.11.1 diff --git a/tests/release.yaml b/tests/release.yaml index ee77c573..e591dd94 100644 --- a/tests/release.yaml +++ b/tests/release.yaml @@ -7,10 +7,10 @@ releases: description: Integration test products: commons: - operatorVersion: 24.11.1-rc2 + operatorVersion: 24.11.1 secret: - operatorVersion: 24.11.1-rc2 + operatorVersion: 24.11.1 listener: - operatorVersion: 24.11.1-rc2 + operatorVersion: 24.11.1 zookeeper: - operatorVersion: 24.11.1-rc2 + operatorVersion: 24.11.1