diff --git a/CHANGELOG.md b/CHANGELOG.md index 54fcf567..a90688a2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,17 @@ All notable changes to this project will be documented in this file. ## [Unreleased] +## [24.11.1-rc2] - 2024-12-12 + +### Fixed + +- Helm chart: The secret migration job can be omitted via Helm values ([#536]). +- Helm chart: The tag of the tools image used for the secret migration job can + be changed in the Helm values and defaults now to 1.0.0-stackable24.11.0 + rather than being hard-coded to 1.0.0-stackable24.7.0 ([#536]). + +[#536]: https://github.com/stackabletech/secret-operator/pull/536 + ## [24.11.1-rc1] - 2024-12-06 ## [24.11.0] - 2024-11-18 diff --git a/Cargo.lock b/Cargo.lock index 7bb0d178..ca79af11 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1419,7 +1419,7 @@ dependencies = [ [[package]] name = "krb5" -version = "24.11.1-rc1" +version = "24.11.1-rc2" dependencies = [ "krb5-sys", "snafu 0.8.5", @@ -1427,7 +1427,7 @@ dependencies = [ [[package]] name = "krb5-sys" -version = "24.11.1-rc1" +version = "24.11.1-rc2" dependencies = [ "bindgen 0.70.1", "pkg-config", @@ -2704,7 +2704,7 @@ checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" [[package]] name = "stackable-krb5-provision-keytab" -version = "24.11.1-rc1" +version = "24.11.1-rc2" dependencies = [ "byteorder", "futures 0.3.31", @@ -2774,7 +2774,7 @@ dependencies = [ [[package]] name = "stackable-secret-operator" -version = "24.11.1-rc1" +version = "24.11.1-rc2" dependencies = [ "anyhow", "async-trait", @@ -2813,7 +2813,7 @@ dependencies = [ [[package]] name = "stackable-secret-operator-crd-utils" -version = "24.11.1-rc1" +version = "24.11.1-rc2" dependencies = [ "serde", "stackable-operator", diff --git a/Cargo.nix b/Cargo.nix index 8336ec1c..466f3ae8 100644 --- a/Cargo.nix +++ b/Cargo.nix @@ -4316,7 +4316,7 @@ rec { }; "krb5" = rec { crateName = "krb5"; - version = "24.11.1-rc1"; + version = "24.11.1-rc2"; edition = "2021"; src = lib.cleanSourceWith { filter = sourceFilter; src = ./rust/krb5; }; authors = [ @@ -4336,7 +4336,7 @@ rec { }; "krb5-sys" = rec { crateName = "krb5-sys"; - version = "24.11.1-rc1"; + version = "24.11.1-rc2"; edition = "2021"; src = lib.cleanSourceWith { filter = sourceFilter; src = ./rust/krb5-sys; }; libName = "krb5_sys"; @@ -8505,7 +8505,7 @@ rec { }; "stackable-krb5-provision-keytab" = rec { crateName = "stackable-krb5-provision-keytab"; - version = "24.11.1-rc1"; + version = "24.11.1-rc2"; edition = "2021"; crateBin = [ { @@ -8786,7 +8786,7 @@ rec { }; "stackable-secret-operator" = rec { crateName = "stackable-secret-operator"; - version = "24.11.1-rc1"; + version = "24.11.1-rc2"; edition = "2021"; crateBin = [ { @@ -8952,7 +8952,7 @@ rec { }; "stackable-secret-operator-crd-utils" = rec { crateName = "stackable-secret-operator-crd-utils"; - version = "24.11.1-rc1"; + version = "24.11.1-rc2"; edition = "2021"; src = lib.cleanSourceWith { filter = sourceFilter; src = ./rust/crd-utils; }; libName = "stackable_secret_operator_crd_utils"; diff --git a/Cargo.toml b/Cargo.toml index 670eda39..cb15f726 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -4,7 +4,7 @@ default-members = ["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/secret-operator/Chart.yaml b/deploy/helm/secret-operator/Chart.yaml index 43ed3a3f..101c407b 100644 --- a/deploy/helm/secret-operator/Chart.yaml +++ b/deploy/helm/secret-operator/Chart.yaml @@ -1,8 +1,8 @@ --- apiVersion: v2 name: secret-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 Stackable Secret Operator home: https://github.com/stackabletech/secret-operator maintainers: diff --git a/deploy/helm/secret-operator/templates/secret_migration_job.yaml b/deploy/helm/secret-operator/templates/secret_migration_job.yaml index ac23f3d7..3a7bc819 100644 --- a/deploy/helm/secret-operator/templates/secret_migration_job.yaml +++ b/deploy/helm/secret-operator/templates/secret_migration_job.yaml @@ -1,4 +1,5 @@ --- +{{ if .Values.secretMigrationJob.enabled -}} # Migrates the TLS CA key pair from the hard-coded default namespace to the operator namespace # See https://github.com/stackabletech/secret-operator/issues/453 apiVersion: batch/v1 @@ -30,7 +31,7 @@ spec: {{- toYaml .Values.podSecurityContext | nindent 8 }} containers: - name: migrate-secret - image: "{{ .Values.secretMigrationJob.image.repository }}:1.0.0-stackable24.7.0" + image: "{{ .Values.secretMigrationJob.image.repository }}:{{ .Values.secretMigrationJob.image.tag }}" imagePullPolicy: {{ .Values.secretMigrationJob.image.pullPolicy }} resources: {{ .Values.secretMigrationJob.resources | toYaml | nindent 12 }} @@ -53,3 +54,4 @@ spec: fi fi restartPolicy: Never +{{- end }} diff --git a/deploy/helm/secret-operator/templates/secret_migration_rbac.yaml b/deploy/helm/secret-operator/templates/secret_migration_rbac.yaml index d4a462d1..561a2416 100644 --- a/deploy/helm/secret-operator/templates/secret_migration_rbac.yaml +++ b/deploy/helm/secret-operator/templates/secret_migration_rbac.yaml @@ -1,4 +1,5 @@ --- +{{ if .Values.secretMigrationJob.enabled -}} apiVersion: v1 kind: ServiceAccount metadata: @@ -53,4 +54,5 @@ rules: - watch - create - patch - - update \ No newline at end of file + - update +{{- end }} diff --git a/deploy/helm/secret-operator/values.yaml b/deploy/helm/secret-operator/values.yaml index a2a7fe6f..1c12089e 100644 --- a/deploy/helm/secret-operator/values.yaml +++ b/deploy/helm/secret-operator/values.yaml @@ -6,8 +6,10 @@ image: pullSecrets: [] secretMigrationJob: + enabled: true image: repository: docker.stackable.tech/stackable/tools + tag: 1.0.0-stackable24.11.0 pullPolicy: IfNotPresent resources: requests: diff --git a/tests/release.yaml b/tests/release.yaml index f62cce64..2fbc5321 100644 --- a/tests/release.yaml +++ b/tests/release.yaml @@ -7,8 +7,8 @@ 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