diff --git a/bootstrap/helmfile-cmp/deploy.sh b/bootstrap/helmfile-cmp/deploy.sh index 73dbc751..146c4fe2 100755 --- a/bootstrap/helmfile-cmp/deploy.sh +++ b/bootstrap/helmfile-cmp/deploy.sh @@ -1,6 +1,6 @@ #!/bin/sh -img=registry.gitlab.com/oceanbox/manifests/helmfile-cmp +img=git.oceanbox.io/platform/manifests/helmfile-cmp tag=${1:-latest} docker build -t "${img}":"${tag}" . diff --git a/helmfile.d/cilium.yaml.gotmpl b/helmfile.d/cilium.yaml.gotmpl index baaca2b4..6e91afd3 100644 --- a/helmfile.d/cilium.yaml.gotmpl +++ b/helmfile.d/cilium.yaml.gotmpl @@ -15,11 +15,11 @@ releases: - name: cilium namespace: kube-system chart: cilium/cilium - version: 1.16.2 + version: {{ if eq (requiredEnv "ARGOCD_ENV_CLUSTER_NAME") "hel1" }}1.18.4{{ else }}1.16.2{{ end }} condition: cilium.enabled values: - ../values/cilium/values/cilium.yaml.gotmpl - - ../values/cilium/values/cilium-{{ .Environment.Name }}.yaml.gotmpl + - ../values/cilium/values/cilium-{{ requiredEnv "ARGOCD_ENV_CLUSTER_NAME" }}.yaml.gotmpl missingFileHandler: Info - name: manifests namespace: cilium @@ -55,4 +55,3 @@ releases: - '{{`{{ .Environment.Name }}`}}' - ../values/cilium/cilium-manifests - manifests -