diff --git a/values/jaeger-operator/jaeger-operator.gotmpl b/values/jaeger-operator/jaeger-operator.gotmpl index 484c380e6c..00e2a7e893 100644 --- a/values/jaeger-operator/jaeger-operator.gotmpl +++ b/values/jaeger-operator/jaeger-operator.gotmpl @@ -1,10 +1,11 @@ {{- $v := .Values }} - +{{- $version := "1.29" }} jaeger: create: true namespace: jaeger spec: allInOne: + image: jaegertracing/all-in-one:{{ $version }} options: query: base-path: /jaeger diff --git a/values/vault-operator/vault-operator-raw.gotmpl b/values/vault-operator/vault-operator-raw.gotmpl index 66aa926f2d..55879878ed 100644 --- a/values/vault-operator/vault-operator-raw.gotmpl +++ b/values/vault-operator/vault-operator-raw.gotmpl @@ -6,6 +6,8 @@ {{- $seal := $vault | get "seal" (dict "type" "default") }} {{- $kms := $v | get "kms" dict }} {{- $rootCASecretName := "root-ca" }} +{{- $vaultVersion := "1.6.1" }} +{{- $bankVaultsVersion := "1.14.4" }} resources: - apiVersion: "vault.banzaicloud.com/v1alpha1" @@ -14,9 +16,8 @@ resources: name: "vault" spec: size: 1 - image: vault:1.6.1 - # specify a custom bank-vaults image with bankVaultsImage: - # bankVaultsImage: ghcr.io/banzaicloud/bank-vaults:latest + image: vault:{{ $vaultVersion }} + bankVaultsImage: 'ghcr.io/banzaicloud/bank-vaults:{{ $bankVaultsVersion }}' # Common annotations for all created resources annotations: diff --git a/values/vault-operator/vault-operator.gotmpl b/values/vault-operator/vault-operator.gotmpl index 41e6a648ad..46688d06d7 100644 --- a/values/vault-operator/vault-operator.gotmpl +++ b/values/vault-operator/vault-operator.gotmpl @@ -3,9 +3,6 @@ watchNamespace: "vault" # @TODO: image: tag: 1.14.4 -vault-operator: - bank-vaults: - version: 1.14.4 {{- with .Values.otomi | get "globalPullSecret" nil }} global: imagePullSecrets: