Created
November 21, 2025 17:04
-
-
Save quiiver/e39d0713fd3d3732cae01234ace720eb to your computer and use it in GitHub Desktop.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| --- Diff (origin/main vs. local) --- | |
| --- origin/main/argo/k8s/argocd-bootstrap | |
| +++ local/argo/k8s/argocd-bootstrap | |
| @@ -6790,6 +6790,17 @@ | |
| tenant: "data-privacy-mapping" | |
| realm: "nonprod" | |
| annotations: | |
| + # We want this to render: image_tag' | |
| + argocd-image-updater.argoproj.io/app.helm.image-name: '{{ dig "charts" "data-privacy-mapping" "image_name" "image.name" . }}' | |
| + argocd-image-updater.argoproj.io/app.helm.image-tag: '{{ dig "charts" "data-privacy-mapping" "image_tag" "image.tag" . }}' | |
| + # The ApplicationSet template will render backslashes from image_regex values | |
| + # as escape characters. To avoid this, we have to escape one level above. | |
| + # We want this to render: .*' | |
| + argocd-image-updater.argoproj.io/image-list: 'app={{ dig "charts" "data-privacy-mapping" "image_repository" "" . }}' | |
| + argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "charts" "data-privacy-mapping" "image_regex" (dig "image_regex" ".*" .) . }}' | |
| + argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "charts" "data-privacy-mapping" "update_strategy" "newest-build" . }}' | |
| + argocd-image-updater.argoproj.io/git-branch: '{{ dig "charts" "data-privacy-mapping" "target_revision" "main" . }}' | |
| + argocd-image-updater.argoproj.io/write-back-method: 'git:secret:argocd-dataservices/image-updater-github-credentials' #pragma: allowlist secret | |
| # resolves to the data-privacy-mapping/k8s/data-privacy-mapping/templates directory and values/Chart files | |
| # image updater creates .argocd-* files in the chart directory to manage image updates | |
| # this will trigger a sync on every application that is consuming these charts which is not intended | |
| @@ -6814,8 +6825,7 @@ | |
| source: | |
| repoURL: "https://github.com/mozilla/dataservices-infra" | |
| path: "data-privacy-mapping/k8s/data-privacy-mapping" | |
| - # Retain environment level dig scope for single chart tenants | |
| - targetRevision: '{{ dig "target_revision" "main" . }}' | |
| + targetRevision: '{{ dig "charts" "data-privacy-mapping" "target_revision" "main" . }}' | |
| helm: | |
| parameters: | |
| - name: global.mozcloud.app_code | |
| @@ -6830,7 +6840,7 @@ | |
| value: moz-fx-data-privacy-mappi-6295 | |
| - name: global.mozcloud.realm | |
| value: nonprod | |
| - releaseName: '{{ dig "release_name" "data-privacy-mapping" . }}' # Primarily used to import existing helm releases | |
| + releaseName: '{{ dig "charts" "data-privacy-mapping" "release_name" "data-privacy-mapping" . }}' # Primarily used to import existing helm releases | |
| valueFiles: | |
| - values.yaml | |
| - 'values-{{ .name }}.yaml' | |
| @@ -6838,15 +6848,14 @@ | |
| name: "dataservices-high-private-nonprod-us-west1" | |
| namespace: "data-privacy-mapping-{{ .name }}" | |
| info: | |
| - # Retain environment level dig scope for single chart tenants | |
| - name: 'Helm Chart' | |
| value: 'https://github.com/mozilla/dataservices-infra/tree/{{ dig "target_revision" "main" . }}/data-privacy-mapping/k8s/data-privacy-mapping' | |
| - name: 'Helm Chart Ref' | |
| - value: '{{ dig "target_revision" "main" . }}' | |
| + value: '{{ dig "charts" "data-privacy-mapping" "target_revision" "main" . }}' | |
| - name: 'Application Repository' | |
| - value: '{{ dig "application_repository" "" . }}' | |
| + value: '{{ dig "charts" "data-privacy-mapping" "application_repository" "" . }}' | |
| - name: 'Image Repository' | |
| - value: '{{ dig "image_repository" "" . }}' | |
| + value: '{{ dig "charts" "data-privacy-mapping" "image_repository" "" . }}' | |
| - name: 'Tenant Definition' | |
| value: 'https://github.com/mozilla/global-platform-admin/blob/main/tenants/data-privacy-mapping.yaml' | |
| # Will ignore differences between live and desired states during the diff. Note that these configurations are not | |
| @@ -6906,6 +6910,17 @@ | |
| tenant: "data-privacy-mapping" | |
| realm: "prod" | |
| annotations: | |
| + # We want this to render: image_tag' | |
| + argocd-image-updater.argoproj.io/app.helm.image-name: '{{ dig "charts" "data-privacy-mapping" "image_name" "image.name" . }}' | |
| + argocd-image-updater.argoproj.io/app.helm.image-tag: '{{ dig "charts" "data-privacy-mapping" "image_tag" "image.tag" . }}' | |
| + # The ApplicationSet template will render backslashes from image_regex values | |
| + # as escape characters. To avoid this, we have to escape one level above. | |
| + # We want this to render: .*' | |
| + argocd-image-updater.argoproj.io/image-list: 'app={{ dig "charts" "data-privacy-mapping" "image_repository" "" . }}' | |
| + argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "charts" "data-privacy-mapping" "image_regex" (dig "image_regex" ".*" .) . }}' | |
| + argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "charts" "data-privacy-mapping" "update_strategy" "newest-build" . }}' | |
| + argocd-image-updater.argoproj.io/git-branch: '{{ dig "charts" "data-privacy-mapping" "target_revision" "main" . }}' | |
| + argocd-image-updater.argoproj.io/write-back-method: 'git:secret:argocd-dataservices/image-updater-github-credentials' #pragma: allowlist secret | |
| # resolves to the data-privacy-mapping/k8s/data-privacy-mapping/templates directory and values/Chart files | |
| # image updater creates .argocd-* files in the chart directory to manage image updates | |
| # this will trigger a sync on every application that is consuming these charts which is not intended | |
| @@ -6930,8 +6945,7 @@ | |
| source: | |
| repoURL: "https://github.com/mozilla/dataservices-infra" | |
| path: "data-privacy-mapping/k8s/data-privacy-mapping" | |
| - # Retain environment level dig scope for single chart tenants | |
| - targetRevision: '{{ dig "target_revision" "main" . }}' | |
| + targetRevision: '{{ dig "charts" "data-privacy-mapping" "target_revision" "main" . }}' | |
| helm: | |
| parameters: | |
| - name: global.mozcloud.app_code | |
| @@ -6946,7 +6960,7 @@ | |
| value: moz-fx-data-privacy-mappi-0bd1 | |
| - name: global.mozcloud.realm | |
| value: prod | |
| - releaseName: '{{ dig "release_name" "data-privacy-mapping" . }}' # Primarily used to import existing helm releases | |
| + releaseName: '{{ dig "charts" "data-privacy-mapping" "release_name" "data-privacy-mapping" . }}' # Primarily used to import existing helm releases | |
| valueFiles: | |
| - values.yaml | |
| - 'values-{{ .name }}.yaml' | |
| @@ -6954,15 +6968,14 @@ | |
| name: "dataservices-high-private-prod-us-west1" | |
| namespace: "data-privacy-mapping-{{ .name }}" | |
| info: | |
| - # Retain environment level dig scope for single chart tenants | |
| - name: 'Helm Chart' | |
| value: 'https://github.com/mozilla/dataservices-infra/tree/{{ dig "target_revision" "main" . }}/data-privacy-mapping/k8s/data-privacy-mapping' | |
| - name: 'Helm Chart Ref' | |
| - value: '{{ dig "target_revision" "main" . }}' | |
| + value: '{{ dig "charts" "data-privacy-mapping" "target_revision" "main" . }}' | |
| - name: 'Application Repository' | |
| - value: '{{ dig "application_repository" "" . }}' | |
| + value: '{{ dig "charts" "data-privacy-mapping" "application_repository" "" . }}' | |
| - name: 'Image Repository' | |
| - value: '{{ dig "image_repository" "" . }}' | |
| + value: '{{ dig "charts" "data-privacy-mapping" "image_repository" "" . }}' | |
| - name: 'Tenant Definition' | |
| value: 'https://github.com/mozilla/global-platform-admin/blob/main/tenants/data-privacy-mapping.yaml' | |
| # Will ignore differences between live and desired states during the diff. Note that these configurations are not | |
| @@ -7023,13 +7031,16 @@ | |
| tenant: "glam" | |
| realm: "nonprod" | |
| annotations: | |
| - argocd-image-updater.argoproj.io/app.helm.image-name: 'image.name' | |
| - argocd-image-updater.argoproj.io/app.helm.image-tag: 'image.tag' | |
| - # Retain environment level dig scope for single chart tenants | |
| - argocd-image-updater.argoproj.io/image-list: 'app={{ dig "image_repository" "us-docker.pkg.dev/moz-fx-glam-prod/glam-prod/glam" . }}' | |
| - argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "image_regex" ".*" . }}' | |
| - argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "update_strategy" "newest-build" . }}' | |
| - argocd-image-updater.argoproj.io/git-branch: '{{ dig "target_revision" "main" . }}' | |
| + # We want this to render: image_tag' | |
| + argocd-image-updater.argoproj.io/app.helm.image-name: '{{ dig "charts" "glam" "image_name" "image.name" . }}' | |
| + argocd-image-updater.argoproj.io/app.helm.image-tag: '{{ dig "charts" "glam" "image_tag" "image.tag" . }}' | |
| + # The ApplicationSet template will render backslashes from image_regex values | |
| + # as escape characters. To avoid this, we have to escape one level above. | |
| + # We want this to render: .*' | |
| + argocd-image-updater.argoproj.io/image-list: 'app={{ dig "charts" "glam" "image_repository" "us-docker.pkg.dev/moz-fx-glam-prod/glam-prod/glam" . }}' | |
| + argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "charts" "glam" "image_regex" (dig "image_regex" ".*" .) . }}' | |
| + argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "charts" "glam" "update_strategy" "newest-build" . }}' | |
| + argocd-image-updater.argoproj.io/git-branch: '{{ dig "charts" "glam" "target_revision" "main" . }}' | |
| argocd-image-updater.argoproj.io/write-back-method: 'git:secret:argocd-dataservices/image-updater-github-credentials' #pragma: allowlist secret | |
| # resolves to the glam/k8s/glam/templates directory and values/Chart files | |
| # image updater creates .argocd-* files in the chart directory to manage image updates | |
| @@ -7055,8 +7066,7 @@ | |
| source: | |
| repoURL: "https://github.com/mozilla/dataservices-infra" | |
| path: "glam/k8s/glam" | |
| - # Retain environment level dig scope for single chart tenants | |
| - targetRevision: '{{ dig "target_revision" "main" . }}' | |
| + targetRevision: '{{ dig "charts" "glam" "target_revision" "main" . }}' | |
| helm: | |
| parameters: | |
| - name: global.mozcloud.app_code | |
| @@ -7071,7 +7081,7 @@ | |
| value: moz-fx-glam-nonprod | |
| - name: global.mozcloud.realm | |
| value: nonprod | |
| - releaseName: '{{ dig "release_name" "glam" . }}' # Primarily used to import existing helm releases | |
| + releaseName: '{{ dig "charts" "glam" "release_name" "glam" . }}' # Primarily used to import existing helm releases | |
| valueFiles: | |
| - values.yaml | |
| - 'values-{{ .name }}.yaml' | |
| @@ -7079,15 +7089,14 @@ | |
| name: "dataservices-high-private-nonprod-us-west1" | |
| namespace: "glam-{{ .name }}" | |
| info: | |
| - # Retain environment level dig scope for single chart tenants | |
| - name: 'Helm Chart' | |
| value: 'https://github.com/mozilla/dataservices-infra/tree/{{ dig "target_revision" "main" . }}/glam/k8s/glam' | |
| - name: 'Helm Chart Ref' | |
| - value: '{{ dig "target_revision" "main" . }}' | |
| + value: '{{ dig "charts" "glam" "target_revision" "main" . }}' | |
| - name: 'Application Repository' | |
| - value: '{{ dig "application_repository" "mozilla/glam" . }}' | |
| + value: '{{ dig "charts" "glam" "application_repository" "mozilla/glam" . }}' | |
| - name: 'Image Repository' | |
| - value: '{{ dig "image_repository" "us-docker.pkg.dev/moz-fx-glam-prod/glam-prod/glam" . }}' | |
| + value: '{{ dig "charts" "glam" "image_repository" "us-docker.pkg.dev/moz-fx-glam-prod/glam-prod/glam" . }}' | |
| - name: 'Tenant Definition' | |
| value: 'https://github.com/mozilla/global-platform-admin/blob/main/tenants/glam.yaml' | |
| # Will ignore differences between live and desired states during the diff. Note that these configurations are not | |
| @@ -7147,13 +7151,16 @@ | |
| tenant: "glam" | |
| realm: "prod" | |
| annotations: | |
| - argocd-image-updater.argoproj.io/app.helm.image-name: 'image.name' | |
| - argocd-image-updater.argoproj.io/app.helm.image-tag: 'image.tag' | |
| - # Retain environment level dig scope for single chart tenants | |
| - argocd-image-updater.argoproj.io/image-list: 'app={{ dig "image_repository" "us-docker.pkg.dev/moz-fx-glam-prod/glam-prod/glam" . }}' | |
| - argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "image_regex" ".*" . }}' | |
| - argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "update_strategy" "newest-build" . }}' | |
| - argocd-image-updater.argoproj.io/git-branch: '{{ dig "target_revision" "main" . }}' | |
| + # We want this to render: image_tag' | |
| + argocd-image-updater.argoproj.io/app.helm.image-name: '{{ dig "charts" "glam" "image_name" "image.name" . }}' | |
| + argocd-image-updater.argoproj.io/app.helm.image-tag: '{{ dig "charts" "glam" "image_tag" "image.tag" . }}' | |
| + # The ApplicationSet template will render backslashes from image_regex values | |
| + # as escape characters. To avoid this, we have to escape one level above. | |
| + # We want this to render: .*' | |
| + argocd-image-updater.argoproj.io/image-list: 'app={{ dig "charts" "glam" "image_repository" "us-docker.pkg.dev/moz-fx-glam-prod/glam-prod/glam" . }}' | |
| + argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "charts" "glam" "image_regex" (dig "image_regex" ".*" .) . }}' | |
| + argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "charts" "glam" "update_strategy" "newest-build" . }}' | |
| + argocd-image-updater.argoproj.io/git-branch: '{{ dig "charts" "glam" "target_revision" "main" . }}' | |
| argocd-image-updater.argoproj.io/write-back-method: 'git:secret:argocd-dataservices/image-updater-github-credentials' #pragma: allowlist secret | |
| # resolves to the glam/k8s/glam/templates directory and values/Chart files | |
| # image updater creates .argocd-* files in the chart directory to manage image updates | |
| @@ -7179,8 +7186,7 @@ | |
| source: | |
| repoURL: "https://github.com/mozilla/dataservices-infra" | |
| path: "glam/k8s/glam" | |
| - # Retain environment level dig scope for single chart tenants | |
| - targetRevision: '{{ dig "target_revision" "main" . }}' | |
| + targetRevision: '{{ dig "charts" "glam" "target_revision" "main" . }}' | |
| helm: | |
| parameters: | |
| - name: global.mozcloud.app_code | |
| @@ -7195,7 +7201,7 @@ | |
| value: moz-fx-glam-prod | |
| - name: global.mozcloud.realm | |
| value: prod | |
| - releaseName: '{{ dig "release_name" "glam" . }}' # Primarily used to import existing helm releases | |
| + releaseName: '{{ dig "charts" "glam" "release_name" "glam" . }}' # Primarily used to import existing helm releases | |
| valueFiles: | |
| - values.yaml | |
| - 'values-{{ .name }}.yaml' | |
| @@ -7203,15 +7209,14 @@ | |
| name: "dataservices-high-private-prod-us-west1" | |
| namespace: "glam-{{ .name }}" | |
| info: | |
| - # Retain environment level dig scope for single chart tenants | |
| - name: 'Helm Chart' | |
| value: 'https://github.com/mozilla/dataservices-infra/tree/{{ dig "target_revision" "main" . }}/glam/k8s/glam' | |
| - name: 'Helm Chart Ref' | |
| - value: '{{ dig "target_revision" "main" . }}' | |
| + value: '{{ dig "charts" "glam" "target_revision" "main" . }}' | |
| - name: 'Application Repository' | |
| - value: '{{ dig "application_repository" "mozilla/glam" . }}' | |
| + value: '{{ dig "charts" "glam" "application_repository" "mozilla/glam" . }}' | |
| - name: 'Image Repository' | |
| - value: '{{ dig "image_repository" "us-docker.pkg.dev/moz-fx-glam-prod/glam-prod/glam" . }}' | |
| + value: '{{ dig "charts" "glam" "image_repository" "us-docker.pkg.dev/moz-fx-glam-prod/glam-prod/glam" . }}' | |
| - name: 'Tenant Definition' | |
| value: 'https://github.com/mozilla/global-platform-admin/blob/main/tenants/glam.yaml' | |
| # Will ignore differences between live and desired states during the diff. Note that these configurations are not | |
| @@ -7272,6 +7272,17 @@ | |
| tenant: "llm-proxy" | |
| realm: "nonprod" | |
| annotations: | |
| + # We want this to render: image_tag' | |
| + argocd-image-updater.argoproj.io/app.helm.image-name: '{{ dig "charts" "llm-proxy" "image_name" "image.name" . }}' | |
| + argocd-image-updater.argoproj.io/app.helm.image-tag: '{{ dig "charts" "llm-proxy" "image_tag" "image.tag" . }}' | |
| + # The ApplicationSet template will render backslashes from image_regex values | |
| + # as escape characters. To avoid this, we have to escape one level above. | |
| + # We want this to render: .*' | |
| + argocd-image-updater.argoproj.io/image-list: 'app={{ dig "charts" "llm-proxy" "image_repository" "" . }}' | |
| + argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "charts" "llm-proxy" "image_regex" (dig "image_regex" ".*" .) . }}' | |
| + argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "charts" "llm-proxy" "update_strategy" "newest-build" . }}' | |
| + argocd-image-updater.argoproj.io/git-branch: '{{ dig "charts" "llm-proxy" "target_revision" "main" . }}' | |
| + argocd-image-updater.argoproj.io/write-back-method: 'git:secret:argocd-dataservices/image-updater-github-credentials' #pragma: allowlist secret | |
| # resolves to the llm-proxy/k8s/llm-proxy/templates directory and values/Chart files | |
| # image updater creates .argocd-* files in the chart directory to manage image updates | |
| # this will trigger a sync on every application that is consuming these charts which is not intended | |
| @@ -7296,8 +7307,7 @@ | |
| source: | |
| repoURL: "https://github.com/mozilla/dataservices-infra" | |
| path: "llm-proxy/k8s/llm-proxy" | |
| - # Retain environment level dig scope for single chart tenants | |
| - targetRevision: '{{ dig "target_revision" "main" . }}' | |
| + targetRevision: '{{ dig "charts" "llm-proxy" "target_revision" "main" . }}' | |
| helm: | |
| parameters: | |
| - name: global.mozcloud.app_code | |
| @@ -7312,7 +7322,7 @@ | |
| value: moz-fx-llm-proxy-nonprod-fd0e | |
| - name: global.mozcloud.realm | |
| value: nonprod | |
| - releaseName: '{{ dig "release_name" "llm-proxy" . }}' # Primarily used to import existing helm releases | |
| + releaseName: '{{ dig "charts" "llm-proxy" "release_name" "llm-proxy" . }}' # Primarily used to import existing helm releases | |
| valueFiles: | |
| - values.yaml | |
| - 'values-{{ .name }}.yaml' | |
| @@ -7320,15 +7330,14 @@ | |
| name: "dataservices-high-private-nonprod-us-west1" | |
| namespace: "llm-proxy-{{ .name }}" | |
| info: | |
| - # Retain environment level dig scope for single chart tenants | |
| - name: 'Helm Chart' | |
| value: 'https://github.com/mozilla/dataservices-infra/tree/{{ dig "target_revision" "main" . }}/llm-proxy/k8s/llm-proxy' | |
| - name: 'Helm Chart Ref' | |
| - value: '{{ dig "target_revision" "main" . }}' | |
| + value: '{{ dig "charts" "llm-proxy" "target_revision" "main" . }}' | |
| - name: 'Application Repository' | |
| - value: '{{ dig "application_repository" "" . }}' | |
| + value: '{{ dig "charts" "llm-proxy" "application_repository" "" . }}' | |
| - name: 'Image Repository' | |
| - value: '{{ dig "image_repository" "" . }}' | |
| + value: '{{ dig "charts" "llm-proxy" "image_repository" "" . }}' | |
| - name: 'Tenant Definition' | |
| value: 'https://github.com/mozilla/global-platform-admin/blob/main/tenants/llm-proxy.yaml' | |
| # Will ignore differences between live and desired states during the diff. Note that these configurations are not | |
| @@ -7388,6 +7392,17 @@ | |
| tenant: "llm-proxy" | |
| realm: "prod" | |
| annotations: | |
| + # We want this to render: image_tag' | |
| + argocd-image-updater.argoproj.io/app.helm.image-name: '{{ dig "charts" "llm-proxy" "image_name" "image.name" . }}' | |
| + argocd-image-updater.argoproj.io/app.helm.image-tag: '{{ dig "charts" "llm-proxy" "image_tag" "image.tag" . }}' | |
| + # The ApplicationSet template will render backslashes from image_regex values | |
| + # as escape characters. To avoid this, we have to escape one level above. | |
| + # We want this to render: .*' | |
| + argocd-image-updater.argoproj.io/image-list: 'app={{ dig "charts" "llm-proxy" "image_repository" "" . }}' | |
| + argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "charts" "llm-proxy" "image_regex" (dig "image_regex" ".*" .) . }}' | |
| + argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "charts" "llm-proxy" "update_strategy" "newest-build" . }}' | |
| + argocd-image-updater.argoproj.io/git-branch: '{{ dig "charts" "llm-proxy" "target_revision" "main" . }}' | |
| + argocd-image-updater.argoproj.io/write-back-method: 'git:secret:argocd-dataservices/image-updater-github-credentials' #pragma: allowlist secret | |
| # resolves to the llm-proxy/k8s/llm-proxy/templates directory and values/Chart files | |
| # image updater creates .argocd-* files in the chart directory to manage image updates | |
| # this will trigger a sync on every application that is consuming these charts which is not intended | |
| @@ -7412,8 +7427,7 @@ | |
| source: | |
| repoURL: "https://github.com/mozilla/dataservices-infra" | |
| path: "llm-proxy/k8s/llm-proxy" | |
| - # Retain environment level dig scope for single chart tenants | |
| - targetRevision: '{{ dig "target_revision" "main" . }}' | |
| + targetRevision: '{{ dig "charts" "llm-proxy" "target_revision" "main" . }}' | |
| helm: | |
| parameters: | |
| - name: global.mozcloud.app_code | |
| @@ -7428,7 +7442,7 @@ | |
| value: moz-fx-llm-proxy-prod-b0b8 | |
| - name: global.mozcloud.realm | |
| value: prod | |
| - releaseName: '{{ dig "release_name" "llm-proxy" . }}' # Primarily used to import existing helm releases | |
| + releaseName: '{{ dig "charts" "llm-proxy" "release_name" "llm-proxy" . }}' # Primarily used to import existing helm releases | |
| valueFiles: | |
| - values.yaml | |
| - 'values-{{ .name }}.yaml' | |
| @@ -7436,15 +7450,14 @@ | |
| name: "dataservices-high-private-prod-us-west1" | |
| namespace: "llm-proxy-{{ .name }}" | |
| info: | |
| - # Retain environment level dig scope for single chart tenants | |
| - name: 'Helm Chart' | |
| value: 'https://github.com/mozilla/dataservices-infra/tree/{{ dig "target_revision" "main" . }}/llm-proxy/k8s/llm-proxy' | |
| - name: 'Helm Chart Ref' | |
| - value: '{{ dig "target_revision" "main" . }}' | |
| + value: '{{ dig "charts" "llm-proxy" "target_revision" "main" . }}' | |
| - name: 'Application Repository' | |
| - value: '{{ dig "application_repository" "" . }}' | |
| + value: '{{ dig "charts" "llm-proxy" "application_repository" "" . }}' | |
| - name: 'Image Repository' | |
| - value: '{{ dig "image_repository" "" . }}' | |
| + value: '{{ dig "charts" "llm-proxy" "image_repository" "" . }}' | |
| - name: 'Tenant Definition' | |
| value: 'https://github.com/mozilla/global-platform-admin/blob/main/tenants/llm-proxy.yaml' | |
| # Will ignore differences between live and desired states during the diff. Note that these configurations are not | |
| @@ -7505,13 +7513,16 @@ | |
| tenant: "telemetry-airflow" | |
| realm: "nonprod" | |
| annotations: | |
| - argocd-image-updater.argoproj.io/app.helm.image-name: 'airflow.images.airflow.repository' | |
| - argocd-image-updater.argoproj.io/app.helm.image-tag: 'airflow.images.airflow.tag' | |
| - # Retain environment level dig scope for single chart tenants | |
| - argocd-image-updater.argoproj.io/image-list: 'app={{ dig "image_repository" "us-docker.pkg.dev/moz-fx-telemetry-airflow-prod/telemetry-airflow-prod/telemetry-airflow" . }}' | |
| - argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "image_regex" ".*" . }}' | |
| - argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "update_strategy" "newest-build" . }}' | |
| - argocd-image-updater.argoproj.io/git-branch: '{{ dig "target_revision" "main" . }}' | |
| + # We want this to render: image_tag' | |
| + argocd-image-updater.argoproj.io/app.helm.image-name: '{{ dig "charts" "telemetry-airflow" "image_name" "airflow.images.airflow.repository" . }}' | |
| + argocd-image-updater.argoproj.io/app.helm.image-tag: '{{ dig "charts" "telemetry-airflow" "image_tag" "airflow.images.airflow.tag" . }}' | |
| + # The ApplicationSet template will render backslashes from image_regex values | |
| + # as escape characters. To avoid this, we have to escape one level above. | |
| + # We want this to render: .*' | |
| + argocd-image-updater.argoproj.io/image-list: 'app={{ dig "charts" "telemetry-airflow" "image_repository" "us-docker.pkg.dev/moz-fx-telemetry-airflow-prod/telemetry-airflow-prod/telemetry-airflow" . }}' | |
| + argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "charts" "telemetry-airflow" "image_regex" (dig "image_regex" ".*" .) . }}' | |
| + argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "charts" "telemetry-airflow" "update_strategy" "newest-build" . }}' | |
| + argocd-image-updater.argoproj.io/git-branch: '{{ dig "charts" "telemetry-airflow" "target_revision" "main" . }}' | |
| argocd-image-updater.argoproj.io/write-back-method: 'git:secret:argocd-dataservices/image-updater-github-credentials' #pragma: allowlist secret | |
| # resolves to the telemetry-airflow/k8s/telemetry-airflow/templates directory and values/Chart files | |
| # image updater creates .argocd-* files in the chart directory to manage image updates | |
| @@ -7537,8 +7548,7 @@ | |
| source: | |
| repoURL: "https://github.com/mozilla/dataservices-infra" | |
| path: "telemetry-airflow/k8s/telemetry-airflow" | |
| - # Retain environment level dig scope for single chart tenants | |
| - targetRevision: '{{ dig "target_revision" "main" . }}' | |
| + targetRevision: '{{ dig "charts" "telemetry-airflow" "target_revision" "main" . }}' | |
| helm: | |
| parameters: | |
| - name: global.mozcloud.app_code | |
| @@ -7553,7 +7563,7 @@ | |
| value: moz-fx-telemetry-airflow-nonpr | |
| - name: global.mozcloud.realm | |
| value: nonprod | |
| - releaseName: '{{ dig "release_name" "gha" . }}' # Primarily used to import existing helm releases | |
| + releaseName: '{{ dig "charts" "telemetry-airflow" "release_name" "gha" . }}' # Primarily used to import existing helm releases | |
| valueFiles: | |
| - values.yaml | |
| - 'values-{{ .name }}.yaml' | |
| @@ -7561,15 +7571,14 @@ | |
| name: "dataservices-high-private-nonprod-us-west1" | |
| namespace: "telemetry-airflow-{{ .name }}" | |
| info: | |
| - # Retain environment level dig scope for single chart tenants | |
| - name: 'Helm Chart' | |
| value: 'https://github.com/mozilla/dataservices-infra/tree/{{ dig "target_revision" "main" . }}/telemetry-airflow/k8s/telemetry-airflow' | |
| - name: 'Helm Chart Ref' | |
| - value: '{{ dig "target_revision" "main" . }}' | |
| + value: '{{ dig "charts" "telemetry-airflow" "target_revision" "main" . }}' | |
| - name: 'Application Repository' | |
| - value: '{{ dig "application_repository" "mozilla/telemetry-airflow" . }}' | |
| + value: '{{ dig "charts" "telemetry-airflow" "application_repository" "mozilla/telemetry-airflow" . }}' | |
| - name: 'Image Repository' | |
| - value: '{{ dig "image_repository" "us-docker.pkg.dev/moz-fx-telemetry-airflow-prod/telemetry-airflow-prod/telemetry-airflow" . }}' | |
| + value: '{{ dig "charts" "telemetry-airflow" "image_repository" "us-docker.pkg.dev/moz-fx-telemetry-airflow-prod/telemetry-airflow-prod/telemetry-airflow" . }}' | |
| - name: 'Tenant Definition' | |
| value: 'https://github.com/mozilla/global-platform-admin/blob/main/tenants/telemetry-airflow.yaml' | |
| # Will ignore differences between live and desired states during the diff. Note that these configurations are not | |
| @@ -7629,13 +7633,16 @@ | |
| tenant: "telemetry-airflow" | |
| realm: "prod" | |
| annotations: | |
| - argocd-image-updater.argoproj.io/app.helm.image-name: 'airflow.images.airflow.repository' | |
| - argocd-image-updater.argoproj.io/app.helm.image-tag: 'airflow.images.airflow.tag' | |
| - # Retain environment level dig scope for single chart tenants | |
| - argocd-image-updater.argoproj.io/image-list: 'app={{ dig "image_repository" "us-docker.pkg.dev/moz-fx-telemetry-airflow-prod/telemetry-airflow-prod/telemetry-airflow" . }}' | |
| - argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "image_regex" ".*" . }}' | |
| - argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "update_strategy" "newest-build" . }}' | |
| - argocd-image-updater.argoproj.io/git-branch: '{{ dig "target_revision" "main" . }}' | |
| + # We want this to render: image_tag' | |
| + argocd-image-updater.argoproj.io/app.helm.image-name: '{{ dig "charts" "telemetry-airflow" "image_name" "airflow.images.airflow.repository" . }}' | |
| + argocd-image-updater.argoproj.io/app.helm.image-tag: '{{ dig "charts" "telemetry-airflow" "image_tag" "airflow.images.airflow.tag" . }}' | |
| + # The ApplicationSet template will render backslashes from image_regex values | |
| + # as escape characters. To avoid this, we have to escape one level above. | |
| + # We want this to render: .*' | |
| + argocd-image-updater.argoproj.io/image-list: 'app={{ dig "charts" "telemetry-airflow" "image_repository" "us-docker.pkg.dev/moz-fx-telemetry-airflow-prod/telemetry-airflow-prod/telemetry-airflow" . }}' | |
| + argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "charts" "telemetry-airflow" "image_regex" (dig "image_regex" ".*" .) . }}' | |
| + argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "charts" "telemetry-airflow" "update_strategy" "newest-build" . }}' | |
| + argocd-image-updater.argoproj.io/git-branch: '{{ dig "charts" "telemetry-airflow" "target_revision" "main" . }}' | |
| argocd-image-updater.argoproj.io/write-back-method: 'git:secret:argocd-dataservices/image-updater-github-credentials' #pragma: allowlist secret | |
| # resolves to the telemetry-airflow/k8s/telemetry-airflow/templates directory and values/Chart files | |
| # image updater creates .argocd-* files in the chart directory to manage image updates | |
| @@ -7661,8 +7668,7 @@ | |
| source: | |
| repoURL: "https://github.com/mozilla/dataservices-infra" | |
| path: "telemetry-airflow/k8s/telemetry-airflow" | |
| - # Retain environment level dig scope for single chart tenants | |
| - targetRevision: '{{ dig "target_revision" "main" . }}' | |
| + targetRevision: '{{ dig "charts" "telemetry-airflow" "target_revision" "main" . }}' | |
| helm: | |
| parameters: | |
| - name: global.mozcloud.app_code | |
| @@ -7677,7 +7683,7 @@ | |
| value: moz-fx-telemetry-airflow-prod | |
| - name: global.mozcloud.realm | |
| value: prod | |
| - releaseName: '{{ dig "release_name" "gha" . }}' # Primarily used to import existing helm releases | |
| + releaseName: '{{ dig "charts" "telemetry-airflow" "release_name" "gha" . }}' # Primarily used to import existing helm releases | |
| valueFiles: | |
| - values.yaml | |
| - 'values-{{ .name }}.yaml' | |
| @@ -7685,15 +7691,14 @@ | |
| name: "dataservices-high-private-prod-us-west1" | |
| namespace: "telemetry-airflow-{{ .name }}" | |
| info: | |
| - # Retain environment level dig scope for single chart tenants | |
| - name: 'Helm Chart' | |
| value: 'https://github.com/mozilla/dataservices-infra/tree/{{ dig "target_revision" "main" . }}/telemetry-airflow/k8s/telemetry-airflow' | |
| - name: 'Helm Chart Ref' | |
| - value: '{{ dig "target_revision" "main" . }}' | |
| + value: '{{ dig "charts" "telemetry-airflow" "target_revision" "main" . }}' | |
| - name: 'Application Repository' | |
| - value: '{{ dig "application_repository" "mozilla/telemetry-airflow" . }}' | |
| + value: '{{ dig "charts" "telemetry-airflow" "application_repository" "mozilla/telemetry-airflow" . }}' | |
| - name: 'Image Repository' | |
| - value: '{{ dig "image_repository" "us-docker.pkg.dev/moz-fx-telemetry-airflow-prod/telemetry-airflow-prod/telemetry-airflow" . }}' | |
| + value: '{{ dig "charts" "telemetry-airflow" "image_repository" "us-docker.pkg.dev/moz-fx-telemetry-airflow-prod/telemetry-airflow-prod/telemetry-airflow" . }}' | |
| - name: 'Tenant Definition' | |
| value: 'https://github.com/mozilla/global-platform-admin/blob/main/tenants/telemetry-airflow.yaml' | |
| # Will ignore differences between live and desired states during the diff. Note that these configurations are not | |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| --- Diff (origin/main vs. local) --- | |
| --- origin/main/argo/k8s/argocd-bootstrap | |
| +++ local/argo/k8s/argocd-bootstrap | |
| @@ -32778,13 +32778,16 @@ | |
| tenant: "o11y-demo" | |
| realm: "nonprod" | |
| annotations: | |
| - argocd-image-updater.argoproj.io/app.helm.image-name: 'image.name' | |
| - argocd-image-updater.argoproj.io/app.helm.image-tag: 'image.tag' | |
| - # Retain environment level dig scope for single chart tenants | |
| - argocd-image-updater.argoproj.io/image-list: 'app={{ dig "image_repository" "us-docker.pkg.dev/moz-fx-o11y-demo-nonprod/o11y-demo-nonprod/o11y-demo" . }}' | |
| - argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "image_regex" ".*" . }}' | |
| - argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "update_strategy" "newest-build" . }}' | |
| - argocd-image-updater.argoproj.io/git-branch: '{{ dig "target_revision" "main" . }}' | |
| + # We want this to render: image_tag' | |
| + argocd-image-updater.argoproj.io/app.helm.image-name: '{{ dig "charts" "o11y-demo" "image_name" "image.name" . }}' | |
| + argocd-image-updater.argoproj.io/app.helm.image-tag: '{{ dig "charts" "o11y-demo" "image_tag" "image.tag" . }}' | |
| + # The ApplicationSet template will render backslashes from image_regex values | |
| + # as escape characters. To avoid this, we have to escape one level above. | |
| + # We want this to render: .*' | |
| + argocd-image-updater.argoproj.io/image-list: 'app={{ dig "charts" "o11y-demo" "image_repository" "us-docker.pkg.dev/moz-fx-o11y-demo-nonprod/o11y-demo-nonprod/o11y-demo" . }}' | |
| + argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "charts" "o11y-demo" "image_regex" (dig "image_regex" ".*" .) . }}' | |
| + argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "charts" "o11y-demo" "update_strategy" "newest-build" . }}' | |
| + argocd-image-updater.argoproj.io/git-branch: '{{ dig "charts" "o11y-demo" "target_revision" "main" . }}' | |
| argocd-image-updater.argoproj.io/write-back-method: 'git:secret:argocd-sandbox/image-updater-github-credentials' #pragma: allowlist secret | |
| argocd-image-updater.argoproj.io/write-back-target: 'helmvalues:./values-{{ .name }}.yaml' | |
| # resolves to the o11y-demo/k8s/o11y-demo/templates directory and values/Chart files | |
| @@ -32811,8 +32814,7 @@ | |
| source: | |
| repoURL: "https://github.com/mozilla/sandbox-infra" | |
| path: "o11y-demo/k8s/o11y-demo" | |
| - # Retain environment level dig scope for single chart tenants | |
| - targetRevision: '{{ dig "target_revision" "main" . }}' | |
| + targetRevision: '{{ dig "charts" "o11y-demo" "target_revision" "main" . }}' | |
| helm: | |
| parameters: | |
| - name: global.mozcloud.app_code | |
| @@ -32827,7 +32829,7 @@ | |
| value: moz-fx-o11y-demo-nonprod | |
| - name: global.mozcloud.realm | |
| value: nonprod | |
| - releaseName: '{{ dig "release_name" "o11y-demo" . }}' # Primarily used to import existing helm releases | |
| + releaseName: '{{ dig "charts" "o11y-demo" "release_name" "o11y-demo" . }}' # Primarily used to import existing helm releases | |
| valueFiles: | |
| - values.yaml | |
| - 'values-{{ .name }}.yaml' | |
| @@ -32835,15 +32837,14 @@ | |
| name: "sandbox-high-private-nonprod-us-west1" | |
| namespace: "o11y-demo-{{ .name }}" | |
| info: | |
| - # Retain environment level dig scope for single chart tenants | |
| - name: 'Helm Chart' | |
| value: 'https://github.com/mozilla/sandbox-infra/tree/{{ dig "target_revision" "main" . }}/o11y-demo/k8s/o11y-demo' | |
| - name: 'Helm Chart Ref' | |
| - value: '{{ dig "target_revision" "main" . }}' | |
| + value: '{{ dig "charts" "o11y-demo" "target_revision" "main" . }}' | |
| - name: 'Application Repository' | |
| - value: '{{ dig "application_repository" "mozilla/service-deploy-status" . }}' | |
| + value: '{{ dig "charts" "o11y-demo" "application_repository" "mozilla/service-deploy-status" . }}' | |
| - name: 'Image Repository' | |
| - value: '{{ dig "image_repository" "us-docker.pkg.dev/moz-fx-o11y-demo-nonprod/o11y-demo-nonprod/o11y-demo" . }}' | |
| + value: '{{ dig "charts" "o11y-demo" "image_repository" "us-docker.pkg.dev/moz-fx-o11y-demo-nonprod/o11y-demo-nonprod/o11y-demo" . }}' | |
| - name: 'Tenant Definition' | |
| value: 'https://github.com/mozilla/global-platform-admin/blob/main/tenants/o11y-demo.yaml' | |
| # Will ignore differences between live and desired states during the diff. Note that these configurations are not | |
| @@ -32903,13 +32899,16 @@ | |
| tenant: "otel-django" | |
| realm: "nonprod" | |
| annotations: | |
| - argocd-image-updater.argoproj.io/app.helm.image-name: 'image.name' | |
| - argocd-image-updater.argoproj.io/app.helm.image-tag: 'image.tag' | |
| - # Retain environment level dig scope for single chart tenants | |
| - argocd-image-updater.argoproj.io/image-list: 'app={{ dig "image_repository" "us-docker.pkg.dev/moz-fx-otel-django-nonprod/otel-django-nonprod/otel-django" . }}' | |
| - argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "image_regex" ".*" . }}' | |
| - argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "update_strategy" "newest-build" . }}' | |
| - argocd-image-updater.argoproj.io/git-branch: '{{ dig "target_revision" "main" . }}' | |
| + # We want this to render: image_tag' | |
| + argocd-image-updater.argoproj.io/app.helm.image-name: '{{ dig "charts" "otel-django" "image_name" "image.name" . }}' | |
| + argocd-image-updater.argoproj.io/app.helm.image-tag: '{{ dig "charts" "otel-django" "image_tag" "image.tag" . }}' | |
| + # The ApplicationSet template will render backslashes from image_regex values | |
| + # as escape characters. To avoid this, we have to escape one level above. | |
| + # We want this to render: .*' | |
| + argocd-image-updater.argoproj.io/image-list: 'app={{ dig "charts" "otel-django" "image_repository" "us-docker.pkg.dev/moz-fx-otel-django-nonprod/otel-django-nonprod/otel-django" . }}' | |
| + argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "charts" "otel-django" "image_regex" (dig "image_regex" ".*" .) . }}' | |
| + argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "charts" "otel-django" "update_strategy" "newest-build" . }}' | |
| + argocd-image-updater.argoproj.io/git-branch: '{{ dig "charts" "otel-django" "target_revision" "main" . }}' | |
| argocd-image-updater.argoproj.io/write-back-method: 'git:secret:argocd-sandbox/image-updater-github-credentials' #pragma: allowlist secret | |
| argocd-image-updater.argoproj.io/write-back-target: 'helmvalues:./values-{{ .name }}.yaml' | |
| # resolves to the otel-django/k8s/otel-django/templates directory and values/Chart files | |
| @@ -32936,8 +32935,7 @@ | |
| source: | |
| repoURL: "https://github.com/mozilla/sandbox-infra" | |
| path: "otel-django/k8s/otel-django" | |
| - # Retain environment level dig scope for single chart tenants | |
| - targetRevision: '{{ dig "target_revision" "main" . }}' | |
| + targetRevision: '{{ dig "charts" "otel-django" "target_revision" "main" . }}' | |
| helm: | |
| parameters: | |
| - name: global.mozcloud.app_code | |
| @@ -32952,7 +32950,7 @@ | |
| value: moz-fx-otel-django-nonprod | |
| - name: global.mozcloud.realm | |
| value: nonprod | |
| - releaseName: '{{ dig "release_name" "otel-django" . }}' # Primarily used to import existing helm releases | |
| + releaseName: '{{ dig "charts" "otel-django" "release_name" "otel-django" . }}' # Primarily used to import existing helm releases | |
| valueFiles: | |
| - values.yaml | |
| - 'values-{{ .name }}.yaml' | |
| @@ -32960,15 +32958,14 @@ | |
| name: "sandbox-high-private-nonprod-us-west1" | |
| namespace: "otel-django-{{ .name }}" | |
| info: | |
| - # Retain environment level dig scope for single chart tenants | |
| - name: 'Helm Chart' | |
| value: 'https://github.com/mozilla/sandbox-infra/tree/{{ dig "target_revision" "main" . }}/otel-django/k8s/otel-django' | |
| - name: 'Helm Chart Ref' | |
| - value: '{{ dig "target_revision" "main" . }}' | |
| + value: '{{ dig "charts" "otel-django" "target_revision" "main" . }}' | |
| - name: 'Application Repository' | |
| - value: '{{ dig "application_repository" "mozilla/otel-django-test" . }}' | |
| + value: '{{ dig "charts" "otel-django" "application_repository" "mozilla/otel-django-test" . }}' | |
| - name: 'Image Repository' | |
| - value: '{{ dig "image_repository" "us-docker.pkg.dev/moz-fx-otel-django-nonprod/otel-django-nonprod/otel-django" . }}' | |
| + value: '{{ dig "charts" "otel-django" "image_repository" "us-docker.pkg.dev/moz-fx-otel-django-nonprod/otel-django-nonprod/otel-django" . }}' | |
| - name: 'Tenant Definition' | |
| value: 'https://github.com/mozilla/global-platform-admin/blob/main/tenants/otel-django.yaml' | |
| # Will ignore differences between live and desired states during the diff. Note that these configurations are not | |
| @@ -33028,6 +33020,18 @@ | |
| tenant: "testapp5" | |
| realm: "nonprod" | |
| annotations: | |
| + # We want this to render: image_tag' | |
| + argocd-image-updater.argoproj.io/app.helm.image-name: '{{ dig "charts" "testapp5" "image_name" "image.name" . }}' | |
| + argocd-image-updater.argoproj.io/app.helm.image-tag: '{{ dig "charts" "testapp5" "image_tag" "image.tag" . }}' | |
| + # The ApplicationSet template will render backslashes from image_regex values | |
| + # as escape characters. To avoid this, we have to escape one level above. | |
| + # We want this to render: .*' | |
| + argocd-image-updater.argoproj.io/image-list: 'app={{ dig "charts" "testapp5" "image_repository" "" . }}' | |
| + argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "charts" "testapp5" "image_regex" (dig "image_regex" ".*" .) . }}' | |
| + argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "charts" "testapp5" "update_strategy" "newest-build" . }}' | |
| + argocd-image-updater.argoproj.io/git-branch: '{{ dig "charts" "testapp5" "target_revision" "main" . }}' | |
| + argocd-image-updater.argoproj.io/write-back-method: 'git:secret:argocd-sandbox/image-updater-github-credentials' #pragma: allowlist secret | |
| + argocd-image-updater.argoproj.io/write-back-target: 'helmvalues:./values-{{ .name }}.yaml' | |
| # resolves to the testapp5/k8s/testapp5/templates directory and values/Chart files | |
| # image updater creates .argocd-* files in the chart directory to manage image updates | |
| # this will trigger a sync on every application that is consuming these charts which is not intended | |
| @@ -33045,14 +33049,6 @@ | |
| spec: | |
| project: 'testapp5-nonprod' | |
| syncPolicy: | |
| - automated: | |
| - selfHeal: true | |
| - retry: | |
| - limit: 3 # number of failed sync attempt retries; unlimited number of attempts if less than 0 | |
| - backoff: | |
| - duration: 15s # the amount to back off. Default unit is seconds, but could also be a duration (e.g. "2m", "1h") | |
| - factor: 2 # a factor to multiply the base duration after each failed retry | |
| - maxDuration: 1m # the maximum amount of time allowed for the backoff strategy | |
| syncOptions: | |
| - CreateNamespace=false | |
| - RespectIgnoreDifferences=true # When syncing changes, respect fields ignored by the ignoreDifferences configuration | |
| @@ -33060,8 +33056,7 @@ | |
| source: | |
| repoURL: "https://github.com/mozilla/sandbox-infra" | |
| path: "testapp5/k8s/testapp5" | |
| - # Retain environment level dig scope for single chart tenants | |
| - targetRevision: '{{ dig "target_revision" "main" . }}' | |
| + targetRevision: '{{ dig "charts" "testapp5" "target_revision" "main" . }}' | |
| helm: | |
| parameters: | |
| - name: global.mozcloud.app_code | |
| @@ -33076,7 +33071,7 @@ | |
| value: moz-fx-testapp5-nonprod | |
| - name: global.mozcloud.realm | |
| value: nonprod | |
| - releaseName: '{{ dig "release_name" "gha" . }}' # Primarily used to import existing helm releases | |
| + releaseName: '{{ dig "charts" "testapp5" "release_name" "gha" . }}' # Primarily used to import existing helm releases | |
| valueFiles: | |
| - values.yaml | |
| - 'values-{{ .name }}.yaml' | |
| @@ -33084,15 +33079,14 @@ | |
| name: "sandbox-high-private-nonprod-us-west1" | |
| namespace: "testapp5-{{ .name }}" | |
| info: | |
| - # Retain environment level dig scope for single chart tenants | |
| - name: 'Helm Chart' | |
| value: 'https://github.com/mozilla/sandbox-infra/tree/{{ dig "target_revision" "main" . }}/testapp5/k8s/testapp5' | |
| - name: 'Helm Chart Ref' | |
| - value: '{{ dig "target_revision" "main" . }}' | |
| + value: '{{ dig "charts" "testapp5" "target_revision" "main" . }}' | |
| - name: 'Application Repository' | |
| - value: '{{ dig "application_repository" "" . }}' | |
| + value: '{{ dig "charts" "testapp5" "application_repository" "" . }}' | |
| - name: 'Image Repository' | |
| - value: '{{ dig "image_repository" "" . }}' | |
| + value: '{{ dig "charts" "testapp5" "image_repository" "" . }}' | |
| - name: 'Tenant Definition' | |
| value: 'https://github.com/mozilla/global-platform-admin/blob/main/tenants/testapp5.yaml' | |
| # Will ignore differences between live and desired states during the diff. Note that these configurations are not | |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| --- Diff (origin/main vs. local) --- | |
| --- origin/main/argo/k8s/argocd-bootstrap | |
| +++ local/argo/k8s/argocd-bootstrap | |
| @@ -9419,6 +9419,17 @@ | |
| tenant: "ads" | |
| realm: "nonprod" | |
| annotations: | |
| + # We want this to render: image_tag' | |
| + argocd-image-updater.argoproj.io/app.helm.image-name: '{{ dig "charts" "ads" "image_name" "image.name" . }}' | |
| + argocd-image-updater.argoproj.io/app.helm.image-tag: '{{ dig "charts" "ads" "image_tag" "image.tag" . }}' | |
| + # The ApplicationSet template will render backslashes from image_regex values | |
| + # as escape characters. To avoid this, we have to escape one level above. | |
| + # We want this to render: .*' | |
| + argocd-image-updater.argoproj.io/image-list: 'app={{ dig "charts" "ads" "image_repository" "" . }}' | |
| + argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "charts" "ads" "image_regex" (dig "image_regex" ".*" .) . }}' | |
| + argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "charts" "ads" "update_strategy" "newest-build" . }}' | |
| + argocd-image-updater.argoproj.io/git-branch: '{{ dig "charts" "ads" "target_revision" "main" . }}' | |
| + argocd-image-updater.argoproj.io/write-back-method: 'git:secret:argocd-webservices/image-updater-github-credentials' #pragma: allowlist secret | |
| # resolves to the ads/k8s/ads/templates directory and values/Chart files | |
| # image updater creates .argocd-* files in the chart directory to manage image updates | |
| # this will trigger a sync on every application that is consuming these charts which is not intended | |
| @@ -9662,6 +9673,17 @@ | |
| tenant: "ads" | |
| realm: "nonprod" | |
| annotations: | |
| + # We want this to render: image_tag' | |
| + argocd-image-updater.argoproj.io/app.helm.image-name: '{{ dig "charts" "ads" "image_name" "image.name" . }}' | |
| + argocd-image-updater.argoproj.io/app.helm.image-tag: '{{ dig "charts" "ads" "image_tag" "image.tag" . }}' | |
| + # The ApplicationSet template will render backslashes from image_regex values | |
| + # as escape characters. To avoid this, we have to escape one level above. | |
| + # We want this to render: .*' | |
| + argocd-image-updater.argoproj.io/image-list: 'app={{ dig "charts" "ads" "image_repository" "" . }}' | |
| + argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "charts" "ads" "image_regex" (dig "image_regex" ".*" .) . }}' | |
| + argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "charts" "ads" "update_strategy" "newest-build" . }}' | |
| + argocd-image-updater.argoproj.io/git-branch: '{{ dig "charts" "ads" "target_revision" "main" . }}' | |
| + argocd-image-updater.argoproj.io/write-back-method: 'git:secret:argocd-webservices/image-updater-github-credentials' #pragma: allowlist secret | |
| # resolves to the ads/k8s/ads/templates directory and values/Chart files | |
| # image updater creates .argocd-* files in the chart directory to manage image updates | |
| # this will trigger a sync on every application that is consuming these charts which is not intended | |
| @@ -10151,6 +10173,17 @@ | |
| tenant: "ads" | |
| realm: "prod" | |
| annotations: | |
| + # We want this to render: image_tag' | |
| + argocd-image-updater.argoproj.io/app.helm.image-name: '{{ dig "charts" "ads" "image_name" "image.name" . }}' | |
| + argocd-image-updater.argoproj.io/app.helm.image-tag: '{{ dig "charts" "ads" "image_tag" "image.tag" . }}' | |
| + # The ApplicationSet template will render backslashes from image_regex values | |
| + # as escape characters. To avoid this, we have to escape one level above. | |
| + # We want this to render: .*' | |
| + argocd-image-updater.argoproj.io/image-list: 'app={{ dig "charts" "ads" "image_repository" "" . }}' | |
| + argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "charts" "ads" "image_regex" (dig "image_regex" ".*" .) . }}' | |
| + argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "charts" "ads" "update_strategy" "newest-build" . }}' | |
| + argocd-image-updater.argoproj.io/git-branch: '{{ dig "charts" "ads" "target_revision" "main" . }}' | |
| + argocd-image-updater.argoproj.io/write-back-method: 'git:secret:argocd-webservices/image-updater-github-credentials' #pragma: allowlist secret | |
| # resolves to the ads/k8s/ads/templates directory and values/Chart files | |
| # image updater creates .argocd-* files in the chart directory to manage image updates | |
| # this will trigger a sync on every application that is consuming these charts which is not intended | |
| @@ -10394,6 +10427,17 @@ | |
| tenant: "ads" | |
| realm: "prod" | |
| annotations: | |
| + # We want this to render: image_tag' | |
| + argocd-image-updater.argoproj.io/app.helm.image-name: '{{ dig "charts" "ads" "image_name" "image.name" . }}' | |
| + argocd-image-updater.argoproj.io/app.helm.image-tag: '{{ dig "charts" "ads" "image_tag" "image.tag" . }}' | |
| + # The ApplicationSet template will render backslashes from image_regex values | |
| + # as escape characters. To avoid this, we have to escape one level above. | |
| + # We want this to render: .*' | |
| + argocd-image-updater.argoproj.io/image-list: 'app={{ dig "charts" "ads" "image_repository" "" . }}' | |
| + argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "charts" "ads" "image_regex" (dig "image_regex" ".*" .) . }}' | |
| + argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "charts" "ads" "update_strategy" "newest-build" . }}' | |
| + argocd-image-updater.argoproj.io/git-branch: '{{ dig "charts" "ads" "target_revision" "main" . }}' | |
| + argocd-image-updater.argoproj.io/write-back-method: 'git:secret:argocd-webservices/image-updater-github-credentials' #pragma: allowlist secret | |
| # resolves to the ads/k8s/ads/templates directory and values/Chart files | |
| # image updater creates .argocd-* files in the chart directory to manage image updates | |
| # this will trigger a sync on every application that is consuming these charts which is not intended | |
| @@ -11511,6 +11555,17 @@ | |
| tenant: "autograph" | |
| realm: "prod" | |
| annotations: | |
| + # We want this to render: image_tag' | |
| + argocd-image-updater.argoproj.io/app.helm.image-name: '{{ dig "charts" "autograph" "image_name" "image.name" . }}' | |
| + argocd-image-updater.argoproj.io/app.helm.image-tag: '{{ dig "charts" "autograph" "image_tag" "image.tag" . }}' | |
| + # The ApplicationSet template will render backslashes from image_regex values | |
| + # as escape characters. To avoid this, we have to escape one level above. | |
| + # We want this to render: .*' | |
| + argocd-image-updater.argoproj.io/image-list: 'app={{ dig "charts" "autograph" "image_repository" "us-docker.pkg.dev/moz-fx-autograph-prod/autograph-prod/autograph" . }}' | |
| + argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "charts" "autograph" "image_regex" (dig "image_regex" ".*" .) . }}' | |
| + argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "charts" "autograph" "update_strategy" "newest-build" . }}' | |
| + argocd-image-updater.argoproj.io/git-branch: '{{ dig "charts" "autograph" "target_revision" "main" . }}' | |
| + argocd-image-updater.argoproj.io/write-back-method: 'git:secret:argocd-webservices/image-updater-github-credentials' #pragma: allowlist secret | |
| # resolves to the autograph/k8s/autograph/templates directory and values/Chart files | |
| # image updater creates .argocd-* files in the chart directory to manage image updates | |
| # this will trigger a sync on every application that is consuming these charts which is not intended | |
| @@ -13010,6 +13065,17 @@ | |
| tenant: "balrog" | |
| realm: "nonprod" | |
| annotations: | |
| + # We want this to render: image_tag' | |
| + argocd-image-updater.argoproj.io/app.helm.image-name: '{{ dig "charts" "balrog" "image_name" "image.name" . }}' | |
| + argocd-image-updater.argoproj.io/app.helm.image-tag: '{{ dig "charts" "balrog" "image_tag" "image.tag" . }}' | |
| + # The ApplicationSet template will render backslashes from image_regex values | |
| + # as escape characters. To avoid this, we have to escape one level above. | |
| + # We want this to render: .*' | |
| + argocd-image-updater.argoproj.io/image-list: 'app={{ dig "charts" "balrog" "image_repository" "" . }}' | |
| + argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "charts" "balrog" "image_regex" (dig "image_regex" ".*" .) . }}' | |
| + argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "charts" "balrog" "update_strategy" "newest-build" . }}' | |
| + argocd-image-updater.argoproj.io/git-branch: '{{ dig "charts" "balrog" "target_revision" "main" . }}' | |
| + argocd-image-updater.argoproj.io/write-back-method: 'git:secret:argocd-webservices/image-updater-github-credentials' #pragma: allowlist secret | |
| # resolves to the balrog/k8s/balrog/templates directory and values/Chart files | |
| # image updater creates .argocd-* files in the chart directory to manage image updates | |
| # this will trigger a sync on every application that is consuming these charts which is not intended | |
| @@ -13034,8 +13100,7 @@ | |
| source: | |
| repoURL: "https://github.com/mozilla/webservices-infra" | |
| path: "balrog/k8s/balrog" | |
| - # Retain environment level dig scope for single chart tenants | |
| - targetRevision: '{{ dig "target_revision" "main" . }}' | |
| + targetRevision: '{{ dig "charts" "balrog" "target_revision" "main" . }}' | |
| helm: | |
| parameters: | |
| - name: global.mozcloud.app_code | |
| @@ -13050,7 +13115,7 @@ | |
| value: moz-fx-balrog-nonprod | |
| - name: global.mozcloud.realm | |
| value: nonprod | |
| - releaseName: '{{ dig "release_name" "balrog" . }}' # Primarily used to import existing helm releases | |
| + releaseName: '{{ dig "charts" "balrog" "release_name" "balrog" . }}' # Primarily used to import existing helm releases | |
| valueFiles: | |
| - values.yaml | |
| - 'values-{{ .name }}.yaml' | |
| @@ -13058,15 +13123,14 @@ | |
| name: "webservices-high-private-nonprod-us-west1" | |
| namespace: "balrog-{{ .name }}" | |
| info: | |
| - # Retain environment level dig scope for single chart tenants | |
| - name: 'Helm Chart' | |
| value: 'https://github.com/mozilla/webservices-infra/tree/{{ dig "target_revision" "main" . }}/balrog/k8s/balrog' | |
| - name: 'Helm Chart Ref' | |
| - value: '{{ dig "target_revision" "main" . }}' | |
| + value: '{{ dig "charts" "balrog" "target_revision" "main" . }}' | |
| - name: 'Application Repository' | |
| - value: '{{ dig "application_repository" "" . }}' | |
| + value: '{{ dig "charts" "balrog" "application_repository" "" . }}' | |
| - name: 'Image Repository' | |
| - value: '{{ dig "image_repository" "" . }}' | |
| + value: '{{ dig "charts" "balrog" "image_repository" "" . }}' | |
| - name: 'Tenant Definition' | |
| value: 'https://github.com/mozilla/global-platform-admin/blob/main/tenants/balrog.yaml' | |
| # Will ignore differences between live and desired states during the diff. Note that these configurations are not | |
| @@ -13126,6 +13185,17 @@ | |
| tenant: "balrog" | |
| realm: "prod" | |
| annotations: | |
| + # We want this to render: image_tag' | |
| + argocd-image-updater.argoproj.io/app.helm.image-name: '{{ dig "charts" "balrog" "image_name" "image.name" . }}' | |
| + argocd-image-updater.argoproj.io/app.helm.image-tag: '{{ dig "charts" "balrog" "image_tag" "image.tag" . }}' | |
| + # The ApplicationSet template will render backslashes from image_regex values | |
| + # as escape characters. To avoid this, we have to escape one level above. | |
| + # We want this to render: .*' | |
| + argocd-image-updater.argoproj.io/image-list: 'app={{ dig "charts" "balrog" "image_repository" "" . }}' | |
| + argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "charts" "balrog" "image_regex" (dig "image_regex" ".*" .) . }}' | |
| + argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "charts" "balrog" "update_strategy" "newest-build" . }}' | |
| + argocd-image-updater.argoproj.io/git-branch: '{{ dig "charts" "balrog" "target_revision" "main" . }}' | |
| + argocd-image-updater.argoproj.io/write-back-method: 'git:secret:argocd-webservices/image-updater-github-credentials' #pragma: allowlist secret | |
| # resolves to the balrog/k8s/balrog/templates directory and values/Chart files | |
| # image updater creates .argocd-* files in the chart directory to manage image updates | |
| # this will trigger a sync on every application that is consuming these charts which is not intended | |
| @@ -13150,8 +13220,7 @@ | |
| source: | |
| repoURL: "https://github.com/mozilla/webservices-infra" | |
| path: "balrog/k8s/balrog" | |
| - # Retain environment level dig scope for single chart tenants | |
| - targetRevision: '{{ dig "target_revision" "main" . }}' | |
| + targetRevision: '{{ dig "charts" "balrog" "target_revision" "main" . }}' | |
| helm: | |
| parameters: | |
| - name: global.mozcloud.app_code | |
| @@ -13166,7 +13235,7 @@ | |
| value: moz-fx-balrog-prod | |
| - name: global.mozcloud.realm | |
| value: prod | |
| - releaseName: '{{ dig "release_name" "balrog" . }}' # Primarily used to import existing helm releases | |
| + releaseName: '{{ dig "charts" "balrog" "release_name" "balrog" . }}' # Primarily used to import existing helm releases | |
| valueFiles: | |
| - values.yaml | |
| - 'values-{{ .name }}.yaml' | |
| @@ -13174,15 +13243,14 @@ | |
| name: "webservices-high-private-prod-us-west1" | |
| namespace: "balrog-{{ .name }}" | |
| info: | |
| - # Retain environment level dig scope for single chart tenants | |
| - name: 'Helm Chart' | |
| value: 'https://github.com/mozilla/webservices-infra/tree/{{ dig "target_revision" "main" . }}/balrog/k8s/balrog' | |
| - name: 'Helm Chart Ref' | |
| - value: '{{ dig "target_revision" "main" . }}' | |
| + value: '{{ dig "charts" "balrog" "target_revision" "main" . }}' | |
| - name: 'Application Repository' | |
| - value: '{{ dig "application_repository" "" . }}' | |
| + value: '{{ dig "charts" "balrog" "application_repository" "" . }}' | |
| - name: 'Image Repository' | |
| - value: '{{ dig "image_repository" "" . }}' | |
| + value: '{{ dig "charts" "balrog" "image_repository" "" . }}' | |
| - name: 'Tenant Definition' | |
| value: 'https://github.com/mozilla/global-platform-admin/blob/main/tenants/balrog.yaml' | |
| # Will ignore differences between live and desired states during the diff. Note that these configurations are not | |
| @@ -13243,13 +13306,16 @@ | |
| tenant: "basket" | |
| realm: "nonprod" | |
| annotations: | |
| - argocd-image-updater.argoproj.io/app.helm.image-name: 'image.name' | |
| - argocd-image-updater.argoproj.io/app.helm.image-tag: 'image.tag' | |
| - # Retain environment level dig scope for single chart tenants | |
| - argocd-image-updater.argoproj.io/image-list: 'app={{ dig "image_repository" "us-docker.pkg.dev/moz-fx-basket-prod/basket-prod/basket" . }}' | |
| - argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "image_regex" ".*" . }}' | |
| - argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "update_strategy" "newest-build" . }}' | |
| - argocd-image-updater.argoproj.io/git-branch: '{{ dig "target_revision" "main" . }}' | |
| + # We want this to render: image_tag' | |
| + argocd-image-updater.argoproj.io/app.helm.image-name: '{{ dig "charts" "basket" "image_name" "image.name" . }}' | |
| + argocd-image-updater.argoproj.io/app.helm.image-tag: '{{ dig "charts" "basket" "image_tag" "image.tag" . }}' | |
| + # The ApplicationSet template will render backslashes from image_regex values | |
| + # as escape characters. To avoid this, we have to escape one level above. | |
| + # We want this to render: .*' | |
| + argocd-image-updater.argoproj.io/image-list: 'app={{ dig "charts" "basket" "image_repository" "us-docker.pkg.dev/moz-fx-basket-prod/basket-prod/basket" . }}' | |
| + argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "charts" "basket" "image_regex" (dig "image_regex" ".*" .) . }}' | |
| + argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "charts" "basket" "update_strategy" "newest-build" . }}' | |
| + argocd-image-updater.argoproj.io/git-branch: '{{ dig "charts" "basket" "target_revision" "main" . }}' | |
| argocd-image-updater.argoproj.io/write-back-method: 'git:secret:argocd-webservices/image-updater-github-credentials' #pragma: allowlist secret | |
| # resolves to the basket/k8s/basket/templates directory and values/Chart files | |
| # image updater creates .argocd-* files in the chart directory to manage image updates | |
| @@ -13275,8 +13341,7 @@ | |
| source: | |
| repoURL: "https://github.com/mozilla/webservices-infra" | |
| path: "basket/k8s/basket" | |
| - # Retain environment level dig scope for single chart tenants | |
| - targetRevision: '{{ dig "target_revision" "main" . }}' | |
| + targetRevision: '{{ dig "charts" "basket" "target_revision" "main" . }}' | |
| helm: | |
| parameters: | |
| - name: global.mozcloud.app_code | |
| @@ -13291,7 +13356,7 @@ | |
| value: moz-fx-basket-nonprod | |
| - name: global.mozcloud.realm | |
| value: nonprod | |
| - releaseName: '{{ dig "release_name" "basket" . }}' # Primarily used to import existing helm releases | |
| + releaseName: '{{ dig "charts" "basket" "release_name" "basket" . }}' # Primarily used to import existing helm releases | |
| valueFiles: | |
| - values.yaml | |
| - 'values-{{ .name }}.yaml' | |
| @@ -13301,15 +13366,14 @@ | |
| name: "webservices-high-private-nonprod-europe-west1" | |
| namespace: "basket-{{ .name }}" | |
| info: | |
| - # Retain environment level dig scope for single chart tenants | |
| - name: 'Helm Chart' | |
| value: 'https://github.com/mozilla/webservices-infra/tree/{{ dig "target_revision" "main" . }}/basket/k8s/basket' | |
| - name: 'Helm Chart Ref' | |
| - value: '{{ dig "target_revision" "main" . }}' | |
| + value: '{{ dig "charts" "basket" "target_revision" "main" . }}' | |
| - name: 'Application Repository' | |
| - value: '{{ dig "application_repository" "mozmeao/basket" . }}' | |
| + value: '{{ dig "charts" "basket" "application_repository" "mozmeao/basket" . }}' | |
| - name: 'Image Repository' | |
| - value: '{{ dig "image_repository" "us-docker.pkg.dev/moz-fx-basket-prod/basket-prod/basket" . }}' | |
| + value: '{{ dig "charts" "basket" "image_repository" "us-docker.pkg.dev/moz-fx-basket-prod/basket-prod/basket" . }}' | |
| - name: 'Tenant Definition' | |
| value: 'https://github.com/mozilla/global-platform-admin/blob/main/tenants/basket.yaml' | |
| # Will ignore differences between live and desired states during the diff. Note that these configurations are not | |
| @@ -13370,13 +13429,16 @@ | |
| tenant: "basket" | |
| realm: "nonprod" | |
| annotations: | |
| - argocd-image-updater.argoproj.io/app.helm.image-name: 'image.name' | |
| - argocd-image-updater.argoproj.io/app.helm.image-tag: 'image.tag' | |
| - # Retain environment level dig scope for single chart tenants | |
| - argocd-image-updater.argoproj.io/image-list: 'app={{ dig "image_repository" "us-docker.pkg.dev/moz-fx-basket-prod/basket-prod/basket" . }}' | |
| - argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "image_regex" ".*" . }}' | |
| - argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "update_strategy" "newest-build" . }}' | |
| - argocd-image-updater.argoproj.io/git-branch: '{{ dig "target_revision" "main" . }}' | |
| + # We want this to render: image_tag' | |
| + argocd-image-updater.argoproj.io/app.helm.image-name: '{{ dig "charts" "basket" "image_name" "image.name" . }}' | |
| + argocd-image-updater.argoproj.io/app.helm.image-tag: '{{ dig "charts" "basket" "image_tag" "image.tag" . }}' | |
| + # The ApplicationSet template will render backslashes from image_regex values | |
| + # as escape characters. To avoid this, we have to escape one level above. | |
| + # We want this to render: .*' | |
| + argocd-image-updater.argoproj.io/image-list: 'app={{ dig "charts" "basket" "image_repository" "us-docker.pkg.dev/moz-fx-basket-prod/basket-prod/basket" . }}' | |
| + argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "charts" "basket" "image_regex" (dig "image_regex" ".*" .) . }}' | |
| + argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "charts" "basket" "update_strategy" "newest-build" . }}' | |
| + argocd-image-updater.argoproj.io/git-branch: '{{ dig "charts" "basket" "target_revision" "main" . }}' | |
| argocd-image-updater.argoproj.io/write-back-method: 'git:secret:argocd-webservices/image-updater-github-credentials' #pragma: allowlist secret | |
| # resolves to the basket/k8s/basket/templates directory and values/Chart files | |
| # image updater creates .argocd-* files in the chart directory to manage image updates | |
| @@ -13402,8 +13464,7 @@ | |
| source: | |
| repoURL: "https://github.com/mozilla/webservices-infra" | |
| path: "basket/k8s/basket" | |
| - # Retain environment level dig scope for single chart tenants | |
| - targetRevision: '{{ dig "target_revision" "main" . }}' | |
| + targetRevision: '{{ dig "charts" "basket" "target_revision" "main" . }}' | |
| helm: | |
| parameters: | |
| - name: global.mozcloud.app_code | |
| @@ -13418,7 +13479,7 @@ | |
| value: moz-fx-basket-nonprod | |
| - name: global.mozcloud.realm | |
| value: nonprod | |
| - releaseName: '{{ dig "release_name" "basket" . }}' # Primarily used to import existing helm releases | |
| + releaseName: '{{ dig "charts" "basket" "release_name" "basket" . }}' # Primarily used to import existing helm releases | |
| valueFiles: | |
| - values.yaml | |
| - 'values-{{ .name }}.yaml' | |
| @@ -13426,15 +13487,14 @@ | |
| name: "webservices-high-private-nonprod-us-west1" | |
| namespace: "basket-{{ .name }}" | |
| info: | |
| - # Retain environment level dig scope for single chart tenants | |
| - name: 'Helm Chart' | |
| value: 'https://github.com/mozilla/webservices-infra/tree/{{ dig "target_revision" "main" . }}/basket/k8s/basket' | |
| - name: 'Helm Chart Ref' | |
| - value: '{{ dig "target_revision" "main" . }}' | |
| + value: '{{ dig "charts" "basket" "target_revision" "main" . }}' | |
| - name: 'Application Repository' | |
| - value: '{{ dig "application_repository" "mozmeao/basket" . }}' | |
| + value: '{{ dig "charts" "basket" "application_repository" "mozmeao/basket" . }}' | |
| - name: 'Image Repository' | |
| - value: '{{ dig "image_repository" "us-docker.pkg.dev/moz-fx-basket-prod/basket-prod/basket" . }}' | |
| + value: '{{ dig "charts" "basket" "image_repository" "us-docker.pkg.dev/moz-fx-basket-prod/basket-prod/basket" . }}' | |
| - name: 'Tenant Definition' | |
| value: 'https://github.com/mozilla/global-platform-admin/blob/main/tenants/basket.yaml' | |
| # Will ignore differences between live and desired states during the diff. Note that these configurations are not | |
| @@ -13494,13 +13549,16 @@ | |
| tenant: "basket" | |
| realm: "prod" | |
| annotations: | |
| - argocd-image-updater.argoproj.io/app.helm.image-name: 'image.name' | |
| - argocd-image-updater.argoproj.io/app.helm.image-tag: 'image.tag' | |
| - # Retain environment level dig scope for single chart tenants | |
| - argocd-image-updater.argoproj.io/image-list: 'app={{ dig "image_repository" "us-docker.pkg.dev/moz-fx-basket-prod/basket-prod/basket" . }}' | |
| - argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "image_regex" ".*" . }}' | |
| - argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "update_strategy" "newest-build" . }}' | |
| - argocd-image-updater.argoproj.io/git-branch: '{{ dig "target_revision" "main" . }}' | |
| + # We want this to render: image_tag' | |
| + argocd-image-updater.argoproj.io/app.helm.image-name: '{{ dig "charts" "basket" "image_name" "image.name" . }}' | |
| + argocd-image-updater.argoproj.io/app.helm.image-tag: '{{ dig "charts" "basket" "image_tag" "image.tag" . }}' | |
| + # The ApplicationSet template will render backslashes from image_regex values | |
| + # as escape characters. To avoid this, we have to escape one level above. | |
| + # We want this to render: .*' | |
| + argocd-image-updater.argoproj.io/image-list: 'app={{ dig "charts" "basket" "image_repository" "us-docker.pkg.dev/moz-fx-basket-prod/basket-prod/basket" . }}' | |
| + argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "charts" "basket" "image_regex" (dig "image_regex" ".*" .) . }}' | |
| + argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "charts" "basket" "update_strategy" "newest-build" . }}' | |
| + argocd-image-updater.argoproj.io/git-branch: '{{ dig "charts" "basket" "target_revision" "main" . }}' | |
| argocd-image-updater.argoproj.io/write-back-method: 'git:secret:argocd-webservices/image-updater-github-credentials' #pragma: allowlist secret | |
| # resolves to the basket/k8s/basket/templates directory and values/Chart files | |
| # image updater creates .argocd-* files in the chart directory to manage image updates | |
| @@ -13526,8 +13584,7 @@ | |
| source: | |
| repoURL: "https://github.com/mozilla/webservices-infra" | |
| path: "basket/k8s/basket" | |
| - # Retain environment level dig scope for single chart tenants | |
| - targetRevision: '{{ dig "target_revision" "main" . }}' | |
| + targetRevision: '{{ dig "charts" "basket" "target_revision" "main" . }}' | |
| helm: | |
| parameters: | |
| - name: global.mozcloud.app_code | |
| @@ -13542,7 +13599,7 @@ | |
| value: moz-fx-basket-prod | |
| - name: global.mozcloud.realm | |
| value: prod | |
| - releaseName: '{{ dig "release_name" "basket" . }}' # Primarily used to import existing helm releases | |
| + releaseName: '{{ dig "charts" "basket" "release_name" "basket" . }}' # Primarily used to import existing helm releases | |
| valueFiles: | |
| - values.yaml | |
| - 'values-{{ .name }}.yaml' | |
| @@ -13552,15 +13609,14 @@ | |
| name: "webservices-high-private-prod-europe-west1" | |
| namespace: "basket-{{ .name }}" | |
| info: | |
| - # Retain environment level dig scope for single chart tenants | |
| - name: 'Helm Chart' | |
| value: 'https://github.com/mozilla/webservices-infra/tree/{{ dig "target_revision" "main" . }}/basket/k8s/basket' | |
| - name: 'Helm Chart Ref' | |
| - value: '{{ dig "target_revision" "main" . }}' | |
| + value: '{{ dig "charts" "basket" "target_revision" "main" . }}' | |
| - name: 'Application Repository' | |
| - value: '{{ dig "application_repository" "mozmeao/basket" . }}' | |
| + value: '{{ dig "charts" "basket" "application_repository" "mozmeao/basket" . }}' | |
| - name: 'Image Repository' | |
| - value: '{{ dig "image_repository" "us-docker.pkg.dev/moz-fx-basket-prod/basket-prod/basket" . }}' | |
| + value: '{{ dig "charts" "basket" "image_repository" "us-docker.pkg.dev/moz-fx-basket-prod/basket-prod/basket" . }}' | |
| - name: 'Tenant Definition' | |
| value: 'https://github.com/mozilla/global-platform-admin/blob/main/tenants/basket.yaml' | |
| # Will ignore differences between live and desired states during the diff. Note that these configurations are not | |
| @@ -13620,13 +13671,16 @@ | |
| tenant: "basket" | |
| realm: "prod" | |
| annotations: | |
| - argocd-image-updater.argoproj.io/app.helm.image-name: 'image.name' | |
| - argocd-image-updater.argoproj.io/app.helm.image-tag: 'image.tag' | |
| - # Retain environment level dig scope for single chart tenants | |
| - argocd-image-updater.argoproj.io/image-list: 'app={{ dig "image_repository" "us-docker.pkg.dev/moz-fx-basket-prod/basket-prod/basket" . }}' | |
| - argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "image_regex" ".*" . }}' | |
| - argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "update_strategy" "newest-build" . }}' | |
| - argocd-image-updater.argoproj.io/git-branch: '{{ dig "target_revision" "main" . }}' | |
| + # We want this to render: image_tag' | |
| + argocd-image-updater.argoproj.io/app.helm.image-name: '{{ dig "charts" "basket" "image_name" "image.name" . }}' | |
| + argocd-image-updater.argoproj.io/app.helm.image-tag: '{{ dig "charts" "basket" "image_tag" "image.tag" . }}' | |
| + # The ApplicationSet template will render backslashes from image_regex values | |
| + # as escape characters. To avoid this, we have to escape one level above. | |
| + # We want this to render: .*' | |
| + argocd-image-updater.argoproj.io/image-list: 'app={{ dig "charts" "basket" "image_repository" "us-docker.pkg.dev/moz-fx-basket-prod/basket-prod/basket" . }}' | |
| + argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "charts" "basket" "image_regex" (dig "image_regex" ".*" .) . }}' | |
| + argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "charts" "basket" "update_strategy" "newest-build" . }}' | |
| + argocd-image-updater.argoproj.io/git-branch: '{{ dig "charts" "basket" "target_revision" "main" . }}' | |
| argocd-image-updater.argoproj.io/write-back-method: 'git:secret:argocd-webservices/image-updater-github-credentials' #pragma: allowlist secret | |
| # resolves to the basket/k8s/basket/templates directory and values/Chart files | |
| # image updater creates .argocd-* files in the chart directory to manage image updates | |
| @@ -13652,8 +13706,7 @@ | |
| source: | |
| repoURL: "https://github.com/mozilla/webservices-infra" | |
| path: "basket/k8s/basket" | |
| - # Retain environment level dig scope for single chart tenants | |
| - targetRevision: '{{ dig "target_revision" "main" . }}' | |
| + targetRevision: '{{ dig "charts" "basket" "target_revision" "main" . }}' | |
| helm: | |
| parameters: | |
| - name: global.mozcloud.app_code | |
| @@ -13668,7 +13721,7 @@ | |
| value: moz-fx-basket-prod | |
| - name: global.mozcloud.realm | |
| value: prod | |
| - releaseName: '{{ dig "release_name" "basket" . }}' # Primarily used to import existing helm releases | |
| + releaseName: '{{ dig "charts" "basket" "release_name" "basket" . }}' # Primarily used to import existing helm releases | |
| valueFiles: | |
| - values.yaml | |
| - 'values-{{ .name }}.yaml' | |
| @@ -13676,15 +13729,14 @@ | |
| name: "webservices-high-private-prod-us-west1" | |
| namespace: "basket-{{ .name }}" | |
| info: | |
| - # Retain environment level dig scope for single chart tenants | |
| - name: 'Helm Chart' | |
| value: 'https://github.com/mozilla/webservices-infra/tree/{{ dig "target_revision" "main" . }}/basket/k8s/basket' | |
| - name: 'Helm Chart Ref' | |
| - value: '{{ dig "target_revision" "main" . }}' | |
| + value: '{{ dig "charts" "basket" "target_revision" "main" . }}' | |
| - name: 'Application Repository' | |
| - value: '{{ dig "application_repository" "mozmeao/basket" . }}' | |
| + value: '{{ dig "charts" "basket" "application_repository" "mozmeao/basket" . }}' | |
| - name: 'Image Repository' | |
| - value: '{{ dig "image_repository" "us-docker.pkg.dev/moz-fx-basket-prod/basket-prod/basket" . }}' | |
| + value: '{{ dig "charts" "basket" "image_repository" "us-docker.pkg.dev/moz-fx-basket-prod/basket-prod/basket" . }}' | |
| - name: 'Tenant Definition' | |
| value: 'https://github.com/mozilla/global-platform-admin/blob/main/tenants/basket.yaml' | |
| # Will ignore differences between live and desired states during the diff. Note that these configurations are not | |
| @@ -13746,13 +13793,16 @@ | |
| tenant: "bedrock" | |
| realm: "nonprod" | |
| annotations: | |
| - argocd-image-updater.argoproj.io/app.helm.image-name: 'image.name' | |
| - argocd-image-updater.argoproj.io/app.helm.image-tag: 'image.tag' | |
| - # Retain environment level dig scope for single chart tenants | |
| - argocd-image-updater.argoproj.io/image-list: 'app={{ dig "image_repository" "us-docker.pkg.dev/moz-fx-bedrock-prod/bedrock-prod/bedrock" . }}' | |
| - argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "image_regex" ".*" . }}' | |
| - argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "update_strategy" "newest-build" . }}' | |
| - argocd-image-updater.argoproj.io/git-branch: '{{ dig "target_revision" "main" . }}' | |
| + # We want this to render: image_tag' | |
| + argocd-image-updater.argoproj.io/app.helm.image-name: '{{ dig "charts" "bedrock" "image_name" "image.name" . }}' | |
| + argocd-image-updater.argoproj.io/app.helm.image-tag: '{{ dig "charts" "bedrock" "image_tag" "image.tag" . }}' | |
| + # The ApplicationSet template will render backslashes from image_regex values | |
| + # as escape characters. To avoid this, we have to escape one level above. | |
| + # We want this to render: .*' | |
| + argocd-image-updater.argoproj.io/image-list: 'app={{ dig "charts" "bedrock" "image_repository" "us-docker.pkg.dev/moz-fx-bedrock-prod/bedrock-prod/bedrock" . }}' | |
| + argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "charts" "bedrock" "image_regex" (dig "image_regex" ".*" .) . }}' | |
| + argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "charts" "bedrock" "update_strategy" "newest-build" . }}' | |
| + argocd-image-updater.argoproj.io/git-branch: '{{ dig "charts" "bedrock" "target_revision" "main" . }}' | |
| argocd-image-updater.argoproj.io/write-back-method: 'git:secret:argocd-webservices/image-updater-github-credentials' #pragma: allowlist secret | |
| # resolves to the bedrock/k8s/bedrock/templates directory and values/Chart files | |
| # image updater creates .argocd-* files in the chart directory to manage image updates | |
| @@ -13778,8 +13828,7 @@ | |
| source: | |
| repoURL: "https://github.com/mozilla/webservices-infra" | |
| path: "bedrock/k8s/bedrock" | |
| - # Retain environment level dig scope for single chart tenants | |
| - targetRevision: '{{ dig "target_revision" "main" . }}' | |
| + targetRevision: '{{ dig "charts" "bedrock" "target_revision" "main" . }}' | |
| helm: | |
| parameters: | |
| - name: global.mozcloud.app_code | |
| @@ -13794,7 +13843,7 @@ | |
| value: moz-fx-bedrock-nonprod | |
| - name: global.mozcloud.realm | |
| value: nonprod | |
| - releaseName: '{{ dig "release_name" "bedrock" . }}' # Primarily used to import existing helm releases | |
| + releaseName: '{{ dig "charts" "bedrock" "release_name" "bedrock" . }}' # Primarily used to import existing helm releases | |
| valueFiles: | |
| - values.yaml | |
| - 'values-{{ .name }}.yaml' | |
| @@ -13804,15 +13853,14 @@ | |
| name: "webservices-low-private-nonprod-europe-west1" | |
| namespace: "bedrock-{{ .name }}" | |
| info: | |
| - # Retain environment level dig scope for single chart tenants | |
| - name: 'Helm Chart' | |
| value: 'https://github.com/mozilla/webservices-infra/tree/{{ dig "target_revision" "main" . }}/bedrock/k8s/bedrock' | |
| - name: 'Helm Chart Ref' | |
| - value: '{{ dig "target_revision" "main" . }}' | |
| + value: '{{ dig "charts" "bedrock" "target_revision" "main" . }}' | |
| - name: 'Application Repository' | |
| - value: '{{ dig "application_repository" "mozilla/bedrock" . }}' | |
| + value: '{{ dig "charts" "bedrock" "application_repository" "mozilla/bedrock" . }}' | |
| - name: 'Image Repository' | |
| - value: '{{ dig "image_repository" "us-docker.pkg.dev/moz-fx-bedrock-prod/bedrock-prod/bedrock" . }}' | |
| + value: '{{ dig "charts" "bedrock" "image_repository" "us-docker.pkg.dev/moz-fx-bedrock-prod/bedrock-prod/bedrock" . }}' | |
| - name: 'Tenant Definition' | |
| value: 'https://github.com/mozilla/global-platform-admin/blob/main/tenants/bedrock.yaml' | |
| # Will ignore differences between live and desired states during the diff. Note that these configurations are not | |
| @@ -13874,13 +13917,16 @@ | |
| tenant: "bedrock" | |
| realm: "nonprod" | |
| annotations: | |
| - argocd-image-updater.argoproj.io/app.helm.image-name: 'image.name' | |
| - argocd-image-updater.argoproj.io/app.helm.image-tag: 'image.tag' | |
| - # Retain environment level dig scope for single chart tenants | |
| - argocd-image-updater.argoproj.io/image-list: 'app={{ dig "image_repository" "us-docker.pkg.dev/moz-fx-bedrock-prod/bedrock-prod/bedrock" . }}' | |
| - argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "image_regex" ".*" . }}' | |
| - argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "update_strategy" "newest-build" . }}' | |
| - argocd-image-updater.argoproj.io/git-branch: '{{ dig "target_revision" "main" . }}' | |
| + # We want this to render: image_tag' | |
| + argocd-image-updater.argoproj.io/app.helm.image-name: '{{ dig "charts" "bedrock" "image_name" "image.name" . }}' | |
| + argocd-image-updater.argoproj.io/app.helm.image-tag: '{{ dig "charts" "bedrock" "image_tag" "image.tag" . }}' | |
| + # The ApplicationSet template will render backslashes from image_regex values | |
| + # as escape characters. To avoid this, we have to escape one level above. | |
| + # We want this to render: .*' | |
| + argocd-image-updater.argoproj.io/image-list: 'app={{ dig "charts" "bedrock" "image_repository" "us-docker.pkg.dev/moz-fx-bedrock-prod/bedrock-prod/bedrock" . }}' | |
| + argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "charts" "bedrock" "image_regex" (dig "image_regex" ".*" .) . }}' | |
| + argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "charts" "bedrock" "update_strategy" "newest-build" . }}' | |
| + argocd-image-updater.argoproj.io/git-branch: '{{ dig "charts" "bedrock" "target_revision" "main" . }}' | |
| argocd-image-updater.argoproj.io/write-back-method: 'git:secret:argocd-webservices/image-updater-github-credentials' #pragma: allowlist secret | |
| # resolves to the bedrock/k8s/bedrock/templates directory and values/Chart files | |
| # image updater creates .argocd-* files in the chart directory to manage image updates | |
| @@ -13906,8 +13952,7 @@ | |
| source: | |
| repoURL: "https://github.com/mozilla/webservices-infra" | |
| path: "bedrock/k8s/bedrock" | |
| - # Retain environment level dig scope for single chart tenants | |
| - targetRevision: '{{ dig "target_revision" "main" . }}' | |
| + targetRevision: '{{ dig "charts" "bedrock" "target_revision" "main" . }}' | |
| helm: | |
| parameters: | |
| - name: global.mozcloud.app_code | |
| @@ -13922,7 +13967,7 @@ | |
| value: moz-fx-bedrock-nonprod | |
| - name: global.mozcloud.realm | |
| value: nonprod | |
| - releaseName: '{{ dig "release_name" "bedrock" . }}' # Primarily used to import existing helm releases | |
| + releaseName: '{{ dig "charts" "bedrock" "release_name" "bedrock" . }}' # Primarily used to import existing helm releases | |
| valueFiles: | |
| - values.yaml | |
| - 'values-{{ .name }}.yaml' | |
| @@ -13930,15 +13975,14 @@ | |
| name: "webservices-low-private-nonprod-us-west1" | |
| namespace: "bedrock-{{ .name }}" | |
| info: | |
| - # Retain environment level dig scope for single chart tenants | |
| - name: 'Helm Chart' | |
| value: 'https://github.com/mozilla/webservices-infra/tree/{{ dig "target_revision" "main" . }}/bedrock/k8s/bedrock' | |
| - name: 'Helm Chart Ref' | |
| - value: '{{ dig "target_revision" "main" . }}' | |
| + value: '{{ dig "charts" "bedrock" "target_revision" "main" . }}' | |
| - name: 'Application Repository' | |
| - value: '{{ dig "application_repository" "mozilla/bedrock" . }}' | |
| + value: '{{ dig "charts" "bedrock" "application_repository" "mozilla/bedrock" . }}' | |
| - name: 'Image Repository' | |
| - value: '{{ dig "image_repository" "us-docker.pkg.dev/moz-fx-bedrock-prod/bedrock-prod/bedrock" . }}' | |
| + value: '{{ dig "charts" "bedrock" "image_repository" "us-docker.pkg.dev/moz-fx-bedrock-prod/bedrock-prod/bedrock" . }}' | |
| - name: 'Tenant Definition' | |
| value: 'https://github.com/mozilla/global-platform-admin/blob/main/tenants/bedrock.yaml' | |
| # Will ignore differences between live and desired states during the diff. Note that these configurations are not | |
| @@ -13998,13 +14037,16 @@ | |
| tenant: "bedrock" | |
| realm: "prod" | |
| annotations: | |
| - argocd-image-updater.argoproj.io/app.helm.image-name: 'image.name' | |
| - argocd-image-updater.argoproj.io/app.helm.image-tag: 'image.tag' | |
| - # Retain environment level dig scope for single chart tenants | |
| - argocd-image-updater.argoproj.io/image-list: 'app={{ dig "image_repository" "us-docker.pkg.dev/moz-fx-bedrock-prod/bedrock-prod/bedrock" . }}' | |
| - argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "image_regex" ".*" . }}' | |
| - argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "update_strategy" "newest-build" . }}' | |
| - argocd-image-updater.argoproj.io/git-branch: '{{ dig "target_revision" "main" . }}' | |
| + # We want this to render: image_tag' | |
| + argocd-image-updater.argoproj.io/app.helm.image-name: '{{ dig "charts" "bedrock" "image_name" "image.name" . }}' | |
| + argocd-image-updater.argoproj.io/app.helm.image-tag: '{{ dig "charts" "bedrock" "image_tag" "image.tag" . }}' | |
| + # The ApplicationSet template will render backslashes from image_regex values | |
| + # as escape characters. To avoid this, we have to escape one level above. | |
| + # We want this to render: .*' | |
| + argocd-image-updater.argoproj.io/image-list: 'app={{ dig "charts" "bedrock" "image_repository" "us-docker.pkg.dev/moz-fx-bedrock-prod/bedrock-prod/bedrock" . }}' | |
| + argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "charts" "bedrock" "image_regex" (dig "image_regex" ".*" .) . }}' | |
| + argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "charts" "bedrock" "update_strategy" "newest-build" . }}' | |
| + argocd-image-updater.argoproj.io/git-branch: '{{ dig "charts" "bedrock" "target_revision" "main" . }}' | |
| argocd-image-updater.argoproj.io/write-back-method: 'git:secret:argocd-webservices/image-updater-github-credentials' #pragma: allowlist secret | |
| # resolves to the bedrock/k8s/bedrock/templates directory and values/Chart files | |
| # image updater creates .argocd-* files in the chart directory to manage image updates | |
| @@ -14030,8 +14072,7 @@ | |
| source: | |
| repoURL: "https://github.com/mozilla/webservices-infra" | |
| path: "bedrock/k8s/bedrock" | |
| - # Retain environment level dig scope for single chart tenants | |
| - targetRevision: '{{ dig "target_revision" "main" . }}' | |
| + targetRevision: '{{ dig "charts" "bedrock" "target_revision" "main" . }}' | |
| helm: | |
| parameters: | |
| - name: global.mozcloud.app_code | |
| @@ -14046,7 +14087,7 @@ | |
| value: moz-fx-bedrock-prod | |
| - name: global.mozcloud.realm | |
| value: prod | |
| - releaseName: '{{ dig "release_name" "bedrock" . }}' # Primarily used to import existing helm releases | |
| + releaseName: '{{ dig "charts" "bedrock" "release_name" "bedrock" . }}' # Primarily used to import existing helm releases | |
| valueFiles: | |
| - values.yaml | |
| - 'values-{{ .name }}.yaml' | |
| @@ -14056,15 +14097,14 @@ | |
| name: "webservices-low-private-prod-europe-west1" | |
| namespace: "bedrock-{{ .name }}" | |
| info: | |
| - # Retain environment level dig scope for single chart tenants | |
| - name: 'Helm Chart' | |
| value: 'https://github.com/mozilla/webservices-infra/tree/{{ dig "target_revision" "main" . }}/bedrock/k8s/bedrock' | |
| - name: 'Helm Chart Ref' | |
| - value: '{{ dig "target_revision" "main" . }}' | |
| + value: '{{ dig "charts" "bedrock" "target_revision" "main" . }}' | |
| - name: 'Application Repository' | |
| - value: '{{ dig "application_repository" "mozilla/bedrock" . }}' | |
| + value: '{{ dig "charts" "bedrock" "application_repository" "mozilla/bedrock" . }}' | |
| - name: 'Image Repository' | |
| - value: '{{ dig "image_repository" "us-docker.pkg.dev/moz-fx-bedrock-prod/bedrock-prod/bedrock" . }}' | |
| + value: '{{ dig "charts" "bedrock" "image_repository" "us-docker.pkg.dev/moz-fx-bedrock-prod/bedrock-prod/bedrock" . }}' | |
| - name: 'Tenant Definition' | |
| value: 'https://github.com/mozilla/global-platform-admin/blob/main/tenants/bedrock.yaml' | |
| # Will ignore differences between live and desired states during the diff. Note that these configurations are not | |
| @@ -14124,13 +14159,16 @@ | |
| tenant: "bedrock" | |
| realm: "prod" | |
| annotations: | |
| - argocd-image-updater.argoproj.io/app.helm.image-name: 'image.name' | |
| - argocd-image-updater.argoproj.io/app.helm.image-tag: 'image.tag' | |
| - # Retain environment level dig scope for single chart tenants | |
| - argocd-image-updater.argoproj.io/image-list: 'app={{ dig "image_repository" "us-docker.pkg.dev/moz-fx-bedrock-prod/bedrock-prod/bedrock" . }}' | |
| - argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "image_regex" ".*" . }}' | |
| - argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "update_strategy" "newest-build" . }}' | |
| - argocd-image-updater.argoproj.io/git-branch: '{{ dig "target_revision" "main" . }}' | |
| + # We want this to render: image_tag' | |
| + argocd-image-updater.argoproj.io/app.helm.image-name: '{{ dig "charts" "bedrock" "image_name" "image.name" . }}' | |
| + argocd-image-updater.argoproj.io/app.helm.image-tag: '{{ dig "charts" "bedrock" "image_tag" "image.tag" . }}' | |
| + # The ApplicationSet template will render backslashes from image_regex values | |
| + # as escape characters. To avoid this, we have to escape one level above. | |
| + # We want this to render: .*' | |
| + argocd-image-updater.argoproj.io/image-list: 'app={{ dig "charts" "bedrock" "image_repository" "us-docker.pkg.dev/moz-fx-bedrock-prod/bedrock-prod/bedrock" . }}' | |
| + argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "charts" "bedrock" "image_regex" (dig "image_regex" ".*" .) . }}' | |
| + argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "charts" "bedrock" "update_strategy" "newest-build" . }}' | |
| + argocd-image-updater.argoproj.io/git-branch: '{{ dig "charts" "bedrock" "target_revision" "main" . }}' | |
| argocd-image-updater.argoproj.io/write-back-method: 'git:secret:argocd-webservices/image-updater-github-credentials' #pragma: allowlist secret | |
| # resolves to the bedrock/k8s/bedrock/templates directory and values/Chart files | |
| # image updater creates .argocd-* files in the chart directory to manage image updates | |
| @@ -14156,8 +14194,7 @@ | |
| source: | |
| repoURL: "https://github.com/mozilla/webservices-infra" | |
| path: "bedrock/k8s/bedrock" | |
| - # Retain environment level dig scope for single chart tenants | |
| - targetRevision: '{{ dig "target_revision" "main" . }}' | |
| + targetRevision: '{{ dig "charts" "bedrock" "target_revision" "main" . }}' | |
| helm: | |
| parameters: | |
| - name: global.mozcloud.app_code | |
| @@ -14172,7 +14209,7 @@ | |
| value: moz-fx-bedrock-prod | |
| - name: global.mozcloud.realm | |
| value: prod | |
| - releaseName: '{{ dig "release_name" "bedrock" . }}' # Primarily used to import existing helm releases | |
| + releaseName: '{{ dig "charts" "bedrock" "release_name" "bedrock" . }}' # Primarily used to import existing helm releases | |
| valueFiles: | |
| - values.yaml | |
| - 'values-{{ .name }}.yaml' | |
| @@ -14180,15 +14217,14 @@ | |
| name: "webservices-low-private-prod-us-west1" | |
| namespace: "bedrock-{{ .name }}" | |
| info: | |
| - # Retain environment level dig scope for single chart tenants | |
| - name: 'Helm Chart' | |
| value: 'https://github.com/mozilla/webservices-infra/tree/{{ dig "target_revision" "main" . }}/bedrock/k8s/bedrock' | |
| - name: 'Helm Chart Ref' | |
| - value: '{{ dig "target_revision" "main" . }}' | |
| + value: '{{ dig "charts" "bedrock" "target_revision" "main" . }}' | |
| - name: 'Application Repository' | |
| - value: '{{ dig "application_repository" "mozilla/bedrock" . }}' | |
| + value: '{{ dig "charts" "bedrock" "application_repository" "mozilla/bedrock" . }}' | |
| - name: 'Image Repository' | |
| - value: '{{ dig "image_repository" "us-docker.pkg.dev/moz-fx-bedrock-prod/bedrock-prod/bedrock" . }}' | |
| + value: '{{ dig "charts" "bedrock" "image_repository" "us-docker.pkg.dev/moz-fx-bedrock-prod/bedrock-prod/bedrock" . }}' | |
| - name: 'Tenant Definition' | |
| value: 'https://github.com/mozilla/global-platform-admin/blob/main/tenants/bedrock.yaml' | |
| # Will ignore differences between live and desired states during the diff. Note that these configurations are not | |
| @@ -14249,13 +14280,16 @@ | |
| tenant: "birdbox" | |
| realm: "nonprod" | |
| annotations: | |
| - argocd-image-updater.argoproj.io/app.helm.image-name: 'image.name' | |
| - argocd-image-updater.argoproj.io/app.helm.image-tag: 'image.tag' | |
| - # Retain environment level dig scope for single chart tenants | |
| - argocd-image-updater.argoproj.io/image-list: 'app={{ dig "image_repository" "us-docker.pkg.dev/moz-fx-birdbox-prod/birdbox-prod/birdbox" . }}' | |
| - argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "image_regex" ".*" . }}' | |
| - argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "update_strategy" "newest-build" . }}' | |
| - argocd-image-updater.argoproj.io/git-branch: '{{ dig "target_revision" "main" . }}' | |
| + # We want this to render: image_tag' | |
| + argocd-image-updater.argoproj.io/app.helm.image-name: '{{ dig "charts" "birdbox" "image_name" "image.name" . }}' | |
| + argocd-image-updater.argoproj.io/app.helm.image-tag: '{{ dig "charts" "birdbox" "image_tag" "image.tag" . }}' | |
| + # The ApplicationSet template will render backslashes from image_regex values | |
| + # as escape characters. To avoid this, we have to escape one level above. | |
| + # We want this to render: .*' | |
| + argocd-image-updater.argoproj.io/image-list: 'app={{ dig "charts" "birdbox" "image_repository" "us-docker.pkg.dev/moz-fx-birdbox-prod/birdbox-prod/birdbox" . }}' | |
| + argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "charts" "birdbox" "image_regex" (dig "image_regex" ".*" .) . }}' | |
| + argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "charts" "birdbox" "update_strategy" "newest-build" . }}' | |
| + argocd-image-updater.argoproj.io/git-branch: '{{ dig "charts" "birdbox" "target_revision" "main" . }}' | |
| argocd-image-updater.argoproj.io/write-back-method: 'git:secret:argocd-webservices/image-updater-github-credentials' #pragma: allowlist secret | |
| # resolves to the birdbox/k8s/birdbox/templates directory and values/Chart files | |
| # image updater creates .argocd-* files in the chart directory to manage image updates | |
| @@ -14281,8 +14315,7 @@ | |
| source: | |
| repoURL: "https://github.com/mozilla/webservices-infra" | |
| path: "birdbox/k8s/birdbox" | |
| - # Retain environment level dig scope for single chart tenants | |
| - targetRevision: '{{ dig "target_revision" "main" . }}' | |
| + targetRevision: '{{ dig "charts" "birdbox" "target_revision" "main" . }}' | |
| helm: | |
| parameters: | |
| - name: global.mozcloud.app_code | |
| @@ -14297,7 +14330,7 @@ | |
| value: moz-fx-birdbox-nonprod | |
| - name: global.mozcloud.realm | |
| value: nonprod | |
| - releaseName: '{{ dig "release_name" "birdbox" . }}' # Primarily used to import existing helm releases | |
| + releaseName: '{{ dig "charts" "birdbox" "release_name" "birdbox" . }}' # Primarily used to import existing helm releases | |
| valueFiles: | |
| - values.yaml | |
| - 'values-{{ .name }}.yaml' | |
| @@ -14305,15 +14338,14 @@ | |
| name: "webservices-high-private-nonprod-us-west1" | |
| namespace: "birdbox-{{ .name }}" | |
| info: | |
| - # Retain environment level dig scope for single chart tenants | |
| - name: 'Helm Chart' | |
| value: 'https://github.com/mozilla/webservices-infra/tree/{{ dig "target_revision" "main" . }}/birdbox/k8s/birdbox' | |
| - name: 'Helm Chart Ref' | |
| - value: '{{ dig "target_revision" "main" . }}' | |
| + value: '{{ dig "charts" "birdbox" "target_revision" "main" . }}' | |
| - name: 'Application Repository' | |
| - value: '{{ dig "application_repository" "mozmeao/birdbox" . }}' | |
| + value: '{{ dig "charts" "birdbox" "application_repository" "mozmeao/birdbox" . }}' | |
| - name: 'Image Repository' | |
| - value: '{{ dig "image_repository" "us-docker.pkg.dev/moz-fx-birdbox-prod/birdbox-prod/birdbox" . }}' | |
| + value: '{{ dig "charts" "birdbox" "image_repository" "us-docker.pkg.dev/moz-fx-birdbox-prod/birdbox-prod/birdbox" . }}' | |
| - name: 'Tenant Definition' | |
| value: 'https://github.com/mozilla/global-platform-admin/blob/main/tenants/birdbox.yaml' | |
| # Will ignore differences between live and desired states during the diff. Note that these configurations are not | |
| @@ -14373,13 +14400,16 @@ | |
| tenant: "birdbox" | |
| realm: "prod" | |
| annotations: | |
| - argocd-image-updater.argoproj.io/app.helm.image-name: 'image.name' | |
| - argocd-image-updater.argoproj.io/app.helm.image-tag: 'image.tag' | |
| - # Retain environment level dig scope for single chart tenants | |
| - argocd-image-updater.argoproj.io/image-list: 'app={{ dig "image_repository" "us-docker.pkg.dev/moz-fx-birdbox-prod/birdbox-prod/birdbox" . }}' | |
| - argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "image_regex" ".*" . }}' | |
| - argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "update_strategy" "newest-build" . }}' | |
| - argocd-image-updater.argoproj.io/git-branch: '{{ dig "target_revision" "main" . }}' | |
| + # We want this to render: image_tag' | |
| + argocd-image-updater.argoproj.io/app.helm.image-name: '{{ dig "charts" "birdbox" "image_name" "image.name" . }}' | |
| + argocd-image-updater.argoproj.io/app.helm.image-tag: '{{ dig "charts" "birdbox" "image_tag" "image.tag" . }}' | |
| + # The ApplicationSet template will render backslashes from image_regex values | |
| + # as escape characters. To avoid this, we have to escape one level above. | |
| + # We want this to render: .*' | |
| + argocd-image-updater.argoproj.io/image-list: 'app={{ dig "charts" "birdbox" "image_repository" "us-docker.pkg.dev/moz-fx-birdbox-prod/birdbox-prod/birdbox" . }}' | |
| + argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "charts" "birdbox" "image_regex" (dig "image_regex" ".*" .) . }}' | |
| + argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "charts" "birdbox" "update_strategy" "newest-build" . }}' | |
| + argocd-image-updater.argoproj.io/git-branch: '{{ dig "charts" "birdbox" "target_revision" "main" . }}' | |
| argocd-image-updater.argoproj.io/write-back-method: 'git:secret:argocd-webservices/image-updater-github-credentials' #pragma: allowlist secret | |
| # resolves to the birdbox/k8s/birdbox/templates directory and values/Chart files | |
| # image updater creates .argocd-* files in the chart directory to manage image updates | |
| @@ -14405,8 +14435,7 @@ | |
| source: | |
| repoURL: "https://github.com/mozilla/webservices-infra" | |
| path: "birdbox/k8s/birdbox" | |
| - # Retain environment level dig scope for single chart tenants | |
| - targetRevision: '{{ dig "target_revision" "main" . }}' | |
| + targetRevision: '{{ dig "charts" "birdbox" "target_revision" "main" . }}' | |
| helm: | |
| parameters: | |
| - name: global.mozcloud.app_code | |
| @@ -14421,7 +14450,7 @@ | |
| value: moz-fx-birdbox-prod | |
| - name: global.mozcloud.realm | |
| value: prod | |
| - releaseName: '{{ dig "release_name" "birdbox" . }}' # Primarily used to import existing helm releases | |
| + releaseName: '{{ dig "charts" "birdbox" "release_name" "birdbox" . }}' # Primarily used to import existing helm releases | |
| valueFiles: | |
| - values.yaml | |
| - 'values-{{ .name }}.yaml' | |
| @@ -14429,15 +14458,14 @@ | |
| name: "webservices-high-private-prod-us-west1" | |
| namespace: "birdbox-{{ .name }}" | |
| info: | |
| - # Retain environment level dig scope for single chart tenants | |
| - name: 'Helm Chart' | |
| value: 'https://github.com/mozilla/webservices-infra/tree/{{ dig "target_revision" "main" . }}/birdbox/k8s/birdbox' | |
| - name: 'Helm Chart Ref' | |
| - value: '{{ dig "target_revision" "main" . }}' | |
| + value: '{{ dig "charts" "birdbox" "target_revision" "main" . }}' | |
| - name: 'Application Repository' | |
| - value: '{{ dig "application_repository" "mozmeao/birdbox" . }}' | |
| + value: '{{ dig "charts" "birdbox" "application_repository" "mozmeao/birdbox" . }}' | |
| - name: 'Image Repository' | |
| - value: '{{ dig "image_repository" "us-docker.pkg.dev/moz-fx-birdbox-prod/birdbox-prod/birdbox" . }}' | |
| + value: '{{ dig "charts" "birdbox" "image_repository" "us-docker.pkg.dev/moz-fx-birdbox-prod/birdbox-prod/birdbox" . }}' | |
| - name: 'Tenant Definition' | |
| value: 'https://github.com/mozilla/global-platform-admin/blob/main/tenants/birdbox.yaml' | |
| # Will ignore differences between live and desired states during the diff. Note that these configurations are not | |
| @@ -15000,6 +15023,17 @@ | |
| tenant: "browser-proxy" | |
| realm: "nonprod" | |
| annotations: | |
| + # We want this to render: image_tag' | |
| + argocd-image-updater.argoproj.io/app.helm.image-name: '{{ dig "charts" "browser-proxy" "image_name" "image.name" . }}' | |
| + argocd-image-updater.argoproj.io/app.helm.image-tag: '{{ dig "charts" "browser-proxy" "image_tag" "image.tag" . }}' | |
| + # The ApplicationSet template will render backslashes from image_regex values | |
| + # as escape characters. To avoid this, we have to escape one level above. | |
| + # We want this to render: .*' | |
| + argocd-image-updater.argoproj.io/image-list: 'app={{ dig "charts" "browser-proxy" "image_repository" "" . }}' | |
| + argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "charts" "browser-proxy" "image_regex" (dig "image_regex" ".*" .) . }}' | |
| + argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "charts" "browser-proxy" "update_strategy" "newest-build" . }}' | |
| + argocd-image-updater.argoproj.io/git-branch: '{{ dig "charts" "browser-proxy" "target_revision" "main" . }}' | |
| + argocd-image-updater.argoproj.io/write-back-method: 'git:secret:argocd-webservices/image-updater-github-credentials' #pragma: allowlist secret | |
| # resolves to the browser-proxy/k8s/browser-proxy/templates directory and values/Chart files | |
| # image updater creates .argocd-* files in the chart directory to manage image updates | |
| # this will trigger a sync on every application that is consuming these charts which is not intended | |
| @@ -15024,8 +15058,7 @@ | |
| source: | |
| repoURL: "https://github.com/mozilla/webservices-infra" | |
| path: "browser-proxy/k8s/browser-proxy" | |
| - # Retain environment level dig scope for single chart tenants | |
| - targetRevision: '{{ dig "target_revision" "main" . }}' | |
| + targetRevision: '{{ dig "charts" "browser-proxy" "target_revision" "main" . }}' | |
| helm: | |
| parameters: | |
| - name: global.mozcloud.app_code | |
| @@ -15040,7 +15073,7 @@ | |
| value: moz-fx-browser-proxy-nonprod | |
| - name: global.mozcloud.realm | |
| value: nonprod | |
| - releaseName: '{{ dig "release_name" "browser-proxy" . }}' # Primarily used to import existing helm releases | |
| + releaseName: '{{ dig "charts" "browser-proxy" "release_name" "browser-proxy" . }}' # Primarily used to import existing helm releases | |
| valueFiles: | |
| - values.yaml | |
| - 'values-{{ .name }}.yaml' | |
| @@ -15050,15 +15083,14 @@ | |
| name: "webservices-high-private-nonprod-us-central1" | |
| namespace: "browser-proxy-{{ .name }}" | |
| info: | |
| - # Retain environment level dig scope for single chart tenants | |
| - name: 'Helm Chart' | |
| value: 'https://github.com/mozilla/webservices-infra/tree/{{ dig "target_revision" "main" . }}/browser-proxy/k8s/browser-proxy' | |
| - name: 'Helm Chart Ref' | |
| - value: '{{ dig "target_revision" "main" . }}' | |
| + value: '{{ dig "charts" "browser-proxy" "target_revision" "main" . }}' | |
| - name: 'Application Repository' | |
| - value: '{{ dig "application_repository" "" . }}' | |
| + value: '{{ dig "charts" "browser-proxy" "application_repository" "" . }}' | |
| - name: 'Image Repository' | |
| - value: '{{ dig "image_repository" "" . }}' | |
| + value: '{{ dig "charts" "browser-proxy" "image_repository" "" . }}' | |
| - name: 'Tenant Definition' | |
| value: 'https://github.com/mozilla/global-platform-admin/blob/main/tenants/browser-proxy.yaml' | |
| # Will ignore differences between live and desired states during the diff. Note that these configurations are not | |
| @@ -15119,6 +15146,17 @@ | |
| tenant: "browser-proxy" | |
| realm: "nonprod" | |
| annotations: | |
| + # We want this to render: image_tag' | |
| + argocd-image-updater.argoproj.io/app.helm.image-name: '{{ dig "charts" "browser-proxy" "image_name" "image.name" . }}' | |
| + argocd-image-updater.argoproj.io/app.helm.image-tag: '{{ dig "charts" "browser-proxy" "image_tag" "image.tag" . }}' | |
| + # The ApplicationSet template will render backslashes from image_regex values | |
| + # as escape characters. To avoid this, we have to escape one level above. | |
| + # We want this to render: .*' | |
| + argocd-image-updater.argoproj.io/image-list: 'app={{ dig "charts" "browser-proxy" "image_repository" "" . }}' | |
| + argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "charts" "browser-proxy" "image_regex" (dig "image_regex" ".*" .) . }}' | |
| + argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "charts" "browser-proxy" "update_strategy" "newest-build" . }}' | |
| + argocd-image-updater.argoproj.io/git-branch: '{{ dig "charts" "browser-proxy" "target_revision" "main" . }}' | |
| + argocd-image-updater.argoproj.io/write-back-method: 'git:secret:argocd-webservices/image-updater-github-credentials' #pragma: allowlist secret | |
| # resolves to the browser-proxy/k8s/browser-proxy/templates directory and values/Chart files | |
| # image updater creates .argocd-* files in the chart directory to manage image updates | |
| # this will trigger a sync on every application that is consuming these charts which is not intended | |
| @@ -15143,8 +15181,7 @@ | |
| source: | |
| repoURL: "https://github.com/mozilla/webservices-infra" | |
| path: "browser-proxy/k8s/browser-proxy" | |
| - # Retain environment level dig scope for single chart tenants | |
| - targetRevision: '{{ dig "target_revision" "main" . }}' | |
| + targetRevision: '{{ dig "charts" "browser-proxy" "target_revision" "main" . }}' | |
| helm: | |
| parameters: | |
| - name: global.mozcloud.app_code | |
| @@ -15159,7 +15196,7 @@ | |
| value: moz-fx-browser-proxy-nonprod | |
| - name: global.mozcloud.realm | |
| value: nonprod | |
| - releaseName: '{{ dig "release_name" "browser-proxy" . }}' # Primarily used to import existing helm releases | |
| + releaseName: '{{ dig "charts" "browser-proxy" "release_name" "browser-proxy" . }}' # Primarily used to import existing helm releases | |
| valueFiles: | |
| - values.yaml | |
| - 'values-{{ .name }}.yaml' | |
| @@ -15167,15 +15204,14 @@ | |
| name: "webservices-high-private-nonprod-us-west1" | |
| namespace: "browser-proxy-{{ .name }}" | |
| info: | |
| - # Retain environment level dig scope for single chart tenants | |
| - name: 'Helm Chart' | |
| value: 'https://github.com/mozilla/webservices-infra/tree/{{ dig "target_revision" "main" . }}/browser-proxy/k8s/browser-proxy' | |
| - name: 'Helm Chart Ref' | |
| - value: '{{ dig "target_revision" "main" . }}' | |
| + value: '{{ dig "charts" "browser-proxy" "target_revision" "main" . }}' | |
| - name: 'Application Repository' | |
| - value: '{{ dig "application_repository" "" . }}' | |
| + value: '{{ dig "charts" "browser-proxy" "application_repository" "" . }}' | |
| - name: 'Image Repository' | |
| - value: '{{ dig "image_repository" "" . }}' | |
| + value: '{{ dig "charts" "browser-proxy" "image_repository" "" . }}' | |
| - name: 'Tenant Definition' | |
| value: 'https://github.com/mozilla/global-platform-admin/blob/main/tenants/browser-proxy.yaml' | |
| # Will ignore differences between live and desired states during the diff. Note that these configurations are not | |
| @@ -15235,6 +15266,17 @@ | |
| tenant: "browser-proxy" | |
| realm: "prod" | |
| annotations: | |
| + # We want this to render: image_tag' | |
| + argocd-image-updater.argoproj.io/app.helm.image-name: '{{ dig "charts" "browser-proxy" "image_name" "image.name" . }}' | |
| + argocd-image-updater.argoproj.io/app.helm.image-tag: '{{ dig "charts" "browser-proxy" "image_tag" "image.tag" . }}' | |
| + # The ApplicationSet template will render backslashes from image_regex values | |
| + # as escape characters. To avoid this, we have to escape one level above. | |
| + # We want this to render: .*' | |
| + argocd-image-updater.argoproj.io/image-list: 'app={{ dig "charts" "browser-proxy" "image_repository" "" . }}' | |
| + argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "charts" "browser-proxy" "image_regex" (dig "image_regex" ".*" .) . }}' | |
| + argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "charts" "browser-proxy" "update_strategy" "newest-build" . }}' | |
| + argocd-image-updater.argoproj.io/git-branch: '{{ dig "charts" "browser-proxy" "target_revision" "main" . }}' | |
| + argocd-image-updater.argoproj.io/write-back-method: 'git:secret:argocd-webservices/image-updater-github-credentials' #pragma: allowlist secret | |
| # resolves to the browser-proxy/k8s/browser-proxy/templates directory and values/Chart files | |
| # image updater creates .argocd-* files in the chart directory to manage image updates | |
| # this will trigger a sync on every application that is consuming these charts which is not intended | |
| @@ -15259,8 +15301,7 @@ | |
| source: | |
| repoURL: "https://github.com/mozilla/webservices-infra" | |
| path: "browser-proxy/k8s/browser-proxy" | |
| - # Retain environment level dig scope for single chart tenants | |
| - targetRevision: '{{ dig "target_revision" "main" . }}' | |
| + targetRevision: '{{ dig "charts" "browser-proxy" "target_revision" "main" . }}' | |
| helm: | |
| parameters: | |
| - name: global.mozcloud.app_code | |
| @@ -15275,7 +15316,7 @@ | |
| value: moz-fx-browser-proxy-prod | |
| - name: global.mozcloud.realm | |
| value: prod | |
| - releaseName: '{{ dig "release_name" "browser-proxy" . }}' # Primarily used to import existing helm releases | |
| + releaseName: '{{ dig "charts" "browser-proxy" "release_name" "browser-proxy" . }}' # Primarily used to import existing helm releases | |
| valueFiles: | |
| - values.yaml | |
| - 'values-{{ .name }}.yaml' | |
| @@ -15285,15 +15326,14 @@ | |
| name: "webservices-high-private-prod-us-central1" | |
| namespace: "browser-proxy-{{ .name }}" | |
| info: | |
| - # Retain environment level dig scope for single chart tenants | |
| - name: 'Helm Chart' | |
| value: 'https://github.com/mozilla/webservices-infra/tree/{{ dig "target_revision" "main" . }}/browser-proxy/k8s/browser-proxy' | |
| - name: 'Helm Chart Ref' | |
| - value: '{{ dig "target_revision" "main" . }}' | |
| + value: '{{ dig "charts" "browser-proxy" "target_revision" "main" . }}' | |
| - name: 'Application Repository' | |
| - value: '{{ dig "application_repository" "" . }}' | |
| + value: '{{ dig "charts" "browser-proxy" "application_repository" "" . }}' | |
| - name: 'Image Repository' | |
| - value: '{{ dig "image_repository" "" . }}' | |
| + value: '{{ dig "charts" "browser-proxy" "image_repository" "" . }}' | |
| - name: 'Tenant Definition' | |
| value: 'https://github.com/mozilla/global-platform-admin/blob/main/tenants/browser-proxy.yaml' | |
| # Will ignore differences between live and desired states during the diff. Note that these configurations are not | |
| @@ -15353,6 +15388,17 @@ | |
| tenant: "browser-proxy" | |
| realm: "prod" | |
| annotations: | |
| + # We want this to render: image_tag' | |
| + argocd-image-updater.argoproj.io/app.helm.image-name: '{{ dig "charts" "browser-proxy" "image_name" "image.name" . }}' | |
| + argocd-image-updater.argoproj.io/app.helm.image-tag: '{{ dig "charts" "browser-proxy" "image_tag" "image.tag" . }}' | |
| + # The ApplicationSet template will render backslashes from image_regex values | |
| + # as escape characters. To avoid this, we have to escape one level above. | |
| + # We want this to render: .*' | |
| + argocd-image-updater.argoproj.io/image-list: 'app={{ dig "charts" "browser-proxy" "image_repository" "" . }}' | |
| + argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "charts" "browser-proxy" "image_regex" (dig "image_regex" ".*" .) . }}' | |
| + argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "charts" "browser-proxy" "update_strategy" "newest-build" . }}' | |
| + argocd-image-updater.argoproj.io/git-branch: '{{ dig "charts" "browser-proxy" "target_revision" "main" . }}' | |
| + argocd-image-updater.argoproj.io/write-back-method: 'git:secret:argocd-webservices/image-updater-github-credentials' #pragma: allowlist secret | |
| # resolves to the browser-proxy/k8s/browser-proxy/templates directory and values/Chart files | |
| # image updater creates .argocd-* files in the chart directory to manage image updates | |
| # this will trigger a sync on every application that is consuming these charts which is not intended | |
| @@ -15377,8 +15423,7 @@ | |
| source: | |
| repoURL: "https://github.com/mozilla/webservices-infra" | |
| path: "browser-proxy/k8s/browser-proxy" | |
| - # Retain environment level dig scope for single chart tenants | |
| - targetRevision: '{{ dig "target_revision" "main" . }}' | |
| + targetRevision: '{{ dig "charts" "browser-proxy" "target_revision" "main" . }}' | |
| helm: | |
| parameters: | |
| - name: global.mozcloud.app_code | |
| @@ -15393,7 +15438,7 @@ | |
| value: moz-fx-browser-proxy-prod | |
| - name: global.mozcloud.realm | |
| value: prod | |
| - releaseName: '{{ dig "release_name" "browser-proxy" . }}' # Primarily used to import existing helm releases | |
| + releaseName: '{{ dig "charts" "browser-proxy" "release_name" "browser-proxy" . }}' # Primarily used to import existing helm releases | |
| valueFiles: | |
| - values.yaml | |
| - 'values-{{ .name }}.yaml' | |
| @@ -15401,15 +15446,14 @@ | |
| name: "webservices-high-private-prod-us-west1" | |
| namespace: "browser-proxy-{{ .name }}" | |
| info: | |
| - # Retain environment level dig scope for single chart tenants | |
| - name: 'Helm Chart' | |
| value: 'https://github.com/mozilla/webservices-infra/tree/{{ dig "target_revision" "main" . }}/browser-proxy/k8s/browser-proxy' | |
| - name: 'Helm Chart Ref' | |
| - value: '{{ dig "target_revision" "main" . }}' | |
| + value: '{{ dig "charts" "browser-proxy" "target_revision" "main" . }}' | |
| - name: 'Application Repository' | |
| - value: '{{ dig "application_repository" "" . }}' | |
| + value: '{{ dig "charts" "browser-proxy" "application_repository" "" . }}' | |
| - name: 'Image Repository' | |
| - value: '{{ dig "image_repository" "" . }}' | |
| + value: '{{ dig "charts" "browser-proxy" "image_repository" "" . }}' | |
| - name: 'Tenant Definition' | |
| value: 'https://github.com/mozilla/global-platform-admin/blob/main/tenants/browser-proxy.yaml' | |
| # Will ignore differences between live and desired states during the diff. Note that these configurations are not | |
| @@ -15469,13 +15508,16 @@ | |
| tenant: "bugbug" | |
| realm: "nonprod" | |
| annotations: | |
| - argocd-image-updater.argoproj.io/app.helm.image-name: 'image.name' | |
| - argocd-image-updater.argoproj.io/app.helm.image-tag: 'image.tag' | |
| - # Retain environment level dig scope for single chart tenants | |
| - argocd-image-updater.argoproj.io/image-list: 'app={{ dig "image_repository" "" . }}' | |
| - argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "image_regex" ".*" . }}' | |
| - argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "update_strategy" "newest-build" . }}' | |
| - argocd-image-updater.argoproj.io/git-branch: '{{ dig "target_revision" "main" . }}' | |
| + # We want this to render: image_tag' | |
| + argocd-image-updater.argoproj.io/app.helm.image-name: '{{ dig "charts" "bugbug" "image_name" "image.name" . }}' | |
| + argocd-image-updater.argoproj.io/app.helm.image-tag: '{{ dig "charts" "bugbug" "image_tag" "image.tag" . }}' | |
| + # The ApplicationSet template will render backslashes from image_regex values | |
| + # as escape characters. To avoid this, we have to escape one level above. | |
| + # We want this to render: .*' | |
| + argocd-image-updater.argoproj.io/image-list: 'app={{ dig "charts" "bugbug" "image_repository" "" . }}' | |
| + argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "charts" "bugbug" "image_regex" (dig "image_regex" ".*" .) . }}' | |
| + argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "charts" "bugbug" "update_strategy" "newest-build" . }}' | |
| + argocd-image-updater.argoproj.io/git-branch: '{{ dig "charts" "bugbug" "target_revision" "main" . }}' | |
| argocd-image-updater.argoproj.io/write-back-method: 'git:secret:argocd-webservices/image-updater-github-credentials' #pragma: allowlist secret | |
| # resolves to the bugbug/k8s/bugbug/templates directory and values/Chart files | |
| # image updater creates .argocd-* files in the chart directory to manage image updates | |
| @@ -15501,8 +15543,7 @@ | |
| source: | |
| repoURL: "https://github.com/mozilla/webservices-infra" | |
| path: "bugbug/k8s/bugbug" | |
| - # Retain environment level dig scope for single chart tenants | |
| - targetRevision: '{{ dig "target_revision" "main" . }}' | |
| + targetRevision: '{{ dig "charts" "bugbug" "target_revision" "main" . }}' | |
| helm: | |
| parameters: | |
| - name: global.mozcloud.app_code | |
| @@ -15517,7 +15558,7 @@ | |
| value: moz-fx-bugbug-nonprod | |
| - name: global.mozcloud.realm | |
| value: nonprod | |
| - releaseName: '{{ dig "release_name" "bugbug" . }}' # Primarily used to import existing helm releases | |
| + releaseName: '{{ dig "charts" "bugbug" "release_name" "bugbug" . }}' # Primarily used to import existing helm releases | |
| valueFiles: | |
| - values.yaml | |
| - 'values-{{ .name }}.yaml' | |
| @@ -15525,15 +15566,14 @@ | |
| name: "webservices-high-private-nonprod-us-west1" | |
| namespace: "bugbug-{{ .name }}" | |
| info: | |
| - # Retain environment level dig scope for single chart tenants | |
| - name: 'Helm Chart' | |
| value: 'https://github.com/mozilla/webservices-infra/tree/{{ dig "target_revision" "main" . }}/bugbug/k8s/bugbug' | |
| - name: 'Helm Chart Ref' | |
| - value: '{{ dig "target_revision" "main" . }}' | |
| + value: '{{ dig "charts" "bugbug" "target_revision" "main" . }}' | |
| - name: 'Application Repository' | |
| - value: '{{ dig "application_repository" "mozilla/bugbug" . }}' | |
| + value: '{{ dig "charts" "bugbug" "application_repository" "mozilla/bugbug" . }}' | |
| - name: 'Image Repository' | |
| - value: '{{ dig "image_repository" "" . }}' | |
| + value: '{{ dig "charts" "bugbug" "image_repository" "" . }}' | |
| - name: 'Tenant Definition' | |
| value: 'https://github.com/mozilla/global-platform-admin/blob/main/tenants/bugbug.yaml' | |
| # Will ignore differences between live and desired states during the diff. Note that these configurations are not | |
| @@ -15593,13 +15628,16 @@ | |
| tenant: "bugbug" | |
| realm: "prod" | |
| annotations: | |
| - argocd-image-updater.argoproj.io/app.helm.image-name: 'image.name' | |
| - argocd-image-updater.argoproj.io/app.helm.image-tag: 'image.tag' | |
| - # Retain environment level dig scope for single chart tenants | |
| - argocd-image-updater.argoproj.io/image-list: 'app={{ dig "image_repository" "" . }}' | |
| - argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "image_regex" ".*" . }}' | |
| - argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "update_strategy" "newest-build" . }}' | |
| - argocd-image-updater.argoproj.io/git-branch: '{{ dig "target_revision" "main" . }}' | |
| + # We want this to render: image_tag' | |
| + argocd-image-updater.argoproj.io/app.helm.image-name: '{{ dig "charts" "bugbug" "image_name" "image.name" . }}' | |
| + argocd-image-updater.argoproj.io/app.helm.image-tag: '{{ dig "charts" "bugbug" "image_tag" "image.tag" . }}' | |
| + # The ApplicationSet template will render backslashes from image_regex values | |
| + # as escape characters. To avoid this, we have to escape one level above. | |
| + # We want this to render: .*' | |
| + argocd-image-updater.argoproj.io/image-list: 'app={{ dig "charts" "bugbug" "image_repository" "" . }}' | |
| + argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "charts" "bugbug" "image_regex" (dig "image_regex" ".*" .) . }}' | |
| + argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "charts" "bugbug" "update_strategy" "newest-build" . }}' | |
| + argocd-image-updater.argoproj.io/git-branch: '{{ dig "charts" "bugbug" "target_revision" "main" . }}' | |
| argocd-image-updater.argoproj.io/write-back-method: 'git:secret:argocd-webservices/image-updater-github-credentials' #pragma: allowlist secret | |
| # resolves to the bugbug/k8s/bugbug/templates directory and values/Chart files | |
| # image updater creates .argocd-* files in the chart directory to manage image updates | |
| @@ -15625,8 +15663,7 @@ | |
| source: | |
| repoURL: "https://github.com/mozilla/webservices-infra" | |
| path: "bugbug/k8s/bugbug" | |
| - # Retain environment level dig scope for single chart tenants | |
| - targetRevision: '{{ dig "target_revision" "main" . }}' | |
| + targetRevision: '{{ dig "charts" "bugbug" "target_revision" "main" . }}' | |
| helm: | |
| parameters: | |
| - name: global.mozcloud.app_code | |
| @@ -15641,7 +15678,7 @@ | |
| value: moz-fx-bugbug-prod | |
| - name: global.mozcloud.realm | |
| value: prod | |
| - releaseName: '{{ dig "release_name" "bugbug" . }}' # Primarily used to import existing helm releases | |
| + releaseName: '{{ dig "charts" "bugbug" "release_name" "bugbug" . }}' # Primarily used to import existing helm releases | |
| valueFiles: | |
| - values.yaml | |
| - 'values-{{ .name }}.yaml' | |
| @@ -15649,15 +15686,14 @@ | |
| name: "webservices-high-private-prod-us-west1" | |
| namespace: "bugbug-{{ .name }}" | |
| info: | |
| - # Retain environment level dig scope for single chart tenants | |
| - name: 'Helm Chart' | |
| value: 'https://github.com/mozilla/webservices-infra/tree/{{ dig "target_revision" "main" . }}/bugbug/k8s/bugbug' | |
| - name: 'Helm Chart Ref' | |
| - value: '{{ dig "target_revision" "main" . }}' | |
| + value: '{{ dig "charts" "bugbug" "target_revision" "main" . }}' | |
| - name: 'Application Repository' | |
| - value: '{{ dig "application_repository" "mozilla/bugbug" . }}' | |
| + value: '{{ dig "charts" "bugbug" "application_repository" "mozilla/bugbug" . }}' | |
| - name: 'Image Repository' | |
| - value: '{{ dig "image_repository" "" . }}' | |
| + value: '{{ dig "charts" "bugbug" "image_repository" "" . }}' | |
| - name: 'Tenant Definition' | |
| value: 'https://github.com/mozilla/global-platform-admin/blob/main/tenants/bugbug.yaml' | |
| # Will ignore differences between live and desired states during the diff. Note that these configurations are not | |
| @@ -15718,13 +15749,16 @@ | |
| tenant: "bugzilla" | |
| realm: "nonprod" | |
| annotations: | |
| - argocd-image-updater.argoproj.io/app.helm.image-name: 'image.name' | |
| - argocd-image-updater.argoproj.io/app.helm.image-tag: 'image.tag' | |
| - # Retain environment level dig scope for single chart tenants | |
| - argocd-image-updater.argoproj.io/image-list: 'app={{ dig "image_repository" "us-docker.pkg.dev/moz-fx-bugzilla-prod/bugzilla-prod/bmo" . }}' | |
| - argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "image_regex" ".*" . }}' | |
| - argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "update_strategy" "newest-build" . }}' | |
| - argocd-image-updater.argoproj.io/git-branch: '{{ dig "target_revision" "main" . }}' | |
| + # We want this to render: image_tag' | |
| + argocd-image-updater.argoproj.io/app.helm.image-name: '{{ dig "charts" "bugzilla" "image_name" "image.name" . }}' | |
| + argocd-image-updater.argoproj.io/app.helm.image-tag: '{{ dig "charts" "bugzilla" "image_tag" "image.tag" . }}' | |
| + # The ApplicationSet template will render backslashes from image_regex values | |
| + # as escape characters. To avoid this, we have to escape one level above. | |
| + # We want this to render: .*' | |
| + argocd-image-updater.argoproj.io/image-list: 'app={{ dig "charts" "bugzilla" "image_repository" "us-docker.pkg.dev/moz-fx-bugzilla-prod/bugzilla-prod/bmo" . }}' | |
| + argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "charts" "bugzilla" "image_regex" (dig "image_regex" ".*" .) . }}' | |
| + argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "charts" "bugzilla" "update_strategy" "newest-build" . }}' | |
| + argocd-image-updater.argoproj.io/git-branch: '{{ dig "charts" "bugzilla" "target_revision" "main" . }}' | |
| argocd-image-updater.argoproj.io/write-back-method: 'git:secret:argocd-webservices/image-updater-github-credentials' #pragma: allowlist secret | |
| # resolves to the bugzilla/k8s/bugzilla/templates directory and values/Chart files | |
| # image updater creates .argocd-* files in the chart directory to manage image updates | |
| @@ -15750,8 +15784,7 @@ | |
| source: | |
| repoURL: "https://github.com/mozilla/webservices-infra" | |
| path: "bugzilla/k8s/bugzilla" | |
| - # Retain environment level dig scope for single chart tenants | |
| - targetRevision: '{{ dig "target_revision" "main" . }}' | |
| + targetRevision: '{{ dig "charts" "bugzilla" "target_revision" "main" . }}' | |
| helm: | |
| parameters: | |
| - name: global.mozcloud.app_code | |
| @@ -15766,7 +15799,7 @@ | |
| value: moz-fx-bugzilla-nonprod | |
| - name: global.mozcloud.realm | |
| value: nonprod | |
| - releaseName: '{{ dig "release_name" "bugzilla" . }}' # Primarily used to import existing helm releases | |
| + releaseName: '{{ dig "charts" "bugzilla" "release_name" "bugzilla" . }}' # Primarily used to import existing helm releases | |
| valueFiles: | |
| - values.yaml | |
| - 'values-{{ .name }}.yaml' | |
| @@ -15774,15 +15807,14 @@ | |
| name: "webservices-high-private-nonprod-us-west1" | |
| namespace: "bugzilla-{{ .name }}" | |
| info: | |
| - # Retain environment level dig scope for single chart tenants | |
| - name: 'Helm Chart' | |
| value: 'https://github.com/mozilla/webservices-infra/tree/{{ dig "target_revision" "main" . }}/bugzilla/k8s/bugzilla' | |
| - name: 'Helm Chart Ref' | |
| - value: '{{ dig "target_revision" "main" . }}' | |
| + value: '{{ dig "charts" "bugzilla" "target_revision" "main" . }}' | |
| - name: 'Application Repository' | |
| - value: '{{ dig "application_repository" "mozilla-bteam/bmo" . }}' | |
| + value: '{{ dig "charts" "bugzilla" "application_repository" "mozilla-bteam/bmo" . }}' | |
| - name: 'Image Repository' | |
| - value: '{{ dig "image_repository" "us-docker.pkg.dev/moz-fx-bugzilla-prod/bugzilla-prod/bmo" . }}' | |
| + value: '{{ dig "charts" "bugzilla" "image_repository" "us-docker.pkg.dev/moz-fx-bugzilla-prod/bugzilla-prod/bmo" . }}' | |
| - name: 'Tenant Definition' | |
| value: 'https://github.com/mozilla/global-platform-admin/blob/main/tenants/bugzilla.yaml' | |
| # Will ignore differences between live and desired states during the diff. Note that these configurations are not | |
| @@ -15842,13 +15869,16 @@ | |
| tenant: "bugzilla" | |
| realm: "prod" | |
| annotations: | |
| - argocd-image-updater.argoproj.io/app.helm.image-name: 'image.name' | |
| - argocd-image-updater.argoproj.io/app.helm.image-tag: 'image.tag' | |
| - # Retain environment level dig scope for single chart tenants | |
| - argocd-image-updater.argoproj.io/image-list: 'app={{ dig "image_repository" "us-docker.pkg.dev/moz-fx-bugzilla-prod/bugzilla-prod/bmo" . }}' | |
| - argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "image_regex" ".*" . }}' | |
| - argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "update_strategy" "newest-build" . }}' | |
| - argocd-image-updater.argoproj.io/git-branch: '{{ dig "target_revision" "main" . }}' | |
| + # We want this to render: image_tag' | |
| + argocd-image-updater.argoproj.io/app.helm.image-name: '{{ dig "charts" "bugzilla" "image_name" "image.name" . }}' | |
| + argocd-image-updater.argoproj.io/app.helm.image-tag: '{{ dig "charts" "bugzilla" "image_tag" "image.tag" . }}' | |
| + # The ApplicationSet template will render backslashes from image_regex values | |
| + # as escape characters. To avoid this, we have to escape one level above. | |
| + # We want this to render: .*' | |
| + argocd-image-updater.argoproj.io/image-list: 'app={{ dig "charts" "bugzilla" "image_repository" "us-docker.pkg.dev/moz-fx-bugzilla-prod/bugzilla-prod/bmo" . }}' | |
| + argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "charts" "bugzilla" "image_regex" (dig "image_regex" ".*" .) . }}' | |
| + argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "charts" "bugzilla" "update_strategy" "newest-build" . }}' | |
| + argocd-image-updater.argoproj.io/git-branch: '{{ dig "charts" "bugzilla" "target_revision" "main" . }}' | |
| argocd-image-updater.argoproj.io/write-back-method: 'git:secret:argocd-webservices/image-updater-github-credentials' #pragma: allowlist secret | |
| # resolves to the bugzilla/k8s/bugzilla/templates directory and values/Chart files | |
| # image updater creates .argocd-* files in the chart directory to manage image updates | |
| @@ -15874,8 +15904,7 @@ | |
| source: | |
| repoURL: "https://github.com/mozilla/webservices-infra" | |
| path: "bugzilla/k8s/bugzilla" | |
| - # Retain environment level dig scope for single chart tenants | |
| - targetRevision: '{{ dig "target_revision" "main" . }}' | |
| + targetRevision: '{{ dig "charts" "bugzilla" "target_revision" "main" . }}' | |
| helm: | |
| parameters: | |
| - name: global.mozcloud.app_code | |
| @@ -15890,7 +15919,7 @@ | |
| value: moz-fx-bugzilla-prod | |
| - name: global.mozcloud.realm | |
| value: prod | |
| - releaseName: '{{ dig "release_name" "bugzilla" . }}' # Primarily used to import existing helm releases | |
| + releaseName: '{{ dig "charts" "bugzilla" "release_name" "bugzilla" . }}' # Primarily used to import existing helm releases | |
| valueFiles: | |
| - values.yaml | |
| - 'values-{{ .name }}.yaml' | |
| @@ -15898,15 +15927,14 @@ | |
| name: "webservices-high-private-prod-us-west1" | |
| namespace: "bugzilla-{{ .name }}" | |
| info: | |
| - # Retain environment level dig scope for single chart tenants | |
| - name: 'Helm Chart' | |
| value: 'https://github.com/mozilla/webservices-infra/tree/{{ dig "target_revision" "main" . }}/bugzilla/k8s/bugzilla' | |
| - name: 'Helm Chart Ref' | |
| - value: '{{ dig "target_revision" "main" . }}' | |
| + value: '{{ dig "charts" "bugzilla" "target_revision" "main" . }}' | |
| - name: 'Application Repository' | |
| - value: '{{ dig "application_repository" "mozilla-bteam/bmo" . }}' | |
| + value: '{{ dig "charts" "bugzilla" "application_repository" "mozilla-bteam/bmo" . }}' | |
| - name: 'Image Repository' | |
| - value: '{{ dig "image_repository" "us-docker.pkg.dev/moz-fx-bugzilla-prod/bugzilla-prod/bmo" . }}' | |
| + value: '{{ dig "charts" "bugzilla" "image_repository" "us-docker.pkg.dev/moz-fx-bugzilla-prod/bugzilla-prod/bmo" . }}' | |
| - name: 'Tenant Definition' | |
| value: 'https://github.com/mozilla/global-platform-admin/blob/main/tenants/bugzilla.yaml' | |
| # Will ignore differences between live and desired states during the diff. Note that these configurations are not | |
| @@ -15967,13 +15990,16 @@ | |
| tenant: "cirrus" | |
| realm: "nonprod" | |
| annotations: | |
| - argocd-image-updater.argoproj.io/app.helm.image-name: 'image.name' | |
| - argocd-image-updater.argoproj.io/app.helm.image-tag: 'image.tag' | |
| - # Retain environment level dig scope for single chart tenants | |
| - argocd-image-updater.argoproj.io/image-list: 'app={{ dig "image_repository" "us-docker.pkg.dev/moz-fx-cirrus-prod/cirrus-prod/cirrus" . }}' | |
| - argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "image_regex" ".*" . }}' | |
| - argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "update_strategy" "newest-build" . }}' | |
| - argocd-image-updater.argoproj.io/git-branch: '{{ dig "target_revision" "main" . }}' | |
| + # We want this to render: image_tag' | |
| + argocd-image-updater.argoproj.io/app.helm.image-name: '{{ dig "charts" "cirrus" "image_name" "image.name" . }}' | |
| + argocd-image-updater.argoproj.io/app.helm.image-tag: '{{ dig "charts" "cirrus" "image_tag" "image.tag" . }}' | |
| + # The ApplicationSet template will render backslashes from image_regex values | |
| + # as escape characters. To avoid this, we have to escape one level above. | |
| + # We want this to render: .*' | |
| + argocd-image-updater.argoproj.io/image-list: 'app={{ dig "charts" "cirrus" "image_repository" "us-docker.pkg.dev/moz-fx-cirrus-prod/cirrus-prod/cirrus" . }}' | |
| + argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "charts" "cirrus" "image_regex" (dig "image_regex" ".*" .) . }}' | |
| + argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "charts" "cirrus" "update_strategy" "newest-build" . }}' | |
| + argocd-image-updater.argoproj.io/git-branch: '{{ dig "charts" "cirrus" "target_revision" "main" . }}' | |
| argocd-image-updater.argoproj.io/write-back-method: 'git:secret:argocd-webservices/image-updater-github-credentials' #pragma: allowlist secret | |
| # resolves to the cirrus/k8s/cirrus/templates directory and values/Chart files | |
| # image updater creates .argocd-* files in the chart directory to manage image updates | |
| @@ -15999,8 +16025,7 @@ | |
| source: | |
| repoURL: "https://github.com/mozilla/webservices-infra" | |
| path: "cirrus/k8s/cirrus" | |
| - # Retain environment level dig scope for single chart tenants | |
| - targetRevision: '{{ dig "target_revision" "main" . }}' | |
| + targetRevision: '{{ dig "charts" "cirrus" "target_revision" "main" . }}' | |
| helm: | |
| parameters: | |
| - name: global.mozcloud.app_code | |
| @@ -16015,7 +16040,7 @@ | |
| value: moz-fx-cirrus-nonprod | |
| - name: global.mozcloud.realm | |
| value: nonprod | |
| - releaseName: '{{ dig "release_name" "cirrus" . }}' # Primarily used to import existing helm releases | |
| + releaseName: '{{ dig "charts" "cirrus" "release_name" "cirrus" . }}' # Primarily used to import existing helm releases | |
| valueFiles: | |
| - values.yaml | |
| - 'values-{{ .name }}.yaml' | |
| @@ -16023,15 +16048,14 @@ | |
| name: "webservices-high-private-nonprod-us-west1" | |
| namespace: "cirrus-{{ .name }}" | |
| info: | |
| - # Retain environment level dig scope for single chart tenants | |
| - name: 'Helm Chart' | |
| value: 'https://github.com/mozilla/webservices-infra/tree/{{ dig "target_revision" "main" . }}/cirrus/k8s/cirrus' | |
| - name: 'Helm Chart Ref' | |
| - value: '{{ dig "target_revision" "main" . }}' | |
| + value: '{{ dig "charts" "cirrus" "target_revision" "main" . }}' | |
| - name: 'Application Repository' | |
| - value: '{{ dig "application_repository" "mozilla/experimenter" . }}' | |
| + value: '{{ dig "charts" "cirrus" "application_repository" "mozilla/experimenter" . }}' | |
| - name: 'Image Repository' | |
| - value: '{{ dig "image_repository" "us-docker.pkg.dev/moz-fx-cirrus-prod/cirrus-prod/cirrus" . }}' | |
| + value: '{{ dig "charts" "cirrus" "image_repository" "us-docker.pkg.dev/moz-fx-cirrus-prod/cirrus-prod/cirrus" . }}' | |
| - name: 'Tenant Definition' | |
| value: 'https://github.com/mozilla/global-platform-admin/blob/main/tenants/cirrus.yaml' | |
| # Will ignore differences between live and desired states during the diff. Note that these configurations are not | |
| @@ -16091,13 +16110,16 @@ | |
| tenant: "cirrus" | |
| realm: "prod" | |
| annotations: | |
| - argocd-image-updater.argoproj.io/app.helm.image-name: 'image.name' | |
| - argocd-image-updater.argoproj.io/app.helm.image-tag: 'image.tag' | |
| - # Retain environment level dig scope for single chart tenants | |
| - argocd-image-updater.argoproj.io/image-list: 'app={{ dig "image_repository" "us-docker.pkg.dev/moz-fx-cirrus-prod/cirrus-prod/cirrus" . }}' | |
| - argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "image_regex" ".*" . }}' | |
| - argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "update_strategy" "newest-build" . }}' | |
| - argocd-image-updater.argoproj.io/git-branch: '{{ dig "target_revision" "main" . }}' | |
| + # We want this to render: image_tag' | |
| + argocd-image-updater.argoproj.io/app.helm.image-name: '{{ dig "charts" "cirrus" "image_name" "image.name" . }}' | |
| + argocd-image-updater.argoproj.io/app.helm.image-tag: '{{ dig "charts" "cirrus" "image_tag" "image.tag" . }}' | |
| + # The ApplicationSet template will render backslashes from image_regex values | |
| + # as escape characters. To avoid this, we have to escape one level above. | |
| + # We want this to render: .*' | |
| + argocd-image-updater.argoproj.io/image-list: 'app={{ dig "charts" "cirrus" "image_repository" "us-docker.pkg.dev/moz-fx-cirrus-prod/cirrus-prod/cirrus" . }}' | |
| + argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "charts" "cirrus" "image_regex" (dig "image_regex" ".*" .) . }}' | |
| + argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "charts" "cirrus" "update_strategy" "newest-build" . }}' | |
| + argocd-image-updater.argoproj.io/git-branch: '{{ dig "charts" "cirrus" "target_revision" "main" . }}' | |
| argocd-image-updater.argoproj.io/write-back-method: 'git:secret:argocd-webservices/image-updater-github-credentials' #pragma: allowlist secret | |
| # resolves to the cirrus/k8s/cirrus/templates directory and values/Chart files | |
| # image updater creates .argocd-* files in the chart directory to manage image updates | |
| @@ -16123,8 +16145,7 @@ | |
| source: | |
| repoURL: "https://github.com/mozilla/webservices-infra" | |
| path: "cirrus/k8s/cirrus" | |
| - # Retain environment level dig scope for single chart tenants | |
| - targetRevision: '{{ dig "target_revision" "main" . }}' | |
| + targetRevision: '{{ dig "charts" "cirrus" "target_revision" "main" . }}' | |
| helm: | |
| parameters: | |
| - name: global.mozcloud.app_code | |
| @@ -16139,7 +16160,7 @@ | |
| value: moz-fx-cirrus-prod | |
| - name: global.mozcloud.realm | |
| value: prod | |
| - releaseName: '{{ dig "release_name" "cirrus" . }}' # Primarily used to import existing helm releases | |
| + releaseName: '{{ dig "charts" "cirrus" "release_name" "cirrus" . }}' # Primarily used to import existing helm releases | |
| valueFiles: | |
| - values.yaml | |
| - 'values-{{ .name }}.yaml' | |
| @@ -16147,15 +16168,14 @@ | |
| name: "webservices-high-private-prod-us-west1" | |
| namespace: "cirrus-{{ .name }}" | |
| info: | |
| - # Retain environment level dig scope for single chart tenants | |
| - name: 'Helm Chart' | |
| value: 'https://github.com/mozilla/webservices-infra/tree/{{ dig "target_revision" "main" . }}/cirrus/k8s/cirrus' | |
| - name: 'Helm Chart Ref' | |
| - value: '{{ dig "target_revision" "main" . }}' | |
| + value: '{{ dig "charts" "cirrus" "target_revision" "main" . }}' | |
| - name: 'Application Repository' | |
| - value: '{{ dig "application_repository" "mozilla/experimenter" . }}' | |
| + value: '{{ dig "charts" "cirrus" "application_repository" "mozilla/experimenter" . }}' | |
| - name: 'Image Repository' | |
| - value: '{{ dig "image_repository" "us-docker.pkg.dev/moz-fx-cirrus-prod/cirrus-prod/cirrus" . }}' | |
| + value: '{{ dig "charts" "cirrus" "image_repository" "us-docker.pkg.dev/moz-fx-cirrus-prod/cirrus-prod/cirrus" . }}' | |
| - name: 'Tenant Definition' | |
| value: 'https://github.com/mozilla/global-platform-admin/blob/main/tenants/cirrus.yaml' | |
| # Will ignore differences between live and desired states during the diff. Note that these configurations are not | |
| @@ -16215,13 +16230,16 @@ | |
| tenant: "classify-client" | |
| realm: "nonprod" | |
| annotations: | |
| - argocd-image-updater.argoproj.io/app.helm.image-name: 'image.name' | |
| - argocd-image-updater.argoproj.io/app.helm.image-tag: 'image.tag' | |
| - # Retain environment level dig scope for single chart tenants | |
| - argocd-image-updater.argoproj.io/image-list: 'app={{ dig "image_repository" "us-docker.pkg.dev/moz-fx-classify-client-pr-09cc/classify-client-prod/classify-client" . }}' | |
| - argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "image_regex" ".*" . }}' | |
| - argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "update_strategy" "newest-build" . }}' | |
| - argocd-image-updater.argoproj.io/git-branch: '{{ dig "target_revision" "main" . }}' | |
| + # We want this to render: image_tag' | |
| + argocd-image-updater.argoproj.io/app.helm.image-name: '{{ dig "charts" "classify-client" "image_name" "image.name" . }}' | |
| + argocd-image-updater.argoproj.io/app.helm.image-tag: '{{ dig "charts" "classify-client" "image_tag" "image.tag" . }}' | |
| + # The ApplicationSet template will render backslashes from image_regex values | |
| + # as escape characters. To avoid this, we have to escape one level above. | |
| + # We want this to render: .*' | |
| + argocd-image-updater.argoproj.io/image-list: 'app={{ dig "charts" "classify-client" "image_repository" "us-docker.pkg.dev/moz-fx-classify-client-pr-09cc/classify-client-prod/classify-client" . }}' | |
| + argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "charts" "classify-client" "image_regex" (dig "image_regex" ".*" .) . }}' | |
| + argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "charts" "classify-client" "update_strategy" "newest-build" . }}' | |
| + argocd-image-updater.argoproj.io/git-branch: '{{ dig "charts" "classify-client" "target_revision" "main" . }}' | |
| argocd-image-updater.argoproj.io/write-back-method: 'git:secret:argocd-webservices/image-updater-github-credentials' #pragma: allowlist secret | |
| # resolves to the classify-client/k8s/classify-client/templates directory and values/Chart files | |
| # image updater creates .argocd-* files in the chart directory to manage image updates | |
| @@ -16247,8 +16265,7 @@ | |
| source: | |
| repoURL: "https://github.com/mozilla/webservices-infra" | |
| path: "classify-client/k8s/classify-client" | |
| - # Retain environment level dig scope for single chart tenants | |
| - targetRevision: '{{ dig "target_revision" "main" . }}' | |
| + targetRevision: '{{ dig "charts" "classify-client" "target_revision" "main" . }}' | |
| helm: | |
| parameters: | |
| - name: global.mozcloud.app_code | |
| @@ -16263,7 +16280,7 @@ | |
| value: moz-fx-classify-client-no-fa8c | |
| - name: global.mozcloud.realm | |
| value: nonprod | |
| - releaseName: '{{ dig "release_name" "gha" . }}' # Primarily used to import existing helm releases | |
| + releaseName: '{{ dig "charts" "classify-client" "release_name" "gha" . }}' # Primarily used to import existing helm releases | |
| valueFiles: | |
| - values.yaml | |
| - 'values-{{ .name }}.yaml' | |
| @@ -16271,15 +16288,14 @@ | |
| name: "webservices-high-private-nonprod-us-west1" | |
| namespace: "classify-client-{{ .name }}" | |
| info: | |
| - # Retain environment level dig scope for single chart tenants | |
| - name: 'Helm Chart' | |
| value: 'https://github.com/mozilla/webservices-infra/tree/{{ dig "target_revision" "main" . }}/classify-client/k8s/classify-client' | |
| - name: 'Helm Chart Ref' | |
| - value: '{{ dig "target_revision" "main" . }}' | |
| + value: '{{ dig "charts" "classify-client" "target_revision" "main" . }}' | |
| - name: 'Application Repository' | |
| - value: '{{ dig "application_repository" "mozilla/classify-client" . }}' | |
| + value: '{{ dig "charts" "classify-client" "application_repository" "mozilla/classify-client" . }}' | |
| - name: 'Image Repository' | |
| - value: '{{ dig "image_repository" "us-docker.pkg.dev/moz-fx-classify-client-pr-09cc/classify-client-prod/classify-client" . }}' | |
| + value: '{{ dig "charts" "classify-client" "image_repository" "us-docker.pkg.dev/moz-fx-classify-client-pr-09cc/classify-client-prod/classify-client" . }}' | |
| - name: 'Tenant Definition' | |
| value: 'https://github.com/mozilla/global-platform-admin/blob/main/tenants/classify-client.yaml' | |
| # Will ignore differences between live and desired states during the diff. Note that these configurations are not | |
| @@ -16339,13 +16350,16 @@ | |
| tenant: "classify-client" | |
| realm: "prod" | |
| annotations: | |
| - argocd-image-updater.argoproj.io/app.helm.image-name: 'image.name' | |
| - argocd-image-updater.argoproj.io/app.helm.image-tag: 'image.tag' | |
| - # Retain environment level dig scope for single chart tenants | |
| - argocd-image-updater.argoproj.io/image-list: 'app={{ dig "image_repository" "us-docker.pkg.dev/moz-fx-classify-client-pr-09cc/classify-client-prod/classify-client" . }}' | |
| - argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "image_regex" ".*" . }}' | |
| - argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "update_strategy" "newest-build" . }}' | |
| - argocd-image-updater.argoproj.io/git-branch: '{{ dig "target_revision" "main" . }}' | |
| + # We want this to render: image_tag' | |
| + argocd-image-updater.argoproj.io/app.helm.image-name: '{{ dig "charts" "classify-client" "image_name" "image.name" . }}' | |
| + argocd-image-updater.argoproj.io/app.helm.image-tag: '{{ dig "charts" "classify-client" "image_tag" "image.tag" . }}' | |
| + # The ApplicationSet template will render backslashes from image_regex values | |
| + # as escape characters. To avoid this, we have to escape one level above. | |
| + # We want this to render: .*' | |
| + argocd-image-updater.argoproj.io/image-list: 'app={{ dig "charts" "classify-client" "image_repository" "us-docker.pkg.dev/moz-fx-classify-client-pr-09cc/classify-client-prod/classify-client" . }}' | |
| + argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "charts" "classify-client" "image_regex" (dig "image_regex" ".*" .) . }}' | |
| + argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "charts" "classify-client" "update_strategy" "newest-build" . }}' | |
| + argocd-image-updater.argoproj.io/git-branch: '{{ dig "charts" "classify-client" "target_revision" "main" . }}' | |
| argocd-image-updater.argoproj.io/write-back-method: 'git:secret:argocd-webservices/image-updater-github-credentials' #pragma: allowlist secret | |
| # resolves to the classify-client/k8s/classify-client/templates directory and values/Chart files | |
| # image updater creates .argocd-* files in the chart directory to manage image updates | |
| @@ -16371,8 +16385,7 @@ | |
| source: | |
| repoURL: "https://github.com/mozilla/webservices-infra" | |
| path: "classify-client/k8s/classify-client" | |
| - # Retain environment level dig scope for single chart tenants | |
| - targetRevision: '{{ dig "target_revision" "main" . }}' | |
| + targetRevision: '{{ dig "charts" "classify-client" "target_revision" "main" . }}' | |
| helm: | |
| parameters: | |
| - name: global.mozcloud.app_code | |
| @@ -16387,7 +16400,7 @@ | |
| value: moz-fx-classify-client-pr-09cc | |
| - name: global.mozcloud.realm | |
| value: prod | |
| - releaseName: '{{ dig "release_name" "gha" . }}' # Primarily used to import existing helm releases | |
| + releaseName: '{{ dig "charts" "classify-client" "release_name" "gha" . }}' # Primarily used to import existing helm releases | |
| valueFiles: | |
| - values.yaml | |
| - 'values-{{ .name }}.yaml' | |
| @@ -16395,15 +16408,14 @@ | |
| name: "webservices-high-private-prod-us-west1" | |
| namespace: "classify-client-{{ .name }}" | |
| info: | |
| - # Retain environment level dig scope for single chart tenants | |
| - name: 'Helm Chart' | |
| value: 'https://github.com/mozilla/webservices-infra/tree/{{ dig "target_revision" "main" . }}/classify-client/k8s/classify-client' | |
| - name: 'Helm Chart Ref' | |
| - value: '{{ dig "target_revision" "main" . }}' | |
| + value: '{{ dig "charts" "classify-client" "target_revision" "main" . }}' | |
| - name: 'Application Repository' | |
| - value: '{{ dig "application_repository" "mozilla/classify-client" . }}' | |
| + value: '{{ dig "charts" "classify-client" "application_repository" "mozilla/classify-client" . }}' | |
| - name: 'Image Repository' | |
| - value: '{{ dig "image_repository" "us-docker.pkg.dev/moz-fx-classify-client-pr-09cc/classify-client-prod/classify-client" . }}' | |
| + value: '{{ dig "charts" "classify-client" "image_repository" "us-docker.pkg.dev/moz-fx-classify-client-pr-09cc/classify-client-prod/classify-client" . }}' | |
| - name: 'Tenant Definition' | |
| value: 'https://github.com/mozilla/global-platform-admin/blob/main/tenants/classify-client.yaml' | |
| # Will ignore differences between live and desired states during the diff. Note that these configurations are not | |
| @@ -18219,6 +18226,17 @@ | |
| tenant: "crlite" | |
| realm: "nonprod" | |
| annotations: | |
| + # We want this to render: image_tag' | |
| + argocd-image-updater.argoproj.io/app.helm.image-name: '{{ dig "charts" "crlite" "image_name" "image.name" . }}' | |
| + argocd-image-updater.argoproj.io/app.helm.image-tag: '{{ dig "charts" "crlite" "image_tag" "image.tag" . }}' | |
| + # The ApplicationSet template will render backslashes from image_regex values | |
| + # as escape characters. To avoid this, we have to escape one level above. | |
| + # We want this to render: .*' | |
| + argocd-image-updater.argoproj.io/image-list: 'app={{ dig "charts" "crlite" "image_repository" "" . }}' | |
| + argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "charts" "crlite" "image_regex" (dig "image_regex" ".*" .) . }}' | |
| + argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "charts" "crlite" "update_strategy" "newest-build" . }}' | |
| + argocd-image-updater.argoproj.io/git-branch: '{{ dig "charts" "crlite" "target_revision" "main" . }}' | |
| + argocd-image-updater.argoproj.io/write-back-method: 'git:secret:argocd-webservices/image-updater-github-credentials' #pragma: allowlist secret | |
| # resolves to the crlite/k8s/crlite/templates directory and values/Chart files | |
| # image updater creates .argocd-* files in the chart directory to manage image updates | |
| # this will trigger a sync on every application that is consuming these charts which is not intended | |
| @@ -18243,8 +18261,7 @@ | |
| source: | |
| repoURL: "https://github.com/mozilla/webservices-infra" | |
| path: "crlite/k8s/crlite" | |
| - # Retain environment level dig scope for single chart tenants | |
| - targetRevision: '{{ dig "target_revision" "main" . }}' | |
| + targetRevision: '{{ dig "charts" "crlite" "target_revision" "main" . }}' | |
| helm: | |
| parameters: | |
| - name: global.mozcloud.app_code | |
| @@ -18259,7 +18276,7 @@ | |
| value: moz-fx-crlite-nonprod | |
| - name: global.mozcloud.realm | |
| value: nonprod | |
| - releaseName: '{{ dig "release_name" "crlite" . }}' # Primarily used to import existing helm releases | |
| + releaseName: '{{ dig "charts" "crlite" "release_name" "crlite" . }}' # Primarily used to import existing helm releases | |
| valueFiles: | |
| - values.yaml | |
| - 'values-{{ .name }}.yaml' | |
| @@ -18267,15 +18284,14 @@ | |
| name: "webservices-high-private-nonprod-us-west1" | |
| namespace: "crlite-{{ .name }}" | |
| info: | |
| - # Retain environment level dig scope for single chart tenants | |
| - name: 'Helm Chart' | |
| value: 'https://github.com/mozilla/webservices-infra/tree/{{ dig "target_revision" "main" . }}/crlite/k8s/crlite' | |
| - name: 'Helm Chart Ref' | |
| - value: '{{ dig "target_revision" "main" . }}' | |
| + value: '{{ dig "charts" "crlite" "target_revision" "main" . }}' | |
| - name: 'Application Repository' | |
| - value: '{{ dig "application_repository" "" . }}' | |
| + value: '{{ dig "charts" "crlite" "application_repository" "" . }}' | |
| - name: 'Image Repository' | |
| - value: '{{ dig "image_repository" "" . }}' | |
| + value: '{{ dig "charts" "crlite" "image_repository" "" . }}' | |
| - name: 'Tenant Definition' | |
| value: 'https://github.com/mozilla/global-platform-admin/blob/main/tenants/crlite.yaml' | |
| # Will ignore differences between live and desired states during the diff. Note that these configurations are not | |
| @@ -18335,6 +18346,17 @@ | |
| tenant: "crlite" | |
| realm: "prod" | |
| annotations: | |
| + # We want this to render: image_tag' | |
| + argocd-image-updater.argoproj.io/app.helm.image-name: '{{ dig "charts" "crlite" "image_name" "image.name" . }}' | |
| + argocd-image-updater.argoproj.io/app.helm.image-tag: '{{ dig "charts" "crlite" "image_tag" "image.tag" . }}' | |
| + # The ApplicationSet template will render backslashes from image_regex values | |
| + # as escape characters. To avoid this, we have to escape one level above. | |
| + # We want this to render: .*' | |
| + argocd-image-updater.argoproj.io/image-list: 'app={{ dig "charts" "crlite" "image_repository" "" . }}' | |
| + argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "charts" "crlite" "image_regex" (dig "image_regex" ".*" .) . }}' | |
| + argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "charts" "crlite" "update_strategy" "newest-build" . }}' | |
| + argocd-image-updater.argoproj.io/git-branch: '{{ dig "charts" "crlite" "target_revision" "main" . }}' | |
| + argocd-image-updater.argoproj.io/write-back-method: 'git:secret:argocd-webservices/image-updater-github-credentials' #pragma: allowlist secret | |
| # resolves to the crlite/k8s/crlite/templates directory and values/Chart files | |
| # image updater creates .argocd-* files in the chart directory to manage image updates | |
| # this will trigger a sync on every application that is consuming these charts which is not intended | |
| @@ -18359,8 +18381,7 @@ | |
| source: | |
| repoURL: "https://github.com/mozilla/webservices-infra" | |
| path: "crlite/k8s/crlite" | |
| - # Retain environment level dig scope for single chart tenants | |
| - targetRevision: '{{ dig "target_revision" "main" . }}' | |
| + targetRevision: '{{ dig "charts" "crlite" "target_revision" "main" . }}' | |
| helm: | |
| parameters: | |
| - name: global.mozcloud.app_code | |
| @@ -18375,7 +18396,7 @@ | |
| value: moz-fx-crlite-prod | |
| - name: global.mozcloud.realm | |
| value: prod | |
| - releaseName: '{{ dig "release_name" "crlite" . }}' # Primarily used to import existing helm releases | |
| + releaseName: '{{ dig "charts" "crlite" "release_name" "crlite" . }}' # Primarily used to import existing helm releases | |
| valueFiles: | |
| - values.yaml | |
| - 'values-{{ .name }}.yaml' | |
| @@ -18383,15 +18404,14 @@ | |
| name: "webservices-high-private-prod-us-west1" | |
| namespace: "crlite-{{ .name }}" | |
| info: | |
| - # Retain environment level dig scope for single chart tenants | |
| - name: 'Helm Chart' | |
| value: 'https://github.com/mozilla/webservices-infra/tree/{{ dig "target_revision" "main" . }}/crlite/k8s/crlite' | |
| - name: 'Helm Chart Ref' | |
| - value: '{{ dig "target_revision" "main" . }}' | |
| + value: '{{ dig "charts" "crlite" "target_revision" "main" . }}' | |
| - name: 'Application Repository' | |
| - value: '{{ dig "application_repository" "" . }}' | |
| + value: '{{ dig "charts" "crlite" "application_repository" "" . }}' | |
| - name: 'Image Repository' | |
| - value: '{{ dig "image_repository" "" . }}' | |
| + value: '{{ dig "charts" "crlite" "image_repository" "" . }}' | |
| - name: 'Tenant Definition' | |
| value: 'https://github.com/mozilla/global-platform-admin/blob/main/tenants/crlite.yaml' | |
| # Will ignore differences between live and desired states during the diff. Note that these configurations are not | |
| @@ -18451,13 +18466,16 @@ | |
| tenant: "ctms" | |
| realm: "nonprod" | |
| annotations: | |
| - argocd-image-updater.argoproj.io/app.helm.image-name: 'image.name' | |
| - argocd-image-updater.argoproj.io/app.helm.image-tag: 'image.tag' | |
| - # Retain environment level dig scope for single chart tenants | |
| - argocd-image-updater.argoproj.io/image-list: 'app={{ dig "image_repository" "us-docker.pkg.dev/moz-fx-ctms-prod/ctms-prod/ctms" . }}' | |
| - argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "image_regex" ".*" . }}' | |
| - argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "update_strategy" "newest-build" . }}' | |
| - argocd-image-updater.argoproj.io/git-branch: '{{ dig "target_revision" "main" . }}' | |
| + # We want this to render: image_tag' | |
| + argocd-image-updater.argoproj.io/app.helm.image-name: '{{ dig "charts" "ctms" "image_name" "image.name" . }}' | |
| + argocd-image-updater.argoproj.io/app.helm.image-tag: '{{ dig "charts" "ctms" "image_tag" "image.tag" . }}' | |
| + # The ApplicationSet template will render backslashes from image_regex values | |
| + # as escape characters. To avoid this, we have to escape one level above. | |
| + # We want this to render: .*' | |
| + argocd-image-updater.argoproj.io/image-list: 'app={{ dig "charts" "ctms" "image_repository" "us-docker.pkg.dev/moz-fx-ctms-prod/ctms-prod/ctms" . }}' | |
| + argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "charts" "ctms" "image_regex" (dig "image_regex" ".*" .) . }}' | |
| + argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "charts" "ctms" "update_strategy" "newest-build" . }}' | |
| + argocd-image-updater.argoproj.io/git-branch: '{{ dig "charts" "ctms" "target_revision" "main" . }}' | |
| argocd-image-updater.argoproj.io/write-back-method: 'git:secret:argocd-webservices/image-updater-github-credentials' #pragma: allowlist secret | |
| # resolves to the ctms/k8s/ctms/templates directory and values/Chart files | |
| # image updater creates .argocd-* files in the chart directory to manage image updates | |
| @@ -18483,8 +18501,7 @@ | |
| source: | |
| repoURL: "https://github.com/mozilla/webservices-infra" | |
| path: "ctms/k8s/ctms" | |
| - # Retain environment level dig scope for single chart tenants | |
| - targetRevision: '{{ dig "target_revision" "main" . }}' | |
| + targetRevision: '{{ dig "charts" "ctms" "target_revision" "main" . }}' | |
| helm: | |
| parameters: | |
| - name: global.mozcloud.app_code | |
| @@ -18499,7 +18516,7 @@ | |
| value: moz-fx-ctms-nonprod | |
| - name: global.mozcloud.realm | |
| value: nonprod | |
| - releaseName: '{{ dig "release_name" "ctms" . }}' # Primarily used to import existing helm releases | |
| + releaseName: '{{ dig "charts" "ctms" "release_name" "ctms" . }}' # Primarily used to import existing helm releases | |
| valueFiles: | |
| - values.yaml | |
| - 'values-{{ .name }}.yaml' | |
| @@ -18507,15 +18524,14 @@ | |
| name: "webservices-high-private-nonprod-us-west1" | |
| namespace: "ctms-{{ .name }}" | |
| info: | |
| - # Retain environment level dig scope for single chart tenants | |
| - name: 'Helm Chart' | |
| value: 'https://github.com/mozilla/webservices-infra/tree/{{ dig "target_revision" "main" . }}/ctms/k8s/ctms' | |
| - name: 'Helm Chart Ref' | |
| - value: '{{ dig "target_revision" "main" . }}' | |
| + value: '{{ dig "charts" "ctms" "target_revision" "main" . }}' | |
| - name: 'Application Repository' | |
| - value: '{{ dig "application_repository" "" . }}' | |
| + value: '{{ dig "charts" "ctms" "application_repository" "" . }}' | |
| - name: 'Image Repository' | |
| - value: '{{ dig "image_repository" "us-docker.pkg.dev/moz-fx-ctms-prod/ctms-prod/ctms" . }}' | |
| + value: '{{ dig "charts" "ctms" "image_repository" "us-docker.pkg.dev/moz-fx-ctms-prod/ctms-prod/ctms" . }}' | |
| - name: 'Tenant Definition' | |
| value: 'https://github.com/mozilla/global-platform-admin/blob/main/tenants/ctms.yaml' | |
| # Will ignore differences between live and desired states during the diff. Note that these configurations are not | |
| @@ -18575,13 +18586,16 @@ | |
| tenant: "ctms" | |
| realm: "prod" | |
| annotations: | |
| - argocd-image-updater.argoproj.io/app.helm.image-name: 'image.name' | |
| - argocd-image-updater.argoproj.io/app.helm.image-tag: 'image.tag' | |
| - # Retain environment level dig scope for single chart tenants | |
| - argocd-image-updater.argoproj.io/image-list: 'app={{ dig "image_repository" "us-docker.pkg.dev/moz-fx-ctms-prod/ctms-prod/ctms" . }}' | |
| - argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "image_regex" ".*" . }}' | |
| - argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "update_strategy" "newest-build" . }}' | |
| - argocd-image-updater.argoproj.io/git-branch: '{{ dig "target_revision" "main" . }}' | |
| + # We want this to render: image_tag' | |
| + argocd-image-updater.argoproj.io/app.helm.image-name: '{{ dig "charts" "ctms" "image_name" "image.name" . }}' | |
| + argocd-image-updater.argoproj.io/app.helm.image-tag: '{{ dig "charts" "ctms" "image_tag" "image.tag" . }}' | |
| + # The ApplicationSet template will render backslashes from image_regex values | |
| + # as escape characters. To avoid this, we have to escape one level above. | |
| + # We want this to render: .*' | |
| + argocd-image-updater.argoproj.io/image-list: 'app={{ dig "charts" "ctms" "image_repository" "us-docker.pkg.dev/moz-fx-ctms-prod/ctms-prod/ctms" . }}' | |
| + argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "charts" "ctms" "image_regex" (dig "image_regex" ".*" .) . }}' | |
| + argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "charts" "ctms" "update_strategy" "newest-build" . }}' | |
| + argocd-image-updater.argoproj.io/git-branch: '{{ dig "charts" "ctms" "target_revision" "main" . }}' | |
| argocd-image-updater.argoproj.io/write-back-method: 'git:secret:argocd-webservices/image-updater-github-credentials' #pragma: allowlist secret | |
| # resolves to the ctms/k8s/ctms/templates directory and values/Chart files | |
| # image updater creates .argocd-* files in the chart directory to manage image updates | |
| @@ -18607,8 +18621,7 @@ | |
| source: | |
| repoURL: "https://github.com/mozilla/webservices-infra" | |
| path: "ctms/k8s/ctms" | |
| - # Retain environment level dig scope for single chart tenants | |
| - targetRevision: '{{ dig "target_revision" "main" . }}' | |
| + targetRevision: '{{ dig "charts" "ctms" "target_revision" "main" . }}' | |
| helm: | |
| parameters: | |
| - name: global.mozcloud.app_code | |
| @@ -18623,7 +18636,7 @@ | |
| value: moz-fx-ctms-prod | |
| - name: global.mozcloud.realm | |
| value: prod | |
| - releaseName: '{{ dig "release_name" "ctms" . }}' # Primarily used to import existing helm releases | |
| + releaseName: '{{ dig "charts" "ctms" "release_name" "ctms" . }}' # Primarily used to import existing helm releases | |
| valueFiles: | |
| - values.yaml | |
| - 'values-{{ .name }}.yaml' | |
| @@ -18631,15 +18644,14 @@ | |
| name: "webservices-high-private-prod-us-west1" | |
| namespace: "ctms-{{ .name }}" | |
| info: | |
| - # Retain environment level dig scope for single chart tenants | |
| - name: 'Helm Chart' | |
| value: 'https://github.com/mozilla/webservices-infra/tree/{{ dig "target_revision" "main" . }}/ctms/k8s/ctms' | |
| - name: 'Helm Chart Ref' | |
| - value: '{{ dig "target_revision" "main" . }}' | |
| + value: '{{ dig "charts" "ctms" "target_revision" "main" . }}' | |
| - name: 'Application Repository' | |
| - value: '{{ dig "application_repository" "" . }}' | |
| + value: '{{ dig "charts" "ctms" "application_repository" "" . }}' | |
| - name: 'Image Repository' | |
| - value: '{{ dig "image_repository" "us-docker.pkg.dev/moz-fx-ctms-prod/ctms-prod/ctms" . }}' | |
| + value: '{{ dig "charts" "ctms" "image_repository" "us-docker.pkg.dev/moz-fx-ctms-prod/ctms-prod/ctms" . }}' | |
| - name: 'Tenant Definition' | |
| value: 'https://github.com/mozilla/global-platform-admin/blob/main/tenants/ctms.yaml' | |
| # Will ignore differences between live and desired states during the diff. Note that these configurations are not | |
| @@ -18700,6 +18707,17 @@ | |
| tenant: "dap" | |
| realm: "nonprod" | |
| annotations: | |
| + # We want this to render: image_tag' | |
| + argocd-image-updater.argoproj.io/app.helm.image-name: '{{ dig "charts" "dap" "image_name" "image.name" . }}' | |
| + argocd-image-updater.argoproj.io/app.helm.image-tag: '{{ dig "charts" "dap" "image_tag" "image.tag" . }}' | |
| + # The ApplicationSet template will render backslashes from image_regex values | |
| + # as escape characters. To avoid this, we have to escape one level above. | |
| + # We want this to render: .*' | |
| + argocd-image-updater.argoproj.io/image-list: 'app={{ dig "charts" "dap" "image_repository" "us-west2-docker.pkg.dev/divviup-artifacts-public/janus/janus_aggregator" . }}' | |
| + argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "charts" "dap" "image_regex" (dig "image_regex" ".*" .) . }}' | |
| + argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "charts" "dap" "update_strategy" "newest-build" . }}' | |
| + argocd-image-updater.argoproj.io/git-branch: '{{ dig "charts" "dap" "target_revision" "main" . }}' | |
| + argocd-image-updater.argoproj.io/write-back-method: 'git:secret:argocd-webservices/image-updater-github-credentials' #pragma: allowlist secret | |
| # resolves to the dap/k8s/dap/templates directory and values/Chart files | |
| # image updater creates .argocd-* files in the chart directory to manage image updates | |
| # this will trigger a sync on every application that is consuming these charts which is not intended | |
| @@ -18724,8 +18742,7 @@ | |
| source: | |
| repoURL: "https://github.com/mozilla/webservices-infra" | |
| path: "dap/k8s/dap" | |
| - # Retain environment level dig scope for single chart tenants | |
| - targetRevision: '{{ dig "target_revision" "main" . }}' | |
| + targetRevision: '{{ dig "charts" "dap" "target_revision" "main" . }}' | |
| helm: | |
| parameters: | |
| - name: global.mozcloud.app_code | |
| @@ -18740,7 +18757,7 @@ | |
| value: moz-fx-dap-nonprod | |
| - name: global.mozcloud.realm | |
| value: nonprod | |
| - releaseName: '{{ dig "release_name" "gha" . }}' # Primarily used to import existing helm releases | |
| + releaseName: '{{ dig "charts" "dap" "release_name" "gha" . }}' # Primarily used to import existing helm releases | |
| valueFiles: | |
| - values.yaml | |
| - 'values-{{ .name }}.yaml' | |
| @@ -18748,15 +18765,14 @@ | |
| name: "webservices-high-private-nonprod-us-west1" | |
| namespace: "dap-{{ .name }}" | |
| info: | |
| - # Retain environment level dig scope for single chart tenants | |
| - name: 'Helm Chart' | |
| value: 'https://github.com/mozilla/webservices-infra/tree/{{ dig "target_revision" "main" . }}/dap/k8s/dap' | |
| - name: 'Helm Chart Ref' | |
| - value: '{{ dig "target_revision" "main" . }}' | |
| + value: '{{ dig "charts" "dap" "target_revision" "main" . }}' | |
| - name: 'Application Repository' | |
| - value: '{{ dig "application_repository" "" . }}' | |
| + value: '{{ dig "charts" "dap" "application_repository" "" . }}' | |
| - name: 'Image Repository' | |
| - value: '{{ dig "image_repository" "us-west2-docker.pkg.dev/divviup-artifacts-public/janus/janus_aggregator" . }}' | |
| + value: '{{ dig "charts" "dap" "image_repository" "us-west2-docker.pkg.dev/divviup-artifacts-public/janus/janus_aggregator" . }}' | |
| - name: 'Tenant Definition' | |
| value: 'https://github.com/mozilla/global-platform-admin/blob/main/tenants/dap.yaml' | |
| # Will ignore differences between live and desired states during the diff. Note that these configurations are not | |
| @@ -18816,6 +18827,17 @@ | |
| tenant: "dap" | |
| realm: "prod" | |
| annotations: | |
| + # We want this to render: image_tag' | |
| + argocd-image-updater.argoproj.io/app.helm.image-name: '{{ dig "charts" "dap" "image_name" "image.name" . }}' | |
| + argocd-image-updater.argoproj.io/app.helm.image-tag: '{{ dig "charts" "dap" "image_tag" "image.tag" . }}' | |
| + # The ApplicationSet template will render backslashes from image_regex values | |
| + # as escape characters. To avoid this, we have to escape one level above. | |
| + # We want this to render: .*' | |
| + argocd-image-updater.argoproj.io/image-list: 'app={{ dig "charts" "dap" "image_repository" "us-west2-docker.pkg.dev/divviup-artifacts-public/janus/janus_aggregator" . }}' | |
| + argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "charts" "dap" "image_regex" (dig "image_regex" ".*" .) . }}' | |
| + argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "charts" "dap" "update_strategy" "newest-build" . }}' | |
| + argocd-image-updater.argoproj.io/git-branch: '{{ dig "charts" "dap" "target_revision" "main" . }}' | |
| + argocd-image-updater.argoproj.io/write-back-method: 'git:secret:argocd-webservices/image-updater-github-credentials' #pragma: allowlist secret | |
| # resolves to the dap/k8s/dap/templates directory and values/Chart files | |
| # image updater creates .argocd-* files in the chart directory to manage image updates | |
| # this will trigger a sync on every application that is consuming these charts which is not intended | |
| @@ -18840,8 +18862,7 @@ | |
| source: | |
| repoURL: "https://github.com/mozilla/webservices-infra" | |
| path: "dap/k8s/dap" | |
| - # Retain environment level dig scope for single chart tenants | |
| - targetRevision: '{{ dig "target_revision" "main" . }}' | |
| + targetRevision: '{{ dig "charts" "dap" "target_revision" "main" . }}' | |
| helm: | |
| parameters: | |
| - name: global.mozcloud.app_code | |
| @@ -18856,7 +18877,7 @@ | |
| value: moz-fx-dap-prod | |
| - name: global.mozcloud.realm | |
| value: prod | |
| - releaseName: '{{ dig "release_name" "gha" . }}' # Primarily used to import existing helm releases | |
| + releaseName: '{{ dig "charts" "dap" "release_name" "gha" . }}' # Primarily used to import existing helm releases | |
| valueFiles: | |
| - values.yaml | |
| - 'values-{{ .name }}.yaml' | |
| @@ -18864,15 +18885,14 @@ | |
| name: "webservices-high-private-prod-us-west1" | |
| namespace: "dap-{{ .name }}" | |
| info: | |
| - # Retain environment level dig scope for single chart tenants | |
| - name: 'Helm Chart' | |
| value: 'https://github.com/mozilla/webservices-infra/tree/{{ dig "target_revision" "main" . }}/dap/k8s/dap' | |
| - name: 'Helm Chart Ref' | |
| - value: '{{ dig "target_revision" "main" . }}' | |
| + value: '{{ dig "charts" "dap" "target_revision" "main" . }}' | |
| - name: 'Application Repository' | |
| - value: '{{ dig "application_repository" "" . }}' | |
| + value: '{{ dig "charts" "dap" "application_repository" "" . }}' | |
| - name: 'Image Repository' | |
| - value: '{{ dig "image_repository" "us-west2-docker.pkg.dev/divviup-artifacts-public/janus/janus_aggregator" . }}' | |
| + value: '{{ dig "charts" "dap" "image_repository" "us-west2-docker.pkg.dev/divviup-artifacts-public/janus/janus_aggregator" . }}' | |
| - name: 'Tenant Definition' | |
| value: 'https://github.com/mozilla/global-platform-admin/blob/main/tenants/dap.yaml' | |
| # Will ignore differences between live and desired states during the diff. Note that these configurations are not | |
| @@ -18932,13 +18947,16 @@ | |
| tenant: "experimenter" | |
| realm: "nonprod" | |
| annotations: | |
| - argocd-image-updater.argoproj.io/app.helm.image-name: 'image.name' | |
| - argocd-image-updater.argoproj.io/app.helm.image-tag: 'image.tag' | |
| - # Retain environment level dig scope for single chart tenants | |
| - argocd-image-updater.argoproj.io/image-list: 'app={{ dig "image_repository" "" . }}' | |
| - argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "image_regex" ".*" . }}' | |
| - argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "update_strategy" "newest-build" . }}' | |
| - argocd-image-updater.argoproj.io/git-branch: '{{ dig "target_revision" "main" . }}' | |
| + # We want this to render: image_tag' | |
| + argocd-image-updater.argoproj.io/app.helm.image-name: '{{ dig "charts" "experimenter" "image_name" "image.name" . }}' | |
| + argocd-image-updater.argoproj.io/app.helm.image-tag: '{{ dig "charts" "experimenter" "image_tag" "image.tag" . }}' | |
| + # The ApplicationSet template will render backslashes from image_regex values | |
| + # as escape characters. To avoid this, we have to escape one level above. | |
| + # We want this to render: .*' | |
| + argocd-image-updater.argoproj.io/image-list: 'app={{ dig "charts" "experimenter" "image_repository" "" . }}' | |
| + argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "charts" "experimenter" "image_regex" (dig "image_regex" ".*" .) . }}' | |
| + argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "charts" "experimenter" "update_strategy" "newest-build" . }}' | |
| + argocd-image-updater.argoproj.io/git-branch: '{{ dig "charts" "experimenter" "target_revision" "main" . }}' | |
| argocd-image-updater.argoproj.io/write-back-method: 'git:secret:argocd-webservices/image-updater-github-credentials' #pragma: allowlist secret | |
| # resolves to the experimenter/k8s/experimenter/templates directory and values/Chart files | |
| # image updater creates .argocd-* files in the chart directory to manage image updates | |
| @@ -18964,8 +18982,7 @@ | |
| source: | |
| repoURL: "https://github.com/mozilla/webservices-infra" | |
| path: "experimenter/k8s/experimenter" | |
| - # Retain environment level dig scope for single chart tenants | |
| - targetRevision: '{{ dig "target_revision" "main" . }}' | |
| + targetRevision: '{{ dig "charts" "experimenter" "target_revision" "main" . }}' | |
| helm: | |
| parameters: | |
| - name: global.mozcloud.app_code | |
| @@ -18980,7 +18997,7 @@ | |
| value: moz-fx-experimenter-nonpr-9ab0 | |
| - name: global.mozcloud.realm | |
| value: nonprod | |
| - releaseName: '{{ dig "release_name" "experimenter" . }}' # Primarily used to import existing helm releases | |
| + releaseName: '{{ dig "charts" "experimenter" "release_name" "experimenter" . }}' # Primarily used to import existing helm releases | |
| valueFiles: | |
| - values.yaml | |
| - 'values-{{ .name }}.yaml' | |
| @@ -18988,15 +19005,14 @@ | |
| name: "webservices-high-private-nonprod-us-west1" | |
| namespace: "experimenter-{{ .name }}" | |
| info: | |
| - # Retain environment level dig scope for single chart tenants | |
| - name: 'Helm Chart' | |
| value: 'https://github.com/mozilla/webservices-infra/tree/{{ dig "target_revision" "main" . }}/experimenter/k8s/experimenter' | |
| - name: 'Helm Chart Ref' | |
| - value: '{{ dig "target_revision" "main" . }}' | |
| + value: '{{ dig "charts" "experimenter" "target_revision" "main" . }}' | |
| - name: 'Application Repository' | |
| - value: '{{ dig "application_repository" "mozilla/experimenter" . }}' | |
| + value: '{{ dig "charts" "experimenter" "application_repository" "mozilla/experimenter" . }}' | |
| - name: 'Image Repository' | |
| - value: '{{ dig "image_repository" "" . }}' | |
| + value: '{{ dig "charts" "experimenter" "image_repository" "" . }}' | |
| - name: 'Tenant Definition' | |
| value: 'https://github.com/mozilla/global-platform-admin/blob/main/tenants/experimenter.yaml' | |
| # Will ignore differences between live and desired states during the diff. Note that these configurations are not | |
| @@ -19056,13 +19067,16 @@ | |
| tenant: "experimenter" | |
| realm: "prod" | |
| annotations: | |
| - argocd-image-updater.argoproj.io/app.helm.image-name: 'image.name' | |
| - argocd-image-updater.argoproj.io/app.helm.image-tag: 'image.tag' | |
| - # Retain environment level dig scope for single chart tenants | |
| - argocd-image-updater.argoproj.io/image-list: 'app={{ dig "image_repository" "" . }}' | |
| - argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "image_regex" ".*" . }}' | |
| - argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "update_strategy" "newest-build" . }}' | |
| - argocd-image-updater.argoproj.io/git-branch: '{{ dig "target_revision" "main" . }}' | |
| + # We want this to render: image_tag' | |
| + argocd-image-updater.argoproj.io/app.helm.image-name: '{{ dig "charts" "experimenter" "image_name" "image.name" . }}' | |
| + argocd-image-updater.argoproj.io/app.helm.image-tag: '{{ dig "charts" "experimenter" "image_tag" "image.tag" . }}' | |
| + # The ApplicationSet template will render backslashes from image_regex values | |
| + # as escape characters. To avoid this, we have to escape one level above. | |
| + # We want this to render: .*' | |
| + argocd-image-updater.argoproj.io/image-list: 'app={{ dig "charts" "experimenter" "image_repository" "" . }}' | |
| + argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "charts" "experimenter" "image_regex" (dig "image_regex" ".*" .) . }}' | |
| + argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "charts" "experimenter" "update_strategy" "newest-build" . }}' | |
| + argocd-image-updater.argoproj.io/git-branch: '{{ dig "charts" "experimenter" "target_revision" "main" . }}' | |
| argocd-image-updater.argoproj.io/write-back-method: 'git:secret:argocd-webservices/image-updater-github-credentials' #pragma: allowlist secret | |
| # resolves to the experimenter/k8s/experimenter/templates directory and values/Chart files | |
| # image updater creates .argocd-* files in the chart directory to manage image updates | |
| @@ -19088,8 +19102,7 @@ | |
| source: | |
| repoURL: "https://github.com/mozilla/webservices-infra" | |
| path: "experimenter/k8s/experimenter" | |
| - # Retain environment level dig scope for single chart tenants | |
| - targetRevision: '{{ dig "target_revision" "main" . }}' | |
| + targetRevision: '{{ dig "charts" "experimenter" "target_revision" "main" . }}' | |
| helm: | |
| parameters: | |
| - name: global.mozcloud.app_code | |
| @@ -19104,7 +19117,7 @@ | |
| value: moz-fx-experimenter-prod-6cd5 | |
| - name: global.mozcloud.realm | |
| value: prod | |
| - releaseName: '{{ dig "release_name" "experimenter" . }}' # Primarily used to import existing helm releases | |
| + releaseName: '{{ dig "charts" "experimenter" "release_name" "experimenter" . }}' # Primarily used to import existing helm releases | |
| valueFiles: | |
| - values.yaml | |
| - 'values-{{ .name }}.yaml' | |
| @@ -19112,15 +19125,14 @@ | |
| name: "webservices-high-private-prod-us-west1" | |
| namespace: "experimenter-{{ .name }}" | |
| info: | |
| - # Retain environment level dig scope for single chart tenants | |
| - name: 'Helm Chart' | |
| value: 'https://github.com/mozilla/webservices-infra/tree/{{ dig "target_revision" "main" . }}/experimenter/k8s/experimenter' | |
| - name: 'Helm Chart Ref' | |
| - value: '{{ dig "target_revision" "main" . }}' | |
| + value: '{{ dig "charts" "experimenter" "target_revision" "main" . }}' | |
| - name: 'Application Repository' | |
| - value: '{{ dig "application_repository" "mozilla/experimenter" . }}' | |
| + value: '{{ dig "charts" "experimenter" "application_repository" "mozilla/experimenter" . }}' | |
| - name: 'Image Repository' | |
| - value: '{{ dig "image_repository" "" . }}' | |
| + value: '{{ dig "charts" "experimenter" "image_repository" "" . }}' | |
| - name: 'Tenant Definition' | |
| value: 'https://github.com/mozilla/global-platform-admin/blob/main/tenants/experimenter.yaml' | |
| # Will ignore differences between live and desired states during the diff. Note that these configurations are not | |
| @@ -19180,6 +19187,17 @@ | |
| tenant: "extensionworkshop" | |
| realm: "nonprod" | |
| annotations: | |
| + # We want this to render: image_tag' | |
| + argocd-image-updater.argoproj.io/app.helm.image-name: '{{ dig "charts" "extensionworkshop" "image_name" "image.name" . }}' | |
| + argocd-image-updater.argoproj.io/app.helm.image-tag: '{{ dig "charts" "extensionworkshop" "image_tag" "image.tag" . }}' | |
| + # The ApplicationSet template will render backslashes from image_regex values | |
| + # as escape characters. To avoid this, we have to escape one level above. | |
| + # We want this to render: .*' | |
| + argocd-image-updater.argoproj.io/image-list: 'app={{ dig "charts" "extensionworkshop" "image_repository" "" . }}' | |
| + argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "charts" "extensionworkshop" "image_regex" (dig "image_regex" ".*" .) . }}' | |
| + argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "charts" "extensionworkshop" "update_strategy" "newest-build" . }}' | |
| + argocd-image-updater.argoproj.io/git-branch: '{{ dig "charts" "extensionworkshop" "target_revision" "main" . }}' | |
| + argocd-image-updater.argoproj.io/write-back-method: 'git:secret:argocd-webservices/image-updater-github-credentials' #pragma: allowlist secret | |
| # resolves to the extensionworkshop/k8s/extensionworkshop/templates directory and values/Chart files | |
| # image updater creates .argocd-* files in the chart directory to manage image updates | |
| # this will trigger a sync on every application that is consuming these charts which is not intended | |
| @@ -19204,8 +19222,7 @@ | |
| source: | |
| repoURL: "https://github.com/mozilla/webservices-infra" | |
| path: "extensionworkshop/k8s/extensionworkshop" | |
| - # Retain environment level dig scope for single chart tenants | |
| - targetRevision: '{{ dig "target_revision" "main" . }}' | |
| + targetRevision: '{{ dig "charts" "extensionworkshop" "target_revision" "main" . }}' | |
| helm: | |
| parameters: | |
| - name: global.mozcloud.app_code | |
| @@ -19220,7 +19237,7 @@ | |
| value: moz-fx-extensionworkshop--8748 | |
| - name: global.mozcloud.realm | |
| value: nonprod | |
| - releaseName: '{{ dig "release_name" "extensionworkshop" . }}' # Primarily used to import existing helm releases | |
| + releaseName: '{{ dig "charts" "extensionworkshop" "release_name" "extensionworkshop" . }}' # Primarily used to import existing helm releases | |
| valueFiles: | |
| - values.yaml | |
| - 'values-{{ .name }}.yaml' | |
| @@ -19228,15 +19245,14 @@ | |
| name: "webservices-low-private-nonprod-us-west1" | |
| namespace: "extensionworkshop-{{ .name }}" | |
| info: | |
| - # Retain environment level dig scope for single chart tenants | |
| - name: 'Helm Chart' | |
| value: 'https://github.com/mozilla/webservices-infra/tree/{{ dig "target_revision" "main" . }}/extensionworkshop/k8s/extensionworkshop' | |
| - name: 'Helm Chart Ref' | |
| - value: '{{ dig "target_revision" "main" . }}' | |
| + value: '{{ dig "charts" "extensionworkshop" "target_revision" "main" . }}' | |
| - name: 'Application Repository' | |
| - value: '{{ dig "application_repository" "" . }}' | |
| + value: '{{ dig "charts" "extensionworkshop" "application_repository" "" . }}' | |
| - name: 'Image Repository' | |
| - value: '{{ dig "image_repository" "" . }}' | |
| + value: '{{ dig "charts" "extensionworkshop" "image_repository" "" . }}' | |
| - name: 'Tenant Definition' | |
| value: 'https://github.com/mozilla/global-platform-admin/blob/main/tenants/extensionworkshop.yaml' | |
| # Will ignore differences between live and desired states during the diff. Note that these configurations are not | |
| @@ -19296,6 +19307,17 @@ | |
| tenant: "extensionworkshop" | |
| realm: "prod" | |
| annotations: | |
| + # We want this to render: image_tag' | |
| + argocd-image-updater.argoproj.io/app.helm.image-name: '{{ dig "charts" "extensionworkshop" "image_name" "image.name" . }}' | |
| + argocd-image-updater.argoproj.io/app.helm.image-tag: '{{ dig "charts" "extensionworkshop" "image_tag" "image.tag" . }}' | |
| + # The ApplicationSet template will render backslashes from image_regex values | |
| + # as escape characters. To avoid this, we have to escape one level above. | |
| + # We want this to render: .*' | |
| + argocd-image-updater.argoproj.io/image-list: 'app={{ dig "charts" "extensionworkshop" "image_repository" "" . }}' | |
| + argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "charts" "extensionworkshop" "image_regex" (dig "image_regex" ".*" .) . }}' | |
| + argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "charts" "extensionworkshop" "update_strategy" "newest-build" . }}' | |
| + argocd-image-updater.argoproj.io/git-branch: '{{ dig "charts" "extensionworkshop" "target_revision" "main" . }}' | |
| + argocd-image-updater.argoproj.io/write-back-method: 'git:secret:argocd-webservices/image-updater-github-credentials' #pragma: allowlist secret | |
| # resolves to the extensionworkshop/k8s/extensionworkshop/templates directory and values/Chart files | |
| # image updater creates .argocd-* files in the chart directory to manage image updates | |
| # this will trigger a sync on every application that is consuming these charts which is not intended | |
| @@ -19320,8 +19342,7 @@ | |
| source: | |
| repoURL: "https://github.com/mozilla/webservices-infra" | |
| path: "extensionworkshop/k8s/extensionworkshop" | |
| - # Retain environment level dig scope for single chart tenants | |
| - targetRevision: '{{ dig "target_revision" "main" . }}' | |
| + targetRevision: '{{ dig "charts" "extensionworkshop" "target_revision" "main" . }}' | |
| helm: | |
| parameters: | |
| - name: global.mozcloud.app_code | |
| @@ -19336,7 +19357,7 @@ | |
| value: moz-fx-extensionworkshop--d04c | |
| - name: global.mozcloud.realm | |
| value: prod | |
| - releaseName: '{{ dig "release_name" "extensionworkshop" . }}' # Primarily used to import existing helm releases | |
| + releaseName: '{{ dig "charts" "extensionworkshop" "release_name" "extensionworkshop" . }}' # Primarily used to import existing helm releases | |
| valueFiles: | |
| - values.yaml | |
| - 'values-{{ .name }}.yaml' | |
| @@ -19344,15 +19365,14 @@ | |
| name: "webservices-low-private-prod-us-west1" | |
| namespace: "extensionworkshop-{{ .name }}" | |
| info: | |
| - # Retain environment level dig scope for single chart tenants | |
| - name: 'Helm Chart' | |
| value: 'https://github.com/mozilla/webservices-infra/tree/{{ dig "target_revision" "main" . }}/extensionworkshop/k8s/extensionworkshop' | |
| - name: 'Helm Chart Ref' | |
| - value: '{{ dig "target_revision" "main" . }}' | |
| + value: '{{ dig "charts" "extensionworkshop" "target_revision" "main" . }}' | |
| - name: 'Application Repository' | |
| - value: '{{ dig "application_repository" "" . }}' | |
| + value: '{{ dig "charts" "extensionworkshop" "application_repository" "" . }}' | |
| - name: 'Image Repository' | |
| - value: '{{ dig "image_repository" "" . }}' | |
| + value: '{{ dig "charts" "extensionworkshop" "image_repository" "" . }}' | |
| - name: 'Tenant Definition' | |
| value: 'https://github.com/mozilla/global-platform-admin/blob/main/tenants/extensionworkshop.yaml' | |
| # Will ignore differences between live and desired states during the diff. Note that these configurations are not | |
| @@ -19413,13 +19428,16 @@ | |
| tenant: "fx-profiler" | |
| realm: "nonprod" | |
| annotations: | |
| - argocd-image-updater.argoproj.io/app.helm.image-name: 'image.name' | |
| - argocd-image-updater.argoproj.io/app.helm.image-tag: 'image.tag' | |
| - # Retain environment level dig scope for single chart tenants | |
| - argocd-image-updater.argoproj.io/image-list: 'app={{ dig "image_repository" "us-docker.pkg.dev/moz-fx-profiler-prod/profiler-prod/firefoxprofiler" . }}' | |
| - argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "image_regex" ".*" . }}' | |
| - argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "update_strategy" "newest-build" . }}' | |
| - argocd-image-updater.argoproj.io/git-branch: '{{ dig "target_revision" "main" . }}' | |
| + # We want this to render: image_tag' | |
| + argocd-image-updater.argoproj.io/app.helm.image-name: '{{ dig "charts" "fx-profiler" "image_name" "image.name" . }}' | |
| + argocd-image-updater.argoproj.io/app.helm.image-tag: '{{ dig "charts" "fx-profiler" "image_tag" "image.tag" . }}' | |
| + # The ApplicationSet template will render backslashes from image_regex values | |
| + # as escape characters. To avoid this, we have to escape one level above. | |
| + # We want this to render: .*' | |
| + argocd-image-updater.argoproj.io/image-list: 'app={{ dig "charts" "fx-profiler" "image_repository" "us-docker.pkg.dev/moz-fx-profiler-prod/profiler-prod/firefoxprofiler" . }}' | |
| + argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "charts" "fx-profiler" "image_regex" (dig "image_regex" ".*" .) . }}' | |
| + argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "charts" "fx-profiler" "update_strategy" "newest-build" . }}' | |
| + argocd-image-updater.argoproj.io/git-branch: '{{ dig "charts" "fx-profiler" "target_revision" "main" . }}' | |
| argocd-image-updater.argoproj.io/write-back-method: 'git:secret:argocd-webservices/image-updater-github-credentials' #pragma: allowlist secret | |
| # resolves to the fx-profiler/k8s/fx-profiler/templates directory and values/Chart files | |
| # image updater creates .argocd-* files in the chart directory to manage image updates | |
| @@ -19445,8 +19463,7 @@ | |
| source: | |
| repoURL: "https://github.com/mozilla/webservices-infra" | |
| path: "fx-profiler/k8s/fx-profiler" | |
| - # Retain environment level dig scope for single chart tenants | |
| - targetRevision: '{{ dig "target_revision" "main" . }}' | |
| + targetRevision: '{{ dig "charts" "fx-profiler" "target_revision" "main" . }}' | |
| helm: | |
| parameters: | |
| - name: global.mozcloud.app_code | |
| @@ -19461,7 +19478,7 @@ | |
| value: moz-fx-profiler-nonprod | |
| - name: global.mozcloud.realm | |
| value: nonprod | |
| - releaseName: '{{ dig "release_name" "fx-profiler" . }}' # Primarily used to import existing helm releases | |
| + releaseName: '{{ dig "charts" "fx-profiler" "release_name" "fx-profiler" . }}' # Primarily used to import existing helm releases | |
| valueFiles: | |
| - values.yaml | |
| - 'values-{{ .name }}.yaml' | |
| @@ -19469,15 +19486,14 @@ | |
| name: "webservices-high-private-nonprod-us-west1" | |
| namespace: "fx-profiler-{{ .name }}" | |
| info: | |
| - # Retain environment level dig scope for single chart tenants | |
| - name: 'Helm Chart' | |
| value: 'https://github.com/mozilla/webservices-infra/tree/{{ dig "target_revision" "main" . }}/fx-profiler/k8s/fx-profiler' | |
| - name: 'Helm Chart Ref' | |
| - value: '{{ dig "target_revision" "main" . }}' | |
| + value: '{{ dig "charts" "fx-profiler" "target_revision" "main" . }}' | |
| - name: 'Application Repository' | |
| - value: '{{ dig "application_repository" "firefox-devtools/profiler-server" . }}' | |
| + value: '{{ dig "charts" "fx-profiler" "application_repository" "firefox-devtools/profiler-server" . }}' | |
| - name: 'Image Repository' | |
| - value: '{{ dig "image_repository" "us-docker.pkg.dev/moz-fx-profiler-prod/profiler-prod/firefoxprofiler" . }}' | |
| + value: '{{ dig "charts" "fx-profiler" "image_repository" "us-docker.pkg.dev/moz-fx-profiler-prod/profiler-prod/firefoxprofiler" . }}' | |
| - name: 'Tenant Definition' | |
| value: 'https://github.com/mozilla/global-platform-admin/blob/main/tenants/fx-profiler.yaml' | |
| # Will ignore differences between live and desired states during the diff. Note that these configurations are not | |
| @@ -19537,13 +19548,16 @@ | |
| tenant: "fx-profiler" | |
| realm: "prod" | |
| annotations: | |
| - argocd-image-updater.argoproj.io/app.helm.image-name: 'image.name' | |
| - argocd-image-updater.argoproj.io/app.helm.image-tag: 'image.tag' | |
| - # Retain environment level dig scope for single chart tenants | |
| - argocd-image-updater.argoproj.io/image-list: 'app={{ dig "image_repository" "us-docker.pkg.dev/moz-fx-profiler-prod/profiler-prod/firefoxprofiler" . }}' | |
| - argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "image_regex" ".*" . }}' | |
| - argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "update_strategy" "newest-build" . }}' | |
| - argocd-image-updater.argoproj.io/git-branch: '{{ dig "target_revision" "main" . }}' | |
| + # We want this to render: image_tag' | |
| + argocd-image-updater.argoproj.io/app.helm.image-name: '{{ dig "charts" "fx-profiler" "image_name" "image.name" . }}' | |
| + argocd-image-updater.argoproj.io/app.helm.image-tag: '{{ dig "charts" "fx-profiler" "image_tag" "image.tag" . }}' | |
| + # The ApplicationSet template will render backslashes from image_regex values | |
| + # as escape characters. To avoid this, we have to escape one level above. | |
| + # We want this to render: .*' | |
| + argocd-image-updater.argoproj.io/image-list: 'app={{ dig "charts" "fx-profiler" "image_repository" "us-docker.pkg.dev/moz-fx-profiler-prod/profiler-prod/firefoxprofiler" . }}' | |
| + argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "charts" "fx-profiler" "image_regex" (dig "image_regex" ".*" .) . }}' | |
| + argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "charts" "fx-profiler" "update_strategy" "newest-build" . }}' | |
| + argocd-image-updater.argoproj.io/git-branch: '{{ dig "charts" "fx-profiler" "target_revision" "main" . }}' | |
| argocd-image-updater.argoproj.io/write-back-method: 'git:secret:argocd-webservices/image-updater-github-credentials' #pragma: allowlist secret | |
| # resolves to the fx-profiler/k8s/fx-profiler/templates directory and values/Chart files | |
| # image updater creates .argocd-* files in the chart directory to manage image updates | |
| @@ -19569,8 +19583,7 @@ | |
| source: | |
| repoURL: "https://github.com/mozilla/webservices-infra" | |
| path: "fx-profiler/k8s/fx-profiler" | |
| - # Retain environment level dig scope for single chart tenants | |
| - targetRevision: '{{ dig "target_revision" "main" . }}' | |
| + targetRevision: '{{ dig "charts" "fx-profiler" "target_revision" "main" . }}' | |
| helm: | |
| parameters: | |
| - name: global.mozcloud.app_code | |
| @@ -19585,7 +19598,7 @@ | |
| value: moz-fx-profiler-prod | |
| - name: global.mozcloud.realm | |
| value: prod | |
| - releaseName: '{{ dig "release_name" "fx-profiler" . }}' # Primarily used to import existing helm releases | |
| + releaseName: '{{ dig "charts" "fx-profiler" "release_name" "fx-profiler" . }}' # Primarily used to import existing helm releases | |
| valueFiles: | |
| - values.yaml | |
| - 'values-{{ .name }}.yaml' | |
| @@ -19593,15 +19606,14 @@ | |
| name: "webservices-high-private-prod-us-west1" | |
| namespace: "fx-profiler-{{ .name }}" | |
| info: | |
| - # Retain environment level dig scope for single chart tenants | |
| - name: 'Helm Chart' | |
| value: 'https://github.com/mozilla/webservices-infra/tree/{{ dig "target_revision" "main" . }}/fx-profiler/k8s/fx-profiler' | |
| - name: 'Helm Chart Ref' | |
| - value: '{{ dig "target_revision" "main" . }}' | |
| + value: '{{ dig "charts" "fx-profiler" "target_revision" "main" . }}' | |
| - name: 'Application Repository' | |
| - value: '{{ dig "application_repository" "firefox-devtools/profiler-server" . }}' | |
| + value: '{{ dig "charts" "fx-profiler" "application_repository" "firefox-devtools/profiler-server" . }}' | |
| - name: 'Image Repository' | |
| - value: '{{ dig "image_repository" "us-docker.pkg.dev/moz-fx-profiler-prod/profiler-prod/firefoxprofiler" . }}' | |
| + value: '{{ dig "charts" "fx-profiler" "image_repository" "us-docker.pkg.dev/moz-fx-profiler-prod/profiler-prod/firefoxprofiler" . }}' | |
| - name: 'Tenant Definition' | |
| value: 'https://github.com/mozilla/global-platform-admin/blob/main/tenants/fx-profiler.yaml' | |
| # Will ignore differences between live and desired states during the diff. Note that these configurations are not | |
| @@ -19662,13 +19669,16 @@ | |
| tenant: "fxa" | |
| realm: "nonprod" | |
| annotations: | |
| - argocd-image-updater.argoproj.io/app.helm.image-name: 'image.name' | |
| - argocd-image-updater.argoproj.io/app.helm.image-tag: 'image.tag' | |
| - # Retain environment level dig scope for single chart tenants | |
| - argocd-image-updater.argoproj.io/image-list: 'app={{ dig "image_repository" "us-docker.pkg.dev/moz-fx-fxa-prod/fxa-prod/fxa-mono" . }}' | |
| - argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "image_regex" ".*" . }}' | |
| - argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "update_strategy" "newest-build" . }}' | |
| - argocd-image-updater.argoproj.io/git-branch: '{{ dig "target_revision" "main" . }}' | |
| + # We want this to render: image_tag' | |
| + argocd-image-updater.argoproj.io/app.helm.image-name: '{{ dig "charts" "fxa" "image_name" "image.name" . }}' | |
| + argocd-image-updater.argoproj.io/app.helm.image-tag: '{{ dig "charts" "fxa" "image_tag" "image.tag" . }}' | |
| + # The ApplicationSet template will render backslashes from image_regex values | |
| + # as escape characters. To avoid this, we have to escape one level above. | |
| + # We want this to render: .*' | |
| + argocd-image-updater.argoproj.io/image-list: 'app={{ dig "charts" "fxa" "image_repository" "us-docker.pkg.dev/moz-fx-fxa-prod/fxa-prod/fxa-mono" . }}' | |
| + argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "charts" "fxa" "image_regex" (dig "image_regex" ".*" .) . }}' | |
| + argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "charts" "fxa" "update_strategy" "newest-build" . }}' | |
| + argocd-image-updater.argoproj.io/git-branch: '{{ dig "charts" "fxa" "target_revision" "main" . }}' | |
| argocd-image-updater.argoproj.io/write-back-method: 'git:secret:argocd-webservices/image-updater-github-credentials' #pragma: allowlist secret | |
| # resolves to the fxa/k8s/fxa/templates directory and values/Chart files | |
| # image updater creates .argocd-* files in the chart directory to manage image updates | |
| @@ -19694,8 +19704,7 @@ | |
| source: | |
| repoURL: "https://github.com/mozilla/webservices-infra" | |
| path: "fxa/k8s/fxa" | |
| - # Retain environment level dig scope for single chart tenants | |
| - targetRevision: '{{ dig "target_revision" "main" . }}' | |
| + targetRevision: '{{ dig "charts" "fxa" "target_revision" "main" . }}' | |
| helm: | |
| parameters: | |
| - name: global.mozcloud.app_code | |
| @@ -19710,7 +19719,7 @@ | |
| value: moz-fx-fxa-nonprod | |
| - name: global.mozcloud.realm | |
| value: nonprod | |
| - releaseName: '{{ dig "release_name" "fxa" . }}' # Primarily used to import existing helm releases | |
| + releaseName: '{{ dig "charts" "fxa" "release_name" "fxa" . }}' # Primarily used to import existing helm releases | |
| valueFiles: | |
| - values.yaml | |
| - 'values-{{ .name }}.yaml' | |
| @@ -19718,15 +19727,14 @@ | |
| name: "webservices-high-private-nonprod-us-west1" | |
| namespace: "fxa-{{ .name }}" | |
| info: | |
| - # Retain environment level dig scope for single chart tenants | |
| - name: 'Helm Chart' | |
| value: 'https://github.com/mozilla/webservices-infra/tree/{{ dig "target_revision" "main" . }}/fxa/k8s/fxa' | |
| - name: 'Helm Chart Ref' | |
| - value: '{{ dig "target_revision" "main" . }}' | |
| + value: '{{ dig "charts" "fxa" "target_revision" "main" . }}' | |
| - name: 'Application Repository' | |
| - value: '{{ dig "application_repository" "mozilla/fxa" . }}' | |
| + value: '{{ dig "charts" "fxa" "application_repository" "mozilla/fxa" . }}' | |
| - name: 'Image Repository' | |
| - value: '{{ dig "image_repository" "us-docker.pkg.dev/moz-fx-fxa-prod/fxa-prod/fxa-mono" . }}' | |
| + value: '{{ dig "charts" "fxa" "image_repository" "us-docker.pkg.dev/moz-fx-fxa-prod/fxa-prod/fxa-mono" . }}' | |
| - name: 'Tenant Definition' | |
| value: 'https://github.com/mozilla/global-platform-admin/blob/main/tenants/fxa.yaml' | |
| # Will ignore differences between live and desired states during the diff. Note that these configurations are not | |
| @@ -19786,6 +19789,17 @@ | |
| tenant: "fxa" | |
| realm: "prod" | |
| annotations: | |
| + # We want this to render: image_tag' | |
| + argocd-image-updater.argoproj.io/app.helm.image-name: '{{ dig "charts" "fxa" "image_name" "image.name" . }}' | |
| + argocd-image-updater.argoproj.io/app.helm.image-tag: '{{ dig "charts" "fxa" "image_tag" "image.tag" . }}' | |
| + # The ApplicationSet template will render backslashes from image_regex values | |
| + # as escape characters. To avoid this, we have to escape one level above. | |
| + # We want this to render: .*' | |
| + argocd-image-updater.argoproj.io/image-list: 'app={{ dig "charts" "fxa" "image_repository" "us-docker.pkg.dev/moz-fx-fxa-prod/fxa-prod/fxa-mono" . }}' | |
| + argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "charts" "fxa" "image_regex" (dig "image_regex" ".*" .) . }}' | |
| + argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "charts" "fxa" "update_strategy" "newest-build" . }}' | |
| + argocd-image-updater.argoproj.io/git-branch: '{{ dig "charts" "fxa" "target_revision" "main" . }}' | |
| + argocd-image-updater.argoproj.io/write-back-method: 'git:secret:argocd-webservices/image-updater-github-credentials' #pragma: allowlist secret | |
| # resolves to the fxa/k8s/fxa/templates directory and values/Chart files | |
| # image updater creates .argocd-* files in the chart directory to manage image updates | |
| # this will trigger a sync on every application that is consuming these charts which is not intended | |
| @@ -19810,8 +19824,7 @@ | |
| source: | |
| repoURL: "https://github.com/mozilla/webservices-infra" | |
| path: "fxa/k8s/fxa" | |
| - # Retain environment level dig scope for single chart tenants | |
| - targetRevision: '{{ dig "target_revision" "main" . }}' | |
| + targetRevision: '{{ dig "charts" "fxa" "target_revision" "main" . }}' | |
| helm: | |
| parameters: | |
| - name: global.mozcloud.app_code | |
| @@ -19826,7 +19839,7 @@ | |
| value: moz-fx-fxa-prod | |
| - name: global.mozcloud.realm | |
| value: prod | |
| - releaseName: '{{ dig "release_name" "fxa" . }}' # Primarily used to import existing helm releases | |
| + releaseName: '{{ dig "charts" "fxa" "release_name" "fxa" . }}' # Primarily used to import existing helm releases | |
| valueFiles: | |
| - values.yaml | |
| - 'values-{{ .name }}.yaml' | |
| @@ -19834,15 +19847,14 @@ | |
| name: "webservices-high-private-prod-us-west1" | |
| namespace: "fxa-{{ .name }}" | |
| info: | |
| - # Retain environment level dig scope for single chart tenants | |
| - name: 'Helm Chart' | |
| value: 'https://github.com/mozilla/webservices-infra/tree/{{ dig "target_revision" "main" . }}/fxa/k8s/fxa' | |
| - name: 'Helm Chart Ref' | |
| - value: '{{ dig "target_revision" "main" . }}' | |
| + value: '{{ dig "charts" "fxa" "target_revision" "main" . }}' | |
| - name: 'Application Repository' | |
| - value: '{{ dig "application_repository" "mozilla/fxa" . }}' | |
| + value: '{{ dig "charts" "fxa" "application_repository" "mozilla/fxa" . }}' | |
| - name: 'Image Repository' | |
| - value: '{{ dig "image_repository" "us-docker.pkg.dev/moz-fx-fxa-prod/fxa-prod/fxa-mono" . }}' | |
| + value: '{{ dig "charts" "fxa" "image_repository" "us-docker.pkg.dev/moz-fx-fxa-prod/fxa-prod/fxa-mono" . }}' | |
| - name: 'Tenant Definition' | |
| value: 'https://github.com/mozilla/global-platform-admin/blob/main/tenants/fxa.yaml' | |
| # Will ignore differences between live and desired states during the diff. Note that these configurations are not | |
| @@ -19903,13 +19910,16 @@ | |
| tenant: "fxa-testing" | |
| realm: "nonprod" | |
| annotations: | |
| - argocd-image-updater.argoproj.io/app.helm.image-name: 'image.name' | |
| - argocd-image-updater.argoproj.io/app.helm.image-tag: 'image.tag' | |
| - # Retain environment level dig scope for single chart tenants | |
| - argocd-image-updater.argoproj.io/image-list: 'app={{ dig "image_repository" "us-docker.pkg.dev/moz-fx-fxa-testing-prod/fxa-testing-prod/restmail" . }}' | |
| - argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "image_regex" ".*" . }}' | |
| - argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "update_strategy" "newest-build" . }}' | |
| - argocd-image-updater.argoproj.io/git-branch: '{{ dig "target_revision" "main" . }}' | |
| + # We want this to render: image_tag' | |
| + argocd-image-updater.argoproj.io/app.helm.image-name: '{{ dig "charts" "fxa-testing" "image_name" "image.name" . }}' | |
| + argocd-image-updater.argoproj.io/app.helm.image-tag: '{{ dig "charts" "fxa-testing" "image_tag" "image.tag" . }}' | |
| + # The ApplicationSet template will render backslashes from image_regex values | |
| + # as escape characters. To avoid this, we have to escape one level above. | |
| + # We want this to render: .*' | |
| + argocd-image-updater.argoproj.io/image-list: 'app={{ dig "charts" "fxa-testing" "image_repository" "us-docker.pkg.dev/moz-fx-fxa-testing-prod/fxa-testing-prod/restmail" . }}' | |
| + argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "charts" "fxa-testing" "image_regex" (dig "image_regex" ".*" .) . }}' | |
| + argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "charts" "fxa-testing" "update_strategy" "newest-build" . }}' | |
| + argocd-image-updater.argoproj.io/git-branch: '{{ dig "charts" "fxa-testing" "target_revision" "main" . }}' | |
| argocd-image-updater.argoproj.io/write-back-method: 'git:secret:argocd-webservices/image-updater-github-credentials' #pragma: allowlist secret | |
| # resolves to the fxa-testing/k8s/fxa-testing/templates directory and values/Chart files | |
| # image updater creates .argocd-* files in the chart directory to manage image updates | |
| @@ -19935,8 +19945,7 @@ | |
| source: | |
| repoURL: "https://github.com/mozilla/webservices-infra" | |
| path: "fxa-testing/k8s/fxa-testing" | |
| - # Retain environment level dig scope for single chart tenants | |
| - targetRevision: '{{ dig "target_revision" "main" . }}' | |
| + targetRevision: '{{ dig "charts" "fxa-testing" "target_revision" "main" . }}' | |
| helm: | |
| parameters: | |
| - name: global.mozcloud.app_code | |
| @@ -19951,7 +19960,7 @@ | |
| value: moz-fx-fxa-testing-nonprod | |
| - name: global.mozcloud.realm | |
| value: nonprod | |
| - releaseName: '{{ dig "release_name" "fxa-testing" . }}' # Primarily used to import existing helm releases | |
| + releaseName: '{{ dig "charts" "fxa-testing" "release_name" "fxa-testing" . }}' # Primarily used to import existing helm releases | |
| valueFiles: | |
| - values.yaml | |
| - 'values-{{ .name }}.yaml' | |
| @@ -19959,15 +19968,14 @@ | |
| name: "webservices-high-private-nonprod-us-west1" | |
| namespace: "fxa-testing-{{ .name }}" | |
| info: | |
| - # Retain environment level dig scope for single chart tenants | |
| - name: 'Helm Chart' | |
| value: 'https://github.com/mozilla/webservices-infra/tree/{{ dig "target_revision" "main" . }}/fxa-testing/k8s/fxa-testing' | |
| - name: 'Helm Chart Ref' | |
| - value: '{{ dig "target_revision" "main" . }}' | |
| + value: '{{ dig "charts" "fxa-testing" "target_revision" "main" . }}' | |
| - name: 'Application Repository' | |
| - value: '{{ dig "application_repository" "" . }}' | |
| + value: '{{ dig "charts" "fxa-testing" "application_repository" "" . }}' | |
| - name: 'Image Repository' | |
| - value: '{{ dig "image_repository" "us-docker.pkg.dev/moz-fx-fxa-testing-prod/fxa-testing-prod/restmail" . }}' | |
| + value: '{{ dig "charts" "fxa-testing" "image_repository" "us-docker.pkg.dev/moz-fx-fxa-testing-prod/fxa-testing-prod/restmail" . }}' | |
| - name: 'Tenant Definition' | |
| value: 'https://github.com/mozilla/global-platform-admin/blob/main/tenants/fxa-testing.yaml' | |
| # Will ignore differences between live and desired states during the diff. Note that these configurations are not | |
| @@ -20027,13 +20030,16 @@ | |
| tenant: "fxa-testing" | |
| realm: "prod" | |
| annotations: | |
| - argocd-image-updater.argoproj.io/app.helm.image-name: 'image.name' | |
| - argocd-image-updater.argoproj.io/app.helm.image-tag: 'image.tag' | |
| - # Retain environment level dig scope for single chart tenants | |
| - argocd-image-updater.argoproj.io/image-list: 'app={{ dig "image_repository" "us-docker.pkg.dev/moz-fx-fxa-testing-prod/fxa-testing-prod/restmail" . }}' | |
| - argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "image_regex" ".*" . }}' | |
| - argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "update_strategy" "newest-build" . }}' | |
| - argocd-image-updater.argoproj.io/git-branch: '{{ dig "target_revision" "main" . }}' | |
| + # We want this to render: image_tag' | |
| + argocd-image-updater.argoproj.io/app.helm.image-name: '{{ dig "charts" "fxa-testing" "image_name" "image.name" . }}' | |
| + argocd-image-updater.argoproj.io/app.helm.image-tag: '{{ dig "charts" "fxa-testing" "image_tag" "image.tag" . }}' | |
| + # The ApplicationSet template will render backslashes from image_regex values | |
| + # as escape characters. To avoid this, we have to escape one level above. | |
| + # We want this to render: .*' | |
| + argocd-image-updater.argoproj.io/image-list: 'app={{ dig "charts" "fxa-testing" "image_repository" "us-docker.pkg.dev/moz-fx-fxa-testing-prod/fxa-testing-prod/restmail" . }}' | |
| + argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "charts" "fxa-testing" "image_regex" (dig "image_regex" ".*" .) . }}' | |
| + argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "charts" "fxa-testing" "update_strategy" "newest-build" . }}' | |
| + argocd-image-updater.argoproj.io/git-branch: '{{ dig "charts" "fxa-testing" "target_revision" "main" . }}' | |
| argocd-image-updater.argoproj.io/write-back-method: 'git:secret:argocd-webservices/image-updater-github-credentials' #pragma: allowlist secret | |
| # resolves to the fxa-testing/k8s/fxa-testing/templates directory and values/Chart files | |
| # image updater creates .argocd-* files in the chart directory to manage image updates | |
| @@ -20059,8 +20065,7 @@ | |
| source: | |
| repoURL: "https://github.com/mozilla/webservices-infra" | |
| path: "fxa-testing/k8s/fxa-testing" | |
| - # Retain environment level dig scope for single chart tenants | |
| - targetRevision: '{{ dig "target_revision" "main" . }}' | |
| + targetRevision: '{{ dig "charts" "fxa-testing" "target_revision" "main" . }}' | |
| helm: | |
| parameters: | |
| - name: global.mozcloud.app_code | |
| @@ -20075,7 +20080,7 @@ | |
| value: moz-fx-fxa-testing-prod | |
| - name: global.mozcloud.realm | |
| value: prod | |
| - releaseName: '{{ dig "release_name" "fxa-testing" . }}' # Primarily used to import existing helm releases | |
| + releaseName: '{{ dig "charts" "fxa-testing" "release_name" "fxa-testing" . }}' # Primarily used to import existing helm releases | |
| valueFiles: | |
| - values.yaml | |
| - 'values-{{ .name }}.yaml' | |
| @@ -20083,15 +20088,14 @@ | |
| name: "webservices-high-private-prod-us-west1" | |
| namespace: "fxa-testing-{{ .name }}" | |
| info: | |
| - # Retain environment level dig scope for single chart tenants | |
| - name: 'Helm Chart' | |
| value: 'https://github.com/mozilla/webservices-infra/tree/{{ dig "target_revision" "main" . }}/fxa-testing/k8s/fxa-testing' | |
| - name: 'Helm Chart Ref' | |
| - value: '{{ dig "target_revision" "main" . }}' | |
| + value: '{{ dig "charts" "fxa-testing" "target_revision" "main" . }}' | |
| - name: 'Application Repository' | |
| - value: '{{ dig "application_repository" "" . }}' | |
| + value: '{{ dig "charts" "fxa-testing" "application_repository" "" . }}' | |
| - name: 'Image Repository' | |
| - value: '{{ dig "image_repository" "us-docker.pkg.dev/moz-fx-fxa-testing-prod/fxa-testing-prod/restmail" . }}' | |
| + value: '{{ dig "charts" "fxa-testing" "image_repository" "us-docker.pkg.dev/moz-fx-fxa-testing-prod/fxa-testing-prod/restmail" . }}' | |
| - name: 'Tenant Definition' | |
| value: 'https://github.com/mozilla/global-platform-admin/blob/main/tenants/fxa-testing.yaml' | |
| # Will ignore differences between live and desired states during the diff. Note that these configurations are not | |
| @@ -20152,13 +20151,16 @@ | |
| tenant: "git-hg-sync" | |
| realm: "nonprod" | |
| annotations: | |
| - argocd-image-updater.argoproj.io/app.helm.image-name: 'image.name' | |
| - argocd-image-updater.argoproj.io/app.helm.image-tag: 'image.tag' | |
| - # Retain environment level dig scope for single chart tenants | |
| - argocd-image-updater.argoproj.io/image-list: 'app={{ dig "image_repository" "us-docker.pkg.dev/moz-fx-git-hg-sync-prod/git-hg-sync-prod/git-hg-sync" . }}' | |
| - argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "image_regex" ".*" . }}' | |
| - argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "update_strategy" "newest-build" . }}' | |
| - argocd-image-updater.argoproj.io/git-branch: '{{ dig "target_revision" "main" . }}' | |
| + # We want this to render: image_tag' | |
| + argocd-image-updater.argoproj.io/app.helm.image-name: '{{ dig "charts" "git-hg-sync" "image_name" "image.name" . }}' | |
| + argocd-image-updater.argoproj.io/app.helm.image-tag: '{{ dig "charts" "git-hg-sync" "image_tag" "image.tag" . }}' | |
| + # The ApplicationSet template will render backslashes from image_regex values | |
| + # as escape characters. To avoid this, we have to escape one level above. | |
| + # We want this to render: .*' | |
| + argocd-image-updater.argoproj.io/image-list: 'app={{ dig "charts" "git-hg-sync" "image_repository" "us-docker.pkg.dev/moz-fx-git-hg-sync-prod/git-hg-sync-prod/git-hg-sync" . }}' | |
| + argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "charts" "git-hg-sync" "image_regex" (dig "image_regex" ".*" .) . }}' | |
| + argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "charts" "git-hg-sync" "update_strategy" "newest-build" . }}' | |
| + argocd-image-updater.argoproj.io/git-branch: '{{ dig "charts" "git-hg-sync" "target_revision" "main" . }}' | |
| argocd-image-updater.argoproj.io/write-back-method: 'git:secret:argocd-webservices/image-updater-github-credentials' #pragma: allowlist secret | |
| # resolves to the git-hg-sync/k8s/git-hg-sync/templates directory and values/Chart files | |
| # image updater creates .argocd-* files in the chart directory to manage image updates | |
| @@ -20184,8 +20186,7 @@ | |
| source: | |
| repoURL: "https://github.com/mozilla/webservices-infra" | |
| path: "git-hg-sync/k8s/git-hg-sync" | |
| - # Retain environment level dig scope for single chart tenants | |
| - targetRevision: '{{ dig "target_revision" "main" . }}' | |
| + targetRevision: '{{ dig "charts" "git-hg-sync" "target_revision" "main" . }}' | |
| helm: | |
| parameters: | |
| - name: global.mozcloud.app_code | |
| @@ -20200,7 +20201,7 @@ | |
| value: moz-fx-git-hg-sync-nonprod | |
| - name: global.mozcloud.realm | |
| value: nonprod | |
| - releaseName: '{{ dig "release_name" "git-hg-sync" . }}' # Primarily used to import existing helm releases | |
| + releaseName: '{{ dig "charts" "git-hg-sync" "release_name" "git-hg-sync" . }}' # Primarily used to import existing helm releases | |
| valueFiles: | |
| - values.yaml | |
| - 'values-{{ .name }}.yaml' | |
| @@ -20208,15 +20209,14 @@ | |
| name: "webservices-high-private-nonprod-us-west1" | |
| namespace: "git-hg-sync-{{ .name }}" | |
| info: | |
| - # Retain environment level dig scope for single chart tenants | |
| - name: 'Helm Chart' | |
| value: 'https://github.com/mozilla/webservices-infra/tree/{{ dig "target_revision" "main" . }}/git-hg-sync/k8s/git-hg-sync' | |
| - name: 'Helm Chart Ref' | |
| - value: '{{ dig "target_revision" "main" . }}' | |
| + value: '{{ dig "charts" "git-hg-sync" "target_revision" "main" . }}' | |
| - name: 'Application Repository' | |
| - value: '{{ dig "application_repository" "" . }}' | |
| + value: '{{ dig "charts" "git-hg-sync" "application_repository" "" . }}' | |
| - name: 'Image Repository' | |
| - value: '{{ dig "image_repository" "us-docker.pkg.dev/moz-fx-git-hg-sync-prod/git-hg-sync-prod/git-hg-sync" . }}' | |
| + value: '{{ dig "charts" "git-hg-sync" "image_repository" "us-docker.pkg.dev/moz-fx-git-hg-sync-prod/git-hg-sync-prod/git-hg-sync" . }}' | |
| - name: 'Tenant Definition' | |
| value: 'https://github.com/mozilla/global-platform-admin/blob/main/tenants/git-hg-sync.yaml' | |
| # Will ignore differences between live and desired states during the diff. Note that these configurations are not | |
| @@ -20276,13 +20271,16 @@ | |
| tenant: "git-hg-sync" | |
| realm: "prod" | |
| annotations: | |
| - argocd-image-updater.argoproj.io/app.helm.image-name: 'image.name' | |
| - argocd-image-updater.argoproj.io/app.helm.image-tag: 'image.tag' | |
| - # Retain environment level dig scope for single chart tenants | |
| - argocd-image-updater.argoproj.io/image-list: 'app={{ dig "image_repository" "us-docker.pkg.dev/moz-fx-git-hg-sync-prod/git-hg-sync-prod/git-hg-sync" . }}' | |
| - argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "image_regex" ".*" . }}' | |
| - argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "update_strategy" "newest-build" . }}' | |
| - argocd-image-updater.argoproj.io/git-branch: '{{ dig "target_revision" "main" . }}' | |
| + # We want this to render: image_tag' | |
| + argocd-image-updater.argoproj.io/app.helm.image-name: '{{ dig "charts" "git-hg-sync" "image_name" "image.name" . }}' | |
| + argocd-image-updater.argoproj.io/app.helm.image-tag: '{{ dig "charts" "git-hg-sync" "image_tag" "image.tag" . }}' | |
| + # The ApplicationSet template will render backslashes from image_regex values | |
| + # as escape characters. To avoid this, we have to escape one level above. | |
| + # We want this to render: .*' | |
| + argocd-image-updater.argoproj.io/image-list: 'app={{ dig "charts" "git-hg-sync" "image_repository" "us-docker.pkg.dev/moz-fx-git-hg-sync-prod/git-hg-sync-prod/git-hg-sync" . }}' | |
| + argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "charts" "git-hg-sync" "image_regex" (dig "image_regex" ".*" .) . }}' | |
| + argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "charts" "git-hg-sync" "update_strategy" "newest-build" . }}' | |
| + argocd-image-updater.argoproj.io/git-branch: '{{ dig "charts" "git-hg-sync" "target_revision" "main" . }}' | |
| argocd-image-updater.argoproj.io/write-back-method: 'git:secret:argocd-webservices/image-updater-github-credentials' #pragma: allowlist secret | |
| # resolves to the git-hg-sync/k8s/git-hg-sync/templates directory and values/Chart files | |
| # image updater creates .argocd-* files in the chart directory to manage image updates | |
| @@ -20308,8 +20306,7 @@ | |
| source: | |
| repoURL: "https://github.com/mozilla/webservices-infra" | |
| path: "git-hg-sync/k8s/git-hg-sync" | |
| - # Retain environment level dig scope for single chart tenants | |
| - targetRevision: '{{ dig "target_revision" "main" . }}' | |
| + targetRevision: '{{ dig "charts" "git-hg-sync" "target_revision" "main" . }}' | |
| helm: | |
| parameters: | |
| - name: global.mozcloud.app_code | |
| @@ -20324,7 +20321,7 @@ | |
| value: moz-fx-git-hg-sync-prod | |
| - name: global.mozcloud.realm | |
| value: prod | |
| - releaseName: '{{ dig "release_name" "git-hg-sync" . }}' # Primarily used to import existing helm releases | |
| + releaseName: '{{ dig "charts" "git-hg-sync" "release_name" "git-hg-sync" . }}' # Primarily used to import existing helm releases | |
| valueFiles: | |
| - values.yaml | |
| - 'values-{{ .name }}.yaml' | |
| @@ -20332,15 +20329,14 @@ | |
| name: "webservices-high-private-prod-us-west1" | |
| namespace: "git-hg-sync-{{ .name }}" | |
| info: | |
| - # Retain environment level dig scope for single chart tenants | |
| - name: 'Helm Chart' | |
| value: 'https://github.com/mozilla/webservices-infra/tree/{{ dig "target_revision" "main" . }}/git-hg-sync/k8s/git-hg-sync' | |
| - name: 'Helm Chart Ref' | |
| - value: '{{ dig "target_revision" "main" . }}' | |
| + value: '{{ dig "charts" "git-hg-sync" "target_revision" "main" . }}' | |
| - name: 'Application Repository' | |
| - value: '{{ dig "application_repository" "" . }}' | |
| + value: '{{ dig "charts" "git-hg-sync" "application_repository" "" . }}' | |
| - name: 'Image Repository' | |
| - value: '{{ dig "image_repository" "us-docker.pkg.dev/moz-fx-git-hg-sync-prod/git-hg-sync-prod/git-hg-sync" . }}' | |
| + value: '{{ dig "charts" "git-hg-sync" "image_repository" "us-docker.pkg.dev/moz-fx-git-hg-sync-prod/git-hg-sync-prod/git-hg-sync" . }}' | |
| - name: 'Tenant Definition' | |
| value: 'https://github.com/mozilla/global-platform-admin/blob/main/tenants/git-hg-sync.yaml' | |
| # Will ignore differences between live and desired states during the diff. Note that these configurations are not | |
| @@ -20400,6 +20391,17 @@ | |
| tenant: "grafana" | |
| realm: "nonprod" | |
| annotations: | |
| + # We want this to render: image_tag' | |
| + argocd-image-updater.argoproj.io/app.helm.image-name: '{{ dig "charts" "grafana" "image_name" "image.name" . }}' | |
| + argocd-image-updater.argoproj.io/app.helm.image-tag: '{{ dig "charts" "grafana" "image_tag" "image.tag" . }}' | |
| + # The ApplicationSet template will render backslashes from image_regex values | |
| + # as escape characters. To avoid this, we have to escape one level above. | |
| + # We want this to render: .*' | |
| + argocd-image-updater.argoproj.io/image-list: 'app={{ dig "charts" "grafana" "image_repository" "us-west1-docker.pkg.dev/moz-fx-platform-artifacts/platform-dockerhub-cache/grafana/grafana-oss" . }}' | |
| + argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "charts" "grafana" "image_regex" (dig "image_regex" ".*" .) . }}' | |
| + argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "charts" "grafana" "update_strategy" "newest-build" . }}' | |
| + argocd-image-updater.argoproj.io/git-branch: '{{ dig "charts" "grafana" "target_revision" "main" . }}' | |
| + argocd-image-updater.argoproj.io/write-back-method: 'git:secret:argocd-webservices/image-updater-github-credentials' #pragma: allowlist secret | |
| # resolves to the grafana/k8s/grafana/templates directory and values/Chart files | |
| # image updater creates .argocd-* files in the chart directory to manage image updates | |
| # this will trigger a sync on every application that is consuming these charts which is not intended | |
| @@ -20424,8 +20426,7 @@ | |
| source: | |
| repoURL: "https://github.com/mozilla/webservices-infra" | |
| path: "grafana/k8s/grafana" | |
| - # Retain environment level dig scope for single chart tenants | |
| - targetRevision: '{{ dig "target_revision" "main" . }}' | |
| + targetRevision: '{{ dig "charts" "grafana" "target_revision" "main" . }}' | |
| helm: | |
| parameters: | |
| - name: global.mozcloud.app_code | |
| @@ -20440,7 +20441,7 @@ | |
| value: moz-fx-grafana-nonprod | |
| - name: global.mozcloud.realm | |
| value: nonprod | |
| - releaseName: '{{ dig "release_name" "grafana" . }}' # Primarily used to import existing helm releases | |
| + releaseName: '{{ dig "charts" "grafana" "release_name" "grafana" . }}' # Primarily used to import existing helm releases | |
| valueFiles: | |
| - values.yaml | |
| - 'values-{{ .name }}.yaml' | |
| @@ -20448,15 +20449,14 @@ | |
| name: "webservices-high-private-nonprod-us-west1" | |
| namespace: "grafana-{{ .name }}" | |
| info: | |
| - # Retain environment level dig scope for single chart tenants | |
| - name: 'Helm Chart' | |
| value: 'https://github.com/mozilla/webservices-infra/tree/{{ dig "target_revision" "main" . }}/grafana/k8s/grafana' | |
| - name: 'Helm Chart Ref' | |
| - value: '{{ dig "target_revision" "main" . }}' | |
| + value: '{{ dig "charts" "grafana" "target_revision" "main" . }}' | |
| - name: 'Application Repository' | |
| - value: '{{ dig "application_repository" "" . }}' | |
| + value: '{{ dig "charts" "grafana" "application_repository" "" . }}' | |
| - name: 'Image Repository' | |
| - value: '{{ dig "image_repository" "us-west1-docker.pkg.dev/moz-fx-platform-artifacts/platform-dockerhub-cache/grafana/grafana-oss" . }}' | |
| + value: '{{ dig "charts" "grafana" "image_repository" "us-west1-docker.pkg.dev/moz-fx-platform-artifacts/platform-dockerhub-cache/grafana/grafana-oss" . }}' | |
| - name: 'Tenant Definition' | |
| value: 'https://github.com/mozilla/global-platform-admin/blob/main/tenants/grafana.yaml' | |
| # Will ignore differences between live and desired states during the diff. Note that these configurations are not | |
| @@ -20516,6 +20511,17 @@ | |
| tenant: "grafana" | |
| realm: "prod" | |
| annotations: | |
| + # We want this to render: image_tag' | |
| + argocd-image-updater.argoproj.io/app.helm.image-name: '{{ dig "charts" "grafana" "image_name" "image.name" . }}' | |
| + argocd-image-updater.argoproj.io/app.helm.image-tag: '{{ dig "charts" "grafana" "image_tag" "image.tag" . }}' | |
| + # The ApplicationSet template will render backslashes from image_regex values | |
| + # as escape characters. To avoid this, we have to escape one level above. | |
| + # We want this to render: .*' | |
| + argocd-image-updater.argoproj.io/image-list: 'app={{ dig "charts" "grafana" "image_repository" "us-west1-docker.pkg.dev/moz-fx-platform-artifacts/platform-dockerhub-cache/grafana/grafana-oss" . }}' | |
| + argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "charts" "grafana" "image_regex" (dig "image_regex" ".*" .) . }}' | |
| + argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "charts" "grafana" "update_strategy" "newest-build" . }}' | |
| + argocd-image-updater.argoproj.io/git-branch: '{{ dig "charts" "grafana" "target_revision" "main" . }}' | |
| + argocd-image-updater.argoproj.io/write-back-method: 'git:secret:argocd-webservices/image-updater-github-credentials' #pragma: allowlist secret | |
| # resolves to the grafana/k8s/grafana/templates directory and values/Chart files | |
| # image updater creates .argocd-* files in the chart directory to manage image updates | |
| # this will trigger a sync on every application that is consuming these charts which is not intended | |
| @@ -20540,8 +20546,7 @@ | |
| source: | |
| repoURL: "https://github.com/mozilla/webservices-infra" | |
| path: "grafana/k8s/grafana" | |
| - # Retain environment level dig scope for single chart tenants | |
| - targetRevision: '{{ dig "target_revision" "main" . }}' | |
| + targetRevision: '{{ dig "charts" "grafana" "target_revision" "main" . }}' | |
| helm: | |
| parameters: | |
| - name: global.mozcloud.app_code | |
| @@ -20556,7 +20561,7 @@ | |
| value: moz-fx-grafana-prod | |
| - name: global.mozcloud.realm | |
| value: prod | |
| - releaseName: '{{ dig "release_name" "grafana" . }}' # Primarily used to import existing helm releases | |
| + releaseName: '{{ dig "charts" "grafana" "release_name" "grafana" . }}' # Primarily used to import existing helm releases | |
| valueFiles: | |
| - values.yaml | |
| - 'values-{{ .name }}.yaml' | |
| @@ -20564,15 +20569,14 @@ | |
| name: "webservices-high-private-prod-us-west1" | |
| namespace: "grafana-{{ .name }}" | |
| info: | |
| - # Retain environment level dig scope for single chart tenants | |
| - name: 'Helm Chart' | |
| value: 'https://github.com/mozilla/webservices-infra/tree/{{ dig "target_revision" "main" . }}/grafana/k8s/grafana' | |
| - name: 'Helm Chart Ref' | |
| - value: '{{ dig "target_revision" "main" . }}' | |
| + value: '{{ dig "charts" "grafana" "target_revision" "main" . }}' | |
| - name: 'Application Repository' | |
| - value: '{{ dig "application_repository" "" . }}' | |
| + value: '{{ dig "charts" "grafana" "application_repository" "" . }}' | |
| - name: 'Image Repository' | |
| - value: '{{ dig "image_repository" "us-west1-docker.pkg.dev/moz-fx-platform-artifacts/platform-dockerhub-cache/grafana/grafana-oss" . }}' | |
| + value: '{{ dig "charts" "grafana" "image_repository" "us-west1-docker.pkg.dev/moz-fx-platform-artifacts/platform-dockerhub-cache/grafana/grafana-oss" . }}' | |
| - name: 'Tenant Definition' | |
| value: 'https://github.com/mozilla/global-platform-admin/blob/main/tenants/grafana.yaml' | |
| # Will ignore differences between live and desired states during the diff. Note that these configurations are not | |
| @@ -20633,6 +20632,17 @@ | |
| tenant: "iam" | |
| realm: "nonprod" | |
| annotations: | |
| + # We want this to render: image_tag' | |
| + argocd-image-updater.argoproj.io/app.helm.image-name: '{{ dig "charts" "cis" "image_name" "image.name" . }}' | |
| + argocd-image-updater.argoproj.io/app.helm.image-tag: '{{ dig "charts" "cis" "image_tag" "image.tag" . }}' | |
| + # The ApplicationSet template will render backslashes from image_regex values | |
| + # as escape characters. To avoid this, we have to escape one level above. | |
| + # We want this to render: .*' | |
| + argocd-image-updater.argoproj.io/image-list: 'app={{ dig "charts" "cis" "image_repository" "us-docker.pkg.dev/moz-fx-iam-prod/iam-prod/cis" . }}' | |
| + argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "charts" "cis" "image_regex" (dig "image_regex" ".*" .) . }}' | |
| + argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "charts" "cis" "update_strategy" "newest-build" . }}' | |
| + argocd-image-updater.argoproj.io/git-branch: '{{ dig "charts" "cis" "target_revision" "main" . }}' | |
| + argocd-image-updater.argoproj.io/write-back-method: 'git:secret:argocd-webservices/image-updater-github-credentials' #pragma: allowlist secret | |
| # resolves to the iam/k8s/cis/templates directory and values/Chart files | |
| # image updater creates .argocd-* files in the chart directory to manage image updates | |
| # this will trigger a sync on every application that is consuming these charts which is not intended | |
| @@ -20747,6 +20757,17 @@ | |
| tenant: "iam" | |
| realm: "prod" | |
| annotations: | |
| + # We want this to render: image_tag' | |
| + argocd-image-updater.argoproj.io/app.helm.image-name: '{{ dig "charts" "cis" "image_name" "image.name" . }}' | |
| + argocd-image-updater.argoproj.io/app.helm.image-tag: '{{ dig "charts" "cis" "image_tag" "image.tag" . }}' | |
| + # The ApplicationSet template will render backslashes from image_regex values | |
| + # as escape characters. To avoid this, we have to escape one level above. | |
| + # We want this to render: .*' | |
| + argocd-image-updater.argoproj.io/image-list: 'app={{ dig "charts" "cis" "image_repository" "us-docker.pkg.dev/moz-fx-iam-prod/iam-prod/cis" . }}' | |
| + argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "charts" "cis" "image_regex" (dig "image_regex" ".*" .) . }}' | |
| + argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "charts" "cis" "update_strategy" "newest-build" . }}' | |
| + argocd-image-updater.argoproj.io/git-branch: '{{ dig "charts" "cis" "target_revision" "main" . }}' | |
| + argocd-image-updater.argoproj.io/write-back-method: 'git:secret:argocd-webservices/image-updater-github-credentials' #pragma: allowlist secret | |
| # resolves to the iam/k8s/cis/templates directory and values/Chart files | |
| # image updater creates .argocd-* files in the chart directory to manage image updates | |
| # this will trigger a sync on every application that is consuming these charts which is not intended | |
| @@ -20861,13 +20882,16 @@ | |
| tenant: "jbi" | |
| realm: "nonprod" | |
| annotations: | |
| - argocd-image-updater.argoproj.io/app.helm.image-name: 'image.name' | |
| - argocd-image-updater.argoproj.io/app.helm.image-tag: 'image.tag' | |
| - # Retain environment level dig scope for single chart tenants | |
| - argocd-image-updater.argoproj.io/image-list: 'app={{ dig "image_repository" "us-docker.pkg.dev/moz-fx-jbi-prod/jbi-prod/jbi" . }}' | |
| - argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "image_regex" ".*" . }}' | |
| - argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "update_strategy" "newest-build" . }}' | |
| - argocd-image-updater.argoproj.io/git-branch: '{{ dig "target_revision" "main" . }}' | |
| + # We want this to render: image_tag' | |
| + argocd-image-updater.argoproj.io/app.helm.image-name: '{{ dig "charts" "jbi" "image_name" "image.name" . }}' | |
| + argocd-image-updater.argoproj.io/app.helm.image-tag: '{{ dig "charts" "jbi" "image_tag" "image.tag" . }}' | |
| + # The ApplicationSet template will render backslashes from image_regex values | |
| + # as escape characters. To avoid this, we have to escape one level above. | |
| + # We want this to render: .*' | |
| + argocd-image-updater.argoproj.io/image-list: 'app={{ dig "charts" "jbi" "image_repository" "us-docker.pkg.dev/moz-fx-jbi-prod/jbi-prod/jbi" . }}' | |
| + argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "charts" "jbi" "image_regex" (dig "image_regex" ".*" .) . }}' | |
| + argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "charts" "jbi" "update_strategy" "newest-build" . }}' | |
| + argocd-image-updater.argoproj.io/git-branch: '{{ dig "charts" "jbi" "target_revision" "main" . }}' | |
| argocd-image-updater.argoproj.io/write-back-method: 'git:secret:argocd-webservices/image-updater-github-credentials' #pragma: allowlist secret | |
| # resolves to the jbi/k8s/jbi/templates directory and values/Chart files | |
| # image updater creates .argocd-* files in the chart directory to manage image updates | |
| @@ -20893,8 +20917,7 @@ | |
| source: | |
| repoURL: "https://github.com/mozilla/webservices-infra" | |
| path: "jbi/k8s/jbi" | |
| - # Retain environment level dig scope for single chart tenants | |
| - targetRevision: '{{ dig "target_revision" "main" . }}' | |
| + targetRevision: '{{ dig "charts" "jbi" "target_revision" "main" . }}' | |
| helm: | |
| parameters: | |
| - name: global.mozcloud.app_code | |
| @@ -20909,7 +20932,7 @@ | |
| value: moz-fx-jbi-nonprod | |
| - name: global.mozcloud.realm | |
| value: nonprod | |
| - releaseName: '{{ dig "release_name" "jbi" . }}' # Primarily used to import existing helm releases | |
| + releaseName: '{{ dig "charts" "jbi" "release_name" "jbi" . }}' # Primarily used to import existing helm releases | |
| valueFiles: | |
| - values.yaml | |
| - 'values-{{ .name }}.yaml' | |
| @@ -20917,15 +20940,14 @@ | |
| name: "webservices-low-private-nonprod-us-west1" | |
| namespace: "jbi-{{ .name }}" | |
| info: | |
| - # Retain environment level dig scope for single chart tenants | |
| - name: 'Helm Chart' | |
| value: 'https://github.com/mozilla/webservices-infra/tree/{{ dig "target_revision" "main" . }}/jbi/k8s/jbi' | |
| - name: 'Helm Chart Ref' | |
| - value: '{{ dig "target_revision" "main" . }}' | |
| + value: '{{ dig "charts" "jbi" "target_revision" "main" . }}' | |
| - name: 'Application Repository' | |
| - value: '{{ dig "application_repository" "" . }}' | |
| + value: '{{ dig "charts" "jbi" "application_repository" "" . }}' | |
| - name: 'Image Repository' | |
| - value: '{{ dig "image_repository" "us-docker.pkg.dev/moz-fx-jbi-prod/jbi-prod/jbi" . }}' | |
| + value: '{{ dig "charts" "jbi" "image_repository" "us-docker.pkg.dev/moz-fx-jbi-prod/jbi-prod/jbi" . }}' | |
| - name: 'Tenant Definition' | |
| value: 'https://github.com/mozilla/global-platform-admin/blob/main/tenants/jbi.yaml' | |
| # Will ignore differences between live and desired states during the diff. Note that these configurations are not | |
| @@ -20985,13 +21002,16 @@ | |
| tenant: "jbi" | |
| realm: "prod" | |
| annotations: | |
| - argocd-image-updater.argoproj.io/app.helm.image-name: 'image.name' | |
| - argocd-image-updater.argoproj.io/app.helm.image-tag: 'image.tag' | |
| - # Retain environment level dig scope for single chart tenants | |
| - argocd-image-updater.argoproj.io/image-list: 'app={{ dig "image_repository" "us-docker.pkg.dev/moz-fx-jbi-prod/jbi-prod/jbi" . }}' | |
| - argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "image_regex" ".*" . }}' | |
| - argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "update_strategy" "newest-build" . }}' | |
| - argocd-image-updater.argoproj.io/git-branch: '{{ dig "target_revision" "main" . }}' | |
| + # We want this to render: image_tag' | |
| + argocd-image-updater.argoproj.io/app.helm.image-name: '{{ dig "charts" "jbi" "image_name" "image.name" . }}' | |
| + argocd-image-updater.argoproj.io/app.helm.image-tag: '{{ dig "charts" "jbi" "image_tag" "image.tag" . }}' | |
| + # The ApplicationSet template will render backslashes from image_regex values | |
| + # as escape characters. To avoid this, we have to escape one level above. | |
| + # We want this to render: .*' | |
| + argocd-image-updater.argoproj.io/image-list: 'app={{ dig "charts" "jbi" "image_repository" "us-docker.pkg.dev/moz-fx-jbi-prod/jbi-prod/jbi" . }}' | |
| + argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "charts" "jbi" "image_regex" (dig "image_regex" ".*" .) . }}' | |
| + argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "charts" "jbi" "update_strategy" "newest-build" . }}' | |
| + argocd-image-updater.argoproj.io/git-branch: '{{ dig "charts" "jbi" "target_revision" "main" . }}' | |
| argocd-image-updater.argoproj.io/write-back-method: 'git:secret:argocd-webservices/image-updater-github-credentials' #pragma: allowlist secret | |
| # resolves to the jbi/k8s/jbi/templates directory and values/Chart files | |
| # image updater creates .argocd-* files in the chart directory to manage image updates | |
| @@ -21017,8 +21037,7 @@ | |
| source: | |
| repoURL: "https://github.com/mozilla/webservices-infra" | |
| path: "jbi/k8s/jbi" | |
| - # Retain environment level dig scope for single chart tenants | |
| - targetRevision: '{{ dig "target_revision" "main" . }}' | |
| + targetRevision: '{{ dig "charts" "jbi" "target_revision" "main" . }}' | |
| helm: | |
| parameters: | |
| - name: global.mozcloud.app_code | |
| @@ -21033,7 +21052,7 @@ | |
| value: moz-fx-jbi-prod | |
| - name: global.mozcloud.realm | |
| value: prod | |
| - releaseName: '{{ dig "release_name" "jbi" . }}' # Primarily used to import existing helm releases | |
| + releaseName: '{{ dig "charts" "jbi" "release_name" "jbi" . }}' # Primarily used to import existing helm releases | |
| valueFiles: | |
| - values.yaml | |
| - 'values-{{ .name }}.yaml' | |
| @@ -21041,15 +21060,14 @@ | |
| name: "webservices-low-private-prod-us-west1" | |
| namespace: "jbi-{{ .name }}" | |
| info: | |
| - # Retain environment level dig scope for single chart tenants | |
| - name: 'Helm Chart' | |
| value: 'https://github.com/mozilla/webservices-infra/tree/{{ dig "target_revision" "main" . }}/jbi/k8s/jbi' | |
| - name: 'Helm Chart Ref' | |
| - value: '{{ dig "target_revision" "main" . }}' | |
| + value: '{{ dig "charts" "jbi" "target_revision" "main" . }}' | |
| - name: 'Application Repository' | |
| - value: '{{ dig "application_repository" "" . }}' | |
| + value: '{{ dig "charts" "jbi" "application_repository" "" . }}' | |
| - name: 'Image Repository' | |
| - value: '{{ dig "image_repository" "us-docker.pkg.dev/moz-fx-jbi-prod/jbi-prod/jbi" . }}' | |
| + value: '{{ dig "charts" "jbi" "image_repository" "us-docker.pkg.dev/moz-fx-jbi-prod/jbi-prod/jbi" . }}' | |
| - name: 'Tenant Definition' | |
| value: 'https://github.com/mozilla/global-platform-admin/blob/main/tenants/jbi.yaml' | |
| # Will ignore differences between live and desired states during the diff. Note that these configurations are not | |
| @@ -21110,13 +21123,16 @@ | |
| tenant: "lando" | |
| realm: "nonprod" | |
| annotations: | |
| - argocd-image-updater.argoproj.io/app.helm.image-name: 'image.name' | |
| - argocd-image-updater.argoproj.io/app.helm.image-tag: 'image.tag' | |
| - # Retain environment level dig scope for single chart tenants | |
| - argocd-image-updater.argoproj.io/image-list: 'app={{ dig "image_repository" "us-docker.pkg.dev/moz-fx-lando-prod/lando-prod/lando" . }}' | |
| - argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "image_regex" ".*" . }}' | |
| - argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "update_strategy" "newest-build" . }}' | |
| - argocd-image-updater.argoproj.io/git-branch: '{{ dig "target_revision" "main" . }}' | |
| + # We want this to render: image_tag' | |
| + argocd-image-updater.argoproj.io/app.helm.image-name: '{{ dig "charts" "lando" "image_name" "image.name" . }}' | |
| + argocd-image-updater.argoproj.io/app.helm.image-tag: '{{ dig "charts" "lando" "image_tag" "image.tag" . }}' | |
| + # The ApplicationSet template will render backslashes from image_regex values | |
| + # as escape characters. To avoid this, we have to escape one level above. | |
| + # We want this to render: .*' | |
| + argocd-image-updater.argoproj.io/image-list: 'app={{ dig "charts" "lando" "image_repository" "us-docker.pkg.dev/moz-fx-lando-prod/lando-prod/lando" . }}' | |
| + argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "charts" "lando" "image_regex" (dig "image_regex" ".*" .) . }}' | |
| + argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "charts" "lando" "update_strategy" "newest-build" . }}' | |
| + argocd-image-updater.argoproj.io/git-branch: '{{ dig "charts" "lando" "target_revision" "main" . }}' | |
| argocd-image-updater.argoproj.io/write-back-method: 'git:secret:argocd-webservices/image-updater-github-credentials' #pragma: allowlist secret | |
| # resolves to the lando/k8s/lando/templates directory and values/Chart files | |
| # image updater creates .argocd-* files in the chart directory to manage image updates | |
| @@ -21142,8 +21158,7 @@ | |
| source: | |
| repoURL: "https://github.com/mozilla/webservices-infra" | |
| path: "lando/k8s/lando" | |
| - # Retain environment level dig scope for single chart tenants | |
| - targetRevision: '{{ dig "target_revision" "main" . }}' | |
| + targetRevision: '{{ dig "charts" "lando" "target_revision" "main" . }}' | |
| helm: | |
| parameters: | |
| - name: global.mozcloud.app_code | |
| @@ -21158,7 +21173,7 @@ | |
| value: moz-fx-lando-nonprod | |
| - name: global.mozcloud.realm | |
| value: nonprod | |
| - releaseName: '{{ dig "release_name" "lando" . }}' # Primarily used to import existing helm releases | |
| + releaseName: '{{ dig "charts" "lando" "release_name" "lando" . }}' # Primarily used to import existing helm releases | |
| valueFiles: | |
| - values.yaml | |
| - 'values-{{ .name }}.yaml' | |
| @@ -21166,15 +21181,14 @@ | |
| name: "webservices-high-private-nonprod-us-west1" | |
| namespace: "lando-{{ .name }}" | |
| info: | |
| - # Retain environment level dig scope for single chart tenants | |
| - name: 'Helm Chart' | |
| value: 'https://github.com/mozilla/webservices-infra/tree/{{ dig "target_revision" "main" . }}/lando/k8s/lando' | |
| - name: 'Helm Chart Ref' | |
| - value: '{{ dig "target_revision" "main" . }}' | |
| + value: '{{ dig "charts" "lando" "target_revision" "main" . }}' | |
| - name: 'Application Repository' | |
| - value: '{{ dig "application_repository" "mozilla-conduit/lando" . }}' | |
| + value: '{{ dig "charts" "lando" "application_repository" "mozilla-conduit/lando" . }}' | |
| - name: 'Image Repository' | |
| - value: '{{ dig "image_repository" "us-docker.pkg.dev/moz-fx-lando-prod/lando-prod/lando" . }}' | |
| + value: '{{ dig "charts" "lando" "image_repository" "us-docker.pkg.dev/moz-fx-lando-prod/lando-prod/lando" . }}' | |
| - name: 'Tenant Definition' | |
| value: 'https://github.com/mozilla/global-platform-admin/blob/main/tenants/lando.yaml' | |
| # Will ignore differences between live and desired states during the diff. Note that these configurations are not | |
| @@ -21234,13 +21243,16 @@ | |
| tenant: "lando" | |
| realm: "prod" | |
| annotations: | |
| - argocd-image-updater.argoproj.io/app.helm.image-name: 'image.name' | |
| - argocd-image-updater.argoproj.io/app.helm.image-tag: 'image.tag' | |
| - # Retain environment level dig scope for single chart tenants | |
| - argocd-image-updater.argoproj.io/image-list: 'app={{ dig "image_repository" "us-docker.pkg.dev/moz-fx-lando-prod/lando-prod/lando" . }}' | |
| - argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "image_regex" ".*" . }}' | |
| - argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "update_strategy" "newest-build" . }}' | |
| - argocd-image-updater.argoproj.io/git-branch: '{{ dig "target_revision" "main" . }}' | |
| + # We want this to render: image_tag' | |
| + argocd-image-updater.argoproj.io/app.helm.image-name: '{{ dig "charts" "lando" "image_name" "image.name" . }}' | |
| + argocd-image-updater.argoproj.io/app.helm.image-tag: '{{ dig "charts" "lando" "image_tag" "image.tag" . }}' | |
| + # The ApplicationSet template will render backslashes from image_regex values | |
| + # as escape characters. To avoid this, we have to escape one level above. | |
| + # We want this to render: .*' | |
| + argocd-image-updater.argoproj.io/image-list: 'app={{ dig "charts" "lando" "image_repository" "us-docker.pkg.dev/moz-fx-lando-prod/lando-prod/lando" . }}' | |
| + argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "charts" "lando" "image_regex" (dig "image_regex" ".*" .) . }}' | |
| + argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "charts" "lando" "update_strategy" "newest-build" . }}' | |
| + argocd-image-updater.argoproj.io/git-branch: '{{ dig "charts" "lando" "target_revision" "main" . }}' | |
| argocd-image-updater.argoproj.io/write-back-method: 'git:secret:argocd-webservices/image-updater-github-credentials' #pragma: allowlist secret | |
| # resolves to the lando/k8s/lando/templates directory and values/Chart files | |
| # image updater creates .argocd-* files in the chart directory to manage image updates | |
| @@ -21266,8 +21278,7 @@ | |
| source: | |
| repoURL: "https://github.com/mozilla/webservices-infra" | |
| path: "lando/k8s/lando" | |
| - # Retain environment level dig scope for single chart tenants | |
| - targetRevision: '{{ dig "target_revision" "main" . }}' | |
| + targetRevision: '{{ dig "charts" "lando" "target_revision" "main" . }}' | |
| helm: | |
| parameters: | |
| - name: global.mozcloud.app_code | |
| @@ -21282,7 +21293,7 @@ | |
| value: moz-fx-lando-prod | |
| - name: global.mozcloud.realm | |
| value: prod | |
| - releaseName: '{{ dig "release_name" "lando" . }}' # Primarily used to import existing helm releases | |
| + releaseName: '{{ dig "charts" "lando" "release_name" "lando" . }}' # Primarily used to import existing helm releases | |
| valueFiles: | |
| - values.yaml | |
| - 'values-{{ .name }}.yaml' | |
| @@ -21290,15 +21301,14 @@ | |
| name: "webservices-high-private-prod-us-west1" | |
| namespace: "lando-{{ .name }}" | |
| info: | |
| - # Retain environment level dig scope for single chart tenants | |
| - name: 'Helm Chart' | |
| value: 'https://github.com/mozilla/webservices-infra/tree/{{ dig "target_revision" "main" . }}/lando/k8s/lando' | |
| - name: 'Helm Chart Ref' | |
| - value: '{{ dig "target_revision" "main" . }}' | |
| + value: '{{ dig "charts" "lando" "target_revision" "main" . }}' | |
| - name: 'Application Repository' | |
| - value: '{{ dig "application_repository" "mozilla-conduit/lando" . }}' | |
| + value: '{{ dig "charts" "lando" "application_repository" "mozilla-conduit/lando" . }}' | |
| - name: 'Image Repository' | |
| - value: '{{ dig "image_repository" "us-docker.pkg.dev/moz-fx-lando-prod/lando-prod/lando" . }}' | |
| + value: '{{ dig "charts" "lando" "image_repository" "us-docker.pkg.dev/moz-fx-lando-prod/lando-prod/lando" . }}' | |
| - name: 'Tenant Definition' | |
| value: 'https://github.com/mozilla/global-platform-admin/blob/main/tenants/lando.yaml' | |
| # Will ignore differences between live and desired states during the diff. Note that these configurations are not | |
| @@ -21610,6 +21615,17 @@ | |
| tenant: "mad" | |
| realm: "nonprod" | |
| annotations: | |
| + # We want this to render: image_tag' | |
| + argocd-image-updater.argoproj.io/app.helm.image-name: '{{ dig "charts" "mad" "image_name" "image.name" . }}' | |
| + argocd-image-updater.argoproj.io/app.helm.image-tag: '{{ dig "charts" "mad" "image_tag" "image.tag" . }}' | |
| + # The ApplicationSet template will render backslashes from image_regex values | |
| + # as escape characters. To avoid this, we have to escape one level above. | |
| + # We want this to render: .*' | |
| + argocd-image-updater.argoproj.io/image-list: 'app={{ dig "charts" "mad" "image_repository" "us-docker.pkg.dev/moz-fx-mad-prod/mad-prod/mad" . }}' | |
| + argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "charts" "mad" "image_regex" (dig "image_regex" ".*" .) . }}' | |
| + argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "charts" "mad" "update_strategy" "newest-build" . }}' | |
| + argocd-image-updater.argoproj.io/git-branch: '{{ dig "charts" "mad" "target_revision" "main" . }}' | |
| + argocd-image-updater.argoproj.io/write-back-method: 'git:secret:argocd-webservices/image-updater-github-credentials' #pragma: allowlist secret | |
| # resolves to the mad/k8s/mad/templates directory and values/Chart files | |
| # image updater creates .argocd-* files in the chart directory to manage image updates | |
| # this will trigger a sync on every application that is consuming these charts which is not intended | |
| @@ -21634,8 +21650,7 @@ | |
| source: | |
| repoURL: "https://github.com/mozilla/webservices-infra" | |
| path: "mad/k8s/mad" | |
| - # Retain environment level dig scope for single chart tenants | |
| - targetRevision: '{{ dig "target_revision" "main" . }}' | |
| + targetRevision: '{{ dig "charts" "mad" "target_revision" "main" . }}' | |
| helm: | |
| parameters: | |
| - name: global.mozcloud.app_code | |
| @@ -21650,7 +21665,7 @@ | |
| value: moz-fx-mad-nonprod | |
| - name: global.mozcloud.realm | |
| value: nonprod | |
| - releaseName: '{{ dig "release_name" "mad-v1" . }}' # Primarily used to import existing helm releases | |
| + releaseName: '{{ dig "charts" "mad" "release_name" "mad-v1" . }}' # Primarily used to import existing helm releases | |
| valueFiles: | |
| - values.yaml | |
| - 'values-{{ .name }}.yaml' | |
| @@ -21658,15 +21673,14 @@ | |
| name: "webservices-high-private-nonprod-us-west1" | |
| namespace: "mad-{{ .name }}" | |
| info: | |
| - # Retain environment level dig scope for single chart tenants | |
| - name: 'Helm Chart' | |
| value: 'https://github.com/mozilla/webservices-infra/tree/{{ dig "target_revision" "main" . }}/mad/k8s/mad' | |
| - name: 'Helm Chart Ref' | |
| - value: '{{ dig "target_revision" "main" . }}' | |
| + value: '{{ dig "charts" "mad" "target_revision" "main" . }}' | |
| - name: 'Application Repository' | |
| - value: '{{ dig "application_repository" "mozilla/mad-server" . }}' | |
| + value: '{{ dig "charts" "mad" "application_repository" "mozilla/mad-server" . }}' | |
| - name: 'Image Repository' | |
| - value: '{{ dig "image_repository" "us-docker.pkg.dev/moz-fx-mad-prod/mad-prod/mad" . }}' | |
| + value: '{{ dig "charts" "mad" "image_repository" "us-docker.pkg.dev/moz-fx-mad-prod/mad-prod/mad" . }}' | |
| - name: 'Tenant Definition' | |
| value: 'https://github.com/mozilla/global-platform-admin/blob/main/tenants/mad.yaml' | |
| # Will ignore differences between live and desired states during the diff. Note that these configurations are not | |
| @@ -21726,6 +21735,17 @@ | |
| tenant: "mad" | |
| realm: "prod" | |
| annotations: | |
| + # We want this to render: image_tag' | |
| + argocd-image-updater.argoproj.io/app.helm.image-name: '{{ dig "charts" "mad" "image_name" "image.name" . }}' | |
| + argocd-image-updater.argoproj.io/app.helm.image-tag: '{{ dig "charts" "mad" "image_tag" "image.tag" . }}' | |
| + # The ApplicationSet template will render backslashes from image_regex values | |
| + # as escape characters. To avoid this, we have to escape one level above. | |
| + # We want this to render: .*' | |
| + argocd-image-updater.argoproj.io/image-list: 'app={{ dig "charts" "mad" "image_repository" "us-docker.pkg.dev/moz-fx-mad-prod/mad-prod/mad" . }}' | |
| + argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "charts" "mad" "image_regex" (dig "image_regex" ".*" .) . }}' | |
| + argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "charts" "mad" "update_strategy" "newest-build" . }}' | |
| + argocd-image-updater.argoproj.io/git-branch: '{{ dig "charts" "mad" "target_revision" "main" . }}' | |
| + argocd-image-updater.argoproj.io/write-back-method: 'git:secret:argocd-webservices/image-updater-github-credentials' #pragma: allowlist secret | |
| # resolves to the mad/k8s/mad/templates directory and values/Chart files | |
| # image updater creates .argocd-* files in the chart directory to manage image updates | |
| # this will trigger a sync on every application that is consuming these charts which is not intended | |
| @@ -21750,8 +21770,7 @@ | |
| source: | |
| repoURL: "https://github.com/mozilla/webservices-infra" | |
| path: "mad/k8s/mad" | |
| - # Retain environment level dig scope for single chart tenants | |
| - targetRevision: '{{ dig "target_revision" "main" . }}' | |
| + targetRevision: '{{ dig "charts" "mad" "target_revision" "main" . }}' | |
| helm: | |
| parameters: | |
| - name: global.mozcloud.app_code | |
| @@ -21766,7 +21785,7 @@ | |
| value: moz-fx-mad-prod | |
| - name: global.mozcloud.realm | |
| value: prod | |
| - releaseName: '{{ dig "release_name" "mad-v1" . }}' # Primarily used to import existing helm releases | |
| + releaseName: '{{ dig "charts" "mad" "release_name" "mad-v1" . }}' # Primarily used to import existing helm releases | |
| valueFiles: | |
| - values.yaml | |
| - 'values-{{ .name }}.yaml' | |
| @@ -21774,15 +21793,14 @@ | |
| name: "webservices-high-private-prod-us-west1" | |
| namespace: "mad-{{ .name }}" | |
| info: | |
| - # Retain environment level dig scope for single chart tenants | |
| - name: 'Helm Chart' | |
| value: 'https://github.com/mozilla/webservices-infra/tree/{{ dig "target_revision" "main" . }}/mad/k8s/mad' | |
| - name: 'Helm Chart Ref' | |
| - value: '{{ dig "target_revision" "main" . }}' | |
| + value: '{{ dig "charts" "mad" "target_revision" "main" . }}' | |
| - name: 'Application Repository' | |
| - value: '{{ dig "application_repository" "mozilla/mad-server" . }}' | |
| + value: '{{ dig "charts" "mad" "application_repository" "mozilla/mad-server" . }}' | |
| - name: 'Image Repository' | |
| - value: '{{ dig "image_repository" "us-docker.pkg.dev/moz-fx-mad-prod/mad-prod/mad" . }}' | |
| + value: '{{ dig "charts" "mad" "image_repository" "us-docker.pkg.dev/moz-fx-mad-prod/mad-prod/mad" . }}' | |
| - name: 'Tenant Definition' | |
| value: 'https://github.com/mozilla/global-platform-admin/blob/main/tenants/mad.yaml' | |
| # Will ignore differences between live and desired states during the diff. Note that these configurations are not | |
| @@ -23354,13 +23367,16 @@ | |
| tenant: "moderator" | |
| realm: "nonprod" | |
| annotations: | |
| - argocd-image-updater.argoproj.io/app.helm.image-name: 'image.name' | |
| - argocd-image-updater.argoproj.io/app.helm.image-tag: 'image.tag' | |
| - # Retain environment level dig scope for single chart tenants | |
| - argocd-image-updater.argoproj.io/image-list: 'app={{ dig "image_repository" "us-docker.pkg.dev/moz-fx-moderator-prod/moderator-prod/moderator" . }}' | |
| - argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "image_regex" ".*" . }}' | |
| - argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "update_strategy" "newest-build" . }}' | |
| - argocd-image-updater.argoproj.io/git-branch: '{{ dig "target_revision" "main" . }}' | |
| + # We want this to render: image_tag' | |
| + argocd-image-updater.argoproj.io/app.helm.image-name: '{{ dig "charts" "moderator" "image_name" "image.name" . }}' | |
| + argocd-image-updater.argoproj.io/app.helm.image-tag: '{{ dig "charts" "moderator" "image_tag" "image.tag" . }}' | |
| + # The ApplicationSet template will render backslashes from image_regex values | |
| + # as escape characters. To avoid this, we have to escape one level above. | |
| + # We want this to render: .*' | |
| + argocd-image-updater.argoproj.io/image-list: 'app={{ dig "charts" "moderator" "image_repository" "us-docker.pkg.dev/moz-fx-moderator-prod/moderator-prod/moderator" . }}' | |
| + argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "charts" "moderator" "image_regex" (dig "image_regex" ".*" .) . }}' | |
| + argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "charts" "moderator" "update_strategy" "newest-build" . }}' | |
| + argocd-image-updater.argoproj.io/git-branch: '{{ dig "charts" "moderator" "target_revision" "main" . }}' | |
| argocd-image-updater.argoproj.io/write-back-method: 'git:secret:argocd-webservices/image-updater-github-credentials' #pragma: allowlist secret | |
| # resolves to the moderator/k8s/moderator/templates directory and values/Chart files | |
| # image updater creates .argocd-* files in the chart directory to manage image updates | |
| @@ -23386,8 +23402,7 @@ | |
| source: | |
| repoURL: "https://github.com/mozilla/webservices-infra" | |
| path: "moderator/k8s/moderator" | |
| - # Retain environment level dig scope for single chart tenants | |
| - targetRevision: '{{ dig "target_revision" "main" . }}' | |
| + targetRevision: '{{ dig "charts" "moderator" "target_revision" "main" . }}' | |
| helm: | |
| parameters: | |
| - name: global.mozcloud.app_code | |
| @@ -23402,7 +23417,7 @@ | |
| value: moz-fx-moderator-nonprod | |
| - name: global.mozcloud.realm | |
| value: nonprod | |
| - releaseName: '{{ dig "release_name" "moderator" . }}' # Primarily used to import existing helm releases | |
| + releaseName: '{{ dig "charts" "moderator" "release_name" "moderator" . }}' # Primarily used to import existing helm releases | |
| valueFiles: | |
| - values.yaml | |
| - 'values-{{ .name }}.yaml' | |
| @@ -23410,15 +23425,14 @@ | |
| name: "webservices-high-private-nonprod-us-west1" | |
| namespace: "moderator-{{ .name }}" | |
| info: | |
| - # Retain environment level dig scope for single chart tenants | |
| - name: 'Helm Chart' | |
| value: 'https://github.com/mozilla/webservices-infra/tree/{{ dig "target_revision" "main" . }}/moderator/k8s/moderator' | |
| - name: 'Helm Chart Ref' | |
| - value: '{{ dig "target_revision" "main" . }}' | |
| + value: '{{ dig "charts" "moderator" "target_revision" "main" . }}' | |
| - name: 'Application Repository' | |
| - value: '{{ dig "application_repository" "" . }}' | |
| + value: '{{ dig "charts" "moderator" "application_repository" "" . }}' | |
| - name: 'Image Repository' | |
| - value: '{{ dig "image_repository" "us-docker.pkg.dev/moz-fx-moderator-prod/moderator-prod/moderator" . }}' | |
| + value: '{{ dig "charts" "moderator" "image_repository" "us-docker.pkg.dev/moz-fx-moderator-prod/moderator-prod/moderator" . }}' | |
| - name: 'Tenant Definition' | |
| value: 'https://github.com/mozilla/global-platform-admin/blob/main/tenants/moderator.yaml' | |
| # Will ignore differences between live and desired states during the diff. Note that these configurations are not | |
| @@ -23478,13 +23487,16 @@ | |
| tenant: "moderator" | |
| realm: "prod" | |
| annotations: | |
| - argocd-image-updater.argoproj.io/app.helm.image-name: 'image.name' | |
| - argocd-image-updater.argoproj.io/app.helm.image-tag: 'image.tag' | |
| - # Retain environment level dig scope for single chart tenants | |
| - argocd-image-updater.argoproj.io/image-list: 'app={{ dig "image_repository" "us-docker.pkg.dev/moz-fx-moderator-prod/moderator-prod/moderator" . }}' | |
| - argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "image_regex" ".*" . }}' | |
| - argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "update_strategy" "newest-build" . }}' | |
| - argocd-image-updater.argoproj.io/git-branch: '{{ dig "target_revision" "main" . }}' | |
| + # We want this to render: image_tag' | |
| + argocd-image-updater.argoproj.io/app.helm.image-name: '{{ dig "charts" "moderator" "image_name" "image.name" . }}' | |
| + argocd-image-updater.argoproj.io/app.helm.image-tag: '{{ dig "charts" "moderator" "image_tag" "image.tag" . }}' | |
| + # The ApplicationSet template will render backslashes from image_regex values | |
| + # as escape characters. To avoid this, we have to escape one level above. | |
| + # We want this to render: .*' | |
| + argocd-image-updater.argoproj.io/image-list: 'app={{ dig "charts" "moderator" "image_repository" "us-docker.pkg.dev/moz-fx-moderator-prod/moderator-prod/moderator" . }}' | |
| + argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "charts" "moderator" "image_regex" (dig "image_regex" ".*" .) . }}' | |
| + argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "charts" "moderator" "update_strategy" "newest-build" . }}' | |
| + argocd-image-updater.argoproj.io/git-branch: '{{ dig "charts" "moderator" "target_revision" "main" . }}' | |
| argocd-image-updater.argoproj.io/write-back-method: 'git:secret:argocd-webservices/image-updater-github-credentials' #pragma: allowlist secret | |
| # resolves to the moderator/k8s/moderator/templates directory and values/Chart files | |
| # image updater creates .argocd-* files in the chart directory to manage image updates | |
| @@ -23510,8 +23522,7 @@ | |
| source: | |
| repoURL: "https://github.com/mozilla/webservices-infra" | |
| path: "moderator/k8s/moderator" | |
| - # Retain environment level dig scope for single chart tenants | |
| - targetRevision: '{{ dig "target_revision" "main" . }}' | |
| + targetRevision: '{{ dig "charts" "moderator" "target_revision" "main" . }}' | |
| helm: | |
| parameters: | |
| - name: global.mozcloud.app_code | |
| @@ -23526,7 +23537,7 @@ | |
| value: moz-fx-moderator-prod | |
| - name: global.mozcloud.realm | |
| value: prod | |
| - releaseName: '{{ dig "release_name" "moderator" . }}' # Primarily used to import existing helm releases | |
| + releaseName: '{{ dig "charts" "moderator" "release_name" "moderator" . }}' # Primarily used to import existing helm releases | |
| valueFiles: | |
| - values.yaml | |
| - 'values-{{ .name }}.yaml' | |
| @@ -23534,15 +23545,14 @@ | |
| name: "webservices-high-private-prod-us-west1" | |
| namespace: "moderator-{{ .name }}" | |
| info: | |
| - # Retain environment level dig scope for single chart tenants | |
| - name: 'Helm Chart' | |
| value: 'https://github.com/mozilla/webservices-infra/tree/{{ dig "target_revision" "main" . }}/moderator/k8s/moderator' | |
| - name: 'Helm Chart Ref' | |
| - value: '{{ dig "target_revision" "main" . }}' | |
| + value: '{{ dig "charts" "moderator" "target_revision" "main" . }}' | |
| - name: 'Application Repository' | |
| - value: '{{ dig "application_repository" "" . }}' | |
| + value: '{{ dig "charts" "moderator" "application_repository" "" . }}' | |
| - name: 'Image Repository' | |
| - value: '{{ dig "image_repository" "us-docker.pkg.dev/moz-fx-moderator-prod/moderator-prod/moderator" . }}' | |
| + value: '{{ dig "charts" "moderator" "image_repository" "us-docker.pkg.dev/moz-fx-moderator-prod/moderator-prod/moderator" . }}' | |
| - name: 'Tenant Definition' | |
| value: 'https://github.com/mozilla/global-platform-admin/blob/main/tenants/moderator.yaml' | |
| # Will ignore differences between live and desired states during the diff. Note that these configurations are not | |
| @@ -23853,13 +23858,16 @@ | |
| tenant: "moz-language-portal" | |
| realm: "nonprod" | |
| annotations: | |
| - argocd-image-updater.argoproj.io/app.helm.image-name: 'image.name' | |
| - argocd-image-updater.argoproj.io/app.helm.image-tag: 'image.tag' | |
| - # Retain environment level dig scope for single chart tenants | |
| - argocd-image-updater.argoproj.io/image-list: 'app={{ dig "image_repository" "us-docker.pkg.dev/moz-fx-moz-language-porta-3139/moz-language-portal-prod/mozilla-language-portal" . }}' | |
| - argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "image_regex" ".*" . }}' | |
| - argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "update_strategy" "newest-build" . }}' | |
| - argocd-image-updater.argoproj.io/git-branch: '{{ dig "target_revision" "main" . }}' | |
| + # We want this to render: image_tag' | |
| + argocd-image-updater.argoproj.io/app.helm.image-name: '{{ dig "charts" "moz-language-portal" "image_name" "image.name" . }}' | |
| + argocd-image-updater.argoproj.io/app.helm.image-tag: '{{ dig "charts" "moz-language-portal" "image_tag" "image.tag" . }}' | |
| + # The ApplicationSet template will render backslashes from image_regex values | |
| + # as escape characters. To avoid this, we have to escape one level above. | |
| + # We want this to render: .*' | |
| + argocd-image-updater.argoproj.io/image-list: 'app={{ dig "charts" "moz-language-portal" "image_repository" "us-docker.pkg.dev/moz-fx-moz-language-porta-3139/moz-language-portal-prod/mozilla-language-portal" . }}' | |
| + argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "charts" "moz-language-portal" "image_regex" (dig "image_regex" ".*" .) . }}' | |
| + argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "charts" "moz-language-portal" "update_strategy" "newest-build" . }}' | |
| + argocd-image-updater.argoproj.io/git-branch: '{{ dig "charts" "moz-language-portal" "target_revision" "main" . }}' | |
| argocd-image-updater.argoproj.io/write-back-method: 'git:secret:argocd-webservices/image-updater-github-credentials' #pragma: allowlist secret | |
| # resolves to the moz-language-portal/k8s/moz-language-portal/templates directory and values/Chart files | |
| # image updater creates .argocd-* files in the chart directory to manage image updates | |
| @@ -23885,8 +23893,7 @@ | |
| source: | |
| repoURL: "https://github.com/mozilla/webservices-infra" | |
| path: "moz-language-portal/k8s/moz-language-portal" | |
| - # Retain environment level dig scope for single chart tenants | |
| - targetRevision: '{{ dig "target_revision" "main" . }}' | |
| + targetRevision: '{{ dig "charts" "moz-language-portal" "target_revision" "main" . }}' | |
| helm: | |
| parameters: | |
| - name: global.mozcloud.app_code | |
| @@ -23901,7 +23908,7 @@ | |
| value: moz-fx-moz-language-porta-a3ef | |
| - name: global.mozcloud.realm | |
| value: nonprod | |
| - releaseName: '{{ dig "release_name" "moz-language-portal" . }}' # Primarily used to import existing helm releases | |
| + releaseName: '{{ dig "charts" "moz-language-portal" "release_name" "moz-language-portal" . }}' # Primarily used to import existing helm releases | |
| valueFiles: | |
| - values.yaml | |
| - 'values-{{ .name }}.yaml' | |
| @@ -23909,15 +23916,14 @@ | |
| name: "webservices-low-private-nonprod-us-west1" | |
| namespace: "moz-language-portal-{{ .name }}" | |
| info: | |
| - # Retain environment level dig scope for single chart tenants | |
| - name: 'Helm Chart' | |
| value: 'https://github.com/mozilla/webservices-infra/tree/{{ dig "target_revision" "main" . }}/moz-language-portal/k8s/moz-language-portal' | |
| - name: 'Helm Chart Ref' | |
| - value: '{{ dig "target_revision" "main" . }}' | |
| + value: '{{ dig "charts" "moz-language-portal" "target_revision" "main" . }}' | |
| - name: 'Application Repository' | |
| - value: '{{ dig "application_repository" "mozilla-l10n/birdbox-mozilla-language-portal" . }}' | |
| + value: '{{ dig "charts" "moz-language-portal" "application_repository" "mozilla-l10n/birdbox-mozilla-language-portal" . }}' | |
| - name: 'Image Repository' | |
| - value: '{{ dig "image_repository" "us-docker.pkg.dev/moz-fx-moz-language-porta-3139/moz-language-portal-prod/mozilla-language-portal" . }}' | |
| + value: '{{ dig "charts" "moz-language-portal" "image_repository" "us-docker.pkg.dev/moz-fx-moz-language-porta-3139/moz-language-portal-prod/mozilla-language-portal" . }}' | |
| - name: 'Tenant Definition' | |
| value: 'https://github.com/mozilla/global-platform-admin/blob/main/tenants/moz-language-portal.yaml' | |
| # Will ignore differences between live and desired states during the diff. Note that these configurations are not | |
| @@ -23977,13 +23978,16 @@ | |
| tenant: "moz-language-portal" | |
| realm: "prod" | |
| annotations: | |
| - argocd-image-updater.argoproj.io/app.helm.image-name: 'image.name' | |
| - argocd-image-updater.argoproj.io/app.helm.image-tag: 'image.tag' | |
| - # Retain environment level dig scope for single chart tenants | |
| - argocd-image-updater.argoproj.io/image-list: 'app={{ dig "image_repository" "us-docker.pkg.dev/moz-fx-moz-language-porta-3139/moz-language-portal-prod/mozilla-language-portal" . }}' | |
| - argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "image_regex" ".*" . }}' | |
| - argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "update_strategy" "newest-build" . }}' | |
| - argocd-image-updater.argoproj.io/git-branch: '{{ dig "target_revision" "main" . }}' | |
| + # We want this to render: image_tag' | |
| + argocd-image-updater.argoproj.io/app.helm.image-name: '{{ dig "charts" "moz-language-portal" "image_name" "image.name" . }}' | |
| + argocd-image-updater.argoproj.io/app.helm.image-tag: '{{ dig "charts" "moz-language-portal" "image_tag" "image.tag" . }}' | |
| + # The ApplicationSet template will render backslashes from image_regex values | |
| + # as escape characters. To avoid this, we have to escape one level above. | |
| + # We want this to render: .*' | |
| + argocd-image-updater.argoproj.io/image-list: 'app={{ dig "charts" "moz-language-portal" "image_repository" "us-docker.pkg.dev/moz-fx-moz-language-porta-3139/moz-language-portal-prod/mozilla-language-portal" . }}' | |
| + argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "charts" "moz-language-portal" "image_regex" (dig "image_regex" ".*" .) . }}' | |
| + argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "charts" "moz-language-portal" "update_strategy" "newest-build" . }}' | |
| + argocd-image-updater.argoproj.io/git-branch: '{{ dig "charts" "moz-language-portal" "target_revision" "main" . }}' | |
| argocd-image-updater.argoproj.io/write-back-method: 'git:secret:argocd-webservices/image-updater-github-credentials' #pragma: allowlist secret | |
| # resolves to the moz-language-portal/k8s/moz-language-portal/templates directory and values/Chart files | |
| # image updater creates .argocd-* files in the chart directory to manage image updates | |
| @@ -24009,8 +24013,7 @@ | |
| source: | |
| repoURL: "https://github.com/mozilla/webservices-infra" | |
| path: "moz-language-portal/k8s/moz-language-portal" | |
| - # Retain environment level dig scope for single chart tenants | |
| - targetRevision: '{{ dig "target_revision" "main" . }}' | |
| + targetRevision: '{{ dig "charts" "moz-language-portal" "target_revision" "main" . }}' | |
| helm: | |
| parameters: | |
| - name: global.mozcloud.app_code | |
| @@ -24025,7 +24028,7 @@ | |
| value: moz-fx-moz-language-porta-3139 | |
| - name: global.mozcloud.realm | |
| value: prod | |
| - releaseName: '{{ dig "release_name" "moz-language-portal" . }}' # Primarily used to import existing helm releases | |
| + releaseName: '{{ dig "charts" "moz-language-portal" "release_name" "moz-language-portal" . }}' # Primarily used to import existing helm releases | |
| valueFiles: | |
| - values.yaml | |
| - 'values-{{ .name }}.yaml' | |
| @@ -24033,15 +24036,14 @@ | |
| name: "webservices-low-private-prod-us-west1" | |
| namespace: "moz-language-portal-{{ .name }}" | |
| info: | |
| - # Retain environment level dig scope for single chart tenants | |
| - name: 'Helm Chart' | |
| value: 'https://github.com/mozilla/webservices-infra/tree/{{ dig "target_revision" "main" . }}/moz-language-portal/k8s/moz-language-portal' | |
| - name: 'Helm Chart Ref' | |
| - value: '{{ dig "target_revision" "main" . }}' | |
| + value: '{{ dig "charts" "moz-language-portal" "target_revision" "main" . }}' | |
| - name: 'Application Repository' | |
| - value: '{{ dig "application_repository" "mozilla-l10n/birdbox-mozilla-language-portal" . }}' | |
| + value: '{{ dig "charts" "moz-language-portal" "application_repository" "mozilla-l10n/birdbox-mozilla-language-portal" . }}' | |
| - name: 'Image Repository' | |
| - value: '{{ dig "image_repository" "us-docker.pkg.dev/moz-fx-moz-language-porta-3139/moz-language-portal-prod/mozilla-language-portal" . }}' | |
| + value: '{{ dig "charts" "moz-language-portal" "image_repository" "us-docker.pkg.dev/moz-fx-moz-language-porta-3139/moz-language-portal-prod/mozilla-language-portal" . }}' | |
| - name: 'Tenant Definition' | |
| value: 'https://github.com/mozilla/global-platform-admin/blob/main/tenants/moz-language-portal.yaml' | |
| # Will ignore differences between live and desired states during the diff. Note that these configurations are not | |
| @@ -24102,13 +24099,16 @@ | |
| tenant: "mzcld-demo" | |
| realm: "nonprod" | |
| annotations: | |
| - argocd-image-updater.argoproj.io/app.helm.image-name: 'image.name' | |
| - argocd-image-updater.argoproj.io/app.helm.image-tag: 'image.tag' | |
| - # Retain environment level dig scope for single chart tenants | |
| - argocd-image-updater.argoproj.io/image-list: 'app={{ dig "image_repository" "us-docker.pkg.dev/moz-fx-mzcld-demo-prod/mzcld-demo-prod/mzcld-demo" . }}' | |
| - argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "image_regex" ".*" . }}' | |
| - argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "update_strategy" "newest-build" . }}' | |
| - argocd-image-updater.argoproj.io/git-branch: '{{ dig "target_revision" "main" . }}' | |
| + # We want this to render: image_tag' | |
| + argocd-image-updater.argoproj.io/app.helm.image-name: '{{ dig "charts" "mzcld-demo" "image_name" "image.name" . }}' | |
| + argocd-image-updater.argoproj.io/app.helm.image-tag: '{{ dig "charts" "mzcld-demo" "image_tag" "image.tag" . }}' | |
| + # The ApplicationSet template will render backslashes from image_regex values | |
| + # as escape characters. To avoid this, we have to escape one level above. | |
| + # We want this to render: .*' | |
| + argocd-image-updater.argoproj.io/image-list: 'app={{ dig "charts" "mzcld-demo" "image_repository" "us-docker.pkg.dev/moz-fx-mzcld-demo-prod/mzcld-demo-prod/mzcld-demo" . }}' | |
| + argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "charts" "mzcld-demo" "image_regex" (dig "image_regex" ".*" .) . }}' | |
| + argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "charts" "mzcld-demo" "update_strategy" "newest-build" . }}' | |
| + argocd-image-updater.argoproj.io/git-branch: '{{ dig "charts" "mzcld-demo" "target_revision" "main" . }}' | |
| argocd-image-updater.argoproj.io/write-back-method: 'git:secret:argocd-webservices/image-updater-github-credentials' #pragma: allowlist secret | |
| # resolves to the mzcld-demo/k8s/mzcld-demo/templates directory and values/Chart files | |
| # image updater creates .argocd-* files in the chart directory to manage image updates | |
| @@ -24134,8 +24134,7 @@ | |
| source: | |
| repoURL: "https://github.com/mozilla/webservices-infra" | |
| path: "mzcld-demo/k8s/mzcld-demo" | |
| - # Retain environment level dig scope for single chart tenants | |
| - targetRevision: '{{ dig "target_revision" "main" . }}' | |
| + targetRevision: '{{ dig "charts" "mzcld-demo" "target_revision" "main" . }}' | |
| helm: | |
| parameters: | |
| - name: global.mozcloud.app_code | |
| @@ -24150,7 +24149,7 @@ | |
| value: moz-fx-mzcld-demo-nonprod | |
| - name: global.mozcloud.realm | |
| value: nonprod | |
| - releaseName: '{{ dig "release_name" "mzcld-demo" . }}' # Primarily used to import existing helm releases | |
| + releaseName: '{{ dig "charts" "mzcld-demo" "release_name" "mzcld-demo" . }}' # Primarily used to import existing helm releases | |
| valueFiles: | |
| - values.yaml | |
| - 'values-{{ .name }}.yaml' | |
| @@ -24158,15 +24157,14 @@ | |
| name: "webservices-low-private-nonprod-us-west1" | |
| namespace: "mzcld-demo-{{ .name }}" | |
| info: | |
| - # Retain environment level dig scope for single chart tenants | |
| - name: 'Helm Chart' | |
| value: 'https://github.com/mozilla/webservices-infra/tree/{{ dig "target_revision" "main" . }}/mzcld-demo/k8s/mzcld-demo' | |
| - name: 'Helm Chart Ref' | |
| - value: '{{ dig "target_revision" "main" . }}' | |
| + value: '{{ dig "charts" "mzcld-demo" "target_revision" "main" . }}' | |
| - name: 'Application Repository' | |
| - value: '{{ dig "application_repository" "mozilla/mzcld-demo" . }}' | |
| + value: '{{ dig "charts" "mzcld-demo" "application_repository" "mozilla/mzcld-demo" . }}' | |
| - name: 'Image Repository' | |
| - value: '{{ dig "image_repository" "us-docker.pkg.dev/moz-fx-mzcld-demo-prod/mzcld-demo-prod/mzcld-demo" . }}' | |
| + value: '{{ dig "charts" "mzcld-demo" "image_repository" "us-docker.pkg.dev/moz-fx-mzcld-demo-prod/mzcld-demo-prod/mzcld-demo" . }}' | |
| - name: 'Tenant Definition' | |
| value: 'https://github.com/mozilla/global-platform-admin/blob/main/tenants/mzcld-demo.yaml' | |
| # Will ignore differences between live and desired states during the diff. Note that these configurations are not | |
| @@ -24226,13 +24219,16 @@ | |
| tenant: "mzcld-demo" | |
| realm: "prod" | |
| annotations: | |
| - argocd-image-updater.argoproj.io/app.helm.image-name: 'image.name' | |
| - argocd-image-updater.argoproj.io/app.helm.image-tag: 'image.tag' | |
| - # Retain environment level dig scope for single chart tenants | |
| - argocd-image-updater.argoproj.io/image-list: 'app={{ dig "image_repository" "us-docker.pkg.dev/moz-fx-mzcld-demo-prod/mzcld-demo-prod/mzcld-demo" . }}' | |
| - argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "image_regex" ".*" . }}' | |
| - argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "update_strategy" "newest-build" . }}' | |
| - argocd-image-updater.argoproj.io/git-branch: '{{ dig "target_revision" "main" . }}' | |
| + # We want this to render: image_tag' | |
| + argocd-image-updater.argoproj.io/app.helm.image-name: '{{ dig "charts" "mzcld-demo" "image_name" "image.name" . }}' | |
| + argocd-image-updater.argoproj.io/app.helm.image-tag: '{{ dig "charts" "mzcld-demo" "image_tag" "image.tag" . }}' | |
| + # The ApplicationSet template will render backslashes from image_regex values | |
| + # as escape characters. To avoid this, we have to escape one level above. | |
| + # We want this to render: .*' | |
| + argocd-image-updater.argoproj.io/image-list: 'app={{ dig "charts" "mzcld-demo" "image_repository" "us-docker.pkg.dev/moz-fx-mzcld-demo-prod/mzcld-demo-prod/mzcld-demo" . }}' | |
| + argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "charts" "mzcld-demo" "image_regex" (dig "image_regex" ".*" .) . }}' | |
| + argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "charts" "mzcld-demo" "update_strategy" "newest-build" . }}' | |
| + argocd-image-updater.argoproj.io/git-branch: '{{ dig "charts" "mzcld-demo" "target_revision" "main" . }}' | |
| argocd-image-updater.argoproj.io/write-back-method: 'git:secret:argocd-webservices/image-updater-github-credentials' #pragma: allowlist secret | |
| # resolves to the mzcld-demo/k8s/mzcld-demo/templates directory and values/Chart files | |
| # image updater creates .argocd-* files in the chart directory to manage image updates | |
| @@ -24258,8 +24254,7 @@ | |
| source: | |
| repoURL: "https://github.com/mozilla/webservices-infra" | |
| path: "mzcld-demo/k8s/mzcld-demo" | |
| - # Retain environment level dig scope for single chart tenants | |
| - targetRevision: '{{ dig "target_revision" "main" . }}' | |
| + targetRevision: '{{ dig "charts" "mzcld-demo" "target_revision" "main" . }}' | |
| helm: | |
| parameters: | |
| - name: global.mozcloud.app_code | |
| @@ -24274,7 +24269,7 @@ | |
| value: moz-fx-mzcld-demo-prod | |
| - name: global.mozcloud.realm | |
| value: prod | |
| - releaseName: '{{ dig "release_name" "mzcld-demo" . }}' # Primarily used to import existing helm releases | |
| + releaseName: '{{ dig "charts" "mzcld-demo" "release_name" "mzcld-demo" . }}' # Primarily used to import existing helm releases | |
| valueFiles: | |
| - values.yaml | |
| - 'values-{{ .name }}.yaml' | |
| @@ -24282,15 +24277,14 @@ | |
| name: "webservices-low-private-prod-us-west1" | |
| namespace: "mzcld-demo-{{ .name }}" | |
| info: | |
| - # Retain environment level dig scope for single chart tenants | |
| - name: 'Helm Chart' | |
| value: 'https://github.com/mozilla/webservices-infra/tree/{{ dig "target_revision" "main" . }}/mzcld-demo/k8s/mzcld-demo' | |
| - name: 'Helm Chart Ref' | |
| - value: '{{ dig "target_revision" "main" . }}' | |
| + value: '{{ dig "charts" "mzcld-demo" "target_revision" "main" . }}' | |
| - name: 'Application Repository' | |
| - value: '{{ dig "application_repository" "mozilla/mzcld-demo" . }}' | |
| + value: '{{ dig "charts" "mzcld-demo" "application_repository" "mozilla/mzcld-demo" . }}' | |
| - name: 'Image Repository' | |
| - value: '{{ dig "image_repository" "us-docker.pkg.dev/moz-fx-mzcld-demo-prod/mzcld-demo-prod/mzcld-demo" . }}' | |
| + value: '{{ dig "charts" "mzcld-demo" "image_repository" "us-docker.pkg.dev/moz-fx-mzcld-demo-prod/mzcld-demo-prod/mzcld-demo" . }}' | |
| - name: 'Tenant Definition' | |
| value: 'https://github.com/mozilla/global-platform-admin/blob/main/tenants/mzcld-demo.yaml' | |
| # Will ignore differences between live and desired states during the diff. Note that these configurations are not | |
| @@ -24351,13 +24340,16 @@ | |
| tenant: "nucleus" | |
| realm: "nonprod" | |
| annotations: | |
| - argocd-image-updater.argoproj.io/app.helm.image-name: 'image.name' | |
| - argocd-image-updater.argoproj.io/app.helm.image-tag: 'image.tag' | |
| - # Retain environment level dig scope for single chart tenants | |
| - argocd-image-updater.argoproj.io/image-list: 'app={{ dig "image_repository" "us-docker.pkg.dev/moz-fx-nucleus-prod/nucleus-prod/nucleus" . }}' | |
| - argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "image_regex" ".*" . }}' | |
| - argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "update_strategy" "newest-build" . }}' | |
| - argocd-image-updater.argoproj.io/git-branch: '{{ dig "target_revision" "main" . }}' | |
| + # We want this to render: image_tag' | |
| + argocd-image-updater.argoproj.io/app.helm.image-name: '{{ dig "charts" "nucleus" "image_name" "image.name" . }}' | |
| + argocd-image-updater.argoproj.io/app.helm.image-tag: '{{ dig "charts" "nucleus" "image_tag" "image.tag" . }}' | |
| + # The ApplicationSet template will render backslashes from image_regex values | |
| + # as escape characters. To avoid this, we have to escape one level above. | |
| + # We want this to render: .*' | |
| + argocd-image-updater.argoproj.io/image-list: 'app={{ dig "charts" "nucleus" "image_repository" "us-docker.pkg.dev/moz-fx-nucleus-prod/nucleus-prod/nucleus" . }}' | |
| + argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "charts" "nucleus" "image_regex" (dig "image_regex" ".*" .) . }}' | |
| + argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "charts" "nucleus" "update_strategy" "newest-build" . }}' | |
| + argocd-image-updater.argoproj.io/git-branch: '{{ dig "charts" "nucleus" "target_revision" "main" . }}' | |
| argocd-image-updater.argoproj.io/write-back-method: 'git:secret:argocd-webservices/image-updater-github-credentials' #pragma: allowlist secret | |
| # resolves to the nucleus/k8s/nucleus/templates directory and values/Chart files | |
| # image updater creates .argocd-* files in the chart directory to manage image updates | |
| @@ -24383,8 +24375,7 @@ | |
| source: | |
| repoURL: "https://github.com/mozilla/webservices-infra" | |
| path: "nucleus/k8s/nucleus" | |
| - # Retain environment level dig scope for single chart tenants | |
| - targetRevision: '{{ dig "target_revision" "main" . }}' | |
| + targetRevision: '{{ dig "charts" "nucleus" "target_revision" "main" . }}' | |
| helm: | |
| parameters: | |
| - name: global.mozcloud.app_code | |
| @@ -24399,7 +24390,7 @@ | |
| value: moz-fx-nucleus-nonprod | |
| - name: global.mozcloud.realm | |
| value: nonprod | |
| - releaseName: '{{ dig "release_name" "nucleus" . }}' # Primarily used to import existing helm releases | |
| + releaseName: '{{ dig "charts" "nucleus" "release_name" "nucleus" . }}' # Primarily used to import existing helm releases | |
| valueFiles: | |
| - values.yaml | |
| - 'values-{{ .name }}.yaml' | |
| @@ -24407,15 +24398,14 @@ | |
| name: "webservices-low-private-nonprod-us-west1" | |
| namespace: "nucleus-{{ .name }}" | |
| info: | |
| - # Retain environment level dig scope for single chart tenants | |
| - name: 'Helm Chart' | |
| value: 'https://github.com/mozilla/webservices-infra/tree/{{ dig "target_revision" "main" . }}/nucleus/k8s/nucleus' | |
| - name: 'Helm Chart Ref' | |
| - value: '{{ dig "target_revision" "main" . }}' | |
| + value: '{{ dig "charts" "nucleus" "target_revision" "main" . }}' | |
| - name: 'Application Repository' | |
| - value: '{{ dig "application_repository" "" . }}' | |
| + value: '{{ dig "charts" "nucleus" "application_repository" "" . }}' | |
| - name: 'Image Repository' | |
| - value: '{{ dig "image_repository" "us-docker.pkg.dev/moz-fx-nucleus-prod/nucleus-prod/nucleus" . }}' | |
| + value: '{{ dig "charts" "nucleus" "image_repository" "us-docker.pkg.dev/moz-fx-nucleus-prod/nucleus-prod/nucleus" . }}' | |
| - name: 'Tenant Definition' | |
| value: 'https://github.com/mozilla/global-platform-admin/blob/main/tenants/nucleus.yaml' | |
| # Will ignore differences between live and desired states during the diff. Note that these configurations are not | |
| @@ -24475,13 +24460,16 @@ | |
| tenant: "nucleus" | |
| realm: "prod" | |
| annotations: | |
| - argocd-image-updater.argoproj.io/app.helm.image-name: 'image.name' | |
| - argocd-image-updater.argoproj.io/app.helm.image-tag: 'image.tag' | |
| - # Retain environment level dig scope for single chart tenants | |
| - argocd-image-updater.argoproj.io/image-list: 'app={{ dig "image_repository" "us-docker.pkg.dev/moz-fx-nucleus-prod/nucleus-prod/nucleus" . }}' | |
| - argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "image_regex" ".*" . }}' | |
| - argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "update_strategy" "newest-build" . }}' | |
| - argocd-image-updater.argoproj.io/git-branch: '{{ dig "target_revision" "main" . }}' | |
| + # We want this to render: image_tag' | |
| + argocd-image-updater.argoproj.io/app.helm.image-name: '{{ dig "charts" "nucleus" "image_name" "image.name" . }}' | |
| + argocd-image-updater.argoproj.io/app.helm.image-tag: '{{ dig "charts" "nucleus" "image_tag" "image.tag" . }}' | |
| + # The ApplicationSet template will render backslashes from image_regex values | |
| + # as escape characters. To avoid this, we have to escape one level above. | |
| + # We want this to render: .*' | |
| + argocd-image-updater.argoproj.io/image-list: 'app={{ dig "charts" "nucleus" "image_repository" "us-docker.pkg.dev/moz-fx-nucleus-prod/nucleus-prod/nucleus" . }}' | |
| + argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "charts" "nucleus" "image_regex" (dig "image_regex" ".*" .) . }}' | |
| + argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "charts" "nucleus" "update_strategy" "newest-build" . }}' | |
| + argocd-image-updater.argoproj.io/git-branch: '{{ dig "charts" "nucleus" "target_revision" "main" . }}' | |
| argocd-image-updater.argoproj.io/write-back-method: 'git:secret:argocd-webservices/image-updater-github-credentials' #pragma: allowlist secret | |
| # resolves to the nucleus/k8s/nucleus/templates directory and values/Chart files | |
| # image updater creates .argocd-* files in the chart directory to manage image updates | |
| @@ -24507,8 +24495,7 @@ | |
| source: | |
| repoURL: "https://github.com/mozilla/webservices-infra" | |
| path: "nucleus/k8s/nucleus" | |
| - # Retain environment level dig scope for single chart tenants | |
| - targetRevision: '{{ dig "target_revision" "main" . }}' | |
| + targetRevision: '{{ dig "charts" "nucleus" "target_revision" "main" . }}' | |
| helm: | |
| parameters: | |
| - name: global.mozcloud.app_code | |
| @@ -24523,7 +24510,7 @@ | |
| value: moz-fx-nucleus-prod | |
| - name: global.mozcloud.realm | |
| value: prod | |
| - releaseName: '{{ dig "release_name" "nucleus" . }}' # Primarily used to import existing helm releases | |
| + releaseName: '{{ dig "charts" "nucleus" "release_name" "nucleus" . }}' # Primarily used to import existing helm releases | |
| valueFiles: | |
| - values.yaml | |
| - 'values-{{ .name }}.yaml' | |
| @@ -24531,15 +24518,14 @@ | |
| name: "webservices-low-private-prod-us-west1" | |
| namespace: "nucleus-{{ .name }}" | |
| info: | |
| - # Retain environment level dig scope for single chart tenants | |
| - name: 'Helm Chart' | |
| value: 'https://github.com/mozilla/webservices-infra/tree/{{ dig "target_revision" "main" . }}/nucleus/k8s/nucleus' | |
| - name: 'Helm Chart Ref' | |
| - value: '{{ dig "target_revision" "main" . }}' | |
| + value: '{{ dig "charts" "nucleus" "target_revision" "main" . }}' | |
| - name: 'Application Repository' | |
| - value: '{{ dig "application_repository" "" . }}' | |
| + value: '{{ dig "charts" "nucleus" "application_repository" "" . }}' | |
| - name: 'Image Repository' | |
| - value: '{{ dig "image_repository" "us-docker.pkg.dev/moz-fx-nucleus-prod/nucleus-prod/nucleus" . }}' | |
| + value: '{{ dig "charts" "nucleus" "image_repository" "us-docker.pkg.dev/moz-fx-nucleus-prod/nucleus-prod/nucleus" . }}' | |
| - name: 'Tenant Definition' | |
| value: 'https://github.com/mozilla/global-platform-admin/blob/main/tenants/nucleus.yaml' | |
| # Will ignore differences between live and desired states during the diff. Note that these configurations are not | |
| @@ -24599,6 +24580,17 @@ | |
| tenant: "ohttp-gateway" | |
| realm: "nonprod" | |
| annotations: | |
| + # We want this to render: image_tag' | |
| + argocd-image-updater.argoproj.io/app.helm.image-name: '{{ dig "charts" "ohttp-gateway" "image_name" "image.name" . }}' | |
| + argocd-image-updater.argoproj.io/app.helm.image-tag: '{{ dig "charts" "ohttp-gateway" "image_tag" "image.tag" . }}' | |
| + # The ApplicationSet template will render backslashes from image_regex values | |
| + # as escape characters. To avoid this, we have to escape one level above. | |
| + # We want this to render: .*' | |
| + argocd-image-updater.argoproj.io/image-list: 'app={{ dig "charts" "ohttp-gateway" "image_repository" "us-docker.pkg.dev/moz-fx-ohttp-gateway-prod/ohttp-gateway-prod/ohttp-gateway" . }}' | |
| + argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "charts" "ohttp-gateway" "image_regex" (dig "image_regex" ".*" .) . }}' | |
| + argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "charts" "ohttp-gateway" "update_strategy" "newest-build" . }}' | |
| + argocd-image-updater.argoproj.io/git-branch: '{{ dig "charts" "ohttp-gateway" "target_revision" "main" . }}' | |
| + argocd-image-updater.argoproj.io/write-back-method: 'git:secret:argocd-webservices/image-updater-github-credentials' #pragma: allowlist secret | |
| # resolves to the ohttp-gateway/k8s/ohttp-gateway/templates directory and values/Chart files | |
| # image updater creates .argocd-* files in the chart directory to manage image updates | |
| # this will trigger a sync on every application that is consuming these charts which is not intended | |
| @@ -24623,8 +24615,7 @@ | |
| source: | |
| repoURL: "https://github.com/mozilla/webservices-infra" | |
| path: "ohttp-gateway/k8s/ohttp-gateway" | |
| - # Retain environment level dig scope for single chart tenants | |
| - targetRevision: '{{ dig "target_revision" "main" . }}' | |
| + targetRevision: '{{ dig "charts" "ohttp-gateway" "target_revision" "main" . }}' | |
| helm: | |
| parameters: | |
| - name: global.mozcloud.app_code | |
| @@ -24639,7 +24630,7 @@ | |
| value: moz-fx-ohttp-gateway-nonprod | |
| - name: global.mozcloud.realm | |
| value: nonprod | |
| - releaseName: '{{ dig "release_name" "ohttp-gateway" . }}' # Primarily used to import existing helm releases | |
| + releaseName: '{{ dig "charts" "ohttp-gateway" "release_name" "ohttp-gateway" . }}' # Primarily used to import existing helm releases | |
| valueFiles: | |
| - values.yaml | |
| - 'values-{{ .name }}.yaml' | |
| @@ -24647,15 +24638,14 @@ | |
| name: "webservices-high-private-nonprod-us-west1" | |
| namespace: "ohttp-gateway-{{ .name }}" | |
| info: | |
| - # Retain environment level dig scope for single chart tenants | |
| - name: 'Helm Chart' | |
| value: 'https://github.com/mozilla/webservices-infra/tree/{{ dig "target_revision" "main" . }}/ohttp-gateway/k8s/ohttp-gateway' | |
| - name: 'Helm Chart Ref' | |
| - value: '{{ dig "target_revision" "main" . }}' | |
| + value: '{{ dig "charts" "ohttp-gateway" "target_revision" "main" . }}' | |
| - name: 'Application Repository' | |
| - value: '{{ dig "application_repository" "" . }}' | |
| + value: '{{ dig "charts" "ohttp-gateway" "application_repository" "" . }}' | |
| - name: 'Image Repository' | |
| - value: '{{ dig "image_repository" "us-docker.pkg.dev/moz-fx-ohttp-gateway-prod/ohttp-gateway-prod/ohttp-gateway" . }}' | |
| + value: '{{ dig "charts" "ohttp-gateway" "image_repository" "us-docker.pkg.dev/moz-fx-ohttp-gateway-prod/ohttp-gateway-prod/ohttp-gateway" . }}' | |
| - name: 'Tenant Definition' | |
| value: 'https://github.com/mozilla/global-platform-admin/blob/main/tenants/ohttp-gateway.yaml' | |
| # Will ignore differences between live and desired states during the diff. Note that these configurations are not | |
| @@ -24715,6 +24700,17 @@ | |
| tenant: "ohttp-gateway" | |
| realm: "prod" | |
| annotations: | |
| + # We want this to render: image_tag' | |
| + argocd-image-updater.argoproj.io/app.helm.image-name: '{{ dig "charts" "ohttp-gateway" "image_name" "image.name" . }}' | |
| + argocd-image-updater.argoproj.io/app.helm.image-tag: '{{ dig "charts" "ohttp-gateway" "image_tag" "image.tag" . }}' | |
| + # The ApplicationSet template will render backslashes from image_regex values | |
| + # as escape characters. To avoid this, we have to escape one level above. | |
| + # We want this to render: .*' | |
| + argocd-image-updater.argoproj.io/image-list: 'app={{ dig "charts" "ohttp-gateway" "image_repository" "us-docker.pkg.dev/moz-fx-ohttp-gateway-prod/ohttp-gateway-prod/ohttp-gateway" . }}' | |
| + argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "charts" "ohttp-gateway" "image_regex" (dig "image_regex" ".*" .) . }}' | |
| + argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "charts" "ohttp-gateway" "update_strategy" "newest-build" . }}' | |
| + argocd-image-updater.argoproj.io/git-branch: '{{ dig "charts" "ohttp-gateway" "target_revision" "main" . }}' | |
| + argocd-image-updater.argoproj.io/write-back-method: 'git:secret:argocd-webservices/image-updater-github-credentials' #pragma: allowlist secret | |
| # resolves to the ohttp-gateway/k8s/ohttp-gateway/templates directory and values/Chart files | |
| # image updater creates .argocd-* files in the chart directory to manage image updates | |
| # this will trigger a sync on every application that is consuming these charts which is not intended | |
| @@ -24739,8 +24735,7 @@ | |
| source: | |
| repoURL: "https://github.com/mozilla/webservices-infra" | |
| path: "ohttp-gateway/k8s/ohttp-gateway" | |
| - # Retain environment level dig scope for single chart tenants | |
| - targetRevision: '{{ dig "target_revision" "main" . }}' | |
| + targetRevision: '{{ dig "charts" "ohttp-gateway" "target_revision" "main" . }}' | |
| helm: | |
| parameters: | |
| - name: global.mozcloud.app_code | |
| @@ -24755,7 +24750,7 @@ | |
| value: moz-fx-ohttp-gateway-prod | |
| - name: global.mozcloud.realm | |
| value: prod | |
| - releaseName: '{{ dig "release_name" "ohttp-gateway" . }}' # Primarily used to import existing helm releases | |
| + releaseName: '{{ dig "charts" "ohttp-gateway" "release_name" "ohttp-gateway" . }}' # Primarily used to import existing helm releases | |
| valueFiles: | |
| - values.yaml | |
| - 'values-{{ .name }}.yaml' | |
| @@ -24763,15 +24758,14 @@ | |
| name: "webservices-high-private-prod-us-west1" | |
| namespace: "ohttp-gateway-{{ .name }}" | |
| info: | |
| - # Retain environment level dig scope for single chart tenants | |
| - name: 'Helm Chart' | |
| value: 'https://github.com/mozilla/webservices-infra/tree/{{ dig "target_revision" "main" . }}/ohttp-gateway/k8s/ohttp-gateway' | |
| - name: 'Helm Chart Ref' | |
| - value: '{{ dig "target_revision" "main" . }}' | |
| + value: '{{ dig "charts" "ohttp-gateway" "target_revision" "main" . }}' | |
| - name: 'Application Repository' | |
| - value: '{{ dig "application_repository" "" . }}' | |
| + value: '{{ dig "charts" "ohttp-gateway" "application_repository" "" . }}' | |
| - name: 'Image Repository' | |
| - value: '{{ dig "image_repository" "us-docker.pkg.dev/moz-fx-ohttp-gateway-prod/ohttp-gateway-prod/ohttp-gateway" . }}' | |
| + value: '{{ dig "charts" "ohttp-gateway" "image_repository" "us-docker.pkg.dev/moz-fx-ohttp-gateway-prod/ohttp-gateway-prod/ohttp-gateway" . }}' | |
| - name: 'Tenant Definition' | |
| value: 'https://github.com/mozilla/global-platform-admin/blob/main/tenants/ohttp-gateway.yaml' | |
| # Will ignore differences between live and desired states during the diff. Note that these configurations are not | |
| @@ -24832,13 +24821,16 @@ | |
| tenant: "orchestrator" | |
| realm: "nonprod" | |
| annotations: | |
| - argocd-image-updater.argoproj.io/app.helm.image-name: 'image.name' | |
| - argocd-image-updater.argoproj.io/app.helm.image-tag: 'image.tag' | |
| - # Retain environment level dig scope for single chart tenants | |
| - argocd-image-updater.argoproj.io/image-list: 'app={{ dig "image_repository" "us-docker.pkg.dev/moz-fx-orchestrator-prod/orchestrator-prod/orchestrator" . }}' | |
| - argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "image_regex" ".*" . }}' | |
| - argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "update_strategy" "newest-build" . }}' | |
| - argocd-image-updater.argoproj.io/git-branch: '{{ dig "target_revision" "main" . }}' | |
| + # We want this to render: image_tag' | |
| + argocd-image-updater.argoproj.io/app.helm.image-name: '{{ dig "charts" "orchestrator" "image_name" "image.name" . }}' | |
| + argocd-image-updater.argoproj.io/app.helm.image-tag: '{{ dig "charts" "orchestrator" "image_tag" "image.tag" . }}' | |
| + # The ApplicationSet template will render backslashes from image_regex values | |
| + # as escape characters. To avoid this, we have to escape one level above. | |
| + # We want this to render: .*' | |
| + argocd-image-updater.argoproj.io/image-list: 'app={{ dig "charts" "orchestrator" "image_repository" "us-docker.pkg.dev/moz-fx-orchestrator-prod/orchestrator-prod/orchestrator" . }}' | |
| + argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "charts" "orchestrator" "image_regex" (dig "image_regex" ".*" .) . }}' | |
| + argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "charts" "orchestrator" "update_strategy" "newest-build" . }}' | |
| + argocd-image-updater.argoproj.io/git-branch: '{{ dig "charts" "orchestrator" "target_revision" "main" . }}' | |
| argocd-image-updater.argoproj.io/write-back-method: 'git:secret:argocd-webservices/image-updater-github-credentials' #pragma: allowlist secret | |
| # resolves to the orchestrator/k8s/orchestrator/templates directory and values/Chart files | |
| # image updater creates .argocd-* files in the chart directory to manage image updates | |
| @@ -24864,8 +24856,7 @@ | |
| source: | |
| repoURL: "https://github.com/mozilla/webservices-infra" | |
| path: "orchestrator/k8s/orchestrator" | |
| - # Retain environment level dig scope for single chart tenants | |
| - targetRevision: '{{ dig "target_revision" "main" . }}' | |
| + targetRevision: '{{ dig "charts" "orchestrator" "target_revision" "main" . }}' | |
| helm: | |
| parameters: | |
| - name: global.mozcloud.app_code | |
| @@ -24880,7 +24871,7 @@ | |
| value: moz-fx-orchestrator-nonprod | |
| - name: global.mozcloud.realm | |
| value: nonprod | |
| - releaseName: '{{ dig "release_name" "orchestrator" . }}' # Primarily used to import existing helm releases | |
| + releaseName: '{{ dig "charts" "orchestrator" "release_name" "orchestrator" . }}' # Primarily used to import existing helm releases | |
| valueFiles: | |
| - values.yaml | |
| - 'values-{{ .name }}.yaml' | |
| @@ -24890,15 +24881,14 @@ | |
| name: "webservices-low-private-nonprod-europe-west1" | |
| namespace: "orchestrator-{{ .name }}" | |
| info: | |
| - # Retain environment level dig scope for single chart tenants | |
| - name: 'Helm Chart' | |
| value: 'https://github.com/mozilla/webservices-infra/tree/{{ dig "target_revision" "main" . }}/orchestrator/k8s/orchestrator' | |
| - name: 'Helm Chart Ref' | |
| - value: '{{ dig "target_revision" "main" . }}' | |
| + value: '{{ dig "charts" "orchestrator" "target_revision" "main" . }}' | |
| - name: 'Application Repository' | |
| - value: '{{ dig "application_repository" "mozmeao/orchestrator" . }}' | |
| + value: '{{ dig "charts" "orchestrator" "application_repository" "mozmeao/orchestrator" . }}' | |
| - name: 'Image Repository' | |
| - value: '{{ dig "image_repository" "us-docker.pkg.dev/moz-fx-orchestrator-prod/orchestrator-prod/orchestrator" . }}' | |
| + value: '{{ dig "charts" "orchestrator" "image_repository" "us-docker.pkg.dev/moz-fx-orchestrator-prod/orchestrator-prod/orchestrator" . }}' | |
| - name: 'Tenant Definition' | |
| value: 'https://github.com/mozilla/global-platform-admin/blob/main/tenants/orchestrator.yaml' | |
| # Will ignore differences between live and desired states during the diff. Note that these configurations are not | |
| @@ -24959,13 +24944,16 @@ | |
| tenant: "orchestrator" | |
| realm: "nonprod" | |
| annotations: | |
| - argocd-image-updater.argoproj.io/app.helm.image-name: 'image.name' | |
| - argocd-image-updater.argoproj.io/app.helm.image-tag: 'image.tag' | |
| - # Retain environment level dig scope for single chart tenants | |
| - argocd-image-updater.argoproj.io/image-list: 'app={{ dig "image_repository" "us-docker.pkg.dev/moz-fx-orchestrator-prod/orchestrator-prod/orchestrator" . }}' | |
| - argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "image_regex" ".*" . }}' | |
| - argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "update_strategy" "newest-build" . }}' | |
| - argocd-image-updater.argoproj.io/git-branch: '{{ dig "target_revision" "main" . }}' | |
| + # We want this to render: image_tag' | |
| + argocd-image-updater.argoproj.io/app.helm.image-name: '{{ dig "charts" "orchestrator" "image_name" "image.name" . }}' | |
| + argocd-image-updater.argoproj.io/app.helm.image-tag: '{{ dig "charts" "orchestrator" "image_tag" "image.tag" . }}' | |
| + # The ApplicationSet template will render backslashes from image_regex values | |
| + # as escape characters. To avoid this, we have to escape one level above. | |
| + # We want this to render: .*' | |
| + argocd-image-updater.argoproj.io/image-list: 'app={{ dig "charts" "orchestrator" "image_repository" "us-docker.pkg.dev/moz-fx-orchestrator-prod/orchestrator-prod/orchestrator" . }}' | |
| + argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "charts" "orchestrator" "image_regex" (dig "image_regex" ".*" .) . }}' | |
| + argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "charts" "orchestrator" "update_strategy" "newest-build" . }}' | |
| + argocd-image-updater.argoproj.io/git-branch: '{{ dig "charts" "orchestrator" "target_revision" "main" . }}' | |
| argocd-image-updater.argoproj.io/write-back-method: 'git:secret:argocd-webservices/image-updater-github-credentials' #pragma: allowlist secret | |
| # resolves to the orchestrator/k8s/orchestrator/templates directory and values/Chart files | |
| # image updater creates .argocd-* files in the chart directory to manage image updates | |
| @@ -24991,8 +24979,7 @@ | |
| source: | |
| repoURL: "https://github.com/mozilla/webservices-infra" | |
| path: "orchestrator/k8s/orchestrator" | |
| - # Retain environment level dig scope for single chart tenants | |
| - targetRevision: '{{ dig "target_revision" "main" . }}' | |
| + targetRevision: '{{ dig "charts" "orchestrator" "target_revision" "main" . }}' | |
| helm: | |
| parameters: | |
| - name: global.mozcloud.app_code | |
| @@ -25007,7 +24994,7 @@ | |
| value: moz-fx-orchestrator-nonprod | |
| - name: global.mozcloud.realm | |
| value: nonprod | |
| - releaseName: '{{ dig "release_name" "orchestrator" . }}' # Primarily used to import existing helm releases | |
| + releaseName: '{{ dig "charts" "orchestrator" "release_name" "orchestrator" . }}' # Primarily used to import existing helm releases | |
| valueFiles: | |
| - values.yaml | |
| - 'values-{{ .name }}.yaml' | |
| @@ -25015,15 +25002,14 @@ | |
| name: "webservices-low-private-nonprod-us-west1" | |
| namespace: "orchestrator-{{ .name }}" | |
| info: | |
| - # Retain environment level dig scope for single chart tenants | |
| - name: 'Helm Chart' | |
| value: 'https://github.com/mozilla/webservices-infra/tree/{{ dig "target_revision" "main" . }}/orchestrator/k8s/orchestrator' | |
| - name: 'Helm Chart Ref' | |
| - value: '{{ dig "target_revision" "main" . }}' | |
| + value: '{{ dig "charts" "orchestrator" "target_revision" "main" . }}' | |
| - name: 'Application Repository' | |
| - value: '{{ dig "application_repository" "mozmeao/orchestrator" . }}' | |
| + value: '{{ dig "charts" "orchestrator" "application_repository" "mozmeao/orchestrator" . }}' | |
| - name: 'Image Repository' | |
| - value: '{{ dig "image_repository" "us-docker.pkg.dev/moz-fx-orchestrator-prod/orchestrator-prod/orchestrator" . }}' | |
| + value: '{{ dig "charts" "orchestrator" "image_repository" "us-docker.pkg.dev/moz-fx-orchestrator-prod/orchestrator-prod/orchestrator" . }}' | |
| - name: 'Tenant Definition' | |
| value: 'https://github.com/mozilla/global-platform-admin/blob/main/tenants/orchestrator.yaml' | |
| # Will ignore differences between live and desired states during the diff. Note that these configurations are not | |
| @@ -25083,13 +25064,16 @@ | |
| tenant: "orchestrator" | |
| realm: "prod" | |
| annotations: | |
| - argocd-image-updater.argoproj.io/app.helm.image-name: 'image.name' | |
| - argocd-image-updater.argoproj.io/app.helm.image-tag: 'image.tag' | |
| - # Retain environment level dig scope for single chart tenants | |
| - argocd-image-updater.argoproj.io/image-list: 'app={{ dig "image_repository" "us-docker.pkg.dev/moz-fx-orchestrator-prod/orchestrator-prod/orchestrator" . }}' | |
| - argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "image_regex" ".*" . }}' | |
| - argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "update_strategy" "newest-build" . }}' | |
| - argocd-image-updater.argoproj.io/git-branch: '{{ dig "target_revision" "main" . }}' | |
| + # We want this to render: image_tag' | |
| + argocd-image-updater.argoproj.io/app.helm.image-name: '{{ dig "charts" "orchestrator" "image_name" "image.name" . }}' | |
| + argocd-image-updater.argoproj.io/app.helm.image-tag: '{{ dig "charts" "orchestrator" "image_tag" "image.tag" . }}' | |
| + # The ApplicationSet template will render backslashes from image_regex values | |
| + # as escape characters. To avoid this, we have to escape one level above. | |
| + # We want this to render: .*' | |
| + argocd-image-updater.argoproj.io/image-list: 'app={{ dig "charts" "orchestrator" "image_repository" "us-docker.pkg.dev/moz-fx-orchestrator-prod/orchestrator-prod/orchestrator" . }}' | |
| + argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "charts" "orchestrator" "image_regex" (dig "image_regex" ".*" .) . }}' | |
| + argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "charts" "orchestrator" "update_strategy" "newest-build" . }}' | |
| + argocd-image-updater.argoproj.io/git-branch: '{{ dig "charts" "orchestrator" "target_revision" "main" . }}' | |
| argocd-image-updater.argoproj.io/write-back-method: 'git:secret:argocd-webservices/image-updater-github-credentials' #pragma: allowlist secret | |
| # resolves to the orchestrator/k8s/orchestrator/templates directory and values/Chart files | |
| # image updater creates .argocd-* files in the chart directory to manage image updates | |
| @@ -25115,8 +25099,7 @@ | |
| source: | |
| repoURL: "https://github.com/mozilla/webservices-infra" | |
| path: "orchestrator/k8s/orchestrator" | |
| - # Retain environment level dig scope for single chart tenants | |
| - targetRevision: '{{ dig "target_revision" "main" . }}' | |
| + targetRevision: '{{ dig "charts" "orchestrator" "target_revision" "main" . }}' | |
| helm: | |
| parameters: | |
| - name: global.mozcloud.app_code | |
| @@ -25131,7 +25114,7 @@ | |
| value: moz-fx-orchestrator-prod | |
| - name: global.mozcloud.realm | |
| value: prod | |
| - releaseName: '{{ dig "release_name" "orchestrator" . }}' # Primarily used to import existing helm releases | |
| + releaseName: '{{ dig "charts" "orchestrator" "release_name" "orchestrator" . }}' # Primarily used to import existing helm releases | |
| valueFiles: | |
| - values.yaml | |
| - 'values-{{ .name }}.yaml' | |
| @@ -25141,15 +25124,14 @@ | |
| name: "webservices-low-private-prod-europe-west1" | |
| namespace: "orchestrator-{{ .name }}" | |
| info: | |
| - # Retain environment level dig scope for single chart tenants | |
| - name: 'Helm Chart' | |
| value: 'https://github.com/mozilla/webservices-infra/tree/{{ dig "target_revision" "main" . }}/orchestrator/k8s/orchestrator' | |
| - name: 'Helm Chart Ref' | |
| - value: '{{ dig "target_revision" "main" . }}' | |
| + value: '{{ dig "charts" "orchestrator" "target_revision" "main" . }}' | |
| - name: 'Application Repository' | |
| - value: '{{ dig "application_repository" "mozmeao/orchestrator" . }}' | |
| + value: '{{ dig "charts" "orchestrator" "application_repository" "mozmeao/orchestrator" . }}' | |
| - name: 'Image Repository' | |
| - value: '{{ dig "image_repository" "us-docker.pkg.dev/moz-fx-orchestrator-prod/orchestrator-prod/orchestrator" . }}' | |
| + value: '{{ dig "charts" "orchestrator" "image_repository" "us-docker.pkg.dev/moz-fx-orchestrator-prod/orchestrator-prod/orchestrator" . }}' | |
| - name: 'Tenant Definition' | |
| value: 'https://github.com/mozilla/global-platform-admin/blob/main/tenants/orchestrator.yaml' | |
| # Will ignore differences between live and desired states during the diff. Note that these configurations are not | |
| @@ -25209,13 +25186,16 @@ | |
| tenant: "orchestrator" | |
| realm: "prod" | |
| annotations: | |
| - argocd-image-updater.argoproj.io/app.helm.image-name: 'image.name' | |
| - argocd-image-updater.argoproj.io/app.helm.image-tag: 'image.tag' | |
| - # Retain environment level dig scope for single chart tenants | |
| - argocd-image-updater.argoproj.io/image-list: 'app={{ dig "image_repository" "us-docker.pkg.dev/moz-fx-orchestrator-prod/orchestrator-prod/orchestrator" . }}' | |
| - argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "image_regex" ".*" . }}' | |
| - argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "update_strategy" "newest-build" . }}' | |
| - argocd-image-updater.argoproj.io/git-branch: '{{ dig "target_revision" "main" . }}' | |
| + # We want this to render: image_tag' | |
| + argocd-image-updater.argoproj.io/app.helm.image-name: '{{ dig "charts" "orchestrator" "image_name" "image.name" . }}' | |
| + argocd-image-updater.argoproj.io/app.helm.image-tag: '{{ dig "charts" "orchestrator" "image_tag" "image.tag" . }}' | |
| + # The ApplicationSet template will render backslashes from image_regex values | |
| + # as escape characters. To avoid this, we have to escape one level above. | |
| + # We want this to render: .*' | |
| + argocd-image-updater.argoproj.io/image-list: 'app={{ dig "charts" "orchestrator" "image_repository" "us-docker.pkg.dev/moz-fx-orchestrator-prod/orchestrator-prod/orchestrator" . }}' | |
| + argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "charts" "orchestrator" "image_regex" (dig "image_regex" ".*" .) . }}' | |
| + argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "charts" "orchestrator" "update_strategy" "newest-build" . }}' | |
| + argocd-image-updater.argoproj.io/git-branch: '{{ dig "charts" "orchestrator" "target_revision" "main" . }}' | |
| argocd-image-updater.argoproj.io/write-back-method: 'git:secret:argocd-webservices/image-updater-github-credentials' #pragma: allowlist secret | |
| # resolves to the orchestrator/k8s/orchestrator/templates directory and values/Chart files | |
| # image updater creates .argocd-* files in the chart directory to manage image updates | |
| @@ -25241,8 +25221,7 @@ | |
| source: | |
| repoURL: "https://github.com/mozilla/webservices-infra" | |
| path: "orchestrator/k8s/orchestrator" | |
| - # Retain environment level dig scope for single chart tenants | |
| - targetRevision: '{{ dig "target_revision" "main" . }}' | |
| + targetRevision: '{{ dig "charts" "orchestrator" "target_revision" "main" . }}' | |
| helm: | |
| parameters: | |
| - name: global.mozcloud.app_code | |
| @@ -25257,7 +25236,7 @@ | |
| value: moz-fx-orchestrator-prod | |
| - name: global.mozcloud.realm | |
| value: prod | |
| - releaseName: '{{ dig "release_name" "orchestrator" . }}' # Primarily used to import existing helm releases | |
| + releaseName: '{{ dig "charts" "orchestrator" "release_name" "orchestrator" . }}' # Primarily used to import existing helm releases | |
| valueFiles: | |
| - values.yaml | |
| - 'values-{{ .name }}.yaml' | |
| @@ -25265,15 +25244,14 @@ | |
| name: "webservices-low-private-prod-us-west1" | |
| namespace: "orchestrator-{{ .name }}" | |
| info: | |
| - # Retain environment level dig scope for single chart tenants | |
| - name: 'Helm Chart' | |
| value: 'https://github.com/mozilla/webservices-infra/tree/{{ dig "target_revision" "main" . }}/orchestrator/k8s/orchestrator' | |
| - name: 'Helm Chart Ref' | |
| - value: '{{ dig "target_revision" "main" . }}' | |
| + value: '{{ dig "charts" "orchestrator" "target_revision" "main" . }}' | |
| - name: 'Application Repository' | |
| - value: '{{ dig "application_repository" "mozmeao/orchestrator" . }}' | |
| + value: '{{ dig "charts" "orchestrator" "application_repository" "mozmeao/orchestrator" . }}' | |
| - name: 'Image Repository' | |
| - value: '{{ dig "image_repository" "us-docker.pkg.dev/moz-fx-orchestrator-prod/orchestrator-prod/orchestrator" . }}' | |
| + value: '{{ dig "charts" "orchestrator" "image_repository" "us-docker.pkg.dev/moz-fx-orchestrator-prod/orchestrator-prod/orchestrator" . }}' | |
| - name: 'Tenant Definition' | |
| value: 'https://github.com/mozilla/global-platform-admin/blob/main/tenants/orchestrator.yaml' | |
| # Will ignore differences between live and desired states during the diff. Note that these configurations are not | |
| @@ -25333,13 +25306,16 @@ | |
| tenant: "outgoing" | |
| realm: "nonprod" | |
| annotations: | |
| - argocd-image-updater.argoproj.io/app.helm.image-name: 'image.app.repository' | |
| - argocd-image-updater.argoproj.io/app.helm.image-tag: 'image.app.tag' | |
| - # Retain environment level dig scope for single chart tenants | |
| - argocd-image-updater.argoproj.io/image-list: 'app={{ dig "image_repository" "us-docker.pkg.dev/moz-fx-outgoing-prod/outgoing-prod/outgoing" . }}' | |
| - argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "image_regex" ".*" . }}' | |
| - argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "update_strategy" "newest-build" . }}' | |
| - argocd-image-updater.argoproj.io/git-branch: '{{ dig "target_revision" "main" . }}' | |
| + # We want this to render: image_tag' | |
| + argocd-image-updater.argoproj.io/app.helm.image-name: '{{ dig "charts" "outgoing" "image_name" "image.app.repository" . }}' | |
| + argocd-image-updater.argoproj.io/app.helm.image-tag: '{{ dig "charts" "outgoing" "image_tag" "image.app.tag" . }}' | |
| + # The ApplicationSet template will render backslashes from image_regex values | |
| + # as escape characters. To avoid this, we have to escape one level above. | |
| + # We want this to render: .*' | |
| + argocd-image-updater.argoproj.io/image-list: 'app={{ dig "charts" "outgoing" "image_repository" "us-docker.pkg.dev/moz-fx-outgoing-prod/outgoing-prod/outgoing" . }}' | |
| + argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "charts" "outgoing" "image_regex" (dig "image_regex" ".*" .) . }}' | |
| + argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "charts" "outgoing" "update_strategy" "newest-build" . }}' | |
| + argocd-image-updater.argoproj.io/git-branch: '{{ dig "charts" "outgoing" "target_revision" "main" . }}' | |
| argocd-image-updater.argoproj.io/write-back-method: 'git:secret:argocd-webservices/image-updater-github-credentials' #pragma: allowlist secret | |
| # resolves to the outgoing/k8s/outgoing/templates directory and values/Chart files | |
| # image updater creates .argocd-* files in the chart directory to manage image updates | |
| @@ -25365,8 +25341,7 @@ | |
| source: | |
| repoURL: "https://github.com/mozilla/webservices-infra" | |
| path: "outgoing/k8s/outgoing" | |
| - # Retain environment level dig scope for single chart tenants | |
| - targetRevision: '{{ dig "target_revision" "main" . }}' | |
| + targetRevision: '{{ dig "charts" "outgoing" "target_revision" "main" . }}' | |
| helm: | |
| parameters: | |
| - name: global.mozcloud.app_code | |
| @@ -25381,7 +25356,7 @@ | |
| value: moz-fx-outgoing-nonprod | |
| - name: global.mozcloud.realm | |
| value: nonprod | |
| - releaseName: '{{ dig "release_name" "outgoing" . }}' # Primarily used to import existing helm releases | |
| + releaseName: '{{ dig "charts" "outgoing" "release_name" "outgoing" . }}' # Primarily used to import existing helm releases | |
| valueFiles: | |
| - values.yaml | |
| - 'values-{{ .name }}.yaml' | |
| @@ -25389,15 +25364,14 @@ | |
| name: "webservices-low-private-nonprod-us-west1" | |
| namespace: "outgoing-{{ .name }}" | |
| info: | |
| - # Retain environment level dig scope for single chart tenants | |
| - name: 'Helm Chart' | |
| value: 'https://github.com/mozilla/webservices-infra/tree/{{ dig "target_revision" "main" . }}/outgoing/k8s/outgoing' | |
| - name: 'Helm Chart Ref' | |
| - value: '{{ dig "target_revision" "main" . }}' | |
| + value: '{{ dig "charts" "outgoing" "target_revision" "main" . }}' | |
| - name: 'Application Repository' | |
| - value: '{{ dig "application_repository" "mozilla-services/outgoing" . }}' | |
| + value: '{{ dig "charts" "outgoing" "application_repository" "mozilla-services/outgoing" . }}' | |
| - name: 'Image Repository' | |
| - value: '{{ dig "image_repository" "us-docker.pkg.dev/moz-fx-outgoing-prod/outgoing-prod/outgoing" . }}' | |
| + value: '{{ dig "charts" "outgoing" "image_repository" "us-docker.pkg.dev/moz-fx-outgoing-prod/outgoing-prod/outgoing" . }}' | |
| - name: 'Tenant Definition' | |
| value: 'https://github.com/mozilla/global-platform-admin/blob/main/tenants/outgoing.yaml' | |
| # Will ignore differences between live and desired states during the diff. Note that these configurations are not | |
| @@ -25457,6 +25426,17 @@ | |
| tenant: "outgoing" | |
| realm: "prod" | |
| annotations: | |
| + # We want this to render: image_tag' | |
| + argocd-image-updater.argoproj.io/app.helm.image-name: '{{ dig "charts" "outgoing" "image_name" "image.app.repository" . }}' | |
| + argocd-image-updater.argoproj.io/app.helm.image-tag: '{{ dig "charts" "outgoing" "image_tag" "image.app.tag" . }}' | |
| + # The ApplicationSet template will render backslashes from image_regex values | |
| + # as escape characters. To avoid this, we have to escape one level above. | |
| + # We want this to render: .*' | |
| + argocd-image-updater.argoproj.io/image-list: 'app={{ dig "charts" "outgoing" "image_repository" "us-docker.pkg.dev/moz-fx-outgoing-prod/outgoing-prod/outgoing" . }}' | |
| + argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "charts" "outgoing" "image_regex" (dig "image_regex" ".*" .) . }}' | |
| + argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "charts" "outgoing" "update_strategy" "newest-build" . }}' | |
| + argocd-image-updater.argoproj.io/git-branch: '{{ dig "charts" "outgoing" "target_revision" "main" . }}' | |
| + argocd-image-updater.argoproj.io/write-back-method: 'git:secret:argocd-webservices/image-updater-github-credentials' #pragma: allowlist secret | |
| # resolves to the outgoing/k8s/outgoing/templates directory and values/Chart files | |
| # image updater creates .argocd-* files in the chart directory to manage image updates | |
| # this will trigger a sync on every application that is consuming these charts which is not intended | |
| @@ -25481,8 +25461,7 @@ | |
| source: | |
| repoURL: "https://github.com/mozilla/webservices-infra" | |
| path: "outgoing/k8s/outgoing" | |
| - # Retain environment level dig scope for single chart tenants | |
| - targetRevision: '{{ dig "target_revision" "main" . }}' | |
| + targetRevision: '{{ dig "charts" "outgoing" "target_revision" "main" . }}' | |
| helm: | |
| parameters: | |
| - name: global.mozcloud.app_code | |
| @@ -25497,7 +25476,7 @@ | |
| value: moz-fx-outgoing-prod | |
| - name: global.mozcloud.realm | |
| value: prod | |
| - releaseName: '{{ dig "release_name" "outgoing" . }}' # Primarily used to import existing helm releases | |
| + releaseName: '{{ dig "charts" "outgoing" "release_name" "outgoing" . }}' # Primarily used to import existing helm releases | |
| valueFiles: | |
| - values.yaml | |
| - 'values-{{ .name }}.yaml' | |
| @@ -25505,15 +25484,14 @@ | |
| name: "webservices-low-private-prod-us-west1" | |
| namespace: "outgoing-{{ .name }}" | |
| info: | |
| - # Retain environment level dig scope for single chart tenants | |
| - name: 'Helm Chart' | |
| value: 'https://github.com/mozilla/webservices-infra/tree/{{ dig "target_revision" "main" . }}/outgoing/k8s/outgoing' | |
| - name: 'Helm Chart Ref' | |
| - value: '{{ dig "target_revision" "main" . }}' | |
| + value: '{{ dig "charts" "outgoing" "target_revision" "main" . }}' | |
| - name: 'Application Repository' | |
| - value: '{{ dig "application_repository" "mozilla-services/outgoing" . }}' | |
| + value: '{{ dig "charts" "outgoing" "application_repository" "mozilla-services/outgoing" . }}' | |
| - name: 'Image Repository' | |
| - value: '{{ dig "image_repository" "us-docker.pkg.dev/moz-fx-outgoing-prod/outgoing-prod/outgoing" . }}' | |
| + value: '{{ dig "charts" "outgoing" "image_repository" "us-docker.pkg.dev/moz-fx-outgoing-prod/outgoing-prod/outgoing" . }}' | |
| - name: 'Tenant Definition' | |
| value: 'https://github.com/mozilla/global-platform-admin/blob/main/tenants/outgoing.yaml' | |
| # Will ignore differences between live and desired states during the diff. Note that these configurations are not | |
| @@ -25574,6 +25547,17 @@ | |
| tenant: "phabricator" | |
| realm: "nonprod" | |
| annotations: | |
| + # We want this to render: image_tag' | |
| + argocd-image-updater.argoproj.io/app.helm.image-name: '{{ dig "charts" "phabricator" "image_name" "image.name" . }}' | |
| + argocd-image-updater.argoproj.io/app.helm.image-tag: '{{ dig "charts" "phabricator" "image_tag" "image.tag" . }}' | |
| + # The ApplicationSet template will render backslashes from image_regex values | |
| + # as escape characters. To avoid this, we have to escape one level above. | |
| + # We want this to render: .*' | |
| + argocd-image-updater.argoproj.io/image-list: 'app={{ dig "charts" "phabricator" "image_repository" "us-docker.pkg.dev/moz-fx-phabricator-prod/phabricator-prod/phabricator" . }}' | |
| + argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "charts" "phabricator" "image_regex" (dig "image_regex" ".*" .) . }}' | |
| + argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "charts" "phabricator" "update_strategy" "newest-build" . }}' | |
| + argocd-image-updater.argoproj.io/git-branch: '{{ dig "charts" "phabricator" "target_revision" "main" . }}' | |
| + argocd-image-updater.argoproj.io/write-back-method: 'git:secret:argocd-webservices/image-updater-github-credentials' #pragma: allowlist secret | |
| # resolves to the phabricator/k8s/phabricator/templates directory and values/Chart files | |
| # image updater creates .argocd-* files in the chart directory to manage image updates | |
| # this will trigger a sync on every application that is consuming these charts which is not intended | |
| @@ -25598,8 +25582,7 @@ | |
| source: | |
| repoURL: "https://github.com/mozilla/webservices-infra" | |
| path: "phabricator/k8s/phabricator" | |
| - # Retain environment level dig scope for single chart tenants | |
| - targetRevision: '{{ dig "target_revision" "main" . }}' | |
| + targetRevision: '{{ dig "charts" "phabricator" "target_revision" "main" . }}' | |
| helm: | |
| parameters: | |
| - name: global.mozcloud.app_code | |
| @@ -25614,7 +25597,7 @@ | |
| value: moz-fx-phabricator-nonprod | |
| - name: global.mozcloud.realm | |
| value: nonprod | |
| - releaseName: '{{ dig "release_name" "phabricator" . }}' # Primarily used to import existing helm releases | |
| + releaseName: '{{ dig "charts" "phabricator" "release_name" "phabricator" . }}' # Primarily used to import existing helm releases | |
| valueFiles: | |
| - values.yaml | |
| - 'values-{{ .name }}.yaml' | |
| @@ -25622,15 +25605,14 @@ | |
| name: "webservices-high-private-nonprod-us-west1" | |
| namespace: "phabricator-{{ .name }}" | |
| info: | |
| - # Retain environment level dig scope for single chart tenants | |
| - name: 'Helm Chart' | |
| value: 'https://github.com/mozilla/webservices-infra/tree/{{ dig "target_revision" "main" . }}/phabricator/k8s/phabricator' | |
| - name: 'Helm Chart Ref' | |
| - value: '{{ dig "target_revision" "main" . }}' | |
| + value: '{{ dig "charts" "phabricator" "target_revision" "main" . }}' | |
| - name: 'Application Repository' | |
| - value: '{{ dig "application_repository" "mozilla-conduit/phabricator" . }}' | |
| + value: '{{ dig "charts" "phabricator" "application_repository" "mozilla-conduit/phabricator" . }}' | |
| - name: 'Image Repository' | |
| - value: '{{ dig "image_repository" "us-docker.pkg.dev/moz-fx-phabricator-prod/phabricator-prod/phabricator" . }}' | |
| + value: '{{ dig "charts" "phabricator" "image_repository" "us-docker.pkg.dev/moz-fx-phabricator-prod/phabricator-prod/phabricator" . }}' | |
| - name: 'Tenant Definition' | |
| value: 'https://github.com/mozilla/global-platform-admin/blob/main/tenants/phabricator.yaml' | |
| # Will ignore differences between live and desired states during the diff. Note that these configurations are not | |
| @@ -25690,6 +25667,17 @@ | |
| tenant: "phabricator" | |
| realm: "prod" | |
| annotations: | |
| + # We want this to render: image_tag' | |
| + argocd-image-updater.argoproj.io/app.helm.image-name: '{{ dig "charts" "phabricator" "image_name" "image.name" . }}' | |
| + argocd-image-updater.argoproj.io/app.helm.image-tag: '{{ dig "charts" "phabricator" "image_tag" "image.tag" . }}' | |
| + # The ApplicationSet template will render backslashes from image_regex values | |
| + # as escape characters. To avoid this, we have to escape one level above. | |
| + # We want this to render: .*' | |
| + argocd-image-updater.argoproj.io/image-list: 'app={{ dig "charts" "phabricator" "image_repository" "us-docker.pkg.dev/moz-fx-phabricator-prod/phabricator-prod/phabricator" . }}' | |
| + argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "charts" "phabricator" "image_regex" (dig "image_regex" ".*" .) . }}' | |
| + argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "charts" "phabricator" "update_strategy" "newest-build" . }}' | |
| + argocd-image-updater.argoproj.io/git-branch: '{{ dig "charts" "phabricator" "target_revision" "main" . }}' | |
| + argocd-image-updater.argoproj.io/write-back-method: 'git:secret:argocd-webservices/image-updater-github-credentials' #pragma: allowlist secret | |
| # resolves to the phabricator/k8s/phabricator/templates directory and values/Chart files | |
| # image updater creates .argocd-* files in the chart directory to manage image updates | |
| # this will trigger a sync on every application that is consuming these charts which is not intended | |
| @@ -25714,8 +25702,7 @@ | |
| source: | |
| repoURL: "https://github.com/mozilla/webservices-infra" | |
| path: "phabricator/k8s/phabricator" | |
| - # Retain environment level dig scope for single chart tenants | |
| - targetRevision: '{{ dig "target_revision" "main" . }}' | |
| + targetRevision: '{{ dig "charts" "phabricator" "target_revision" "main" . }}' | |
| helm: | |
| parameters: | |
| - name: global.mozcloud.app_code | |
| @@ -25730,7 +25717,7 @@ | |
| value: moz-fx-phabricator-prod | |
| - name: global.mozcloud.realm | |
| value: prod | |
| - releaseName: '{{ dig "release_name" "phabricator" . }}' # Primarily used to import existing helm releases | |
| + releaseName: '{{ dig "charts" "phabricator" "release_name" "phabricator" . }}' # Primarily used to import existing helm releases | |
| valueFiles: | |
| - values.yaml | |
| - 'values-{{ .name }}.yaml' | |
| @@ -25738,15 +25725,14 @@ | |
| name: "webservices-high-private-prod-us-west1" | |
| namespace: "phabricator-{{ .name }}" | |
| info: | |
| - # Retain environment level dig scope for single chart tenants | |
| - name: 'Helm Chart' | |
| value: 'https://github.com/mozilla/webservices-infra/tree/{{ dig "target_revision" "main" . }}/phabricator/k8s/phabricator' | |
| - name: 'Helm Chart Ref' | |
| - value: '{{ dig "target_revision" "main" . }}' | |
| + value: '{{ dig "charts" "phabricator" "target_revision" "main" . }}' | |
| - name: 'Application Repository' | |
| - value: '{{ dig "application_repository" "mozilla-conduit/phabricator" . }}' | |
| + value: '{{ dig "charts" "phabricator" "application_repository" "mozilla-conduit/phabricator" . }}' | |
| - name: 'Image Repository' | |
| - value: '{{ dig "image_repository" "us-docker.pkg.dev/moz-fx-phabricator-prod/phabricator-prod/phabricator" . }}' | |
| + value: '{{ dig "charts" "phabricator" "image_repository" "us-docker.pkg.dev/moz-fx-phabricator-prod/phabricator-prod/phabricator" . }}' | |
| - name: 'Tenant Definition' | |
| value: 'https://github.com/mozilla/global-platform-admin/blob/main/tenants/phabricator.yaml' | |
| # Will ignore differences between live and desired states during the diff. Note that these configurations are not | |
| @@ -25806,6 +25787,17 @@ | |
| tenant: "pollbot" | |
| realm: "nonprod" | |
| annotations: | |
| + # We want this to render: image_tag' | |
| + argocd-image-updater.argoproj.io/app.helm.image-name: '{{ dig "charts" "pollbot" "image_name" "image.name" . }}' | |
| + argocd-image-updater.argoproj.io/app.helm.image-tag: '{{ dig "charts" "pollbot" "image_tag" "image.tag" . }}' | |
| + # The ApplicationSet template will render backslashes from image_regex values | |
| + # as escape characters. To avoid this, we have to escape one level above. | |
| + # We want this to render: .*' | |
| + argocd-image-updater.argoproj.io/image-list: 'app={{ dig "charts" "pollbot" "image_repository" "us-docker.pkg.dev/moz-fx-pollbot-prod/pollbot-prod/pollbot" . }}' | |
| + argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "charts" "pollbot" "image_regex" (dig "image_regex" ".*" .) . }}' | |
| + argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "charts" "pollbot" "update_strategy" "newest-build" . }}' | |
| + argocd-image-updater.argoproj.io/git-branch: '{{ dig "charts" "pollbot" "target_revision" "main" . }}' | |
| + argocd-image-updater.argoproj.io/write-back-method: 'git:secret:argocd-webservices/image-updater-github-credentials' #pragma: allowlist secret | |
| # resolves to the pollbot/k8s/pollbot/templates directory and values/Chart files | |
| # image updater creates .argocd-* files in the chart directory to manage image updates | |
| # this will trigger a sync on every application that is consuming these charts which is not intended | |
| @@ -25830,8 +25822,7 @@ | |
| source: | |
| repoURL: "https://github.com/mozilla/webservices-infra" | |
| path: "pollbot/k8s/pollbot" | |
| - # Retain environment level dig scope for single chart tenants | |
| - targetRevision: '{{ dig "target_revision" "main" . }}' | |
| + targetRevision: '{{ dig "charts" "pollbot" "target_revision" "main" . }}' | |
| helm: | |
| parameters: | |
| - name: global.mozcloud.app_code | |
| @@ -25846,7 +25837,7 @@ | |
| value: moz-fx-pollbot-nonprod | |
| - name: global.mozcloud.realm | |
| value: nonprod | |
| - releaseName: '{{ dig "release_name" "pollbot" . }}' # Primarily used to import existing helm releases | |
| + releaseName: '{{ dig "charts" "pollbot" "release_name" "pollbot" . }}' # Primarily used to import existing helm releases | |
| valueFiles: | |
| - values.yaml | |
| - 'values-{{ .name }}.yaml' | |
| @@ -25854,15 +25845,14 @@ | |
| name: "webservices-low-private-nonprod-us-west1" | |
| namespace: "pollbot-{{ .name }}" | |
| info: | |
| - # Retain environment level dig scope for single chart tenants | |
| - name: 'Helm Chart' | |
| value: 'https://github.com/mozilla/webservices-infra/tree/{{ dig "target_revision" "main" . }}/pollbot/k8s/pollbot' | |
| - name: 'Helm Chart Ref' | |
| - value: '{{ dig "target_revision" "main" . }}' | |
| + value: '{{ dig "charts" "pollbot" "target_revision" "main" . }}' | |
| - name: 'Application Repository' | |
| - value: '{{ dig "application_repository" "mozilla/pollbot" . }}' | |
| + value: '{{ dig "charts" "pollbot" "application_repository" "mozilla/pollbot" . }}' | |
| - name: 'Image Repository' | |
| - value: '{{ dig "image_repository" "us-docker.pkg.dev/moz-fx-pollbot-prod/pollbot-prod/pollbot" . }}' | |
| + value: '{{ dig "charts" "pollbot" "image_repository" "us-docker.pkg.dev/moz-fx-pollbot-prod/pollbot-prod/pollbot" . }}' | |
| - name: 'Tenant Definition' | |
| value: 'https://github.com/mozilla/global-platform-admin/blob/main/tenants/pollbot.yaml' | |
| # Will ignore differences between live and desired states during the diff. Note that these configurations are not | |
| @@ -25922,6 +25907,17 @@ | |
| tenant: "pollbot" | |
| realm: "prod" | |
| annotations: | |
| + # We want this to render: image_tag' | |
| + argocd-image-updater.argoproj.io/app.helm.image-name: '{{ dig "charts" "pollbot" "image_name" "image.name" . }}' | |
| + argocd-image-updater.argoproj.io/app.helm.image-tag: '{{ dig "charts" "pollbot" "image_tag" "image.tag" . }}' | |
| + # The ApplicationSet template will render backslashes from image_regex values | |
| + # as escape characters. To avoid this, we have to escape one level above. | |
| + # We want this to render: .*' | |
| + argocd-image-updater.argoproj.io/image-list: 'app={{ dig "charts" "pollbot" "image_repository" "us-docker.pkg.dev/moz-fx-pollbot-prod/pollbot-prod/pollbot" . }}' | |
| + argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "charts" "pollbot" "image_regex" (dig "image_regex" ".*" .) . }}' | |
| + argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "charts" "pollbot" "update_strategy" "newest-build" . }}' | |
| + argocd-image-updater.argoproj.io/git-branch: '{{ dig "charts" "pollbot" "target_revision" "main" . }}' | |
| + argocd-image-updater.argoproj.io/write-back-method: 'git:secret:argocd-webservices/image-updater-github-credentials' #pragma: allowlist secret | |
| # resolves to the pollbot/k8s/pollbot/templates directory and values/Chart files | |
| # image updater creates .argocd-* files in the chart directory to manage image updates | |
| # this will trigger a sync on every application that is consuming these charts which is not intended | |
| @@ -25946,8 +25942,7 @@ | |
| source: | |
| repoURL: "https://github.com/mozilla/webservices-infra" | |
| path: "pollbot/k8s/pollbot" | |
| - # Retain environment level dig scope for single chart tenants | |
| - targetRevision: '{{ dig "target_revision" "main" . }}' | |
| + targetRevision: '{{ dig "charts" "pollbot" "target_revision" "main" . }}' | |
| helm: | |
| parameters: | |
| - name: global.mozcloud.app_code | |
| @@ -25962,7 +25957,7 @@ | |
| value: moz-fx-pollbot-prod | |
| - name: global.mozcloud.realm | |
| value: prod | |
| - releaseName: '{{ dig "release_name" "pollbot" . }}' # Primarily used to import existing helm releases | |
| + releaseName: '{{ dig "charts" "pollbot" "release_name" "pollbot" . }}' # Primarily used to import existing helm releases | |
| valueFiles: | |
| - values.yaml | |
| - 'values-{{ .name }}.yaml' | |
| @@ -25970,15 +25965,14 @@ | |
| name: "webservices-low-private-prod-us-west1" | |
| namespace: "pollbot-{{ .name }}" | |
| info: | |
| - # Retain environment level dig scope for single chart tenants | |
| - name: 'Helm Chart' | |
| value: 'https://github.com/mozilla/webservices-infra/tree/{{ dig "target_revision" "main" . }}/pollbot/k8s/pollbot' | |
| - name: 'Helm Chart Ref' | |
| - value: '{{ dig "target_revision" "main" . }}' | |
| + value: '{{ dig "charts" "pollbot" "target_revision" "main" . }}' | |
| - name: 'Application Repository' | |
| - value: '{{ dig "application_repository" "mozilla/pollbot" . }}' | |
| + value: '{{ dig "charts" "pollbot" "application_repository" "mozilla/pollbot" . }}' | |
| - name: 'Image Repository' | |
| - value: '{{ dig "image_repository" "us-docker.pkg.dev/moz-fx-pollbot-prod/pollbot-prod/pollbot" . }}' | |
| + value: '{{ dig "charts" "pollbot" "image_repository" "us-docker.pkg.dev/moz-fx-pollbot-prod/pollbot-prod/pollbot" . }}' | |
| - name: 'Tenant Definition' | |
| value: 'https://github.com/mozilla/global-platform-admin/blob/main/tenants/pollbot.yaml' | |
| # Will ignore differences between live and desired states during the diff. Note that these configurations are not | |
| @@ -26289,6 +26278,17 @@ | |
| tenant: "productdelivery" | |
| realm: "nonprod" | |
| annotations: | |
| + # We want this to render: image_tag' | |
| + argocd-image-updater.argoproj.io/app.helm.image-name: '{{ dig "charts" "productdelivery" "image_name" "image.name" . }}' | |
| + argocd-image-updater.argoproj.io/app.helm.image-tag: '{{ dig "charts" "productdelivery" "image_tag" "image.tag" . }}' | |
| + # The ApplicationSet template will render backslashes from image_regex values | |
| + # as escape characters. To avoid this, we have to escape one level above. | |
| + # We want this to render: .*' | |
| + argocd-image-updater.argoproj.io/image-list: 'app={{ dig "charts" "productdelivery" "image_repository" "" . }}' | |
| + argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "charts" "productdelivery" "image_regex" (dig "image_regex" ".*" .) . }}' | |
| + argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "charts" "productdelivery" "update_strategy" "newest-build" . }}' | |
| + argocd-image-updater.argoproj.io/git-branch: '{{ dig "charts" "productdelivery" "target_revision" "main" . }}' | |
| + argocd-image-updater.argoproj.io/write-back-method: 'git:secret:argocd-webservices/image-updater-github-credentials' #pragma: allowlist secret | |
| # resolves to the productdelivery/k8s/productdelivery/templates directory and values/Chart files | |
| # image updater creates .argocd-* files in the chart directory to manage image updates | |
| # this will trigger a sync on every application that is consuming these charts which is not intended | |
| @@ -26313,8 +26313,7 @@ | |
| source: | |
| repoURL: "https://github.com/mozilla/webservices-infra" | |
| path: "productdelivery/k8s/productdelivery" | |
| - # Retain environment level dig scope for single chart tenants | |
| - targetRevision: '{{ dig "target_revision" "main" . }}' | |
| + targetRevision: '{{ dig "charts" "productdelivery" "target_revision" "main" . }}' | |
| helm: | |
| parameters: | |
| - name: global.mozcloud.app_code | |
| @@ -26329,7 +26328,7 @@ | |
| value: moz-fx-productdelivery-no-7d6a | |
| - name: global.mozcloud.realm | |
| value: nonprod | |
| - releaseName: '{{ dig "release_name" "productdelivery" . }}' # Primarily used to import existing helm releases | |
| + releaseName: '{{ dig "charts" "productdelivery" "release_name" "productdelivery" . }}' # Primarily used to import existing helm releases | |
| valueFiles: | |
| - values.yaml | |
| - 'values-{{ .name }}.yaml' | |
| @@ -26337,15 +26336,14 @@ | |
| name: "webservices-high-private-nonprod-us-west1" | |
| namespace: "productdelivery-{{ .name }}" | |
| info: | |
| - # Retain environment level dig scope for single chart tenants | |
| - name: 'Helm Chart' | |
| value: 'https://github.com/mozilla/webservices-infra/tree/{{ dig "target_revision" "main" . }}/productdelivery/k8s/productdelivery' | |
| - name: 'Helm Chart Ref' | |
| - value: '{{ dig "target_revision" "main" . }}' | |
| + value: '{{ dig "charts" "productdelivery" "target_revision" "main" . }}' | |
| - name: 'Application Repository' | |
| - value: '{{ dig "application_repository" "" . }}' | |
| + value: '{{ dig "charts" "productdelivery" "application_repository" "" . }}' | |
| - name: 'Image Repository' | |
| - value: '{{ dig "image_repository" "" . }}' | |
| + value: '{{ dig "charts" "productdelivery" "image_repository" "" . }}' | |
| - name: 'Tenant Definition' | |
| value: 'https://github.com/mozilla/global-platform-admin/blob/main/tenants/productdelivery.yaml' | |
| # Will ignore differences between live and desired states during the diff. Note that these configurations are not | |
| @@ -26405,6 +26398,17 @@ | |
| tenant: "productdelivery" | |
| realm: "prod" | |
| annotations: | |
| + # We want this to render: image_tag' | |
| + argocd-image-updater.argoproj.io/app.helm.image-name: '{{ dig "charts" "productdelivery" "image_name" "image.name" . }}' | |
| + argocd-image-updater.argoproj.io/app.helm.image-tag: '{{ dig "charts" "productdelivery" "image_tag" "image.tag" . }}' | |
| + # The ApplicationSet template will render backslashes from image_regex values | |
| + # as escape characters. To avoid this, we have to escape one level above. | |
| + # We want this to render: .*' | |
| + argocd-image-updater.argoproj.io/image-list: 'app={{ dig "charts" "productdelivery" "image_repository" "" . }}' | |
| + argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "charts" "productdelivery" "image_regex" (dig "image_regex" ".*" .) . }}' | |
| + argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "charts" "productdelivery" "update_strategy" "newest-build" . }}' | |
| + argocd-image-updater.argoproj.io/git-branch: '{{ dig "charts" "productdelivery" "target_revision" "main" . }}' | |
| + argocd-image-updater.argoproj.io/write-back-method: 'git:secret:argocd-webservices/image-updater-github-credentials' #pragma: allowlist secret | |
| # resolves to the productdelivery/k8s/productdelivery/templates directory and values/Chart files | |
| # image updater creates .argocd-* files in the chart directory to manage image updates | |
| # this will trigger a sync on every application that is consuming these charts which is not intended | |
| @@ -26429,8 +26433,7 @@ | |
| source: | |
| repoURL: "https://github.com/mozilla/webservices-infra" | |
| path: "productdelivery/k8s/productdelivery" | |
| - # Retain environment level dig scope for single chart tenants | |
| - targetRevision: '{{ dig "target_revision" "main" . }}' | |
| + targetRevision: '{{ dig "charts" "productdelivery" "target_revision" "main" . }}' | |
| helm: | |
| parameters: | |
| - name: global.mozcloud.app_code | |
| @@ -26445,7 +26448,7 @@ | |
| value: moz-fx-productdelivery-pr-38b5 | |
| - name: global.mozcloud.realm | |
| value: prod | |
| - releaseName: '{{ dig "release_name" "productdelivery" . }}' # Primarily used to import existing helm releases | |
| + releaseName: '{{ dig "charts" "productdelivery" "release_name" "productdelivery" . }}' # Primarily used to import existing helm releases | |
| valueFiles: | |
| - values.yaml | |
| - 'values-{{ .name }}.yaml' | |
| @@ -26453,15 +26456,14 @@ | |
| name: "webservices-high-private-prod-us-west1" | |
| namespace: "productdelivery-{{ .name }}" | |
| info: | |
| - # Retain environment level dig scope for single chart tenants | |
| - name: 'Helm Chart' | |
| value: 'https://github.com/mozilla/webservices-infra/tree/{{ dig "target_revision" "main" . }}/productdelivery/k8s/productdelivery' | |
| - name: 'Helm Chart Ref' | |
| - value: '{{ dig "target_revision" "main" . }}' | |
| + value: '{{ dig "charts" "productdelivery" "target_revision" "main" . }}' | |
| - name: 'Application Repository' | |
| - value: '{{ dig "application_repository" "" . }}' | |
| + value: '{{ dig "charts" "productdelivery" "application_repository" "" . }}' | |
| - name: 'Image Repository' | |
| - value: '{{ dig "image_repository" "" . }}' | |
| + value: '{{ dig "charts" "productdelivery" "image_repository" "" . }}' | |
| - name: 'Tenant Definition' | |
| value: 'https://github.com/mozilla/global-platform-admin/blob/main/tenants/productdelivery.yaml' | |
| # Will ignore differences between live and desired states during the diff. Note that these configurations are not | |
| @@ -26772,13 +26769,16 @@ | |
| tenant: "relay" | |
| realm: "nonprod" | |
| annotations: | |
| - argocd-image-updater.argoproj.io/app.helm.image-name: 'image.name' | |
| - argocd-image-updater.argoproj.io/app.helm.image-tag: 'image.tag' | |
| - # Retain environment level dig scope for single chart tenants | |
| - argocd-image-updater.argoproj.io/image-list: 'app={{ dig "image_repository" "us-docker.pkg.dev/moz-fx-relay-prod/relay-prod/fx-private-relay" . }}' | |
| - argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "image_regex" ".*" . }}' | |
| - argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "update_strategy" "newest-build" . }}' | |
| - argocd-image-updater.argoproj.io/git-branch: '{{ dig "target_revision" "main" . }}' | |
| + # We want this to render: image_tag' | |
| + argocd-image-updater.argoproj.io/app.helm.image-name: '{{ dig "charts" "relay" "image_name" "image.name" . }}' | |
| + argocd-image-updater.argoproj.io/app.helm.image-tag: '{{ dig "charts" "relay" "image_tag" "image.tag" . }}' | |
| + # The ApplicationSet template will render backslashes from image_regex values | |
| + # as escape characters. To avoid this, we have to escape one level above. | |
| + # We want this to render: .*' | |
| + argocd-image-updater.argoproj.io/image-list: 'app={{ dig "charts" "relay" "image_repository" "us-docker.pkg.dev/moz-fx-relay-prod/relay-prod/fx-private-relay" . }}' | |
| + argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "charts" "relay" "image_regex" (dig "image_regex" ".*" .) . }}' | |
| + argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "charts" "relay" "update_strategy" "newest-build" . }}' | |
| + argocd-image-updater.argoproj.io/git-branch: '{{ dig "charts" "relay" "target_revision" "main" . }}' | |
| argocd-image-updater.argoproj.io/write-back-method: 'git:secret:argocd-webservices/image-updater-github-credentials' #pragma: allowlist secret | |
| # resolves to the relay/k8s/relay/templates directory and values/Chart files | |
| # image updater creates .argocd-* files in the chart directory to manage image updates | |
| @@ -26804,8 +26804,7 @@ | |
| source: | |
| repoURL: "https://github.com/mozilla/webservices-infra" | |
| path: "relay/k8s/relay" | |
| - # Retain environment level dig scope for single chart tenants | |
| - targetRevision: '{{ dig "target_revision" "main" . }}' | |
| + targetRevision: '{{ dig "charts" "relay" "target_revision" "main" . }}' | |
| helm: | |
| parameters: | |
| - name: global.mozcloud.app_code | |
| @@ -26820,7 +26819,7 @@ | |
| value: moz-fx-relay-nonprod | |
| - name: global.mozcloud.realm | |
| value: nonprod | |
| - releaseName: '{{ dig "release_name" "relay" . }}' # Primarily used to import existing helm releases | |
| + releaseName: '{{ dig "charts" "relay" "release_name" "relay" . }}' # Primarily used to import existing helm releases | |
| valueFiles: | |
| - values.yaml | |
| - 'values-{{ .name }}.yaml' | |
| @@ -26828,15 +26827,14 @@ | |
| name: "webservices-high-private-nonprod-us-west1" | |
| namespace: "relay-{{ .name }}" | |
| info: | |
| - # Retain environment level dig scope for single chart tenants | |
| - name: 'Helm Chart' | |
| value: 'https://github.com/mozilla/webservices-infra/tree/{{ dig "target_revision" "main" . }}/relay/k8s/relay' | |
| - name: 'Helm Chart Ref' | |
| - value: '{{ dig "target_revision" "main" . }}' | |
| + value: '{{ dig "charts" "relay" "target_revision" "main" . }}' | |
| - name: 'Application Repository' | |
| - value: '{{ dig "application_repository" "mozilla/fx-private-relay" . }}' | |
| + value: '{{ dig "charts" "relay" "application_repository" "mozilla/fx-private-relay" . }}' | |
| - name: 'Image Repository' | |
| - value: '{{ dig "image_repository" "us-docker.pkg.dev/moz-fx-relay-prod/relay-prod/fx-private-relay" . }}' | |
| + value: '{{ dig "charts" "relay" "image_repository" "us-docker.pkg.dev/moz-fx-relay-prod/relay-prod/fx-private-relay" . }}' | |
| - name: 'Tenant Definition' | |
| value: 'https://github.com/mozilla/global-platform-admin/blob/main/tenants/relay.yaml' | |
| # Will ignore differences between live and desired states during the diff. Note that these configurations are not | |
| @@ -26896,13 +26889,16 @@ | |
| tenant: "relay" | |
| realm: "prod" | |
| annotations: | |
| - argocd-image-updater.argoproj.io/app.helm.image-name: 'image.name' | |
| - argocd-image-updater.argoproj.io/app.helm.image-tag: 'image.tag' | |
| - # Retain environment level dig scope for single chart tenants | |
| - argocd-image-updater.argoproj.io/image-list: 'app={{ dig "image_repository" "us-docker.pkg.dev/moz-fx-relay-prod/relay-prod/fx-private-relay" . }}' | |
| - argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "image_regex" ".*" . }}' | |
| - argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "update_strategy" "newest-build" . }}' | |
| - argocd-image-updater.argoproj.io/git-branch: '{{ dig "target_revision" "main" . }}' | |
| + # We want this to render: image_tag' | |
| + argocd-image-updater.argoproj.io/app.helm.image-name: '{{ dig "charts" "relay" "image_name" "image.name" . }}' | |
| + argocd-image-updater.argoproj.io/app.helm.image-tag: '{{ dig "charts" "relay" "image_tag" "image.tag" . }}' | |
| + # The ApplicationSet template will render backslashes from image_regex values | |
| + # as escape characters. To avoid this, we have to escape one level above. | |
| + # We want this to render: .*' | |
| + argocd-image-updater.argoproj.io/image-list: 'app={{ dig "charts" "relay" "image_repository" "us-docker.pkg.dev/moz-fx-relay-prod/relay-prod/fx-private-relay" . }}' | |
| + argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "charts" "relay" "image_regex" (dig "image_regex" ".*" .) . }}' | |
| + argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "charts" "relay" "update_strategy" "newest-build" . }}' | |
| + argocd-image-updater.argoproj.io/git-branch: '{{ dig "charts" "relay" "target_revision" "main" . }}' | |
| argocd-image-updater.argoproj.io/write-back-method: 'git:secret:argocd-webservices/image-updater-github-credentials' #pragma: allowlist secret | |
| # resolves to the relay/k8s/relay/templates directory and values/Chart files | |
| # image updater creates .argocd-* files in the chart directory to manage image updates | |
| @@ -26928,8 +26924,7 @@ | |
| source: | |
| repoURL: "https://github.com/mozilla/webservices-infra" | |
| path: "relay/k8s/relay" | |
| - # Retain environment level dig scope for single chart tenants | |
| - targetRevision: '{{ dig "target_revision" "main" . }}' | |
| + targetRevision: '{{ dig "charts" "relay" "target_revision" "main" . }}' | |
| helm: | |
| parameters: | |
| - name: global.mozcloud.app_code | |
| @@ -26944,7 +26939,7 @@ | |
| value: moz-fx-relay-prod | |
| - name: global.mozcloud.realm | |
| value: prod | |
| - releaseName: '{{ dig "release_name" "relay" . }}' # Primarily used to import existing helm releases | |
| + releaseName: '{{ dig "charts" "relay" "release_name" "relay" . }}' # Primarily used to import existing helm releases | |
| valueFiles: | |
| - values.yaml | |
| - 'values-{{ .name }}.yaml' | |
| @@ -26952,15 +26947,14 @@ | |
| name: "webservices-high-private-prod-us-west1" | |
| namespace: "relay-{{ .name }}" | |
| info: | |
| - # Retain environment level dig scope for single chart tenants | |
| - name: 'Helm Chart' | |
| value: 'https://github.com/mozilla/webservices-infra/tree/{{ dig "target_revision" "main" . }}/relay/k8s/relay' | |
| - name: 'Helm Chart Ref' | |
| - value: '{{ dig "target_revision" "main" . }}' | |
| + value: '{{ dig "charts" "relay" "target_revision" "main" . }}' | |
| - name: 'Application Repository' | |
| - value: '{{ dig "application_repository" "mozilla/fx-private-relay" . }}' | |
| + value: '{{ dig "charts" "relay" "application_repository" "mozilla/fx-private-relay" . }}' | |
| - name: 'Image Repository' | |
| - value: '{{ dig "image_repository" "us-docker.pkg.dev/moz-fx-relay-prod/relay-prod/fx-private-relay" . }}' | |
| + value: '{{ dig "charts" "relay" "image_repository" "us-docker.pkg.dev/moz-fx-relay-prod/relay-prod/fx-private-relay" . }}' | |
| - name: 'Tenant Definition' | |
| value: 'https://github.com/mozilla/global-platform-admin/blob/main/tenants/relay.yaml' | |
| # Will ignore differences between live and desired states during the diff. Note that these configurations are not | |
| @@ -27021,6 +27010,17 @@ | |
| tenant: "relengworker" | |
| realm: "nonprod" | |
| annotations: | |
| + # We want this to render: image_tag' | |
| + argocd-image-updater.argoproj.io/app.helm.image-name: '{{ dig "charts" "relengworker" "image_name" "image.name" . }}' | |
| + argocd-image-updater.argoproj.io/app.helm.image-tag: '{{ dig "charts" "relengworker" "image_tag" "image.tag" . }}' | |
| + # The ApplicationSet template will render backslashes from image_regex values | |
| + # as escape characters. To avoid this, we have to escape one level above. | |
| + # We want this to render: .*' | |
| + argocd-image-updater.argoproj.io/image-list: 'app={{ dig "charts" "relengworker" "image_repository" "" . }}' | |
| + argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "charts" "relengworker" "image_regex" (dig "image_regex" ".*" .) . }}' | |
| + argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "charts" "relengworker" "update_strategy" "newest-build" . }}' | |
| + argocd-image-updater.argoproj.io/git-branch: '{{ dig "charts" "relengworker" "target_revision" "main" . }}' | |
| + argocd-image-updater.argoproj.io/write-back-method: 'git:secret:argocd-webservices/image-updater-github-credentials' #pragma: allowlist secret | |
| # resolves to the relengworker/k8s/relengworker/templates directory and values/Chart files | |
| # image updater creates .argocd-* files in the chart directory to manage image updates | |
| # this will trigger a sync on every application that is consuming these charts which is not intended | |
| @@ -27045,8 +27045,7 @@ | |
| source: | |
| repoURL: "https://github.com/mozilla/webservices-infra" | |
| path: "relengworker/k8s/relengworker" | |
| - # Retain environment level dig scope for single chart tenants | |
| - targetRevision: '{{ dig "target_revision" "main" . }}' | |
| + targetRevision: '{{ dig "charts" "relengworker" "target_revision" "main" . }}' | |
| helm: | |
| parameters: | |
| - name: global.mozcloud.app_code | |
| @@ -27061,7 +27060,7 @@ | |
| value: moz-fx-relengworker-nonprod | |
| - name: global.mozcloud.realm | |
| value: nonprod | |
| - releaseName: '{{ dig "release_name" "relengworker" . }}' # Primarily used to import existing helm releases | |
| + releaseName: '{{ dig "charts" "relengworker" "release_name" "relengworker" . }}' # Primarily used to import existing helm releases | |
| valueFiles: | |
| - values.yaml | |
| - 'values-{{ .name }}.yaml' | |
| @@ -27069,15 +27068,14 @@ | |
| name: "webservices-high-private-nonprod-us-west1" | |
| namespace: "relengworker-{{ .name }}" | |
| info: | |
| - # Retain environment level dig scope for single chart tenants | |
| - name: 'Helm Chart' | |
| value: 'https://github.com/mozilla/webservices-infra/tree/{{ dig "target_revision" "main" . }}/relengworker/k8s/relengworker' | |
| - name: 'Helm Chart Ref' | |
| - value: '{{ dig "target_revision" "main" . }}' | |
| + value: '{{ dig "charts" "relengworker" "target_revision" "main" . }}' | |
| - name: 'Application Repository' | |
| - value: '{{ dig "application_repository" "" . }}' | |
| + value: '{{ dig "charts" "relengworker" "application_repository" "" . }}' | |
| - name: 'Image Repository' | |
| - value: '{{ dig "image_repository" "" . }}' | |
| + value: '{{ dig "charts" "relengworker" "image_repository" "" . }}' | |
| - name: 'Tenant Definition' | |
| value: 'https://github.com/mozilla/global-platform-admin/blob/main/tenants/relengworker.yaml' | |
| # Will ignore differences between live and desired states during the diff. Note that these configurations are not | |
| @@ -27137,6 +27130,17 @@ | |
| tenant: "relengworker" | |
| realm: "prod" | |
| annotations: | |
| + # We want this to render: image_tag' | |
| + argocd-image-updater.argoproj.io/app.helm.image-name: '{{ dig "charts" "relengworker" "image_name" "image.name" . }}' | |
| + argocd-image-updater.argoproj.io/app.helm.image-tag: '{{ dig "charts" "relengworker" "image_tag" "image.tag" . }}' | |
| + # The ApplicationSet template will render backslashes from image_regex values | |
| + # as escape characters. To avoid this, we have to escape one level above. | |
| + # We want this to render: .*' | |
| + argocd-image-updater.argoproj.io/image-list: 'app={{ dig "charts" "relengworker" "image_repository" "" . }}' | |
| + argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "charts" "relengworker" "image_regex" (dig "image_regex" ".*" .) . }}' | |
| + argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "charts" "relengworker" "update_strategy" "newest-build" . }}' | |
| + argocd-image-updater.argoproj.io/git-branch: '{{ dig "charts" "relengworker" "target_revision" "main" . }}' | |
| + argocd-image-updater.argoproj.io/write-back-method: 'git:secret:argocd-webservices/image-updater-github-credentials' #pragma: allowlist secret | |
| # resolves to the relengworker/k8s/relengworker/templates directory and values/Chart files | |
| # image updater creates .argocd-* files in the chart directory to manage image updates | |
| # this will trigger a sync on every application that is consuming these charts which is not intended | |
| @@ -27161,8 +27165,7 @@ | |
| source: | |
| repoURL: "https://github.com/mozilla/webservices-infra" | |
| path: "relengworker/k8s/relengworker" | |
| - # Retain environment level dig scope for single chart tenants | |
| - targetRevision: '{{ dig "target_revision" "main" . }}' | |
| + targetRevision: '{{ dig "charts" "relengworker" "target_revision" "main" . }}' | |
| helm: | |
| parameters: | |
| - name: global.mozcloud.app_code | |
| @@ -27177,7 +27180,7 @@ | |
| value: moz-fx-relengworker-prod | |
| - name: global.mozcloud.realm | |
| value: prod | |
| - releaseName: '{{ dig "release_name" "relengworker" . }}' # Primarily used to import existing helm releases | |
| + releaseName: '{{ dig "charts" "relengworker" "release_name" "relengworker" . }}' # Primarily used to import existing helm releases | |
| valueFiles: | |
| - values.yaml | |
| - 'values-{{ .name }}.yaml' | |
| @@ -27185,15 +27188,14 @@ | |
| name: "webservices-high-private-prod-us-west1" | |
| namespace: "relengworker-{{ .name }}" | |
| info: | |
| - # Retain environment level dig scope for single chart tenants | |
| - name: 'Helm Chart' | |
| value: 'https://github.com/mozilla/webservices-infra/tree/{{ dig "target_revision" "main" . }}/relengworker/k8s/relengworker' | |
| - name: 'Helm Chart Ref' | |
| - value: '{{ dig "target_revision" "main" . }}' | |
| + value: '{{ dig "charts" "relengworker" "target_revision" "main" . }}' | |
| - name: 'Application Repository' | |
| - value: '{{ dig "application_repository" "" . }}' | |
| + value: '{{ dig "charts" "relengworker" "application_repository" "" . }}' | |
| - name: 'Image Repository' | |
| - value: '{{ dig "image_repository" "" . }}' | |
| + value: '{{ dig "charts" "relengworker" "image_repository" "" . }}' | |
| - name: 'Tenant Definition' | |
| value: 'https://github.com/mozilla/global-platform-admin/blob/main/tenants/relengworker.yaml' | |
| # Will ignore differences between live and desired states during the diff. Note that these configurations are not | |
| @@ -27253,6 +27250,17 @@ | |
| tenant: "relsre-metrics" | |
| realm: "nonprod" | |
| annotations: | |
| + # We want this to render: image_tag' | |
| + argocd-image-updater.argoproj.io/app.helm.image-name: '{{ dig "charts" "relsre-metrics" "image_name" "image.name" . }}' | |
| + argocd-image-updater.argoproj.io/app.helm.image-tag: '{{ dig "charts" "relsre-metrics" "image_tag" "image.tag" . }}' | |
| + # The ApplicationSet template will render backslashes from image_regex values | |
| + # as escape characters. To avoid this, we have to escape one level above. | |
| + # We want this to render: .*' | |
| + argocd-image-updater.argoproj.io/image-list: 'app={{ dig "charts" "relsre-metrics" "image_repository" "us-west1-docker.pkg.dev/moz-fx-platform-artifacts/platform-dockerhub-cache/relsre-metrics" . }}' | |
| + argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "charts" "relsre-metrics" "image_regex" (dig "image_regex" ".*" .) . }}' | |
| + argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "charts" "relsre-metrics" "update_strategy" "newest-build" . }}' | |
| + argocd-image-updater.argoproj.io/git-branch: '{{ dig "charts" "relsre-metrics" "target_revision" "main" . }}' | |
| + argocd-image-updater.argoproj.io/write-back-method: 'git:secret:argocd-webservices/image-updater-github-credentials' #pragma: allowlist secret | |
| # resolves to the relsre-metrics/k8s/relsre-metrics/templates directory and values/Chart files | |
| # image updater creates .argocd-* files in the chart directory to manage image updates | |
| # this will trigger a sync on every application that is consuming these charts which is not intended | |
| @@ -27277,8 +27285,7 @@ | |
| source: | |
| repoURL: "https://github.com/mozilla/webservices-infra" | |
| path: "relsre-metrics/k8s/relsre-metrics" | |
| - # Retain environment level dig scope for single chart tenants | |
| - targetRevision: '{{ dig "target_revision" "main" . }}' | |
| + targetRevision: '{{ dig "charts" "relsre-metrics" "target_revision" "main" . }}' | |
| helm: | |
| parameters: | |
| - name: global.mozcloud.app_code | |
| @@ -27293,7 +27300,7 @@ | |
| value: moz-fx-relsre-metrics-nonprod | |
| - name: global.mozcloud.realm | |
| value: nonprod | |
| - releaseName: '{{ dig "release_name" "relsre-metrics" . }}' # Primarily used to import existing helm releases | |
| + releaseName: '{{ dig "charts" "relsre-metrics" "release_name" "relsre-metrics" . }}' # Primarily used to import existing helm releases | |
| valueFiles: | |
| - values.yaml | |
| - 'values-{{ .name }}.yaml' | |
| @@ -27301,15 +27308,14 @@ | |
| name: "webservices-low-private-nonprod-us-west1" | |
| namespace: "relsre-metrics-{{ .name }}" | |
| info: | |
| - # Retain environment level dig scope for single chart tenants | |
| - name: 'Helm Chart' | |
| value: 'https://github.com/mozilla/webservices-infra/tree/{{ dig "target_revision" "main" . }}/relsre-metrics/k8s/relsre-metrics' | |
| - name: 'Helm Chart Ref' | |
| - value: '{{ dig "target_revision" "main" . }}' | |
| + value: '{{ dig "charts" "relsre-metrics" "target_revision" "main" . }}' | |
| - name: 'Application Repository' | |
| - value: '{{ dig "application_repository" "" . }}' | |
| + value: '{{ dig "charts" "relsre-metrics" "application_repository" "" . }}' | |
| - name: 'Image Repository' | |
| - value: '{{ dig "image_repository" "us-west1-docker.pkg.dev/moz-fx-platform-artifacts/platform-dockerhub-cache/relsre-metrics" . }}' | |
| + value: '{{ dig "charts" "relsre-metrics" "image_repository" "us-west1-docker.pkg.dev/moz-fx-platform-artifacts/platform-dockerhub-cache/relsre-metrics" . }}' | |
| - name: 'Tenant Definition' | |
| value: 'https://github.com/mozilla/global-platform-admin/blob/main/tenants/relsre-metrics.yaml' | |
| # Will ignore differences between live and desired states during the diff. Note that these configurations are not | |
| @@ -27369,6 +27370,17 @@ | |
| tenant: "relsre-metrics" | |
| realm: "prod" | |
| annotations: | |
| + # We want this to render: image_tag' | |
| + argocd-image-updater.argoproj.io/app.helm.image-name: '{{ dig "charts" "relsre-metrics" "image_name" "image.name" . }}' | |
| + argocd-image-updater.argoproj.io/app.helm.image-tag: '{{ dig "charts" "relsre-metrics" "image_tag" "image.tag" . }}' | |
| + # The ApplicationSet template will render backslashes from image_regex values | |
| + # as escape characters. To avoid this, we have to escape one level above. | |
| + # We want this to render: .*' | |
| + argocd-image-updater.argoproj.io/image-list: 'app={{ dig "charts" "relsre-metrics" "image_repository" "us-west1-docker.pkg.dev/moz-fx-platform-artifacts/platform-dockerhub-cache/relsre-metrics" . }}' | |
| + argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "charts" "relsre-metrics" "image_regex" (dig "image_regex" ".*" .) . }}' | |
| + argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "charts" "relsre-metrics" "update_strategy" "newest-build" . }}' | |
| + argocd-image-updater.argoproj.io/git-branch: '{{ dig "charts" "relsre-metrics" "target_revision" "main" . }}' | |
| + argocd-image-updater.argoproj.io/write-back-method: 'git:secret:argocd-webservices/image-updater-github-credentials' #pragma: allowlist secret | |
| # resolves to the relsre-metrics/k8s/relsre-metrics/templates directory and values/Chart files | |
| # image updater creates .argocd-* files in the chart directory to manage image updates | |
| # this will trigger a sync on every application that is consuming these charts which is not intended | |
| @@ -27393,8 +27405,7 @@ | |
| source: | |
| repoURL: "https://github.com/mozilla/webservices-infra" | |
| path: "relsre-metrics/k8s/relsre-metrics" | |
| - # Retain environment level dig scope for single chart tenants | |
| - targetRevision: '{{ dig "target_revision" "main" . }}' | |
| + targetRevision: '{{ dig "charts" "relsre-metrics" "target_revision" "main" . }}' | |
| helm: | |
| parameters: | |
| - name: global.mozcloud.app_code | |
| @@ -27409,7 +27420,7 @@ | |
| value: moz-fx-relsre-metrics-prod | |
| - name: global.mozcloud.realm | |
| value: prod | |
| - releaseName: '{{ dig "release_name" "relsre-metrics" . }}' # Primarily used to import existing helm releases | |
| + releaseName: '{{ dig "charts" "relsre-metrics" "release_name" "relsre-metrics" . }}' # Primarily used to import existing helm releases | |
| valueFiles: | |
| - values.yaml | |
| - 'values-{{ .name }}.yaml' | |
| @@ -27417,15 +27428,14 @@ | |
| name: "webservices-low-private-prod-us-west1" | |
| namespace: "relsre-metrics-{{ .name }}" | |
| info: | |
| - # Retain environment level dig scope for single chart tenants | |
| - name: 'Helm Chart' | |
| value: 'https://github.com/mozilla/webservices-infra/tree/{{ dig "target_revision" "main" . }}/relsre-metrics/k8s/relsre-metrics' | |
| - name: 'Helm Chart Ref' | |
| - value: '{{ dig "target_revision" "main" . }}' | |
| + value: '{{ dig "charts" "relsre-metrics" "target_revision" "main" . }}' | |
| - name: 'Application Repository' | |
| - value: '{{ dig "application_repository" "" . }}' | |
| + value: '{{ dig "charts" "relsre-metrics" "application_repository" "" . }}' | |
| - name: 'Image Repository' | |
| - value: '{{ dig "image_repository" "us-west1-docker.pkg.dev/moz-fx-platform-artifacts/platform-dockerhub-cache/relsre-metrics" . }}' | |
| + value: '{{ dig "charts" "relsre-metrics" "image_repository" "us-west1-docker.pkg.dev/moz-fx-platform-artifacts/platform-dockerhub-cache/relsre-metrics" . }}' | |
| - name: 'Tenant Definition' | |
| value: 'https://github.com/mozilla/global-platform-admin/blob/main/tenants/relsre-metrics.yaml' | |
| # Will ignore differences between live and desired states during the diff. Note that these configurations are not | |
| @@ -29121,13 +29126,16 @@ | |
| tenant: "springfield" | |
| realm: "nonprod" | |
| annotations: | |
| - argocd-image-updater.argoproj.io/app.helm.image-name: 'image.name' | |
| - argocd-image-updater.argoproj.io/app.helm.image-tag: 'image.tag' | |
| - # Retain environment level dig scope for single chart tenants | |
| - argocd-image-updater.argoproj.io/image-list: 'app={{ dig "image_repository" "us-docker.pkg.dev/moz-fx-springfield-prod/springfield-prod/springfield" . }}' | |
| - argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "image_regex" ".*" . }}' | |
| - argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "update_strategy" "newest-build" . }}' | |
| - argocd-image-updater.argoproj.io/git-branch: '{{ dig "target_revision" "main" . }}' | |
| + # We want this to render: image_tag' | |
| + argocd-image-updater.argoproj.io/app.helm.image-name: '{{ dig "charts" "springfield" "image_name" "image.name" . }}' | |
| + argocd-image-updater.argoproj.io/app.helm.image-tag: '{{ dig "charts" "springfield" "image_tag" "image.tag" . }}' | |
| + # The ApplicationSet template will render backslashes from image_regex values | |
| + # as escape characters. To avoid this, we have to escape one level above. | |
| + # We want this to render: .*' | |
| + argocd-image-updater.argoproj.io/image-list: 'app={{ dig "charts" "springfield" "image_repository" "us-docker.pkg.dev/moz-fx-springfield-prod/springfield-prod/springfield" . }}' | |
| + argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "charts" "springfield" "image_regex" (dig "image_regex" ".*" .) . }}' | |
| + argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "charts" "springfield" "update_strategy" "newest-build" . }}' | |
| + argocd-image-updater.argoproj.io/git-branch: '{{ dig "charts" "springfield" "target_revision" "main" . }}' | |
| argocd-image-updater.argoproj.io/write-back-method: 'git:secret:argocd-webservices/image-updater-github-credentials' #pragma: allowlist secret | |
| # resolves to the springfield/k8s/springfield/templates directory and values/Chart files | |
| # image updater creates .argocd-* files in the chart directory to manage image updates | |
| @@ -29153,8 +29161,7 @@ | |
| source: | |
| repoURL: "https://github.com/mozilla/webservices-infra" | |
| path: "springfield/k8s/springfield" | |
| - # Retain environment level dig scope for single chart tenants | |
| - targetRevision: '{{ dig "target_revision" "main" . }}' | |
| + targetRevision: '{{ dig "charts" "springfield" "target_revision" "main" . }}' | |
| helm: | |
| parameters: | |
| - name: global.mozcloud.app_code | |
| @@ -29169,7 +29176,7 @@ | |
| value: moz-fx-springfield-nonprod | |
| - name: global.mozcloud.realm | |
| value: nonprod | |
| - releaseName: '{{ dig "release_name" "springfield" . }}' # Primarily used to import existing helm releases | |
| + releaseName: '{{ dig "charts" "springfield" "release_name" "springfield" . }}' # Primarily used to import existing helm releases | |
| valueFiles: | |
| - values.yaml | |
| - 'values-{{ .name }}.yaml' | |
| @@ -29179,15 +29186,14 @@ | |
| name: "webservices-low-private-nonprod-europe-west1" | |
| namespace: "springfield-{{ .name }}" | |
| info: | |
| - # Retain environment level dig scope for single chart tenants | |
| - name: 'Helm Chart' | |
| value: 'https://github.com/mozilla/webservices-infra/tree/{{ dig "target_revision" "main" . }}/springfield/k8s/springfield' | |
| - name: 'Helm Chart Ref' | |
| - value: '{{ dig "target_revision" "main" . }}' | |
| + value: '{{ dig "charts" "springfield" "target_revision" "main" . }}' | |
| - name: 'Application Repository' | |
| - value: '{{ dig "application_repository" "mozilla/springfield" . }}' | |
| + value: '{{ dig "charts" "springfield" "application_repository" "mozilla/springfield" . }}' | |
| - name: 'Image Repository' | |
| - value: '{{ dig "image_repository" "us-docker.pkg.dev/moz-fx-springfield-prod/springfield-prod/springfield" . }}' | |
| + value: '{{ dig "charts" "springfield" "image_repository" "us-docker.pkg.dev/moz-fx-springfield-prod/springfield-prod/springfield" . }}' | |
| - name: 'Tenant Definition' | |
| value: 'https://github.com/mozilla/global-platform-admin/blob/main/tenants/springfield.yaml' | |
| # Will ignore differences between live and desired states during the diff. Note that these configurations are not | |
| @@ -29249,13 +29250,16 @@ | |
| tenant: "springfield" | |
| realm: "nonprod" | |
| annotations: | |
| - argocd-image-updater.argoproj.io/app.helm.image-name: 'image.name' | |
| - argocd-image-updater.argoproj.io/app.helm.image-tag: 'image.tag' | |
| - # Retain environment level dig scope for single chart tenants | |
| - argocd-image-updater.argoproj.io/image-list: 'app={{ dig "image_repository" "us-docker.pkg.dev/moz-fx-springfield-prod/springfield-prod/springfield" . }}' | |
| - argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "image_regex" ".*" . }}' | |
| - argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "update_strategy" "newest-build" . }}' | |
| - argocd-image-updater.argoproj.io/git-branch: '{{ dig "target_revision" "main" . }}' | |
| + # We want this to render: image_tag' | |
| + argocd-image-updater.argoproj.io/app.helm.image-name: '{{ dig "charts" "springfield" "image_name" "image.name" . }}' | |
| + argocd-image-updater.argoproj.io/app.helm.image-tag: '{{ dig "charts" "springfield" "image_tag" "image.tag" . }}' | |
| + # The ApplicationSet template will render backslashes from image_regex values | |
| + # as escape characters. To avoid this, we have to escape one level above. | |
| + # We want this to render: .*' | |
| + argocd-image-updater.argoproj.io/image-list: 'app={{ dig "charts" "springfield" "image_repository" "us-docker.pkg.dev/moz-fx-springfield-prod/springfield-prod/springfield" . }}' | |
| + argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "charts" "springfield" "image_regex" (dig "image_regex" ".*" .) . }}' | |
| + argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "charts" "springfield" "update_strategy" "newest-build" . }}' | |
| + argocd-image-updater.argoproj.io/git-branch: '{{ dig "charts" "springfield" "target_revision" "main" . }}' | |
| argocd-image-updater.argoproj.io/write-back-method: 'git:secret:argocd-webservices/image-updater-github-credentials' #pragma: allowlist secret | |
| # resolves to the springfield/k8s/springfield/templates directory and values/Chart files | |
| # image updater creates .argocd-* files in the chart directory to manage image updates | |
| @@ -29281,8 +29285,7 @@ | |
| source: | |
| repoURL: "https://github.com/mozilla/webservices-infra" | |
| path: "springfield/k8s/springfield" | |
| - # Retain environment level dig scope for single chart tenants | |
| - targetRevision: '{{ dig "target_revision" "main" . }}' | |
| + targetRevision: '{{ dig "charts" "springfield" "target_revision" "main" . }}' | |
| helm: | |
| parameters: | |
| - name: global.mozcloud.app_code | |
| @@ -29297,7 +29300,7 @@ | |
| value: moz-fx-springfield-nonprod | |
| - name: global.mozcloud.realm | |
| value: nonprod | |
| - releaseName: '{{ dig "release_name" "springfield" . }}' # Primarily used to import existing helm releases | |
| + releaseName: '{{ dig "charts" "springfield" "release_name" "springfield" . }}' # Primarily used to import existing helm releases | |
| valueFiles: | |
| - values.yaml | |
| - 'values-{{ .name }}.yaml' | |
| @@ -29305,15 +29308,14 @@ | |
| name: "webservices-low-private-nonprod-us-west1" | |
| namespace: "springfield-{{ .name }}" | |
| info: | |
| - # Retain environment level dig scope for single chart tenants | |
| - name: 'Helm Chart' | |
| value: 'https://github.com/mozilla/webservices-infra/tree/{{ dig "target_revision" "main" . }}/springfield/k8s/springfield' | |
| - name: 'Helm Chart Ref' | |
| - value: '{{ dig "target_revision" "main" . }}' | |
| + value: '{{ dig "charts" "springfield" "target_revision" "main" . }}' | |
| - name: 'Application Repository' | |
| - value: '{{ dig "application_repository" "mozilla/springfield" . }}' | |
| + value: '{{ dig "charts" "springfield" "application_repository" "mozilla/springfield" . }}' | |
| - name: 'Image Repository' | |
| - value: '{{ dig "image_repository" "us-docker.pkg.dev/moz-fx-springfield-prod/springfield-prod/springfield" . }}' | |
| + value: '{{ dig "charts" "springfield" "image_repository" "us-docker.pkg.dev/moz-fx-springfield-prod/springfield-prod/springfield" . }}' | |
| - name: 'Tenant Definition' | |
| value: 'https://github.com/mozilla/global-platform-admin/blob/main/tenants/springfield.yaml' | |
| # Will ignore differences between live and desired states during the diff. Note that these configurations are not | |
| @@ -29373,13 +29370,16 @@ | |
| tenant: "springfield" | |
| realm: "prod" | |
| annotations: | |
| - argocd-image-updater.argoproj.io/app.helm.image-name: 'image.name' | |
| - argocd-image-updater.argoproj.io/app.helm.image-tag: 'image.tag' | |
| - # Retain environment level dig scope for single chart tenants | |
| - argocd-image-updater.argoproj.io/image-list: 'app={{ dig "image_repository" "us-docker.pkg.dev/moz-fx-springfield-prod/springfield-prod/springfield" . }}' | |
| - argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "image_regex" ".*" . }}' | |
| - argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "update_strategy" "newest-build" . }}' | |
| - argocd-image-updater.argoproj.io/git-branch: '{{ dig "target_revision" "main" . }}' | |
| + # We want this to render: image_tag' | |
| + argocd-image-updater.argoproj.io/app.helm.image-name: '{{ dig "charts" "springfield" "image_name" "image.name" . }}' | |
| + argocd-image-updater.argoproj.io/app.helm.image-tag: '{{ dig "charts" "springfield" "image_tag" "image.tag" . }}' | |
| + # The ApplicationSet template will render backslashes from image_regex values | |
| + # as escape characters. To avoid this, we have to escape one level above. | |
| + # We want this to render: .*' | |
| + argocd-image-updater.argoproj.io/image-list: 'app={{ dig "charts" "springfield" "image_repository" "us-docker.pkg.dev/moz-fx-springfield-prod/springfield-prod/springfield" . }}' | |
| + argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "charts" "springfield" "image_regex" (dig "image_regex" ".*" .) . }}' | |
| + argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "charts" "springfield" "update_strategy" "newest-build" . }}' | |
| + argocd-image-updater.argoproj.io/git-branch: '{{ dig "charts" "springfield" "target_revision" "main" . }}' | |
| argocd-image-updater.argoproj.io/write-back-method: 'git:secret:argocd-webservices/image-updater-github-credentials' #pragma: allowlist secret | |
| # resolves to the springfield/k8s/springfield/templates directory and values/Chart files | |
| # image updater creates .argocd-* files in the chart directory to manage image updates | |
| @@ -29405,8 +29405,7 @@ | |
| source: | |
| repoURL: "https://github.com/mozilla/webservices-infra" | |
| path: "springfield/k8s/springfield" | |
| - # Retain environment level dig scope for single chart tenants | |
| - targetRevision: '{{ dig "target_revision" "main" . }}' | |
| + targetRevision: '{{ dig "charts" "springfield" "target_revision" "main" . }}' | |
| helm: | |
| parameters: | |
| - name: global.mozcloud.app_code | |
| @@ -29421,7 +29420,7 @@ | |
| value: moz-fx-springfield-prod | |
| - name: global.mozcloud.realm | |
| value: prod | |
| - releaseName: '{{ dig "release_name" "springfield" . }}' # Primarily used to import existing helm releases | |
| + releaseName: '{{ dig "charts" "springfield" "release_name" "springfield" . }}' # Primarily used to import existing helm releases | |
| valueFiles: | |
| - values.yaml | |
| - 'values-{{ .name }}.yaml' | |
| @@ -29431,15 +29430,14 @@ | |
| name: "webservices-low-private-prod-europe-west1" | |
| namespace: "springfield-{{ .name }}" | |
| info: | |
| - # Retain environment level dig scope for single chart tenants | |
| - name: 'Helm Chart' | |
| value: 'https://github.com/mozilla/webservices-infra/tree/{{ dig "target_revision" "main" . }}/springfield/k8s/springfield' | |
| - name: 'Helm Chart Ref' | |
| - value: '{{ dig "target_revision" "main" . }}' | |
| + value: '{{ dig "charts" "springfield" "target_revision" "main" . }}' | |
| - name: 'Application Repository' | |
| - value: '{{ dig "application_repository" "mozilla/springfield" . }}' | |
| + value: '{{ dig "charts" "springfield" "application_repository" "mozilla/springfield" . }}' | |
| - name: 'Image Repository' | |
| - value: '{{ dig "image_repository" "us-docker.pkg.dev/moz-fx-springfield-prod/springfield-prod/springfield" . }}' | |
| + value: '{{ dig "charts" "springfield" "image_repository" "us-docker.pkg.dev/moz-fx-springfield-prod/springfield-prod/springfield" . }}' | |
| - name: 'Tenant Definition' | |
| value: 'https://github.com/mozilla/global-platform-admin/blob/main/tenants/springfield.yaml' | |
| # Will ignore differences between live and desired states during the diff. Note that these configurations are not | |
| @@ -29499,13 +29492,16 @@ | |
| tenant: "springfield" | |
| realm: "prod" | |
| annotations: | |
| - argocd-image-updater.argoproj.io/app.helm.image-name: 'image.name' | |
| - argocd-image-updater.argoproj.io/app.helm.image-tag: 'image.tag' | |
| - # Retain environment level dig scope for single chart tenants | |
| - argocd-image-updater.argoproj.io/image-list: 'app={{ dig "image_repository" "us-docker.pkg.dev/moz-fx-springfield-prod/springfield-prod/springfield" . }}' | |
| - argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "image_regex" ".*" . }}' | |
| - argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "update_strategy" "newest-build" . }}' | |
| - argocd-image-updater.argoproj.io/git-branch: '{{ dig "target_revision" "main" . }}' | |
| + # We want this to render: image_tag' | |
| + argocd-image-updater.argoproj.io/app.helm.image-name: '{{ dig "charts" "springfield" "image_name" "image.name" . }}' | |
| + argocd-image-updater.argoproj.io/app.helm.image-tag: '{{ dig "charts" "springfield" "image_tag" "image.tag" . }}' | |
| + # The ApplicationSet template will render backslashes from image_regex values | |
| + # as escape characters. To avoid this, we have to escape one level above. | |
| + # We want this to render: .*' | |
| + argocd-image-updater.argoproj.io/image-list: 'app={{ dig "charts" "springfield" "image_repository" "us-docker.pkg.dev/moz-fx-springfield-prod/springfield-prod/springfield" . }}' | |
| + argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "charts" "springfield" "image_regex" (dig "image_regex" ".*" .) . }}' | |
| + argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "charts" "springfield" "update_strategy" "newest-build" . }}' | |
| + argocd-image-updater.argoproj.io/git-branch: '{{ dig "charts" "springfield" "target_revision" "main" . }}' | |
| argocd-image-updater.argoproj.io/write-back-method: 'git:secret:argocd-webservices/image-updater-github-credentials' #pragma: allowlist secret | |
| # resolves to the springfield/k8s/springfield/templates directory and values/Chart files | |
| # image updater creates .argocd-* files in the chart directory to manage image updates | |
| @@ -29531,8 +29527,7 @@ | |
| source: | |
| repoURL: "https://github.com/mozilla/webservices-infra" | |
| path: "springfield/k8s/springfield" | |
| - # Retain environment level dig scope for single chart tenants | |
| - targetRevision: '{{ dig "target_revision" "main" . }}' | |
| + targetRevision: '{{ dig "charts" "springfield" "target_revision" "main" . }}' | |
| helm: | |
| parameters: | |
| - name: global.mozcloud.app_code | |
| @@ -29547,7 +29542,7 @@ | |
| value: moz-fx-springfield-prod | |
| - name: global.mozcloud.realm | |
| value: prod | |
| - releaseName: '{{ dig "release_name" "springfield" . }}' # Primarily used to import existing helm releases | |
| + releaseName: '{{ dig "charts" "springfield" "release_name" "springfield" . }}' # Primarily used to import existing helm releases | |
| valueFiles: | |
| - values.yaml | |
| - 'values-{{ .name }}.yaml' | |
| @@ -29555,15 +29550,14 @@ | |
| name: "webservices-low-private-prod-us-west1" | |
| namespace: "springfield-{{ .name }}" | |
| info: | |
| - # Retain environment level dig scope for single chart tenants | |
| - name: 'Helm Chart' | |
| value: 'https://github.com/mozilla/webservices-infra/tree/{{ dig "target_revision" "main" . }}/springfield/k8s/springfield' | |
| - name: 'Helm Chart Ref' | |
| - value: '{{ dig "target_revision" "main" . }}' | |
| + value: '{{ dig "charts" "springfield" "target_revision" "main" . }}' | |
| - name: 'Application Repository' | |
| - value: '{{ dig "application_repository" "mozilla/springfield" . }}' | |
| + value: '{{ dig "charts" "springfield" "application_repository" "mozilla/springfield" . }}' | |
| - name: 'Image Repository' | |
| - value: '{{ dig "image_repository" "us-docker.pkg.dev/moz-fx-springfield-prod/springfield-prod/springfield" . }}' | |
| + value: '{{ dig "charts" "springfield" "image_repository" "us-docker.pkg.dev/moz-fx-springfield-prod/springfield-prod/springfield" . }}' | |
| - name: 'Tenant Definition' | |
| value: 'https://github.com/mozilla/global-platform-admin/blob/main/tenants/springfield.yaml' | |
| # Will ignore differences between live and desired states during the diff. Note that these configurations are not | |
| @@ -29624,6 +29613,17 @@ | |
| tenant: "stubattribution" | |
| realm: "nonprod" | |
| annotations: | |
| + # We want this to render: image_tag' | |
| + argocd-image-updater.argoproj.io/app.helm.image-name: '{{ dig "charts" "stubattribution" "image_name" "image.name" . }}' | |
| + argocd-image-updater.argoproj.io/app.helm.image-tag: '{{ dig "charts" "stubattribution" "image_tag" "image.tag" . }}' | |
| + # The ApplicationSet template will render backslashes from image_regex values | |
| + # as escape characters. To avoid this, we have to escape one level above. | |
| + # We want this to render: .*' | |
| + argocd-image-updater.argoproj.io/image-list: 'app={{ dig "charts" "stubattribution" "image_repository" "" . }}' | |
| + argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "charts" "stubattribution" "image_regex" (dig "image_regex" ".*" .) . }}' | |
| + argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "charts" "stubattribution" "update_strategy" "newest-build" . }}' | |
| + argocd-image-updater.argoproj.io/git-branch: '{{ dig "charts" "stubattribution" "target_revision" "main" . }}' | |
| + argocd-image-updater.argoproj.io/write-back-method: 'git:secret:argocd-webservices/image-updater-github-credentials' #pragma: allowlist secret | |
| # resolves to the stubattribution/k8s/stubattribution/templates directory and values/Chart files | |
| # image updater creates .argocd-* files in the chart directory to manage image updates | |
| # this will trigger a sync on every application that is consuming these charts which is not intended | |
| @@ -29648,8 +29648,7 @@ | |
| source: | |
| repoURL: "https://github.com/mozilla/webservices-infra" | |
| path: "stubattribution/k8s/stubattribution" | |
| - # Retain environment level dig scope for single chart tenants | |
| - targetRevision: '{{ dig "target_revision" "main" . }}' | |
| + targetRevision: '{{ dig "charts" "stubattribution" "target_revision" "main" . }}' | |
| helm: | |
| parameters: | |
| - name: global.mozcloud.app_code | |
| @@ -29664,7 +29663,7 @@ | |
| value: moz-fx-stubattribution-nonprod | |
| - name: global.mozcloud.realm | |
| value: nonprod | |
| - releaseName: '{{ dig "release_name" "stubattribution" . }}' # Primarily used to import existing helm releases | |
| + releaseName: '{{ dig "charts" "stubattribution" "release_name" "stubattribution" . }}' # Primarily used to import existing helm releases | |
| valueFiles: | |
| - values.yaml | |
| - 'values-{{ .name }}.yaml' | |
| @@ -29672,15 +29671,14 @@ | |
| name: "webservices-high-private-nonprod-us-west1" | |
| namespace: "stubattribution-{{ .name }}" | |
| info: | |
| - # Retain environment level dig scope for single chart tenants | |
| - name: 'Helm Chart' | |
| value: 'https://github.com/mozilla/webservices-infra/tree/{{ dig "target_revision" "main" . }}/stubattribution/k8s/stubattribution' | |
| - name: 'Helm Chart Ref' | |
| - value: '{{ dig "target_revision" "main" . }}' | |
| + value: '{{ dig "charts" "stubattribution" "target_revision" "main" . }}' | |
| - name: 'Application Repository' | |
| - value: '{{ dig "application_repository" "" . }}' | |
| + value: '{{ dig "charts" "stubattribution" "application_repository" "" . }}' | |
| - name: 'Image Repository' | |
| - value: '{{ dig "image_repository" "" . }}' | |
| + value: '{{ dig "charts" "stubattribution" "image_repository" "" . }}' | |
| - name: 'Tenant Definition' | |
| value: 'https://github.com/mozilla/global-platform-admin/blob/main/tenants/stubattribution.yaml' | |
| # Will ignore differences between live and desired states during the diff. Note that these configurations are not | |
| @@ -29740,6 +29733,17 @@ | |
| tenant: "stubattribution" | |
| realm: "prod" | |
| annotations: | |
| + # We want this to render: image_tag' | |
| + argocd-image-updater.argoproj.io/app.helm.image-name: '{{ dig "charts" "stubattribution" "image_name" "image.name" . }}' | |
| + argocd-image-updater.argoproj.io/app.helm.image-tag: '{{ dig "charts" "stubattribution" "image_tag" "image.tag" . }}' | |
| + # The ApplicationSet template will render backslashes from image_regex values | |
| + # as escape characters. To avoid this, we have to escape one level above. | |
| + # We want this to render: .*' | |
| + argocd-image-updater.argoproj.io/image-list: 'app={{ dig "charts" "stubattribution" "image_repository" "" . }}' | |
| + argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "charts" "stubattribution" "image_regex" (dig "image_regex" ".*" .) . }}' | |
| + argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "charts" "stubattribution" "update_strategy" "newest-build" . }}' | |
| + argocd-image-updater.argoproj.io/git-branch: '{{ dig "charts" "stubattribution" "target_revision" "main" . }}' | |
| + argocd-image-updater.argoproj.io/write-back-method: 'git:secret:argocd-webservices/image-updater-github-credentials' #pragma: allowlist secret | |
| # resolves to the stubattribution/k8s/stubattribution/templates directory and values/Chart files | |
| # image updater creates .argocd-* files in the chart directory to manage image updates | |
| # this will trigger a sync on every application that is consuming these charts which is not intended | |
| @@ -29764,8 +29768,7 @@ | |
| source: | |
| repoURL: "https://github.com/mozilla/webservices-infra" | |
| path: "stubattribution/k8s/stubattribution" | |
| - # Retain environment level dig scope for single chart tenants | |
| - targetRevision: '{{ dig "target_revision" "main" . }}' | |
| + targetRevision: '{{ dig "charts" "stubattribution" "target_revision" "main" . }}' | |
| helm: | |
| parameters: | |
| - name: global.mozcloud.app_code | |
| @@ -29780,7 +29783,7 @@ | |
| value: moz-fx-stubattribution-prod | |
| - name: global.mozcloud.realm | |
| value: prod | |
| - releaseName: '{{ dig "release_name" "stubattribution" . }}' # Primarily used to import existing helm releases | |
| + releaseName: '{{ dig "charts" "stubattribution" "release_name" "stubattribution" . }}' # Primarily used to import existing helm releases | |
| valueFiles: | |
| - values.yaml | |
| - 'values-{{ .name }}.yaml' | |
| @@ -29788,15 +29791,14 @@ | |
| name: "webservices-high-private-prod-us-west1" | |
| namespace: "stubattribution-{{ .name }}" | |
| info: | |
| - # Retain environment level dig scope for single chart tenants | |
| - name: 'Helm Chart' | |
| value: 'https://github.com/mozilla/webservices-infra/tree/{{ dig "target_revision" "main" . }}/stubattribution/k8s/stubattribution' | |
| - name: 'Helm Chart Ref' | |
| - value: '{{ dig "target_revision" "main" . }}' | |
| + value: '{{ dig "charts" "stubattribution" "target_revision" "main" . }}' | |
| - name: 'Application Repository' | |
| - value: '{{ dig "application_repository" "" . }}' | |
| + value: '{{ dig "charts" "stubattribution" "application_repository" "" . }}' | |
| - name: 'Image Repository' | |
| - value: '{{ dig "image_repository" "" . }}' | |
| + value: '{{ dig "charts" "stubattribution" "image_repository" "" . }}' | |
| - name: 'Tenant Definition' | |
| value: 'https://github.com/mozilla/global-platform-admin/blob/main/tenants/stubattribution.yaml' | |
| # Will ignore differences between live and desired states during the diff. Note that these configurations are not | |
| @@ -30108,13 +30105,16 @@ | |
| tenant: "sumo" | |
| realm: "nonprod" | |
| annotations: | |
| - argocd-image-updater.argoproj.io/app.helm.image-name: 'image.name' | |
| - argocd-image-updater.argoproj.io/app.helm.image-tag: 'image.tag' | |
| - # Retain environment level dig scope for single chart tenants | |
| - argocd-image-updater.argoproj.io/image-list: 'app={{ dig "image_repository" "us-docker.pkg.dev/moz-fx-sumo-prod/sumo-prod/kitsune" . }}' | |
| - argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "image_regex" ".*" . }}' | |
| - argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "update_strategy" "newest-build" . }}' | |
| - argocd-image-updater.argoproj.io/git-branch: '{{ dig "target_revision" "main" . }}' | |
| + # We want this to render: image_tag' | |
| + argocd-image-updater.argoproj.io/app.helm.image-name: '{{ dig "charts" "sumo" "image_name" "image.name" . }}' | |
| + argocd-image-updater.argoproj.io/app.helm.image-tag: '{{ dig "charts" "sumo" "image_tag" "image.tag" . }}' | |
| + # The ApplicationSet template will render backslashes from image_regex values | |
| + # as escape characters. To avoid this, we have to escape one level above. | |
| + # We want this to render: .*' | |
| + argocd-image-updater.argoproj.io/image-list: 'app={{ dig "charts" "sumo" "image_repository" "us-docker.pkg.dev/moz-fx-sumo-prod/sumo-prod/kitsune" . }}' | |
| + argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "charts" "sumo" "image_regex" (dig "image_regex" ".*" .) . }}' | |
| + argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "charts" "sumo" "update_strategy" "newest-build" . }}' | |
| + argocd-image-updater.argoproj.io/git-branch: '{{ dig "charts" "sumo" "target_revision" "main" . }}' | |
| argocd-image-updater.argoproj.io/write-back-method: 'git:secret:argocd-webservices/image-updater-github-credentials' #pragma: allowlist secret | |
| # resolves to the sumo/k8s/sumo/templates directory and values/Chart files | |
| # image updater creates .argocd-* files in the chart directory to manage image updates | |
| @@ -30140,8 +30140,7 @@ | |
| source: | |
| repoURL: "https://github.com/mozilla/webservices-infra" | |
| path: "sumo/k8s/sumo" | |
| - # Retain environment level dig scope for single chart tenants | |
| - targetRevision: '{{ dig "target_revision" "main" . }}' | |
| + targetRevision: '{{ dig "charts" "sumo" "target_revision" "main" . }}' | |
| helm: | |
| parameters: | |
| - name: global.mozcloud.app_code | |
| @@ -30156,7 +30155,7 @@ | |
| value: moz-fx-sumo-nonprod | |
| - name: global.mozcloud.realm | |
| value: nonprod | |
| - releaseName: '{{ dig "release_name" "sumo" . }}' # Primarily used to import existing helm releases | |
| + releaseName: '{{ dig "charts" "sumo" "release_name" "sumo" . }}' # Primarily used to import existing helm releases | |
| valueFiles: | |
| - values.yaml | |
| - 'values-{{ .name }}.yaml' | |
| @@ -30166,15 +30165,14 @@ | |
| name: "webservices-high-private-nonprod-europe-west1" | |
| namespace: "sumo-{{ .name }}" | |
| info: | |
| - # Retain environment level dig scope for single chart tenants | |
| - name: 'Helm Chart' | |
| value: 'https://github.com/mozilla/webservices-infra/tree/{{ dig "target_revision" "main" . }}/sumo/k8s/sumo' | |
| - name: 'Helm Chart Ref' | |
| - value: '{{ dig "target_revision" "main" . }}' | |
| + value: '{{ dig "charts" "sumo" "target_revision" "main" . }}' | |
| - name: 'Application Repository' | |
| - value: '{{ dig "application_repository" "" . }}' | |
| + value: '{{ dig "charts" "sumo" "application_repository" "" . }}' | |
| - name: 'Image Repository' | |
| - value: '{{ dig "image_repository" "us-docker.pkg.dev/moz-fx-sumo-prod/sumo-prod/kitsune" . }}' | |
| + value: '{{ dig "charts" "sumo" "image_repository" "us-docker.pkg.dev/moz-fx-sumo-prod/sumo-prod/kitsune" . }}' | |
| - name: 'Tenant Definition' | |
| value: 'https://github.com/mozilla/global-platform-admin/blob/main/tenants/sumo.yaml' | |
| # Will ignore differences between live and desired states during the diff. Note that these configurations are not | |
| @@ -30235,13 +30228,16 @@ | |
| tenant: "sumo" | |
| realm: "nonprod" | |
| annotations: | |
| - argocd-image-updater.argoproj.io/app.helm.image-name: 'image.name' | |
| - argocd-image-updater.argoproj.io/app.helm.image-tag: 'image.tag' | |
| - # Retain environment level dig scope for single chart tenants | |
| - argocd-image-updater.argoproj.io/image-list: 'app={{ dig "image_repository" "us-docker.pkg.dev/moz-fx-sumo-prod/sumo-prod/kitsune" . }}' | |
| - argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "image_regex" ".*" . }}' | |
| - argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "update_strategy" "newest-build" . }}' | |
| - argocd-image-updater.argoproj.io/git-branch: '{{ dig "target_revision" "main" . }}' | |
| + # We want this to render: image_tag' | |
| + argocd-image-updater.argoproj.io/app.helm.image-name: '{{ dig "charts" "sumo" "image_name" "image.name" . }}' | |
| + argocd-image-updater.argoproj.io/app.helm.image-tag: '{{ dig "charts" "sumo" "image_tag" "image.tag" . }}' | |
| + # The ApplicationSet template will render backslashes from image_regex values | |
| + # as escape characters. To avoid this, we have to escape one level above. | |
| + # We want this to render: .*' | |
| + argocd-image-updater.argoproj.io/image-list: 'app={{ dig "charts" "sumo" "image_repository" "us-docker.pkg.dev/moz-fx-sumo-prod/sumo-prod/kitsune" . }}' | |
| + argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "charts" "sumo" "image_regex" (dig "image_regex" ".*" .) . }}' | |
| + argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "charts" "sumo" "update_strategy" "newest-build" . }}' | |
| + argocd-image-updater.argoproj.io/git-branch: '{{ dig "charts" "sumo" "target_revision" "main" . }}' | |
| argocd-image-updater.argoproj.io/write-back-method: 'git:secret:argocd-webservices/image-updater-github-credentials' #pragma: allowlist secret | |
| # resolves to the sumo/k8s/sumo/templates directory and values/Chart files | |
| # image updater creates .argocd-* files in the chart directory to manage image updates | |
| @@ -30267,8 +30263,7 @@ | |
| source: | |
| repoURL: "https://github.com/mozilla/webservices-infra" | |
| path: "sumo/k8s/sumo" | |
| - # Retain environment level dig scope for single chart tenants | |
| - targetRevision: '{{ dig "target_revision" "main" . }}' | |
| + targetRevision: '{{ dig "charts" "sumo" "target_revision" "main" . }}' | |
| helm: | |
| parameters: | |
| - name: global.mozcloud.app_code | |
| @@ -30283,7 +30278,7 @@ | |
| value: moz-fx-sumo-nonprod | |
| - name: global.mozcloud.realm | |
| value: nonprod | |
| - releaseName: '{{ dig "release_name" "sumo" . }}' # Primarily used to import existing helm releases | |
| + releaseName: '{{ dig "charts" "sumo" "release_name" "sumo" . }}' # Primarily used to import existing helm releases | |
| valueFiles: | |
| - values.yaml | |
| - 'values-{{ .name }}.yaml' | |
| @@ -30291,15 +30286,14 @@ | |
| name: "webservices-high-private-nonprod-us-west1" | |
| namespace: "sumo-{{ .name }}" | |
| info: | |
| - # Retain environment level dig scope for single chart tenants | |
| - name: 'Helm Chart' | |
| value: 'https://github.com/mozilla/webservices-infra/tree/{{ dig "target_revision" "main" . }}/sumo/k8s/sumo' | |
| - name: 'Helm Chart Ref' | |
| - value: '{{ dig "target_revision" "main" . }}' | |
| + value: '{{ dig "charts" "sumo" "target_revision" "main" . }}' | |
| - name: 'Application Repository' | |
| - value: '{{ dig "application_repository" "" . }}' | |
| + value: '{{ dig "charts" "sumo" "application_repository" "" . }}' | |
| - name: 'Image Repository' | |
| - value: '{{ dig "image_repository" "us-docker.pkg.dev/moz-fx-sumo-prod/sumo-prod/kitsune" . }}' | |
| + value: '{{ dig "charts" "sumo" "image_repository" "us-docker.pkg.dev/moz-fx-sumo-prod/sumo-prod/kitsune" . }}' | |
| - name: 'Tenant Definition' | |
| value: 'https://github.com/mozilla/global-platform-admin/blob/main/tenants/sumo.yaml' | |
| # Will ignore differences between live and desired states during the diff. Note that these configurations are not | |
| @@ -30359,13 +30348,16 @@ | |
| tenant: "sumo" | |
| realm: "prod" | |
| annotations: | |
| - argocd-image-updater.argoproj.io/app.helm.image-name: 'image.name' | |
| - argocd-image-updater.argoproj.io/app.helm.image-tag: 'image.tag' | |
| - # Retain environment level dig scope for single chart tenants | |
| - argocd-image-updater.argoproj.io/image-list: 'app={{ dig "image_repository" "us-docker.pkg.dev/moz-fx-sumo-prod/sumo-prod/kitsune" . }}' | |
| - argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "image_regex" ".*" . }}' | |
| - argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "update_strategy" "newest-build" . }}' | |
| - argocd-image-updater.argoproj.io/git-branch: '{{ dig "target_revision" "main" . }}' | |
| + # We want this to render: image_tag' | |
| + argocd-image-updater.argoproj.io/app.helm.image-name: '{{ dig "charts" "sumo" "image_name" "image.name" . }}' | |
| + argocd-image-updater.argoproj.io/app.helm.image-tag: '{{ dig "charts" "sumo" "image_tag" "image.tag" . }}' | |
| + # The ApplicationSet template will render backslashes from image_regex values | |
| + # as escape characters. To avoid this, we have to escape one level above. | |
| + # We want this to render: .*' | |
| + argocd-image-updater.argoproj.io/image-list: 'app={{ dig "charts" "sumo" "image_repository" "us-docker.pkg.dev/moz-fx-sumo-prod/sumo-prod/kitsune" . }}' | |
| + argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "charts" "sumo" "image_regex" (dig "image_regex" ".*" .) . }}' | |
| + argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "charts" "sumo" "update_strategy" "newest-build" . }}' | |
| + argocd-image-updater.argoproj.io/git-branch: '{{ dig "charts" "sumo" "target_revision" "main" . }}' | |
| argocd-image-updater.argoproj.io/write-back-method: 'git:secret:argocd-webservices/image-updater-github-credentials' #pragma: allowlist secret | |
| # resolves to the sumo/k8s/sumo/templates directory and values/Chart files | |
| # image updater creates .argocd-* files in the chart directory to manage image updates | |
| @@ -30391,8 +30383,7 @@ | |
| source: | |
| repoURL: "https://github.com/mozilla/webservices-infra" | |
| path: "sumo/k8s/sumo" | |
| - # Retain environment level dig scope for single chart tenants | |
| - targetRevision: '{{ dig "target_revision" "main" . }}' | |
| + targetRevision: '{{ dig "charts" "sumo" "target_revision" "main" . }}' | |
| helm: | |
| parameters: | |
| - name: global.mozcloud.app_code | |
| @@ -30407,7 +30398,7 @@ | |
| value: moz-fx-sumo-prod | |
| - name: global.mozcloud.realm | |
| value: prod | |
| - releaseName: '{{ dig "release_name" "sumo" . }}' # Primarily used to import existing helm releases | |
| + releaseName: '{{ dig "charts" "sumo" "release_name" "sumo" . }}' # Primarily used to import existing helm releases | |
| valueFiles: | |
| - values.yaml | |
| - 'values-{{ .name }}.yaml' | |
| @@ -30417,15 +30408,14 @@ | |
| name: "webservices-high-private-prod-europe-west1" | |
| namespace: "sumo-{{ .name }}" | |
| info: | |
| - # Retain environment level dig scope for single chart tenants | |
| - name: 'Helm Chart' | |
| value: 'https://github.com/mozilla/webservices-infra/tree/{{ dig "target_revision" "main" . }}/sumo/k8s/sumo' | |
| - name: 'Helm Chart Ref' | |
| - value: '{{ dig "target_revision" "main" . }}' | |
| + value: '{{ dig "charts" "sumo" "target_revision" "main" . }}' | |
| - name: 'Application Repository' | |
| - value: '{{ dig "application_repository" "" . }}' | |
| + value: '{{ dig "charts" "sumo" "application_repository" "" . }}' | |
| - name: 'Image Repository' | |
| - value: '{{ dig "image_repository" "us-docker.pkg.dev/moz-fx-sumo-prod/sumo-prod/kitsune" . }}' | |
| + value: '{{ dig "charts" "sumo" "image_repository" "us-docker.pkg.dev/moz-fx-sumo-prod/sumo-prod/kitsune" . }}' | |
| - name: 'Tenant Definition' | |
| value: 'https://github.com/mozilla/global-platform-admin/blob/main/tenants/sumo.yaml' | |
| # Will ignore differences between live and desired states during the diff. Note that these configurations are not | |
| @@ -30485,13 +30470,16 @@ | |
| tenant: "sumo" | |
| realm: "prod" | |
| annotations: | |
| - argocd-image-updater.argoproj.io/app.helm.image-name: 'image.name' | |
| - argocd-image-updater.argoproj.io/app.helm.image-tag: 'image.tag' | |
| - # Retain environment level dig scope for single chart tenants | |
| - argocd-image-updater.argoproj.io/image-list: 'app={{ dig "image_repository" "us-docker.pkg.dev/moz-fx-sumo-prod/sumo-prod/kitsune" . }}' | |
| - argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "image_regex" ".*" . }}' | |
| - argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "update_strategy" "newest-build" . }}' | |
| - argocd-image-updater.argoproj.io/git-branch: '{{ dig "target_revision" "main" . }}' | |
| + # We want this to render: image_tag' | |
| + argocd-image-updater.argoproj.io/app.helm.image-name: '{{ dig "charts" "sumo" "image_name" "image.name" . }}' | |
| + argocd-image-updater.argoproj.io/app.helm.image-tag: '{{ dig "charts" "sumo" "image_tag" "image.tag" . }}' | |
| + # The ApplicationSet template will render backslashes from image_regex values | |
| + # as escape characters. To avoid this, we have to escape one level above. | |
| + # We want this to render: .*' | |
| + argocd-image-updater.argoproj.io/image-list: 'app={{ dig "charts" "sumo" "image_repository" "us-docker.pkg.dev/moz-fx-sumo-prod/sumo-prod/kitsune" . }}' | |
| + argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "charts" "sumo" "image_regex" (dig "image_regex" ".*" .) . }}' | |
| + argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "charts" "sumo" "update_strategy" "newest-build" . }}' | |
| + argocd-image-updater.argoproj.io/git-branch: '{{ dig "charts" "sumo" "target_revision" "main" . }}' | |
| argocd-image-updater.argoproj.io/write-back-method: 'git:secret:argocd-webservices/image-updater-github-credentials' #pragma: allowlist secret | |
| # resolves to the sumo/k8s/sumo/templates directory and values/Chart files | |
| # image updater creates .argocd-* files in the chart directory to manage image updates | |
| @@ -30517,8 +30505,7 @@ | |
| source: | |
| repoURL: "https://github.com/mozilla/webservices-infra" | |
| path: "sumo/k8s/sumo" | |
| - # Retain environment level dig scope for single chart tenants | |
| - targetRevision: '{{ dig "target_revision" "main" . }}' | |
| + targetRevision: '{{ dig "charts" "sumo" "target_revision" "main" . }}' | |
| helm: | |
| parameters: | |
| - name: global.mozcloud.app_code | |
| @@ -30533,7 +30520,7 @@ | |
| value: moz-fx-sumo-prod | |
| - name: global.mozcloud.realm | |
| value: prod | |
| - releaseName: '{{ dig "release_name" "sumo" . }}' # Primarily used to import existing helm releases | |
| + releaseName: '{{ dig "charts" "sumo" "release_name" "sumo" . }}' # Primarily used to import existing helm releases | |
| valueFiles: | |
| - values.yaml | |
| - 'values-{{ .name }}.yaml' | |
| @@ -30541,15 +30528,14 @@ | |
| name: "webservices-high-private-prod-us-west1" | |
| namespace: "sumo-{{ .name }}" | |
| info: | |
| - # Retain environment level dig scope for single chart tenants | |
| - name: 'Helm Chart' | |
| value: 'https://github.com/mozilla/webservices-infra/tree/{{ dig "target_revision" "main" . }}/sumo/k8s/sumo' | |
| - name: 'Helm Chart Ref' | |
| - value: '{{ dig "target_revision" "main" . }}' | |
| + value: '{{ dig "charts" "sumo" "target_revision" "main" . }}' | |
| - name: 'Application Repository' | |
| - value: '{{ dig "application_repository" "" . }}' | |
| + value: '{{ dig "charts" "sumo" "application_repository" "" . }}' | |
| - name: 'Image Repository' | |
| - value: '{{ dig "image_repository" "us-docker.pkg.dev/moz-fx-sumo-prod/sumo-prod/kitsune" . }}' | |
| + value: '{{ dig "charts" "sumo" "image_repository" "us-docker.pkg.dev/moz-fx-sumo-prod/sumo-prod/kitsune" . }}' | |
| - name: 'Tenant Definition' | |
| value: 'https://github.com/mozilla/global-platform-admin/blob/main/tenants/sumo.yaml' | |
| # Will ignore differences between live and desired states during the diff. Note that these configurations are not | |
| @@ -34121,6 +34102,17 @@ | |
| tenant: "taskcluster" | |
| realm: "nonprod" | |
| annotations: | |
| + # We want this to render: image_tag' | |
| + argocd-image-updater.argoproj.io/app.helm.image-name: '{{ dig "charts" "taskcluster" "image_name" "image.name" . }}' | |
| + argocd-image-updater.argoproj.io/app.helm.image-tag: '{{ dig "charts" "taskcluster" "image_tag" "image.tag" . }}' | |
| + # The ApplicationSet template will render backslashes from image_regex values | |
| + # as escape characters. To avoid this, we have to escape one level above. | |
| + # We want this to render: .*' | |
| + argocd-image-updater.argoproj.io/image-list: 'app={{ dig "charts" "taskcluster" "image_repository" "" . }}' | |
| + argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "charts" "taskcluster" "image_regex" (dig "image_regex" ".*" .) . }}' | |
| + argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "charts" "taskcluster" "update_strategy" "newest-build" . }}' | |
| + argocd-image-updater.argoproj.io/git-branch: '{{ dig "charts" "taskcluster" "target_revision" "main" . }}' | |
| + argocd-image-updater.argoproj.io/write-back-method: 'git:secret:argocd-webservices/image-updater-github-credentials' #pragma: allowlist secret | |
| # resolves to the taskcluster/k8s/taskcluster/templates directory and values/Chart files | |
| # image updater creates .argocd-* files in the chart directory to manage image updates | |
| # this will trigger a sync on every application that is consuming these charts which is not intended | |
| @@ -34145,8 +34137,7 @@ | |
| source: | |
| repoURL: "https://github.com/mozilla/webservices-infra" | |
| path: "taskcluster/k8s/taskcluster" | |
| - # Retain environment level dig scope for single chart tenants | |
| - targetRevision: '{{ dig "target_revision" "main" . }}' | |
| + targetRevision: '{{ dig "charts" "taskcluster" "target_revision" "main" . }}' | |
| helm: | |
| parameters: | |
| - name: global.mozcloud.app_code | |
| @@ -34161,7 +34152,7 @@ | |
| value: moz-fx-taskcluster-nonprod | |
| - name: global.mozcloud.realm | |
| value: nonprod | |
| - releaseName: '{{ dig "release_name" "taskcluster" . }}' # Primarily used to import existing helm releases | |
| + releaseName: '{{ dig "charts" "taskcluster" "release_name" "taskcluster" . }}' # Primarily used to import existing helm releases | |
| valueFiles: | |
| - values.yaml | |
| - 'values-{{ .name }}.yaml' | |
| @@ -34169,15 +34160,14 @@ | |
| name: "webservices-high-private-nonprod-us-west1" | |
| namespace: "taskcluster-{{ .name }}" | |
| info: | |
| - # Retain environment level dig scope for single chart tenants | |
| - name: 'Helm Chart' | |
| value: 'https://github.com/mozilla/webservices-infra/tree/{{ dig "target_revision" "main" . }}/taskcluster/k8s/taskcluster' | |
| - name: 'Helm Chart Ref' | |
| - value: '{{ dig "target_revision" "main" . }}' | |
| + value: '{{ dig "charts" "taskcluster" "target_revision" "main" . }}' | |
| - name: 'Application Repository' | |
| - value: '{{ dig "application_repository" "" . }}' | |
| + value: '{{ dig "charts" "taskcluster" "application_repository" "" . }}' | |
| - name: 'Image Repository' | |
| - value: '{{ dig "image_repository" "" . }}' | |
| + value: '{{ dig "charts" "taskcluster" "image_repository" "" . }}' | |
| - name: 'Tenant Definition' | |
| value: 'https://github.com/mozilla/global-platform-admin/blob/main/tenants/taskcluster.yaml' | |
| # Will ignore differences between live and desired states during the diff. Note that these configurations are not | |
| @@ -34238,6 +34223,17 @@ | |
| tenant: "taskcluster" | |
| realm: "prod" | |
| annotations: | |
| + # We want this to render: image_tag' | |
| + argocd-image-updater.argoproj.io/app.helm.image-name: '{{ dig "charts" "taskcluster" "image_name" "image.name" . }}' | |
| + argocd-image-updater.argoproj.io/app.helm.image-tag: '{{ dig "charts" "taskcluster" "image_tag" "image.tag" . }}' | |
| + # The ApplicationSet template will render backslashes from image_regex values | |
| + # as escape characters. To avoid this, we have to escape one level above. | |
| + # We want this to render: .*' | |
| + argocd-image-updater.argoproj.io/image-list: 'app={{ dig "charts" "taskcluster" "image_repository" "" . }}' | |
| + argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "charts" "taskcluster" "image_regex" (dig "image_regex" ".*" .) . }}' | |
| + argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "charts" "taskcluster" "update_strategy" "newest-build" . }}' | |
| + argocd-image-updater.argoproj.io/git-branch: '{{ dig "charts" "taskcluster" "target_revision" "main" . }}' | |
| + argocd-image-updater.argoproj.io/write-back-method: 'git:secret:argocd-webservices/image-updater-github-credentials' #pragma: allowlist secret | |
| # resolves to the taskcluster/k8s/taskcluster/templates directory and values/Chart files | |
| # image updater creates .argocd-* files in the chart directory to manage image updates | |
| # this will trigger a sync on every application that is consuming these charts which is not intended | |
| @@ -34262,8 +34258,7 @@ | |
| source: | |
| repoURL: "https://github.com/mozilla/webservices-infra" | |
| path: "taskcluster/k8s/taskcluster" | |
| - # Retain environment level dig scope for single chart tenants | |
| - targetRevision: '{{ dig "target_revision" "main" . }}' | |
| + targetRevision: '{{ dig "charts" "taskcluster" "target_revision" "main" . }}' | |
| helm: | |
| parameters: | |
| - name: global.mozcloud.app_code | |
| @@ -34278,7 +34273,7 @@ | |
| value: moz-fx-taskcluster-prod | |
| - name: global.mozcloud.realm | |
| value: prod | |
| - releaseName: '{{ dig "release_name" "taskcluster" . }}' # Primarily used to import existing helm releases | |
| + releaseName: '{{ dig "charts" "taskcluster" "release_name" "taskcluster" . }}' # Primarily used to import existing helm releases | |
| valueFiles: | |
| - values.yaml | |
| - 'values-{{ .name }}.yaml' | |
| @@ -34286,15 +34281,14 @@ | |
| name: "webservices-high-private-prod-us-west1" | |
| namespace: "taskcluster-{{ .name }}" | |
| info: | |
| - # Retain environment level dig scope for single chart tenants | |
| - name: 'Helm Chart' | |
| value: 'https://github.com/mozilla/webservices-infra/tree/{{ dig "target_revision" "main" . }}/taskcluster/k8s/taskcluster' | |
| - name: 'Helm Chart Ref' | |
| - value: '{{ dig "target_revision" "main" . }}' | |
| + value: '{{ dig "charts" "taskcluster" "target_revision" "main" . }}' | |
| - name: 'Application Repository' | |
| - value: '{{ dig "application_repository" "" . }}' | |
| + value: '{{ dig "charts" "taskcluster" "application_repository" "" . }}' | |
| - name: 'Image Repository' | |
| - value: '{{ dig "image_repository" "" . }}' | |
| + value: '{{ dig "charts" "taskcluster" "image_repository" "" . }}' | |
| - name: 'Tenant Definition' | |
| value: 'https://github.com/mozilla/global-platform-admin/blob/main/tenants/taskcluster.yaml' | |
| # Will ignore differences between live and desired states during the diff. Note that these configurations are not | |
| @@ -34354,13 +34343,16 @@ | |
| tenant: "telescope" | |
| realm: "nonprod" | |
| annotations: | |
| - argocd-image-updater.argoproj.io/app.helm.image-name: 'image.name' | |
| - argocd-image-updater.argoproj.io/app.helm.image-tag: 'image.tag' | |
| - # Retain environment level dig scope for single chart tenants | |
| - argocd-image-updater.argoproj.io/image-list: 'app={{ dig "image_repository" "us-docker.pkg.dev/moz-fx-telescope-prod/telescope-prod/telescope" . }}' | |
| - argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "image_regex" ".*" . }}' | |
| - argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "update_strategy" "newest-build" . }}' | |
| - argocd-image-updater.argoproj.io/git-branch: '{{ dig "target_revision" "main" . }}' | |
| + # We want this to render: image_tag' | |
| + argocd-image-updater.argoproj.io/app.helm.image-name: '{{ dig "charts" "telescope" "image_name" "image.name" . }}' | |
| + argocd-image-updater.argoproj.io/app.helm.image-tag: '{{ dig "charts" "telescope" "image_tag" "image.tag" . }}' | |
| + # The ApplicationSet template will render backslashes from image_regex values | |
| + # as escape characters. To avoid this, we have to escape one level above. | |
| + # We want this to render: .*' | |
| + argocd-image-updater.argoproj.io/image-list: 'app={{ dig "charts" "telescope" "image_repository" "us-docker.pkg.dev/moz-fx-telescope-prod/telescope-prod/telescope" . }}' | |
| + argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "charts" "telescope" "image_regex" (dig "image_regex" ".*" .) . }}' | |
| + argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "charts" "telescope" "update_strategy" "newest-build" . }}' | |
| + argocd-image-updater.argoproj.io/git-branch: '{{ dig "charts" "telescope" "target_revision" "main" . }}' | |
| argocd-image-updater.argoproj.io/write-back-method: 'git:secret:argocd-webservices/image-updater-github-credentials' #pragma: allowlist secret | |
| # resolves to the telescope/k8s/telescope/templates directory and values/Chart files | |
| # image updater creates .argocd-* files in the chart directory to manage image updates | |
| @@ -34386,8 +34378,7 @@ | |
| source: | |
| repoURL: "https://github.com/mozilla/webservices-infra" | |
| path: "telescope/k8s/telescope" | |
| - # Retain environment level dig scope for single chart tenants | |
| - targetRevision: '{{ dig "target_revision" "main" . }}' | |
| + targetRevision: '{{ dig "charts" "telescope" "target_revision" "main" . }}' | |
| helm: | |
| parameters: | |
| - name: global.mozcloud.app_code | |
| @@ -34402,7 +34393,7 @@ | |
| value: moz-fx-telescope-nonprod | |
| - name: global.mozcloud.realm | |
| value: nonprod | |
| - releaseName: '{{ dig "release_name" "telescope" . }}' # Primarily used to import existing helm releases | |
| + releaseName: '{{ dig "charts" "telescope" "release_name" "telescope" . }}' # Primarily used to import existing helm releases | |
| valueFiles: | |
| - values.yaml | |
| - 'values-{{ .name }}.yaml' | |
| @@ -34410,15 +34401,14 @@ | |
| name: "webservices-high-private-nonprod-us-west1" | |
| namespace: "telescope-{{ .name }}" | |
| info: | |
| - # Retain environment level dig scope for single chart tenants | |
| - name: 'Helm Chart' | |
| value: 'https://github.com/mozilla/webservices-infra/tree/{{ dig "target_revision" "main" . }}/telescope/k8s/telescope' | |
| - name: 'Helm Chart Ref' | |
| - value: '{{ dig "target_revision" "main" . }}' | |
| + value: '{{ dig "charts" "telescope" "target_revision" "main" . }}' | |
| - name: 'Application Repository' | |
| - value: '{{ dig "application_repository" "" . }}' | |
| + value: '{{ dig "charts" "telescope" "application_repository" "" . }}' | |
| - name: 'Image Repository' | |
| - value: '{{ dig "image_repository" "us-docker.pkg.dev/moz-fx-telescope-prod/telescope-prod/telescope" . }}' | |
| + value: '{{ dig "charts" "telescope" "image_repository" "us-docker.pkg.dev/moz-fx-telescope-prod/telescope-prod/telescope" . }}' | |
| - name: 'Tenant Definition' | |
| value: 'https://github.com/mozilla/global-platform-admin/blob/main/tenants/telescope.yaml' | |
| # Will ignore differences between live and desired states during the diff. Note that these configurations are not | |
| @@ -34478,13 +34463,16 @@ | |
| tenant: "telescope" | |
| realm: "prod" | |
| annotations: | |
| - argocd-image-updater.argoproj.io/app.helm.image-name: 'image.name' | |
| - argocd-image-updater.argoproj.io/app.helm.image-tag: 'image.tag' | |
| - # Retain environment level dig scope for single chart tenants | |
| - argocd-image-updater.argoproj.io/image-list: 'app={{ dig "image_repository" "us-docker.pkg.dev/moz-fx-telescope-prod/telescope-prod/telescope" . }}' | |
| - argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "image_regex" ".*" . }}' | |
| - argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "update_strategy" "newest-build" . }}' | |
| - argocd-image-updater.argoproj.io/git-branch: '{{ dig "target_revision" "main" . }}' | |
| + # We want this to render: image_tag' | |
| + argocd-image-updater.argoproj.io/app.helm.image-name: '{{ dig "charts" "telescope" "image_name" "image.name" . }}' | |
| + argocd-image-updater.argoproj.io/app.helm.image-tag: '{{ dig "charts" "telescope" "image_tag" "image.tag" . }}' | |
| + # The ApplicationSet template will render backslashes from image_regex values | |
| + # as escape characters. To avoid this, we have to escape one level above. | |
| + # We want this to render: .*' | |
| + argocd-image-updater.argoproj.io/image-list: 'app={{ dig "charts" "telescope" "image_repository" "us-docker.pkg.dev/moz-fx-telescope-prod/telescope-prod/telescope" . }}' | |
| + argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "charts" "telescope" "image_regex" (dig "image_regex" ".*" .) . }}' | |
| + argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "charts" "telescope" "update_strategy" "newest-build" . }}' | |
| + argocd-image-updater.argoproj.io/git-branch: '{{ dig "charts" "telescope" "target_revision" "main" . }}' | |
| argocd-image-updater.argoproj.io/write-back-method: 'git:secret:argocd-webservices/image-updater-github-credentials' #pragma: allowlist secret | |
| # resolves to the telescope/k8s/telescope/templates directory and values/Chart files | |
| # image updater creates .argocd-* files in the chart directory to manage image updates | |
| @@ -34510,8 +34498,7 @@ | |
| source: | |
| repoURL: "https://github.com/mozilla/webservices-infra" | |
| path: "telescope/k8s/telescope" | |
| - # Retain environment level dig scope for single chart tenants | |
| - targetRevision: '{{ dig "target_revision" "main" . }}' | |
| + targetRevision: '{{ dig "charts" "telescope" "target_revision" "main" . }}' | |
| helm: | |
| parameters: | |
| - name: global.mozcloud.app_code | |
| @@ -34526,7 +34513,7 @@ | |
| value: moz-fx-telescope-prod | |
| - name: global.mozcloud.realm | |
| value: prod | |
| - releaseName: '{{ dig "release_name" "telescope" . }}' # Primarily used to import existing helm releases | |
| + releaseName: '{{ dig "charts" "telescope" "release_name" "telescope" . }}' # Primarily used to import existing helm releases | |
| valueFiles: | |
| - values.yaml | |
| - 'values-{{ .name }}.yaml' | |
| @@ -34534,15 +34521,14 @@ | |
| name: "webservices-high-private-prod-us-west1" | |
| namespace: "telescope-{{ .name }}" | |
| info: | |
| - # Retain environment level dig scope for single chart tenants | |
| - name: 'Helm Chart' | |
| value: 'https://github.com/mozilla/webservices-infra/tree/{{ dig "target_revision" "main" . }}/telescope/k8s/telescope' | |
| - name: 'Helm Chart Ref' | |
| - value: '{{ dig "target_revision" "main" . }}' | |
| + value: '{{ dig "charts" "telescope" "target_revision" "main" . }}' | |
| - name: 'Application Repository' | |
| - value: '{{ dig "application_repository" "" . }}' | |
| + value: '{{ dig "charts" "telescope" "application_repository" "" . }}' | |
| - name: 'Image Repository' | |
| - value: '{{ dig "image_repository" "us-docker.pkg.dev/moz-fx-telescope-prod/telescope-prod/telescope" . }}' | |
| + value: '{{ dig "charts" "telescope" "image_repository" "us-docker.pkg.dev/moz-fx-telescope-prod/telescope-prod/telescope" . }}' | |
| - name: 'Tenant Definition' | |
| value: 'https://github.com/mozilla/global-platform-admin/blob/main/tenants/telescope.yaml' | |
| # Will ignore differences between live and desired states during the diff. Note that these configurations are not | |
| @@ -34854,6 +34835,17 @@ | |
| tenant: "vpn" | |
| realm: "nonprod" | |
| annotations: | |
| + # We want this to render: image_tag' | |
| + argocd-image-updater.argoproj.io/app.helm.image-name: '{{ dig "charts" "vpn" "image_name" "image.name" . }}' | |
| + argocd-image-updater.argoproj.io/app.helm.image-tag: '{{ dig "charts" "vpn" "image_tag" "image.tag" . }}' | |
| + # The ApplicationSet template will render backslashes from image_regex values | |
| + # as escape characters. To avoid this, we have to escape one level above. | |
| + # We want this to render: .*' | |
| + argocd-image-updater.argoproj.io/image-list: 'app={{ dig "charts" "vpn" "image_repository" "" . }}' | |
| + argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "charts" "vpn" "image_regex" (dig "image_regex" ".*" .) . }}' | |
| + argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "charts" "vpn" "update_strategy" "newest-build" . }}' | |
| + argocd-image-updater.argoproj.io/git-branch: '{{ dig "charts" "vpn" "target_revision" "main" . }}' | |
| + argocd-image-updater.argoproj.io/write-back-method: 'git:secret:argocd-webservices/image-updater-github-credentials' #pragma: allowlist secret | |
| # resolves to the vpn/k8s/vpn/templates directory and values/Chart files | |
| # image updater creates .argocd-* files in the chart directory to manage image updates | |
| # this will trigger a sync on every application that is consuming these charts which is not intended | |
| @@ -34878,8 +34870,7 @@ | |
| source: | |
| repoURL: "https://github.com/mozilla/webservices-infra" | |
| path: "vpn/k8s/vpn" | |
| - # Retain environment level dig scope for single chart tenants | |
| - targetRevision: '{{ dig "target_revision" "main" . }}' | |
| + targetRevision: '{{ dig "charts" "vpn" "target_revision" "main" . }}' | |
| helm: | |
| parameters: | |
| - name: global.mozcloud.app_code | |
| @@ -34894,7 +34885,7 @@ | |
| value: moz-fx-vpn-nonprod | |
| - name: global.mozcloud.realm | |
| value: nonprod | |
| - releaseName: '{{ dig "release_name" "vpn" . }}' # Primarily used to import existing helm releases | |
| + releaseName: '{{ dig "charts" "vpn" "release_name" "vpn" . }}' # Primarily used to import existing helm releases | |
| valueFiles: | |
| - values.yaml | |
| - 'values-{{ .name }}.yaml' | |
| @@ -34902,15 +34893,14 @@ | |
| name: "webservices-high-private-nonprod-us-west1" | |
| namespace: "vpn-{{ .name }}" | |
| info: | |
| - # Retain environment level dig scope for single chart tenants | |
| - name: 'Helm Chart' | |
| value: 'https://github.com/mozilla/webservices-infra/tree/{{ dig "target_revision" "main" . }}/vpn/k8s/vpn' | |
| - name: 'Helm Chart Ref' | |
| - value: '{{ dig "target_revision" "main" . }}' | |
| + value: '{{ dig "charts" "vpn" "target_revision" "main" . }}' | |
| - name: 'Application Repository' | |
| - value: '{{ dig "application_repository" "" . }}' | |
| + value: '{{ dig "charts" "vpn" "application_repository" "" . }}' | |
| - name: 'Image Repository' | |
| - value: '{{ dig "image_repository" "" . }}' | |
| + value: '{{ dig "charts" "vpn" "image_repository" "" . }}' | |
| - name: 'Tenant Definition' | |
| value: 'https://github.com/mozilla/global-platform-admin/blob/main/tenants/vpn.yaml' | |
| # Will ignore differences between live and desired states during the diff. Note that these configurations are not | |
| @@ -34970,6 +34955,17 @@ | |
| tenant: "vpn" | |
| realm: "prod" | |
| annotations: | |
| + # We want this to render: image_tag' | |
| + argocd-image-updater.argoproj.io/app.helm.image-name: '{{ dig "charts" "vpn" "image_name" "image.name" . }}' | |
| + argocd-image-updater.argoproj.io/app.helm.image-tag: '{{ dig "charts" "vpn" "image_tag" "image.tag" . }}' | |
| + # The ApplicationSet template will render backslashes from image_regex values | |
| + # as escape characters. To avoid this, we have to escape one level above. | |
| + # We want this to render: .*' | |
| + argocd-image-updater.argoproj.io/image-list: 'app={{ dig "charts" "vpn" "image_repository" "" . }}' | |
| + argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "charts" "vpn" "image_regex" (dig "image_regex" ".*" .) . }}' | |
| + argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "charts" "vpn" "update_strategy" "newest-build" . }}' | |
| + argocd-image-updater.argoproj.io/git-branch: '{{ dig "charts" "vpn" "target_revision" "main" . }}' | |
| + argocd-image-updater.argoproj.io/write-back-method: 'git:secret:argocd-webservices/image-updater-github-credentials' #pragma: allowlist secret | |
| # resolves to the vpn/k8s/vpn/templates directory and values/Chart files | |
| # image updater creates .argocd-* files in the chart directory to manage image updates | |
| # this will trigger a sync on every application that is consuming these charts which is not intended | |
| @@ -34994,8 +34990,7 @@ | |
| source: | |
| repoURL: "https://github.com/mozilla/webservices-infra" | |
| path: "vpn/k8s/vpn" | |
| - # Retain environment level dig scope for single chart tenants | |
| - targetRevision: '{{ dig "target_revision" "main" . }}' | |
| + targetRevision: '{{ dig "charts" "vpn" "target_revision" "main" . }}' | |
| helm: | |
| parameters: | |
| - name: global.mozcloud.app_code | |
| @@ -35010,7 +35005,7 @@ | |
| value: moz-fx-vpn-prod | |
| - name: global.mozcloud.realm | |
| value: prod | |
| - releaseName: '{{ dig "release_name" "vpn" . }}' # Primarily used to import existing helm releases | |
| + releaseName: '{{ dig "charts" "vpn" "release_name" "vpn" . }}' # Primarily used to import existing helm releases | |
| valueFiles: | |
| - values.yaml | |
| - 'values-{{ .name }}.yaml' | |
| @@ -35018,15 +35013,14 @@ | |
| name: "webservices-high-private-prod-us-west1" | |
| namespace: "vpn-{{ .name }}" | |
| info: | |
| - # Retain environment level dig scope for single chart tenants | |
| - name: 'Helm Chart' | |
| value: 'https://github.com/mozilla/webservices-infra/tree/{{ dig "target_revision" "main" . }}/vpn/k8s/vpn' | |
| - name: 'Helm Chart Ref' | |
| - value: '{{ dig "target_revision" "main" . }}' | |
| + value: '{{ dig "charts" "vpn" "target_revision" "main" . }}' | |
| - name: 'Application Repository' | |
| - value: '{{ dig "application_repository" "" . }}' | |
| + value: '{{ dig "charts" "vpn" "application_repository" "" . }}' | |
| - name: 'Image Repository' | |
| - value: '{{ dig "image_repository" "" . }}' | |
| + value: '{{ dig "charts" "vpn" "image_repository" "" . }}' | |
| - name: 'Tenant Definition' | |
| value: 'https://github.com/mozilla/global-platform-admin/blob/main/tenants/vpn.yaml' | |
| # Will ignore differences between live and desired states during the diff. Note that these configurations are not | |
| @@ -35087,13 +35076,16 @@ | |
| tenant: "webcompat" | |
| realm: "nonprod" | |
| annotations: | |
| - argocd-image-updater.argoproj.io/app.helm.image-name: 'image.name' | |
| - argocd-image-updater.argoproj.io/app.helm.image-tag: 'image.tag' | |
| - # Retain environment level dig scope for single chart tenants | |
| - argocd-image-updater.argoproj.io/image-list: 'app={{ dig "image_repository" "us-docker.pkg.dev/moz-fx-webcompat-prod/webcompat-prod/webcompat" . }}' | |
| - argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "image_regex" ".*" . }}' | |
| - argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "update_strategy" "newest-build" . }}' | |
| - argocd-image-updater.argoproj.io/git-branch: '{{ dig "target_revision" "main" . }}' | |
| + # We want this to render: image_tag' | |
| + argocd-image-updater.argoproj.io/app.helm.image-name: '{{ dig "charts" "webcompat" "image_name" "image.name" . }}' | |
| + argocd-image-updater.argoproj.io/app.helm.image-tag: '{{ dig "charts" "webcompat" "image_tag" "image.tag" . }}' | |
| + # The ApplicationSet template will render backslashes from image_regex values | |
| + # as escape characters. To avoid this, we have to escape one level above. | |
| + # We want this to render: .*' | |
| + argocd-image-updater.argoproj.io/image-list: 'app={{ dig "charts" "webcompat" "image_repository" "us-docker.pkg.dev/moz-fx-webcompat-prod/webcompat-prod/webcompat" . }}' | |
| + argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "charts" "webcompat" "image_regex" (dig "image_regex" ".*" .) . }}' | |
| + argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "charts" "webcompat" "update_strategy" "newest-build" . }}' | |
| + argocd-image-updater.argoproj.io/git-branch: '{{ dig "charts" "webcompat" "target_revision" "main" . }}' | |
| argocd-image-updater.argoproj.io/write-back-method: 'git:secret:argocd-webservices/image-updater-github-credentials' #pragma: allowlist secret | |
| # resolves to the webcompat/k8s/webcompat/templates directory and values/Chart files | |
| # image updater creates .argocd-* files in the chart directory to manage image updates | |
| @@ -35119,8 +35111,7 @@ | |
| source: | |
| repoURL: "https://github.com/mozilla/webservices-infra" | |
| path: "webcompat/k8s/webcompat" | |
| - # Retain environment level dig scope for single chart tenants | |
| - targetRevision: '{{ dig "target_revision" "main" . }}' | |
| + targetRevision: '{{ dig "charts" "webcompat" "target_revision" "main" . }}' | |
| helm: | |
| parameters: | |
| - name: global.mozcloud.app_code | |
| @@ -35135,7 +35126,7 @@ | |
| value: moz-fx-webcompat-nonprod | |
| - name: global.mozcloud.realm | |
| value: nonprod | |
| - releaseName: '{{ dig "release_name" "webcompat" . }}' # Primarily used to import existing helm releases | |
| + releaseName: '{{ dig "charts" "webcompat" "release_name" "webcompat" . }}' # Primarily used to import existing helm releases | |
| valueFiles: | |
| - values.yaml | |
| - 'values-{{ .name }}.yaml' | |
| @@ -35143,15 +35134,14 @@ | |
| name: "webservices-high-private-nonprod-us-west1" | |
| namespace: "webcompat-{{ .name }}" | |
| info: | |
| - # Retain environment level dig scope for single chart tenants | |
| - name: 'Helm Chart' | |
| value: 'https://github.com/mozilla/webservices-infra/tree/{{ dig "target_revision" "main" . }}/webcompat/k8s/webcompat' | |
| - name: 'Helm Chart Ref' | |
| - value: '{{ dig "target_revision" "main" . }}' | |
| + value: '{{ dig "charts" "webcompat" "target_revision" "main" . }}' | |
| - name: 'Application Repository' | |
| - value: '{{ dig "application_repository" "" . }}' | |
| + value: '{{ dig "charts" "webcompat" "application_repository" "" . }}' | |
| - name: 'Image Repository' | |
| - value: '{{ dig "image_repository" "us-docker.pkg.dev/moz-fx-webcompat-prod/webcompat-prod/webcompat" . }}' | |
| + value: '{{ dig "charts" "webcompat" "image_repository" "us-docker.pkg.dev/moz-fx-webcompat-prod/webcompat-prod/webcompat" . }}' | |
| - name: 'Tenant Definition' | |
| value: 'https://github.com/mozilla/global-platform-admin/blob/main/tenants/webcompat.yaml' | |
| # Will ignore differences between live and desired states during the diff. Note that these configurations are not | |
| @@ -35211,13 +35196,16 @@ | |
| tenant: "webcompat" | |
| realm: "prod" | |
| annotations: | |
| - argocd-image-updater.argoproj.io/app.helm.image-name: 'image.name' | |
| - argocd-image-updater.argoproj.io/app.helm.image-tag: 'image.tag' | |
| - # Retain environment level dig scope for single chart tenants | |
| - argocd-image-updater.argoproj.io/image-list: 'app={{ dig "image_repository" "us-docker.pkg.dev/moz-fx-webcompat-prod/webcompat-prod/webcompat" . }}' | |
| - argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "image_regex" ".*" . }}' | |
| - argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "update_strategy" "newest-build" . }}' | |
| - argocd-image-updater.argoproj.io/git-branch: '{{ dig "target_revision" "main" . }}' | |
| + # We want this to render: image_tag' | |
| + argocd-image-updater.argoproj.io/app.helm.image-name: '{{ dig "charts" "webcompat" "image_name" "image.name" . }}' | |
| + argocd-image-updater.argoproj.io/app.helm.image-tag: '{{ dig "charts" "webcompat" "image_tag" "image.tag" . }}' | |
| + # The ApplicationSet template will render backslashes from image_regex values | |
| + # as escape characters. To avoid this, we have to escape one level above. | |
| + # We want this to render: .*' | |
| + argocd-image-updater.argoproj.io/image-list: 'app={{ dig "charts" "webcompat" "image_repository" "us-docker.pkg.dev/moz-fx-webcompat-prod/webcompat-prod/webcompat" . }}' | |
| + argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "charts" "webcompat" "image_regex" (dig "image_regex" ".*" .) . }}' | |
| + argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "charts" "webcompat" "update_strategy" "newest-build" . }}' | |
| + argocd-image-updater.argoproj.io/git-branch: '{{ dig "charts" "webcompat" "target_revision" "main" . }}' | |
| argocd-image-updater.argoproj.io/write-back-method: 'git:secret:argocd-webservices/image-updater-github-credentials' #pragma: allowlist secret | |
| # resolves to the webcompat/k8s/webcompat/templates directory and values/Chart files | |
| # image updater creates .argocd-* files in the chart directory to manage image updates | |
| @@ -35243,8 +35231,7 @@ | |
| source: | |
| repoURL: "https://github.com/mozilla/webservices-infra" | |
| path: "webcompat/k8s/webcompat" | |
| - # Retain environment level dig scope for single chart tenants | |
| - targetRevision: '{{ dig "target_revision" "main" . }}' | |
| + targetRevision: '{{ dig "charts" "webcompat" "target_revision" "main" . }}' | |
| helm: | |
| parameters: | |
| - name: global.mozcloud.app_code | |
| @@ -35259,7 +35246,7 @@ | |
| value: moz-fx-webcompat-prod | |
| - name: global.mozcloud.realm | |
| value: prod | |
| - releaseName: '{{ dig "release_name" "webcompat" . }}' # Primarily used to import existing helm releases | |
| + releaseName: '{{ dig "charts" "webcompat" "release_name" "webcompat" . }}' # Primarily used to import existing helm releases | |
| valueFiles: | |
| - values.yaml | |
| - 'values-{{ .name }}.yaml' | |
| @@ -35267,15 +35254,14 @@ | |
| name: "webservices-high-private-prod-us-west1" | |
| namespace: "webcompat-{{ .name }}" | |
| info: | |
| - # Retain environment level dig scope for single chart tenants | |
| - name: 'Helm Chart' | |
| value: 'https://github.com/mozilla/webservices-infra/tree/{{ dig "target_revision" "main" . }}/webcompat/k8s/webcompat' | |
| - name: 'Helm Chart Ref' | |
| - value: '{{ dig "target_revision" "main" . }}' | |
| + value: '{{ dig "charts" "webcompat" "target_revision" "main" . }}' | |
| - name: 'Application Repository' | |
| - value: '{{ dig "application_repository" "" . }}' | |
| + value: '{{ dig "charts" "webcompat" "application_repository" "" . }}' | |
| - name: 'Image Repository' | |
| - value: '{{ dig "image_repository" "us-docker.pkg.dev/moz-fx-webcompat-prod/webcompat-prod/webcompat" . }}' | |
| + value: '{{ dig "charts" "webcompat" "image_repository" "us-docker.pkg.dev/moz-fx-webcompat-prod/webcompat-prod/webcompat" . }}' | |
| - name: 'Tenant Definition' | |
| value: 'https://github.com/mozilla/global-platform-admin/blob/main/tenants/webcompat.yaml' | |
| # Will ignore differences between live and desired states during the diff. Note that these configurations are not | |
| @@ -35336,13 +35317,16 @@ | |
| tenant: "whattrainisitnow" | |
| realm: "nonprod" | |
| annotations: | |
| - argocd-image-updater.argoproj.io/app.helm.image-name: 'image.name' | |
| - argocd-image-updater.argoproj.io/app.helm.image-tag: 'image.tag' | |
| - # Retain environment level dig scope for single chart tenants | |
| - argocd-image-updater.argoproj.io/image-list: 'app={{ dig "image_repository" "us-docker.pkg.dev/moz-fx-whattrainisitnow-prod/whattrainisitnow-prod/whattrainisitnow" . }}' | |
| - argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "image_regex" ".*" . }}' | |
| - argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "update_strategy" "newest-build" . }}' | |
| - argocd-image-updater.argoproj.io/git-branch: '{{ dig "target_revision" "main" . }}' | |
| + # We want this to render: image_tag' | |
| + argocd-image-updater.argoproj.io/app.helm.image-name: '{{ dig "charts" "whattrainisitnow" "image_name" "image.name" . }}' | |
| + argocd-image-updater.argoproj.io/app.helm.image-tag: '{{ dig "charts" "whattrainisitnow" "image_tag" "image.tag" . }}' | |
| + # The ApplicationSet template will render backslashes from image_regex values | |
| + # as escape characters. To avoid this, we have to escape one level above. | |
| + # We want this to render: .*' | |
| + argocd-image-updater.argoproj.io/image-list: 'app={{ dig "charts" "whattrainisitnow" "image_repository" "us-docker.pkg.dev/moz-fx-whattrainisitnow-prod/whattrainisitnow-prod/whattrainisitnow" . }}' | |
| + argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "charts" "whattrainisitnow" "image_regex" (dig "image_regex" ".*" .) . }}' | |
| + argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "charts" "whattrainisitnow" "update_strategy" "newest-build" . }}' | |
| + argocd-image-updater.argoproj.io/git-branch: '{{ dig "charts" "whattrainisitnow" "target_revision" "main" . }}' | |
| argocd-image-updater.argoproj.io/write-back-method: 'git:secret:argocd-webservices/image-updater-github-credentials' #pragma: allowlist secret | |
| # resolves to the whattrainisitnow/k8s/whattrainisitnow/templates directory and values/Chart files | |
| # image updater creates .argocd-* files in the chart directory to manage image updates | |
| @@ -35368,8 +35352,7 @@ | |
| source: | |
| repoURL: "https://github.com/mozilla/webservices-infra" | |
| path: "whattrainisitnow/k8s/whattrainisitnow" | |
| - # Retain environment level dig scope for single chart tenants | |
| - targetRevision: '{{ dig "target_revision" "main" . }}' | |
| + targetRevision: '{{ dig "charts" "whattrainisitnow" "target_revision" "main" . }}' | |
| helm: | |
| parameters: | |
| - name: global.mozcloud.app_code | |
| @@ -35384,7 +35367,7 @@ | |
| value: moz-fx-whattrainisitnow-nonpro | |
| - name: global.mozcloud.realm | |
| value: nonprod | |
| - releaseName: '{{ dig "release_name" "gha" . }}' # Primarily used to import existing helm releases | |
| + releaseName: '{{ dig "charts" "whattrainisitnow" "release_name" "gha" . }}' # Primarily used to import existing helm releases | |
| valueFiles: | |
| - values.yaml | |
| - 'values-{{ .name }}.yaml' | |
| @@ -35392,15 +35375,14 @@ | |
| name: "webservices-low-private-nonprod-us-west1" | |
| namespace: "whattrainisitnow-{{ .name }}" | |
| info: | |
| - # Retain environment level dig scope for single chart tenants | |
| - name: 'Helm Chart' | |
| value: 'https://github.com/mozilla/webservices-infra/tree/{{ dig "target_revision" "main" . }}/whattrainisitnow/k8s/whattrainisitnow' | |
| - name: 'Helm Chart Ref' | |
| - value: '{{ dig "target_revision" "main" . }}' | |
| + value: '{{ dig "charts" "whattrainisitnow" "target_revision" "main" . }}' | |
| - name: 'Application Repository' | |
| - value: '{{ dig "application_repository" "mozilla/releases_insights" . }}' | |
| + value: '{{ dig "charts" "whattrainisitnow" "application_repository" "mozilla/releases_insights" . }}' | |
| - name: 'Image Repository' | |
| - value: '{{ dig "image_repository" "us-docker.pkg.dev/moz-fx-whattrainisitnow-prod/whattrainisitnow-prod/whattrainisitnow" . }}' | |
| + value: '{{ dig "charts" "whattrainisitnow" "image_repository" "us-docker.pkg.dev/moz-fx-whattrainisitnow-prod/whattrainisitnow-prod/whattrainisitnow" . }}' | |
| - name: 'Tenant Definition' | |
| value: 'https://github.com/mozilla/global-platform-admin/blob/main/tenants/whattrainisitnow.yaml' | |
| # Will ignore differences between live and desired states during the diff. Note that these configurations are not | |
| @@ -35460,13 +35437,16 @@ | |
| tenant: "whattrainisitnow" | |
| realm: "prod" | |
| annotations: | |
| - argocd-image-updater.argoproj.io/app.helm.image-name: 'image.name' | |
| - argocd-image-updater.argoproj.io/app.helm.image-tag: 'image.tag' | |
| - # Retain environment level dig scope for single chart tenants | |
| - argocd-image-updater.argoproj.io/image-list: 'app={{ dig "image_repository" "us-docker.pkg.dev/moz-fx-whattrainisitnow-prod/whattrainisitnow-prod/whattrainisitnow" . }}' | |
| - argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "image_regex" ".*" . }}' | |
| - argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "update_strategy" "newest-build" . }}' | |
| - argocd-image-updater.argoproj.io/git-branch: '{{ dig "target_revision" "main" . }}' | |
| + # We want this to render: image_tag' | |
| + argocd-image-updater.argoproj.io/app.helm.image-name: '{{ dig "charts" "whattrainisitnow" "image_name" "image.name" . }}' | |
| + argocd-image-updater.argoproj.io/app.helm.image-tag: '{{ dig "charts" "whattrainisitnow" "image_tag" "image.tag" . }}' | |
| + # The ApplicationSet template will render backslashes from image_regex values | |
| + # as escape characters. To avoid this, we have to escape one level above. | |
| + # We want this to render: .*' | |
| + argocd-image-updater.argoproj.io/image-list: 'app={{ dig "charts" "whattrainisitnow" "image_repository" "us-docker.pkg.dev/moz-fx-whattrainisitnow-prod/whattrainisitnow-prod/whattrainisitnow" . }}' | |
| + argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "charts" "whattrainisitnow" "image_regex" (dig "image_regex" ".*" .) . }}' | |
| + argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "charts" "whattrainisitnow" "update_strategy" "newest-build" . }}' | |
| + argocd-image-updater.argoproj.io/git-branch: '{{ dig "charts" "whattrainisitnow" "target_revision" "main" . }}' | |
| argocd-image-updater.argoproj.io/write-back-method: 'git:secret:argocd-webservices/image-updater-github-credentials' #pragma: allowlist secret | |
| # resolves to the whattrainisitnow/k8s/whattrainisitnow/templates directory and values/Chart files | |
| # image updater creates .argocd-* files in the chart directory to manage image updates | |
| @@ -35492,8 +35472,7 @@ | |
| source: | |
| repoURL: "https://github.com/mozilla/webservices-infra" | |
| path: "whattrainisitnow/k8s/whattrainisitnow" | |
| - # Retain environment level dig scope for single chart tenants | |
| - targetRevision: '{{ dig "target_revision" "main" . }}' | |
| + targetRevision: '{{ dig "charts" "whattrainisitnow" "target_revision" "main" . }}' | |
| helm: | |
| parameters: | |
| - name: global.mozcloud.app_code | |
| @@ -35508,7 +35487,7 @@ | |
| value: moz-fx-whattrainisitnow-prod | |
| - name: global.mozcloud.realm | |
| value: prod | |
| - releaseName: '{{ dig "release_name" "gha" . }}' # Primarily used to import existing helm releases | |
| + releaseName: '{{ dig "charts" "whattrainisitnow" "release_name" "gha" . }}' # Primarily used to import existing helm releases | |
| valueFiles: | |
| - values.yaml | |
| - 'values-{{ .name }}.yaml' | |
| @@ -35516,15 +35495,14 @@ | |
| name: "webservices-low-private-prod-us-west1" | |
| namespace: "whattrainisitnow-{{ .name }}" | |
| info: | |
| - # Retain environment level dig scope for single chart tenants | |
| - name: 'Helm Chart' | |
| value: 'https://github.com/mozilla/webservices-infra/tree/{{ dig "target_revision" "main" . }}/whattrainisitnow/k8s/whattrainisitnow' | |
| - name: 'Helm Chart Ref' | |
| - value: '{{ dig "target_revision" "main" . }}' | |
| + value: '{{ dig "charts" "whattrainisitnow" "target_revision" "main" . }}' | |
| - name: 'Application Repository' | |
| - value: '{{ dig "application_repository" "mozilla/releases_insights" . }}' | |
| + value: '{{ dig "charts" "whattrainisitnow" "application_repository" "mozilla/releases_insights" . }}' | |
| - name: 'Image Repository' | |
| - value: '{{ dig "image_repository" "us-docker.pkg.dev/moz-fx-whattrainisitnow-prod/whattrainisitnow-prod/whattrainisitnow" . }}' | |
| + value: '{{ dig "charts" "whattrainisitnow" "image_repository" "us-docker.pkg.dev/moz-fx-whattrainisitnow-prod/whattrainisitnow-prod/whattrainisitnow" . }}' | |
| - name: 'Tenant Definition' | |
| value: 'https://github.com/mozilla/global-platform-admin/blob/main/tenants/whattrainisitnow.yaml' | |
| # Will ignore differences between live and desired states during the diff. Note that these configurations are not | |
| @@ -35584,6 +35557,17 @@ | |
| tenant: "youtube-test" | |
| realm: "nonprod" | |
| annotations: | |
| + # We want this to render: image_tag' | |
| + argocd-image-updater.argoproj.io/app.helm.image-name: '{{ dig "charts" "youtube-test" "image_name" "image.name" . }}' | |
| + argocd-image-updater.argoproj.io/app.helm.image-tag: '{{ dig "charts" "youtube-test" "image_tag" "image.tag" . }}' | |
| + # The ApplicationSet template will render backslashes from image_regex values | |
| + # as escape characters. To avoid this, we have to escape one level above. | |
| + # We want this to render: .*' | |
| + argocd-image-updater.argoproj.io/image-list: 'app={{ dig "charts" "youtube-test" "image_repository" "us-west1-docker.pkg.dev/moz-fx-platform-artifacts/platform-shared-images/openresty-oidc" . }}' | |
| + argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "charts" "youtube-test" "image_regex" (dig "image_regex" ".*" .) . }}' | |
| + argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "charts" "youtube-test" "update_strategy" "newest-build" . }}' | |
| + argocd-image-updater.argoproj.io/git-branch: '{{ dig "charts" "youtube-test" "target_revision" "main" . }}' | |
| + argocd-image-updater.argoproj.io/write-back-method: 'git:secret:argocd-webservices/image-updater-github-credentials' #pragma: allowlist secret | |
| # resolves to the youtube-test/k8s/youtube-test/templates directory and values/Chart files | |
| # image updater creates .argocd-* files in the chart directory to manage image updates | |
| # this will trigger a sync on every application that is consuming these charts which is not intended | |
| @@ -35608,8 +35592,7 @@ | |
| source: | |
| repoURL: "https://github.com/mozilla/webservices-infra" | |
| path: "youtube-test/k8s/youtube-test" | |
| - # Retain environment level dig scope for single chart tenants | |
| - targetRevision: '{{ dig "target_revision" "main" . }}' | |
| + targetRevision: '{{ dig "charts" "youtube-test" "target_revision" "main" . }}' | |
| helm: | |
| parameters: | |
| - name: global.mozcloud.app_code | |
| @@ -35624,7 +35607,7 @@ | |
| value: moz-fx-youtube-test-nonprod | |
| - name: global.mozcloud.realm | |
| value: nonprod | |
| - releaseName: '{{ dig "release_name" "yttest" . }}' # Primarily used to import existing helm releases | |
| + releaseName: '{{ dig "charts" "youtube-test" "release_name" "yttest" . }}' # Primarily used to import existing helm releases | |
| valueFiles: | |
| - values.yaml | |
| - 'values-{{ .name }}.yaml' | |
| @@ -35632,15 +35615,14 @@ | |
| name: "webservices-low-private-nonprod-us-west1" | |
| namespace: "youtube-test-{{ .name }}" | |
| info: | |
| - # Retain environment level dig scope for single chart tenants | |
| - name: 'Helm Chart' | |
| value: 'https://github.com/mozilla/webservices-infra/tree/{{ dig "target_revision" "main" . }}/youtube-test/k8s/youtube-test' | |
| - name: 'Helm Chart Ref' | |
| - value: '{{ dig "target_revision" "main" . }}' | |
| + value: '{{ dig "charts" "youtube-test" "target_revision" "main" . }}' | |
| - name: 'Application Repository' | |
| - value: '{{ dig "application_repository" "" . }}' | |
| + value: '{{ dig "charts" "youtube-test" "application_repository" "" . }}' | |
| - name: 'Image Repository' | |
| - value: '{{ dig "image_repository" "us-west1-docker.pkg.dev/moz-fx-platform-artifacts/platform-shared-images/openresty-oidc" . }}' | |
| + value: '{{ dig "charts" "youtube-test" "image_repository" "us-west1-docker.pkg.dev/moz-fx-platform-artifacts/platform-shared-images/openresty-oidc" . }}' | |
| - name: 'Tenant Definition' | |
| value: 'https://github.com/mozilla/global-platform-admin/blob/main/tenants/youtube-test.yaml' | |
| # Will ignore differences between live and desired states during the diff. Note that these configurations are not | |
| @@ -35700,6 +35677,17 @@ | |
| tenant: "youtube-test" | |
| realm: "prod" | |
| annotations: | |
| + # We want this to render: image_tag' | |
| + argocd-image-updater.argoproj.io/app.helm.image-name: '{{ dig "charts" "youtube-test" "image_name" "image.name" . }}' | |
| + argocd-image-updater.argoproj.io/app.helm.image-tag: '{{ dig "charts" "youtube-test" "image_tag" "image.tag" . }}' | |
| + # The ApplicationSet template will render backslashes from image_regex values | |
| + # as escape characters. To avoid this, we have to escape one level above. | |
| + # We want this to render: .*' | |
| + argocd-image-updater.argoproj.io/image-list: 'app={{ dig "charts" "youtube-test" "image_repository" "us-west1-docker.pkg.dev/moz-fx-platform-artifacts/platform-shared-images/openresty-oidc" . }}' | |
| + argocd-image-updater.argoproj.io/app.allow-tags: 'regexp:{{ dig "charts" "youtube-test" "image_regex" (dig "image_regex" ".*" .) . }}' | |
| + argocd-image-updater.argoproj.io/app.update-strategy: '{{ dig "charts" "youtube-test" "update_strategy" "newest-build" . }}' | |
| + argocd-image-updater.argoproj.io/git-branch: '{{ dig "charts" "youtube-test" "target_revision" "main" . }}' | |
| + argocd-image-updater.argoproj.io/write-back-method: 'git:secret:argocd-webservices/image-updater-github-credentials' #pragma: allowlist secret | |
| # resolves to the youtube-test/k8s/youtube-test/templates directory and values/Chart files | |
| # image updater creates .argocd-* files in the chart directory to manage image updates | |
| # this will trigger a sync on every application that is consuming these charts which is not intended | |
| @@ -35724,8 +35712,7 @@ | |
| source: | |
| repoURL: "https://github.com/mozilla/webservices-infra" | |
| path: "youtube-test/k8s/youtube-test" | |
| - # Retain environment level dig scope for single chart tenants | |
| - targetRevision: '{{ dig "target_revision" "main" . }}' | |
| + targetRevision: '{{ dig "charts" "youtube-test" "target_revision" "main" . }}' | |
| helm: | |
| parameters: | |
| - name: global.mozcloud.app_code | |
| @@ -35740,7 +35727,7 @@ | |
| value: moz-fx-youtube-test-prod | |
| - name: global.mozcloud.realm | |
| value: prod | |
| - releaseName: '{{ dig "release_name" "yttest" . }}' # Primarily used to import existing helm releases | |
| + releaseName: '{{ dig "charts" "youtube-test" "release_name" "yttest" . }}' # Primarily used to import existing helm releases | |
| valueFiles: | |
| - values.yaml | |
| - 'values-{{ .name }}.yaml' | |
| @@ -35748,15 +35735,14 @@ | |
| name: "webservices-low-private-prod-us-west1" | |
| namespace: "youtube-test-{{ .name }}" | |
| info: | |
| - # Retain environment level dig scope for single chart tenants | |
| - name: 'Helm Chart' | |
| value: 'https://github.com/mozilla/webservices-infra/tree/{{ dig "target_revision" "main" . }}/youtube-test/k8s/youtube-test' | |
| - name: 'Helm Chart Ref' | |
| - value: '{{ dig "target_revision" "main" . }}' | |
| + value: '{{ dig "charts" "youtube-test" "target_revision" "main" . }}' | |
| - name: 'Application Repository' | |
| - value: '{{ dig "application_repository" "" . }}' | |
| + value: '{{ dig "charts" "youtube-test" "application_repository" "" . }}' | |
| - name: 'Image Repository' | |
| - value: '{{ dig "image_repository" "us-west1-docker.pkg.dev/moz-fx-platform-artifacts/platform-shared-images/openresty-oidc" . }}' | |
| + value: '{{ dig "charts" "youtube-test" "image_repository" "us-west1-docker.pkg.dev/moz-fx-platform-artifacts/platform-shared-images/openresty-oidc" . }}' | |
| - name: 'Tenant Definition' | |
| value: 'https://github.com/mozilla/global-platform-admin/blob/main/tenants/youtube-test.yaml' | |
| # Will ignore differences between live and desired states during the diff. Note that these configurations are not | |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| No differences found between rendered manifests. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment