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. |
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. |
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 --git i/misc/scripts/tenant-managment/src/main.py w/misc/scripts/tenant-managment/src/main.py | |
| index dd47e72a..8b487600 100644 | |
| --- i/misc/scripts/tenant-managment/src/main.py | |
| +++ w/misc/scripts/tenant-managment/src/main.py | |
| @@ -83,18 +83,25 @@ def simplify_schema(schema_path): | |
| help="Path to the tenant file", | |
| type=click.Path(exists=True, file_okay=True, dir_okay=False, path_type=Path), | |
| ) | |
| -def migrate_tenants(schema_path: Path, tenant_path: Optional[Path]): | |
| +@click.option( |
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 --git i/argo/k8s/argocd-bootstrap/templates/tenants/tenant-applicationsets.yaml w/argo/k8s/argocd-bootstrap/templates/tenants/tenant-applicationsets.yaml | |
| index 71ad7a40..4ad4c2c3 100644 | |
| --- i/argo/k8s/argocd-bootstrap/templates/tenants/tenant-applicationsets.yaml | |
| +++ w/argo/k8s/argocd-bootstrap/templates/tenants/tenant-applicationsets.yaml | |
| @@ -35,7 +35,7 @@ spec: | |
| generators: | |
| - git: | |
| repoURL: https://github.com/{{ $.Values.argo.cd.github.organization }}/global-platform-admin | |
| - revision: main | |
| + revision: {{ $.Values.argo.cd.github.revision | default "main" }} |
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
| --- /Users/wstuckey/dev/global-platform-admin/tmpdir/dataservices/data-privacy-mapping-nonprod-us-west1-data-privacy-mapping-current.yaml 2025-11-25 12:05:08 | |
| +++ /Users/wstuckey/dev/global-platform-admin/tmpdir/dataservices/data-privacy-mapping-nonprod-us-west1-data-privacy-mapping-incoming.yaml 2025-11-25 12:05:08 | |
| @@ -62,7 +62,7 @@ | |
| value: moz-fx-data-privacy-mappi-6295 | |
| - name: global.mozcloud.realm | |
| value: nonprod | |
| - releaseName: gha | |
| + releaseName: data-privacy-mapping | |
| valueFiles: | |
| - values.yaml |
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
| #!/bin/bash | |
| set -eo pipefail | |
| functions="webservices sandbox dataservices" | |
| # functions="sandbox" | |
| tenants="${1}" | |
| gitroot=$(git rev-parse --show-toplevel) | |
| argo_dir="$gitroot/argo/k8s/argocd-bootstrap" |
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
| --- /Users/wstuckey/dev/global-platform-admin/tmpdir/sandbox/cicd-demos-nonprod-us-west1-cicd-demos-current.yaml 2025-11-25 11:02:27 | |
| +++ /Users/wstuckey/dev/global-platform-admin/tmpdir/sandbox/cicd-demos-nonprod-us-west1-cicd-demos-incoming.yaml 2025-11-25 11:02:16 | |
| @@ -20,10 +20,8 @@ | |
| notifications.argoproj.io/subscribe.on-sync-running.grafana: tenant=cicd-demos|realm=nonprod|region=us-west1|chart=cicd-demos|argocd=sync-running|environment=dev | |
| notifications.argoproj.io/subscribe.on-sync-status-unknown.grafana: tenant=cicd-demos|realm=nonprod|region=us-west1|chart=cicd-demos|argocd=sync-status-unknown|environment=dev | |
| notifications.argoproj.io/subscribe.on-sync-succeeded.grafana: tenant=cicd-demos|realm=nonprod|region=us-west1|chart=cicd-demos|argocd=sync-succeeded|environment=dev | |
| - creationTimestamp: "2024-10-23T16:54:05Z" | |
| finalizers: | |
| - resources-finalizer.argocd.argoproj.io | |
| - generation: 18230 |
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 --git i/argo/k8s/argocd-bootstrap/templates/tenants/tenant-applicationsets.yaml w/argo/k8s/argocd-bootstrap/templates/tenants/tenant-applicationsets.yaml | |
| index 8d59fcac..e232d7c7 100644 | |
| --- i/argo/k8s/argocd-bootstrap/templates/tenants/tenant-applicationsets.yaml | |
| +++ w/argo/k8s/argocd-bootstrap/templates/tenants/tenant-applicationsets.yaml | |
| @@ -190,7 +190,8 @@ spec: | |
| ignoreMissingValueFiles: true | |
| {{- end }} | |
| destination: | |
| - name: "{{ $tenant.globals.function }}-{{ $tenant.globals.risk_level }}-{{ ($tenant.globals).cluster_type | default "private" }}-{{ $realm }}-{{ $region }}" | |
| + # Enable environment level cluster type override |
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 | |
| @@ -6817,8 +6817,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" . }}' |
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" . }}' |
NewerOlder