Created
December 3, 2025 21:16
-
-
Save quiiver/e693198a4171f4635a55ae2e6e0955be 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
| 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 (origin/main vs. local) --- | |
| --- origin/main/argo/k8s/argocd-bootstrap | |
| +++ local/argo/k8s/argocd-bootstrap | |
| @@ -27482,7 +27482,7 @@ | |
| operator: In | |
| values: | |
| - - ent-dev | |
| + [] | |
| template: | |
| metadata: | |
| @@ -27609,7 +27609,7 @@ | |
| operator: In | |
| values: | |
| - - ent-dev | |
| + [] | |
| template: | |
| metadata: | |
| @@ -27708,7 +27708,7 @@ | |
| apiVersion: argoproj.io/v1alpha1 | |
| kind: ApplicationSet | |
| metadata: | |
| - name: "remote-settings-nonprod-europe-west1-remote-settings-permissions" | |
| + name: "remote-settings-nonprod-europe-west1-remote-settings-git" | |
| namespace: release | |
| spec: | |
| # Allow toggling of AutoSync in the UI | |
| @@ -27740,6 +27740,122 @@ | |
| template: | |
| metadata: | |
| + name: 'remote-settings-{{ .name }}-europe-west1-remote-settings-git' | |
| + labels: | |
| + chart: remote-settings-git | |
| + environment: '{{ .name }}' | |
| + region: europe-west1 | |
| + tenant: "remote-settings" | |
| + realm: "nonprod" | |
| + annotations: | |
| + # resolves to the remote-settings/k8s/remote-settings-git/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 | |
| + # we can simplify this when glob paths make it into a stable ArgoCD release: https://github.com/argoproj/argo-cd/pull/18055 | |
| + argocd.argoproj.io/manifest-generate-paths: './templates;./files;./Chart.yaml;./values.yaml;./values-{{ .name }}*.yaml;./.argocd-source-remote-settings-{{ .name }}-europe-west1-remote-settings-git.yaml' | |
| + notifications.argoproj.io/subscribe.on-deployed.grafana: 'tenant=remote-settings|realm=nonprod|region=europe-west1|chart=remote-settings-git|argocd=deployed|environment={{.name}}' | |
| + notifications.argoproj.io/subscribe.on-health-degraded.grafana: 'tenant=remote-settings|realm=nonprod|region=europe-west1|chart=remote-settings-git|argocd=health-degraded|environment={{.name}}' | |
| + notifications.argoproj.io/subscribe.on-sync-failed.grafana: 'tenant=remote-settings|realm=nonprod|region=europe-west1|chart=remote-settings-git|argocd=sync-failed|environment={{.name}}' | |
| + notifications.argoproj.io/subscribe.on-sync-running.grafana: 'tenant=remote-settings|realm=nonprod|region=europe-west1|chart=remote-settings-git|argocd=sync-running|environment={{.name}}' | |
| + notifications.argoproj.io/subscribe.on-sync-status-unknown.grafana: 'tenant=remote-settings|realm=nonprod|region=europe-west1|chart=remote-settings-git|argocd=sync-status-unknown|environment={{.name}}' | |
| + notifications.argoproj.io/subscribe.on-sync-succeeded.grafana: 'tenant=remote-settings|realm=nonprod|region=europe-west1|chart=remote-settings-git|argocd=sync-succeeded|environment={{.name}}' | |
| + notifications.argoproj.io/subscribe.on-deployed.slack: 'remote-settings-alerts' | |
| + notifications.argoproj.io/subscribe.on-health-degraded.slack: 'remote-settings-alerts' | |
| + notifications.argoproj.io/subscribe.on-sync-failed.slack: 'remote-settings-alerts' | |
| + spec: | |
| + project: 'remote-settings-nonprod' | |
| + syncPolicy: | |
| + syncOptions: | |
| + - CreateNamespace=false | |
| + - RespectIgnoreDifferences=true # When syncing changes, respect fields ignored by the ignoreDifferences configuration | |
| + - ServerSideApply=false | |
| + source: | |
| + repoURL: "https://github.com/mozilla/webservices-infra" | |
| + path: "remote-settings/k8s/remote-settings-git" | |
| + targetRevision: '{{ dig "charts" "remote-settings-git" "target_revision" "main" . }}' | |
| + helm: | |
| + parameters: | |
| + - name: global.mozcloud.app_code | |
| + value: remote-settings | |
| + - name: global.mozcloud.artifact_id | |
| + value: $ARGOCD_APP_REVISION_SHORT_8 | |
| + - name: global.mozcloud.chart | |
| + value: remote-settings-git | |
| + - name: global.mozcloud.env_code | |
| + value: '{{ .name }}' | |
| + - name: global.mozcloud.project_id | |
| + value: moz-fx-remote-settings-nonprod | |
| + - name: global.mozcloud.realm | |
| + value: nonprod | |
| + releaseName: '{{ dig "charts" "remote-settings-git" "release_name" "remote-settings-git" . }}' # Primarily used to import existing helm releases | |
| + valueFiles: | |
| + - values.yaml | |
| + - 'values-{{ .name }}.yaml' | |
| + - 'values-{{ .name }}-europe-west1.yaml' | |
| + ignoreMissingValueFiles: true | |
| + destination: | |
| + name: "webservices-high-private-nonprod-europe-west1" | |
| + namespace: "remote-settings-{{ .name }}" | |
| + info: | |
| + - name: 'Helm Chart' | |
| + value: 'https://github.com/mozilla/webservices-infra/tree/{{ dig "target_revision" "main" . }}/remote-settings/k8s/remote-settings-git' | |
| + - name: 'Helm Chart Ref' | |
| + value: '{{ dig "charts" "remote-settings-git" "target_revision" "main" . }}' | |
| + - name: 'Application Repository' | |
| + value: '{{ dig "charts" "remote-settings-git" "application_repository" "mozilla/remote-settings" . }}' | |
| + - name: 'Image Repository' | |
| + value: '{{ dig "charts" "remote-settings-git" "image_repository" "us-docker.pkg.dev/moz-fx-remote-settings-prod/remote-settings-prod/remote-settings-git" . }}' | |
| + - name: 'Tenant Definition' | |
| + value: 'https://github.com/mozilla/global-platform-admin/blob/main/tenants/remote-settings.yaml' | |
| + # Will ignore differences between live and desired states during the diff. Note that these configurations are not | |
| + # used during the sync process unless the `RespectIgnoreDifferences=true` sync option is enabled. | |
| + # https://argo-cd.readthedocs.io/en/stable/user-guide/diffing/#application-level-configuration | |
| + ignoreDifferences: | |
| + - group: apps | |
| + kind: Deployment | |
| + jsonPointers: | |
| + - /spec/replicas | |
| + - group: networking.k8s.io | |
| + kind: Ingress | |
| + jsonPointers: | |
| + - /metadata/annotations/ingress.gcp.kubernetes.io~1pre-shared-cert | |
| + revisionHistoryLimit: 5 | |
| +--- | |
| +apiVersion: argoproj.io/v1alpha1 | |
| +kind: ApplicationSet | |
| +metadata: | |
| + name: "remote-settings-nonprod-europe-west1-remote-settings-permissions" | |
| + namespace: release | |
| +spec: | |
| + # Allow toggling of AutoSync in the UI | |
| + # https://argo-cd.readthedocs.io/en/stable/operator-manual/applicationset/Controlling-Resource-Modification/#allow-temporarily-toggling-auto-sync | |
| + ignoreApplicationDifferences: | |
| + - jsonPointers: | |
| + - /spec/syncPolicy | |
| + - /spec/source/targetRevision # Allow branch overrides in argocd applications | |
| + goTemplate: true | |
| + goTemplateOptions: ["missingkey=error"] | |
| + generators: | |
| + - matrix: | |
| + generators: | |
| + - git: | |
| + repoURL: https://github.com/mozilla/global-platform-admin | |
| + revision: main | |
| + files: | |
| + - path: "tenants/remote-settings.yaml" | |
| + - list: | |
| + elements: [] | |
| + elementsYaml: '{{.realms.nonprod.environments | toJson }}' | |
| + selector: | |
| + matchExpressions: | |
| + - key: name | |
| + operator: In | |
| + values: | |
| + | |
| + [] | |
| + | |
| + template: | |
| + metadata: | |
| name: 'remote-settings-{{ .name }}-europe-west1-remote-settings-permissions' | |
| labels: | |
| chart: remote-settings-permissions | |
| @@ -28087,6 +28203,120 @@ | |
| apiVersion: argoproj.io/v1alpha1 | |
| kind: ApplicationSet | |
| metadata: | |
| + name: "remote-settings-nonprod-us-west1-remote-settings-git" | |
| + namespace: release | |
| +spec: | |
| + # Allow toggling of AutoSync in the UI | |
| + # https://argo-cd.readthedocs.io/en/stable/operator-manual/applicationset/Controlling-Resource-Modification/#allow-temporarily-toggling-auto-sync | |
| + ignoreApplicationDifferences: | |
| + - jsonPointers: | |
| + - /spec/syncPolicy | |
| + - /spec/source/targetRevision # Allow branch overrides in argocd applications | |
| + goTemplate: true | |
| + goTemplateOptions: ["missingkey=error"] | |
| + generators: | |
| + - matrix: | |
| + generators: | |
| + - git: | |
| + repoURL: https://github.com/mozilla/global-platform-admin | |
| + revision: main | |
| + files: | |
| + - path: "tenants/remote-settings.yaml" | |
| + - list: | |
| + elements: [] | |
| + elementsYaml: '{{.realms.nonprod.environments | toJson }}' | |
| + selector: | |
| + matchExpressions: | |
| + - key: name | |
| + operator: In | |
| + values: | |
| + | |
| + [] | |
| + | |
| + template: | |
| + metadata: | |
| + name: 'remote-settings-{{ .name }}-us-west1-remote-settings-git' | |
| + labels: | |
| + chart: remote-settings-git | |
| + environment: '{{ .name }}' | |
| + region: us-west1 | |
| + tenant: "remote-settings" | |
| + realm: "nonprod" | |
| + annotations: | |
| + # resolves to the remote-settings/k8s/remote-settings-git/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 | |
| + # we can simplify this when glob paths make it into a stable ArgoCD release: https://github.com/argoproj/argo-cd/pull/18055 | |
| + argocd.argoproj.io/manifest-generate-paths: './templates;./files;./Chart.yaml;./values.yaml;./values-{{ .name }}*.yaml;./.argocd-source-remote-settings-{{ .name }}-us-west1-remote-settings-git.yaml' | |
| + notifications.argoproj.io/subscribe.on-deployed.grafana: 'tenant=remote-settings|realm=nonprod|region=us-west1|chart=remote-settings-git|argocd=deployed|environment={{.name}}' | |
| + notifications.argoproj.io/subscribe.on-health-degraded.grafana: 'tenant=remote-settings|realm=nonprod|region=us-west1|chart=remote-settings-git|argocd=health-degraded|environment={{.name}}' | |
| + notifications.argoproj.io/subscribe.on-sync-failed.grafana: 'tenant=remote-settings|realm=nonprod|region=us-west1|chart=remote-settings-git|argocd=sync-failed|environment={{.name}}' | |
| + notifications.argoproj.io/subscribe.on-sync-running.grafana: 'tenant=remote-settings|realm=nonprod|region=us-west1|chart=remote-settings-git|argocd=sync-running|environment={{.name}}' | |
| + notifications.argoproj.io/subscribe.on-sync-status-unknown.grafana: 'tenant=remote-settings|realm=nonprod|region=us-west1|chart=remote-settings-git|argocd=sync-status-unknown|environment={{.name}}' | |
| + notifications.argoproj.io/subscribe.on-sync-succeeded.grafana: 'tenant=remote-settings|realm=nonprod|region=us-west1|chart=remote-settings-git|argocd=sync-succeeded|environment={{.name}}' | |
| + notifications.argoproj.io/subscribe.on-deployed.slack: 'remote-settings-alerts' | |
| + notifications.argoproj.io/subscribe.on-health-degraded.slack: 'remote-settings-alerts' | |
| + notifications.argoproj.io/subscribe.on-sync-failed.slack: 'remote-settings-alerts' | |
| + spec: | |
| + project: 'remote-settings-nonprod' | |
| + syncPolicy: | |
| + syncOptions: | |
| + - CreateNamespace=false | |
| + - RespectIgnoreDifferences=true # When syncing changes, respect fields ignored by the ignoreDifferences configuration | |
| + - ServerSideApply=false | |
| + source: | |
| + repoURL: "https://github.com/mozilla/webservices-infra" | |
| + path: "remote-settings/k8s/remote-settings-git" | |
| + targetRevision: '{{ dig "charts" "remote-settings-git" "target_revision" "main" . }}' | |
| + helm: | |
| + parameters: | |
| + - name: global.mozcloud.app_code | |
| + value: remote-settings | |
| + - name: global.mozcloud.artifact_id | |
| + value: $ARGOCD_APP_REVISION_SHORT_8 | |
| + - name: global.mozcloud.chart | |
| + value: remote-settings-git | |
| + - name: global.mozcloud.env_code | |
| + value: '{{ .name }}' | |
| + - name: global.mozcloud.project_id | |
| + value: moz-fx-remote-settings-nonprod | |
| + - name: global.mozcloud.realm | |
| + value: nonprod | |
| + releaseName: '{{ dig "charts" "remote-settings-git" "release_name" "remote-settings-git" . }}' # Primarily used to import existing helm releases | |
| + valueFiles: | |
| + - values.yaml | |
| + - 'values-{{ .name }}.yaml' | |
| + destination: | |
| + name: "webservices-high-private-nonprod-us-west1" | |
| + namespace: "remote-settings-{{ .name }}" | |
| + info: | |
| + - name: 'Helm Chart' | |
| + value: 'https://github.com/mozilla/webservices-infra/tree/{{ dig "target_revision" "main" . }}/remote-settings/k8s/remote-settings-git' | |
| + - name: 'Helm Chart Ref' | |
| + value: '{{ dig "charts" "remote-settings-git" "target_revision" "main" . }}' | |
| + - name: 'Application Repository' | |
| + value: '{{ dig "charts" "remote-settings-git" "application_repository" "mozilla/remote-settings" . }}' | |
| + - name: 'Image Repository' | |
| + value: '{{ dig "charts" "remote-settings-git" "image_repository" "us-docker.pkg.dev/moz-fx-remote-settings-prod/remote-settings-prod/remote-settings-git" . }}' | |
| + - name: 'Tenant Definition' | |
| + value: 'https://github.com/mozilla/global-platform-admin/blob/main/tenants/remote-settings.yaml' | |
| + # Will ignore differences between live and desired states during the diff. Note that these configurations are not | |
| + # used during the sync process unless the `RespectIgnoreDifferences=true` sync option is enabled. | |
| + # https://argo-cd.readthedocs.io/en/stable/user-guide/diffing/#application-level-configuration | |
| + ignoreDifferences: | |
| + - group: apps | |
| + kind: Deployment | |
| + jsonPointers: | |
| + - /spec/replicas | |
| + - group: networking.k8s.io | |
| + kind: Ingress | |
| + jsonPointers: | |
| + - /metadata/annotations/ingress.gcp.kubernetes.io~1pre-shared-cert | |
| + revisionHistoryLimit: 5 | |
| +--- | |
| +apiVersion: argoproj.io/v1alpha1 | |
| +kind: ApplicationSet | |
| +metadata: | |
| name: "remote-settings-nonprod-us-west1-remote-settings-permissions" | |
| namespace: release | |
| spec: | |
| @@ -28463,6 +28693,120 @@ | |
| apiVersion: argoproj.io/v1alpha1 | |
| kind: ApplicationSet | |
| metadata: | |
| + name: "remote-settings-prod-us-west1-remote-settings-git" | |
| + namespace: release | |
| +spec: | |
| + # Allow toggling of AutoSync in the UI | |
| + # https://argo-cd.readthedocs.io/en/stable/operator-manual/applicationset/Controlling-Resource-Modification/#allow-temporarily-toggling-auto-sync | |
| + ignoreApplicationDifferences: | |
| + - jsonPointers: | |
| + - /spec/syncPolicy | |
| + - /spec/source/targetRevision # Allow branch overrides in argocd applications | |
| + goTemplate: true | |
| + goTemplateOptions: ["missingkey=error"] | |
| + generators: | |
| + - matrix: | |
| + generators: | |
| + - git: | |
| + repoURL: https://github.com/mozilla/global-platform-admin | |
| + revision: main | |
| + files: | |
| + - path: "tenants/remote-settings.yaml" | |
| + - list: | |
| + elements: [] | |
| + elementsYaml: '{{.realms.prod.environments | toJson }}' | |
| + selector: | |
| + matchExpressions: | |
| + - key: name | |
| + operator: In | |
| + values: | |
| + | |
| + [] | |
| + | |
| + template: | |
| + metadata: | |
| + name: 'remote-settings-{{ .name }}-us-west1-remote-settings-git' | |
| + labels: | |
| + chart: remote-settings-git | |
| + environment: '{{ .name }}' | |
| + region: us-west1 | |
| + tenant: "remote-settings" | |
| + realm: "prod" | |
| + annotations: | |
| + # resolves to the remote-settings/k8s/remote-settings-git/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 | |
| + # we can simplify this when glob paths make it into a stable ArgoCD release: https://github.com/argoproj/argo-cd/pull/18055 | |
| + argocd.argoproj.io/manifest-generate-paths: './templates;./files;./Chart.yaml;./values.yaml;./values-{{ .name }}*.yaml;./.argocd-source-remote-settings-{{ .name }}-us-west1-remote-settings-git.yaml' | |
| + notifications.argoproj.io/subscribe.on-deployed.grafana: 'tenant=remote-settings|realm=prod|region=us-west1|chart=remote-settings-git|argocd=deployed|environment={{.name}}' | |
| + notifications.argoproj.io/subscribe.on-health-degraded.grafana: 'tenant=remote-settings|realm=prod|region=us-west1|chart=remote-settings-git|argocd=health-degraded|environment={{.name}}' | |
| + notifications.argoproj.io/subscribe.on-sync-failed.grafana: 'tenant=remote-settings|realm=prod|region=us-west1|chart=remote-settings-git|argocd=sync-failed|environment={{.name}}' | |
| + notifications.argoproj.io/subscribe.on-sync-running.grafana: 'tenant=remote-settings|realm=prod|region=us-west1|chart=remote-settings-git|argocd=sync-running|environment={{.name}}' | |
| + notifications.argoproj.io/subscribe.on-sync-status-unknown.grafana: 'tenant=remote-settings|realm=prod|region=us-west1|chart=remote-settings-git|argocd=sync-status-unknown|environment={{.name}}' | |
| + notifications.argoproj.io/subscribe.on-sync-succeeded.grafana: 'tenant=remote-settings|realm=prod|region=us-west1|chart=remote-settings-git|argocd=sync-succeeded|environment={{.name}}' | |
| + notifications.argoproj.io/subscribe.on-deployed.slack: 'remote-settings-alerts' | |
| + notifications.argoproj.io/subscribe.on-health-degraded.slack: 'remote-settings-alerts' | |
| + notifications.argoproj.io/subscribe.on-sync-failed.slack: 'remote-settings-alerts' | |
| + spec: | |
| + project: 'remote-settings-prod' | |
| + syncPolicy: | |
| + syncOptions: | |
| + - CreateNamespace=false | |
| + - RespectIgnoreDifferences=true # When syncing changes, respect fields ignored by the ignoreDifferences configuration | |
| + - ServerSideApply=false | |
| + source: | |
| + repoURL: "https://github.com/mozilla/webservices-infra" | |
| + path: "remote-settings/k8s/remote-settings-git" | |
| + targetRevision: '{{ dig "charts" "remote-settings-git" "target_revision" "main" . }}' | |
| + helm: | |
| + parameters: | |
| + - name: global.mozcloud.app_code | |
| + value: remote-settings | |
| + - name: global.mozcloud.artifact_id | |
| + value: $ARGOCD_APP_REVISION_SHORT_8 | |
| + - name: global.mozcloud.chart | |
| + value: remote-settings-git | |
| + - name: global.mozcloud.env_code | |
| + value: '{{ .name }}' | |
| + - name: global.mozcloud.project_id | |
| + value: moz-fx-remote-settings-prod | |
| + - name: global.mozcloud.realm | |
| + value: prod | |
| + releaseName: '{{ dig "charts" "remote-settings-git" "release_name" "remote-settings-git" . }}' # Primarily used to import existing helm releases | |
| + valueFiles: | |
| + - values.yaml | |
| + - 'values-{{ .name }}.yaml' | |
| + destination: | |
| + name: "webservices-high-private-prod-us-west1" | |
| + namespace: "remote-settings-{{ .name }}" | |
| + info: | |
| + - name: 'Helm Chart' | |
| + value: 'https://github.com/mozilla/webservices-infra/tree/{{ dig "target_revision" "main" . }}/remote-settings/k8s/remote-settings-git' | |
| + - name: 'Helm Chart Ref' | |
| + value: '{{ dig "charts" "remote-settings-git" "target_revision" "main" . }}' | |
| + - name: 'Application Repository' | |
| + value: '{{ dig "charts" "remote-settings-git" "application_repository" "mozilla/remote-settings" . }}' | |
| + - name: 'Image Repository' | |
| + value: '{{ dig "charts" "remote-settings-git" "image_repository" "us-docker.pkg.dev/moz-fx-remote-settings-prod/remote-settings-prod/remote-settings-git" . }}' | |
| + - name: 'Tenant Definition' | |
| + value: 'https://github.com/mozilla/global-platform-admin/blob/main/tenants/remote-settings.yaml' | |
| + # Will ignore differences between live and desired states during the diff. Note that these configurations are not | |
| + # used during the sync process unless the `RespectIgnoreDifferences=true` sync option is enabled. | |
| + # https://argo-cd.readthedocs.io/en/stable/user-guide/diffing/#application-level-configuration | |
| + ignoreDifferences: | |
| + - group: apps | |
| + kind: Deployment | |
| + jsonPointers: | |
| + - /spec/replicas | |
| + - group: networking.k8s.io | |
| + kind: Ingress | |
| + jsonPointers: | |
| + - /metadata/annotations/ingress.gcp.kubernetes.io~1pre-shared-cert | |
| + revisionHistoryLimit: 5 | |
| +--- | |
| +apiVersion: argoproj.io/v1alpha1 | |
| +kind: ApplicationSet | |
| +metadata: | |
| name: "remote-settings-prod-us-west1-remote-settings-permissions" | |
| namespace: release | |
| spec: | |
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