diff --git a/api/cloudbuild.yaml b/api/cloudbuild.yaml index 32dc9b1be7..05ad8cd0ad 100644 --- a/api/cloudbuild.yaml +++ b/api/cloudbuild.yaml @@ -82,7 +82,7 @@ steps: args: - '-c' - | - echo "gcr.io/$PROJECT_ID/api-js:$BRANCH_NAME-$SHORT_SHA-$(date +%s)" > /workspace/imagename + echo "northamerica-northeast1-docker.pkg.dev/$PROJECT_ID/tracker/api-js:$BRANCH_NAME-$SHORT_SHA-$(date +%s)" > /workspace/imagename - name: 'gcr.io/cloud-builders/docker' id: build-if-master diff --git a/azure-defender-easm/add-domain-to-easm/cloudbuild.yaml b/azure-defender-easm/add-domain-to-easm/cloudbuild.yaml index adbfe419c8..685594c43b 100644 --- a/azure-defender-easm/add-domain-to-easm/cloudbuild.yaml +++ b/azure-defender-easm/add-domain-to-easm/cloudbuild.yaml @@ -6,7 +6,7 @@ steps: args: - "-c" - | - echo "gcr.io/$PROJECT_ID/azure-defender-easm/add-domain-to-easm:$BRANCH_NAME-$SHORT_SHA-$(date +%s)" > /workspace/imagename + echo "northamerica-northeast1-docker.pkg.dev/$PROJECT_ID/tracker/azure-defender-easm/add-domain-to-easm:$BRANCH_NAME-$SHORT_SHA-$(date +%s)" > /workspace/imagename - name: "gcr.io/cloud-builders/docker" id: build-https-if-master diff --git a/azure-defender-easm/label-known-easm-assets/cloudbuild.yaml b/azure-defender-easm/label-known-easm-assets/cloudbuild.yaml index 730bb47ae9..9dfd06756c 100644 --- a/azure-defender-easm/label-known-easm-assets/cloudbuild.yaml +++ b/azure-defender-easm/label-known-easm-assets/cloudbuild.yaml @@ -6,7 +6,7 @@ steps: args: - "-c" - | - echo "gcr.io/$PROJECT_ID/azure-defender-easm/label-known-easm-assets:$BRANCH_NAME-$SHORT_SHA-$(date +%s)" > /workspace/imagename + echo "northamerica-northeast1-docker.pkg.dev/$PROJECT_ID/tracker/azure-defender-easm/label-known-easm-assets:$BRANCH_NAME-$SHORT_SHA-$(date +%s)" > /workspace/imagename - name: "gcr.io/cloud-builders/docker" id: build-https-if-master diff --git a/ci/README.md b/ci/README.md index 2ac2a0ea16..349d814244 100644 --- a/ci/README.md +++ b/ci/README.md @@ -6,11 +6,11 @@ You can see it in the cloudbuild.yaml files under the name "track-compliance/ci" To build a copy of this image: ```sh -docker build -t gcr.io/track-compliance/ci . +docker build -t northamerica-northeast1-docker.pkg.dev/track-compliance/tracker/ci . ``` To push to the registry you will need to configure docker with proper credentials. ```sh gcloud auth configure-docker -docker push gcr.io/track-compliance/ci +docker push northamerica-northeast1-docker.pkg.dev/track-compliance/tracker/ci ``` diff --git a/ci/cloudbuild.yaml b/ci/cloudbuild.yaml index e07da8bb77..29f42bfe7e 100644 --- a/ci/cloudbuild.yaml +++ b/ci/cloudbuild.yaml @@ -9,7 +9,7 @@ steps: - | if [[ "$BRANCH_NAME" == "master" ]] then - docker build -t gcr.io/track-compliance/ci . + docker build -t northamerica-northeast1-docker.pkg.dev/track-compliance/tracker/ci . else exit 0 fi @@ -23,7 +23,7 @@ steps: - | if [[ "$BRANCH_NAME" == "master" ]] then - docker push gcr.io/track-compliance/ci + docker push northamerica-northeast1-docker.pkg.dev/track-compliance/tracker/ci else exit 0 fi diff --git a/clients/python/cloudbuild.yaml b/clients/python/cloudbuild.yaml index e8e7b5b6e6..34ab0b38c5 100644 --- a/clients/python/cloudbuild.yaml +++ b/clients/python/cloudbuild.yaml @@ -1,5 +1,5 @@ steps: - - name: 'gcr.io/track-compliance/ci' + - name: 'northamerica-northeast1-docker.pkg.dev/track-compliance/tracker/ci' id: install-client-deps dir: clients/python entrypoint: pipenv @@ -7,13 +7,13 @@ steps: env: - PIPENV_NOSPIN=TRUE - - name: 'gcr.io/track-compliance/ci' + - name: 'northamerica-northeast1-docker.pkg.dev/track-compliance/tracker/ci' id: lint-client dir: clients/python entrypoint: /bin/sh args: ['-c', 'pipenv run black --check tracker_client/ && pipenv run bandit -r tracker_client/'] - - name: 'gcr.io/track-compliance/ci' + - name: 'northamerica-northeast1-docker.pkg.dev/track-compliance/tracker/ci' id: test-client dir: clients/python entrypoint: pipenv @@ -26,4 +26,4 @@ steps: timeout: 1200s options: machineType: 'E2_HIGHCPU_8' - + diff --git a/frontend-maintenance/cloudbuild.yaml b/frontend-maintenance/cloudbuild.yaml index 2455556ace..48818707e8 100644 --- a/frontend-maintenance/cloudbuild.yaml +++ b/frontend-maintenance/cloudbuild.yaml @@ -6,7 +6,7 @@ steps: args: - '-c' - | - echo "gcr.io/$PROJECT_ID/frontend-maintenance:$BRANCH_NAME-$SHORT_SHA-$(date +%s)" > /workspace/imagename + echo "northamerica-northeast1-docker.pkg.dev/$PROJECT_ID/tracker/frontend-maintenance:$BRANCH_NAME-$SHORT_SHA-$(date +%s)" > /workspace/imagename - name: 'gcr.io/cloud-builders/docker' id: build-if-master diff --git a/frontend/cloudbuild.yaml b/frontend/cloudbuild.yaml index 7fb1ab45ec..db0824dbdf 100644 --- a/frontend/cloudbuild.yaml +++ b/frontend/cloudbuild.yaml @@ -42,7 +42,7 @@ steps: args: - '-c' - | - echo "gcr.io/$PROJECT_ID/frontend:$BRANCH_NAME-$SHORT_SHA-$(date +%s)" > /workspace/imagename + echo "northamerica-northeast1-docker.pkg.dev/$PROJECT_ID/tracker/frontend:$BRANCH_NAME-$SHORT_SHA-$(date +%s)" > /workspace/imagename - name: 'gcr.io/cloud-builders/docker' id: build-if-master diff --git a/k8s/apps/bases/api/deployment.yaml b/k8s/apps/bases/api/deployment.yaml index 4807004553..eb6162305d 100644 --- a/k8s/apps/bases/api/deployment.yaml +++ b/k8s/apps/bases/api/deployment.yaml @@ -23,7 +23,7 @@ spec: app: tracker-api spec: initContainers: - - image: gcr.io/track-compliance/database-migration:test-0000003 + - image: northamerica-northeast1-docker.pkg.dev/track-compliance/tracker/database-migration:test-0000003 name: database-migration env: - name: DB_USER @@ -54,7 +54,7 @@ spec: - name: database-config mountPath: /app containers: - - image: gcr.io/track-compliance/api-js:master-168ac58-1706037325 # {"$imagepolicy": "flux-system:api"} + - image: northamerica-northeast1-docker.pkg.dev/track-compliance/tracker/api-js:master-168ac58-1706037325 # {"$imagepolicy": "flux-system:api"} name: api ports: - containerPort: 4000 diff --git a/k8s/apps/bases/api/domain-cleanup-cronjob.yaml b/k8s/apps/bases/api/domain-cleanup-cronjob.yaml index 51fe76547d..fea3fe0625 100644 --- a/k8s/apps/bases/api/domain-cleanup-cronjob.yaml +++ b/k8s/apps/bases/api/domain-cleanup-cronjob.yaml @@ -13,7 +13,7 @@ spec: spec: containers: - name: domain-cleanup - image: gcr.io/track-compliance/services/domain-cleanup:master-a528fe0-1701118115 # {"$imagepolicy": "flux-system:domain-cleanup"} + image: northamerica-northeast1-docker.pkg.dev/track-compliance/tracker/services/domain-cleanup:master-a528fe0-1701118115 # {"$imagepolicy": "flux-system:domain-cleanup"} env: - name: DB_PASS valueFrom: diff --git a/k8s/apps/bases/api/org-footprint-cronjob/cronjob.yaml b/k8s/apps/bases/api/org-footprint-cronjob/cronjob.yaml index 9ded107be9..16ae2d4f79 100644 --- a/k8s/apps/bases/api/org-footprint-cronjob/cronjob.yaml +++ b/k8s/apps/bases/api/org-footprint-cronjob/cronjob.yaml @@ -13,7 +13,7 @@ spec: spec: containers: - name: org-footprint - image: gcr.io/track-compliance/services/org-footprint:master-8900ba0-1704892977 # {"$imagepolicy": "flux-system:org-footprint"} + image: northamerica-northeast1-docker.pkg.dev/track-compliance/tracker/services/org-footprint:master-8900ba0-1704892977 # {"$imagepolicy": "flux-system:org-footprint"} env: - name: DB_PASS valueFrom: diff --git a/k8s/apps/bases/api/progress-report-cronjob/cronjob.yaml b/k8s/apps/bases/api/progress-report-cronjob/cronjob.yaml index f6f1240395..412d98e252 100644 --- a/k8s/apps/bases/api/progress-report-cronjob/cronjob.yaml +++ b/k8s/apps/bases/api/progress-report-cronjob/cronjob.yaml @@ -13,7 +13,7 @@ spec: spec: containers: - name: progress-report - image: gcr.io/track-compliance/services/progress-report:master-b30504a-1704892971 # {"$imagepolicy": "flux-system:progress-report"} + image: northamerica-northeast1-docker.pkg.dev/track-compliance/tracker/services/progress-report:master-b30504a-1704892971 # {"$imagepolicy": "flux-system:progress-report"} env: - name: DB_PASS valueFrom: diff --git a/k8s/apps/bases/azure-defender-easm/add-domain-to-easm/deployment.yaml b/k8s/apps/bases/azure-defender-easm/add-domain-to-easm/deployment.yaml index 9747a9a8ef..f0d2ae9a02 100644 --- a/k8s/apps/bases/azure-defender-easm/add-domain-to-easm/deployment.yaml +++ b/k8s/apps/bases/azure-defender-easm/add-domain-to-easm/deployment.yaml @@ -18,7 +18,7 @@ spec: spec: containers: - name: add-domain-to-easm - image: gcr.io/track-compliance/azure-defender-easm/add-domain-to-easm:master-5104232-1706728878 # {"$imagepolicy": "flux-system:add-domain-to-easm"} + image: northamerica-northeast1-docker.pkg.dev/track-compliance/tracker/azure-defender-easm/add-domain-to-easm:master-5104232-1706728878 # {"$imagepolicy": "flux-system:add-domain-to-easm"} env: - name: SUBSCRIBE_TO value: domains.* diff --git a/k8s/apps/bases/azure-defender-easm/label-known-easm-assets-cronjob/cronjob.yaml b/k8s/apps/bases/azure-defender-easm/label-known-easm-assets-cronjob/cronjob.yaml index 4e7f388471..47b9e92b2a 100644 --- a/k8s/apps/bases/azure-defender-easm/label-known-easm-assets-cronjob/cronjob.yaml +++ b/k8s/apps/bases/azure-defender-easm/label-known-easm-assets-cronjob/cronjob.yaml @@ -16,7 +16,7 @@ spec: spec: containers: - name: label-known-easm-assets - image: gcr.io/track-compliance/azure-defender-easm/label-known-easm-assets:master-8296e62-1706728448 # {"$imagepolicy": "flux-system:label-known-easm-assets"} + image: northamerica-northeast1-docker.pkg.dev/track-compliance/tracker/azure-defender-easm/label-known-easm-assets:master-8296e62-1706728448 # {"$imagepolicy": "flux-system:label-known-easm-assets"} env: - name: DB_PASS valueFrom: diff --git a/k8s/apps/bases/frontend/deployment.yaml b/k8s/apps/bases/frontend/deployment.yaml index d8e439a766..c2385f40cf 100644 --- a/k8s/apps/bases/frontend/deployment.yaml +++ b/k8s/apps/bases/frontend/deployment.yaml @@ -20,7 +20,7 @@ spec: app: tracker-frontend spec: containers: - - image: gcr.io/track-compliance/frontend:master-f30af73-1707499537 # {"$imagepolicy": "flux-system:frontend"} + - image: northamerica-northeast1-docker.pkg.dev/track-compliance/tracker/frontend:master-f30af73-1707499537 # {"$imagepolicy": "flux-system:frontend"} name: frontend resources: limits: diff --git a/k8s/apps/bases/frontend/maintenance-deployment.yaml b/k8s/apps/bases/frontend/maintenance-deployment.yaml index 1b6866ac94..41deaa6a50 100644 --- a/k8s/apps/bases/frontend/maintenance-deployment.yaml +++ b/k8s/apps/bases/frontend/maintenance-deployment.yaml @@ -20,7 +20,7 @@ spec: app: tracker-frontend-maintenance spec: containers: - - image: gcr.io/track-compliance/frontend-maintenance:master-a1a1a1b-1692191661 # {"$imagepolicy": "flux-system:frontend-maintenance"} + - image: northamerica-northeast1-docker.pkg.dev/track-compliance/tracker/frontend-maintenance:master-a1a1a1b-1692191661 # {"$imagepolicy": "flux-system:frontend-maintenance"} name: frontend-maintenance resources: limits: diff --git a/k8s/apps/bases/scanners/dmarc-report-cronjob/cronjob.yaml b/k8s/apps/bases/scanners/dmarc-report-cronjob/cronjob.yaml index ffa411cd37..aa3a65e47e 100644 --- a/k8s/apps/bases/scanners/dmarc-report-cronjob/cronjob.yaml +++ b/k8s/apps/bases/scanners/dmarc-report-cronjob/cronjob.yaml @@ -13,7 +13,7 @@ spec: spec: containers: - name: dmarc-report - image: gcr.io/track-compliance/dmarc-report:master-11c83b6-1697548787 # {"$imagepolicy": "flux-system:dmarc-report"} + image: northamerica-northeast1-docker.pkg.dev/track-compliance/tracker/dmarc-report:master-11c83b6-1697548787 # {"$imagepolicy": "flux-system:dmarc-report"} env: - name: DB_NAME valueFrom: diff --git a/k8s/apps/bases/scanners/dns-processor/deployment.yaml b/k8s/apps/bases/scanners/dns-processor/deployment.yaml index c4f3d655cb..862a19e710 100644 --- a/k8s/apps/bases/scanners/dns-processor/deployment.yaml +++ b/k8s/apps/bases/scanners/dns-processor/deployment.yaml @@ -18,7 +18,7 @@ spec: spec: containers: - name: dns-processor - image: gcr.io/track-compliance/dns-processor:master-32396c5-1706129739 # {"$imagepolicy": "flux-system:dns-processor"} + image: northamerica-northeast1-docker.pkg.dev/track-compliance/tracker/dns-processor:master-32396c5-1706129739 # {"$imagepolicy": "flux-system:dns-processor"} env: - name: DB_NAME value: track_dmarc diff --git a/k8s/apps/bases/scanners/dns-scanner/deployment.yaml b/k8s/apps/bases/scanners/dns-scanner/deployment.yaml index e0291c2fc2..aeb8bf5171 100644 --- a/k8s/apps/bases/scanners/dns-scanner/deployment.yaml +++ b/k8s/apps/bases/scanners/dns-scanner/deployment.yaml @@ -17,7 +17,7 @@ spec: spec: containers: - name: dns-scanner - image: gcr.io/track-compliance/dns-scanner:master-f9e4221-1706633799 # {"$imagepolicy": "flux-system:dns-scanner"} + image: northamerica-northeast1-docker.pkg.dev/track-compliance/tracker/dns-scanner:master-f9e4221-1706633799 # {"$imagepolicy": "flux-system:dns-scanner"} env: - name: DB_NAME value: track_dmarc diff --git a/k8s/apps/bases/scanners/domain-discovery/deployment.yaml b/k8s/apps/bases/scanners/domain-discovery/deployment.yaml index 983ab09200..b4fe9c56a7 100644 --- a/k8s/apps/bases/scanners/domain-discovery/deployment.yaml +++ b/k8s/apps/bases/scanners/domain-discovery/deployment.yaml @@ -18,7 +18,7 @@ spec: spec: containers: - name: domain-discovery - image: gcr.io/track-compliance/domain-discovery:master-4b3c965-1702065336 # {"$imagepolicy": "flux-system:domain-discovery"} + image: northamerica-northeast1-docker.pkg.dev/track-compliance/tracker/domain-discovery:master-4b3c965-1702065336 # {"$imagepolicy": "flux-system:domain-discovery"} env: - name: DB_NAME value: track_dmarc diff --git a/k8s/apps/bases/scanners/domain-dispatcher-cronjob/cronjob.yaml b/k8s/apps/bases/scanners/domain-dispatcher-cronjob/cronjob.yaml index 02ca7a837e..0cb58ba615 100644 --- a/k8s/apps/bases/scanners/domain-dispatcher-cronjob/cronjob.yaml +++ b/k8s/apps/bases/scanners/domain-dispatcher-cronjob/cronjob.yaml @@ -16,7 +16,7 @@ spec: spec: containers: - name: domain-dispatcher - image: gcr.io/track-compliance/domain-dispatcher:master-17ff220-1697550117 # {"$imagepolicy": "flux-system:domain-dispatcher"} + image: northamerica-northeast1-docker.pkg.dev/track-compliance/tracker/domain-dispatcher:master-17ff220-1697550117 # {"$imagepolicy": "flux-system:domain-dispatcher"} env: - name: DB_PASS valueFrom: diff --git a/k8s/apps/bases/scanners/log4shell-processor/deployment.yaml b/k8s/apps/bases/scanners/log4shell-processor/deployment.yaml index c0b2b85b91..01d5729cfc 100644 --- a/k8s/apps/bases/scanners/log4shell-processor/deployment.yaml +++ b/k8s/apps/bases/scanners/log4shell-processor/deployment.yaml @@ -16,6 +16,6 @@ spec: spec: containers: - name: log4shell-processor - image: gcr.io/track-compliance/log4shell-processor:master-002cd7f-1690199509 # {"$imagepolicy": "flux-system:log4shell-processor"} + image: northamerica-northeast1-docker.pkg.dev/track-compliance/tracker/log4shell-processor:master-002cd7f-1690199509 # {"$imagepolicy": "flux-system:log4shell-processor"} resources: {} status: {} diff --git a/k8s/apps/bases/scanners/log4shell-scanner/deployment.yaml b/k8s/apps/bases/scanners/log4shell-scanner/deployment.yaml index bc7cbe7173..c407725c03 100644 --- a/k8s/apps/bases/scanners/log4shell-scanner/deployment.yaml +++ b/k8s/apps/bases/scanners/log4shell-scanner/deployment.yaml @@ -15,7 +15,7 @@ spec: spec: containers: - name: log4shell-scanner - image: gcr.io/track-compliance/log4shell-scanner:master-ee5d6a6-1697631334 # {"$imagepolicy": "flux-system:log4shell-scanner"} + image: northamerica-northeast1-docker.pkg.dev/track-compliance/tracker/log4shell-scanner:master-ee5d6a6-1697631334 # {"$imagepolicy": "flux-system:log4shell-scanner"} env: - name: PYTHONWARNINGS value: ignore diff --git a/k8s/apps/bases/scanners/spring4shell-scanner/deployment.yaml b/k8s/apps/bases/scanners/spring4shell-scanner/deployment.yaml index 0ff2fbdf91..03420c9414 100644 --- a/k8s/apps/bases/scanners/spring4shell-scanner/deployment.yaml +++ b/k8s/apps/bases/scanners/spring4shell-scanner/deployment.yaml @@ -16,7 +16,7 @@ spec: spec: containers: - name: spring4shell-scanner - image: gcr.io/track-compliance/spring4shell-scanner:master-2b216b0-1697550239 # {"$imagepolicy": "flux-system:spring4shell-scanner"} + image: northamerica-northeast1-docker.pkg.dev/track-compliance/tracker/spring4shell-scanner:master-2b216b0-1697550239 # {"$imagepolicy": "flux-system:spring4shell-scanner"} env: - name: SUBSCRIBE_TO value: domains.* diff --git a/k8s/apps/bases/scanners/summaries-cronjob/cronjob.yaml b/k8s/apps/bases/scanners/summaries-cronjob/cronjob.yaml index 5d34a1dc75..43ec9444f0 100644 --- a/k8s/apps/bases/scanners/summaries-cronjob/cronjob.yaml +++ b/k8s/apps/bases/scanners/summaries-cronjob/cronjob.yaml @@ -13,7 +13,7 @@ spec: spec: containers: - name: summaries - image: gcr.io/track-compliance/services/summaries:master-9a0d453-1697814387 # {"$imagepolicy": "flux-system:summaries"} + image: northamerica-northeast1-docker.pkg.dev/track-compliance/tracker/services/summaries:master-9a0d453-1697814387 # {"$imagepolicy": "flux-system:summaries"} env: - name: DB_USER valueFrom: diff --git a/k8s/apps/bases/scanners/update-selectors-cronjob/cronjob.yaml b/k8s/apps/bases/scanners/update-selectors-cronjob/cronjob.yaml index c1d44fa601..e55220aba9 100644 --- a/k8s/apps/bases/scanners/update-selectors-cronjob/cronjob.yaml +++ b/k8s/apps/bases/scanners/update-selectors-cronjob/cronjob.yaml @@ -16,7 +16,7 @@ spec: spec: containers: - name: update-selectors - image: gcr.io/track-compliance/services/update-selectors:master-90cb9ef-1708446048 # {"$imagepolicy": "flux-system:update-selectors"} + image: northamerica-northeast1-docker.pkg.dev/track-compliance/tracker/services/update-selectors:master-90cb9ef-1708446048 # {"$imagepolicy": "flux-system:update-selectors"} env: - name: ARANGO_DB_USER valueFrom: diff --git a/k8s/apps/bases/scanners/web-processor/deployment.yaml b/k8s/apps/bases/scanners/web-processor/deployment.yaml index 8dead42968..af0f4262ec 100644 --- a/k8s/apps/bases/scanners/web-processor/deployment.yaml +++ b/k8s/apps/bases/scanners/web-processor/deployment.yaml @@ -18,7 +18,7 @@ spec: spec: containers: - name: web-processor - image: gcr.io/track-compliance/web-processor:master-9522869-1705942059 # {"$imagepolicy": "flux-system:web-processor"} + image: northamerica-northeast1-docker.pkg.dev/track-compliance/tracker/web-processor:master-9522869-1705942059 # {"$imagepolicy": "flux-system:web-processor"} env: - name: DB_NAME value: track_dmarc diff --git a/k8s/apps/bases/scanners/web-scanner/deployment.yaml b/k8s/apps/bases/scanners/web-scanner/deployment.yaml index 4a321b1a6b..dd458a1928 100644 --- a/k8s/apps/bases/scanners/web-scanner/deployment.yaml +++ b/k8s/apps/bases/scanners/web-scanner/deployment.yaml @@ -19,7 +19,7 @@ spec: spec: containers: - name: web-scanner - image: gcr.io/track-compliance/web-scanner:master-acebeaf-1707238108 # {"$imagepolicy": "flux-system:web-scanner"} + image: northamerica-northeast1-docker.pkg.dev/track-compliance/tracker/web-scanner:master-acebeaf-1707238108 # {"$imagepolicy": "flux-system:web-scanner"} env: - name: PYTHONWARNINGS value: ignore diff --git a/k8s/clusters/auto-image-update/bases/image-repo-policies/add-domain-to-easm-image-repo-policy.yaml b/k8s/clusters/auto-image-update/bases/image-repo-policies/add-domain-to-easm-image-repo-policy.yaml index 1f02efab31..fb582bd9cc 100644 --- a/k8s/clusters/auto-image-update/bases/image-repo-policies/add-domain-to-easm-image-repo-policy.yaml +++ b/k8s/clusters/auto-image-update/bases/image-repo-policies/add-domain-to-easm-image-repo-policy.yaml @@ -4,7 +4,7 @@ metadata: name: add-domain-to-easm namespace: flux-system spec: - image: gcr.io/track-compliance/add-domain-to-easm + image: northamerica-northeast1-docker.pkg.dev/track-compliance/tracker/add-domain-to-easm interval: 5m0s --- apiVersion: image.toolkit.fluxcd.io/v1alpha1 diff --git a/k8s/clusters/auto-image-update/bases/image-repo-policies/api-image-repo-policy.yaml b/k8s/clusters/auto-image-update/bases/image-repo-policies/api-image-repo-policy.yaml index 6e01bf998d..a33699eba1 100644 --- a/k8s/clusters/auto-image-update/bases/image-repo-policies/api-image-repo-policy.yaml +++ b/k8s/clusters/auto-image-update/bases/image-repo-policies/api-image-repo-policy.yaml @@ -4,7 +4,7 @@ metadata: name: api namespace: flux-system spec: - image: gcr.io/track-compliance/api-js + image: northamerica-northeast1-docker.pkg.dev/track-compliance/tracker/api-js interval: 1m0s --- apiVersion: image.toolkit.fluxcd.io/v1alpha1 diff --git a/k8s/clusters/auto-image-update/bases/image-repo-policies/dmarc-report-image-repo-policy.yaml b/k8s/clusters/auto-image-update/bases/image-repo-policies/dmarc-report-image-repo-policy.yaml index edf58dc5e7..431eeb348e 100644 --- a/k8s/clusters/auto-image-update/bases/image-repo-policies/dmarc-report-image-repo-policy.yaml +++ b/k8s/clusters/auto-image-update/bases/image-repo-policies/dmarc-report-image-repo-policy.yaml @@ -4,7 +4,7 @@ metadata: name: dmarc-report namespace: flux-system spec: - image: gcr.io/track-compliance/dmarc-report + image: northamerica-northeast1-docker.pkg.dev/track-compliance/tracker/dmarc-report interval: 1m0s --- apiVersion: image.toolkit.fluxcd.io/v1alpha1 diff --git a/k8s/clusters/auto-image-update/bases/image-repo-policies/dns-processor-image-repo-policy.yaml b/k8s/clusters/auto-image-update/bases/image-repo-policies/dns-processor-image-repo-policy.yaml index 29544322cc..6e86af56b2 100644 --- a/k8s/clusters/auto-image-update/bases/image-repo-policies/dns-processor-image-repo-policy.yaml +++ b/k8s/clusters/auto-image-update/bases/image-repo-policies/dns-processor-image-repo-policy.yaml @@ -4,7 +4,7 @@ metadata: name: dns-processor namespace: flux-system spec: - image: gcr.io/track-compliance/dns-processor + image: northamerica-northeast1-docker.pkg.dev/track-compliance/tracker/dns-processor interval: 5m0s --- apiVersion: image.toolkit.fluxcd.io/v1alpha1 diff --git a/k8s/clusters/auto-image-update/bases/image-repo-policies/dns-scanner-image-repo-policy.yaml b/k8s/clusters/auto-image-update/bases/image-repo-policies/dns-scanner-image-repo-policy.yaml index 33a42a18b1..311bd407be 100644 --- a/k8s/clusters/auto-image-update/bases/image-repo-policies/dns-scanner-image-repo-policy.yaml +++ b/k8s/clusters/auto-image-update/bases/image-repo-policies/dns-scanner-image-repo-policy.yaml @@ -4,7 +4,7 @@ metadata: name: dns-scanner namespace: flux-system spec: - image: gcr.io/track-compliance/dns-scanner + image: northamerica-northeast1-docker.pkg.dev/track-compliance/tracker/dns-scanner interval: 5m0s --- apiVersion: image.toolkit.fluxcd.io/v1alpha1 diff --git a/k8s/clusters/auto-image-update/bases/image-repo-policies/domain-cleanup-image-repo-policy.yaml b/k8s/clusters/auto-image-update/bases/image-repo-policies/domain-cleanup-image-repo-policy.yaml index 394077bd38..43ce905cee 100644 --- a/k8s/clusters/auto-image-update/bases/image-repo-policies/domain-cleanup-image-repo-policy.yaml +++ b/k8s/clusters/auto-image-update/bases/image-repo-policies/domain-cleanup-image-repo-policy.yaml @@ -4,7 +4,7 @@ metadata: name: domain-cleanup namespace: flux-system spec: - image: gcr.io/track-compliance/services/domain-cleanup + image: northamerica-northeast1-docker.pkg.dev/track-compliance/tracker/services/domain-cleanup interval: 1m0s --- apiVersion: image.toolkit.fluxcd.io/v1alpha1 diff --git a/k8s/clusters/auto-image-update/bases/image-repo-policies/domain-discovery-image-repo-policy.yaml b/k8s/clusters/auto-image-update/bases/image-repo-policies/domain-discovery-image-repo-policy.yaml index 5d6a3937c5..e5340ef757 100644 --- a/k8s/clusters/auto-image-update/bases/image-repo-policies/domain-discovery-image-repo-policy.yaml +++ b/k8s/clusters/auto-image-update/bases/image-repo-policies/domain-discovery-image-repo-policy.yaml @@ -4,7 +4,7 @@ metadata: name: domain-discovery namespace: flux-system spec: - image: gcr.io/track-compliance/domain-discovery + image: northamerica-northeast1-docker.pkg.dev/track-compliance/tracker/domain-discovery interval: 5m0s --- apiVersion: image.toolkit.fluxcd.io/v1alpha1 diff --git a/k8s/clusters/auto-image-update/bases/image-repo-policies/domain-dispatcher-image-repo-policy.yaml b/k8s/clusters/auto-image-update/bases/image-repo-policies/domain-dispatcher-image-repo-policy.yaml index 42b75b2616..7725dc97e7 100644 --- a/k8s/clusters/auto-image-update/bases/image-repo-policies/domain-dispatcher-image-repo-policy.yaml +++ b/k8s/clusters/auto-image-update/bases/image-repo-policies/domain-dispatcher-image-repo-policy.yaml @@ -4,7 +4,7 @@ metadata: name: domain-dispatcher namespace: flux-system spec: - image: gcr.io/track-compliance/domain-dispatcher + image: northamerica-northeast1-docker.pkg.dev/track-compliance/tracker/domain-dispatcher interval: 5m0s --- apiVersion: image.toolkit.fluxcd.io/v1alpha1 diff --git a/k8s/clusters/auto-image-update/bases/image-repo-policies/frontend-image-repo-policy.yaml b/k8s/clusters/auto-image-update/bases/image-repo-policies/frontend-image-repo-policy.yaml index 609ef7c079..39be1017ed 100644 --- a/k8s/clusters/auto-image-update/bases/image-repo-policies/frontend-image-repo-policy.yaml +++ b/k8s/clusters/auto-image-update/bases/image-repo-policies/frontend-image-repo-policy.yaml @@ -4,7 +4,7 @@ metadata: name: frontend namespace: flux-system spec: - image: gcr.io/track-compliance/frontend + image: northamerica-northeast1-docker.pkg.dev/track-compliance/tracker/frontend interval: 1m0s --- apiVersion: image.toolkit.fluxcd.io/v1alpha1 diff --git a/k8s/clusters/auto-image-update/bases/image-repo-policies/frontend-maintenance-image-repo-policy.yaml b/k8s/clusters/auto-image-update/bases/image-repo-policies/frontend-maintenance-image-repo-policy.yaml index c8b9eb72a6..645d4757ae 100644 --- a/k8s/clusters/auto-image-update/bases/image-repo-policies/frontend-maintenance-image-repo-policy.yaml +++ b/k8s/clusters/auto-image-update/bases/image-repo-policies/frontend-maintenance-image-repo-policy.yaml @@ -4,7 +4,7 @@ metadata: name: frontend-maintenance namespace: flux-system spec: - image: gcr.io/track-compliance/frontend-maintenance + image: northamerica-northeast1-docker.pkg.dev/track-compliance/tracker/frontend-maintenance interval: 1m0s --- apiVersion: image.toolkit.fluxcd.io/v1alpha1 diff --git a/k8s/clusters/auto-image-update/bases/image-repo-policies/guidance-image-repo-policy.yaml b/k8s/clusters/auto-image-update/bases/image-repo-policies/guidance-image-repo-policy.yaml index 75ef408d05..d57589f256 100644 --- a/k8s/clusters/auto-image-update/bases/image-repo-policies/guidance-image-repo-policy.yaml +++ b/k8s/clusters/auto-image-update/bases/image-repo-policies/guidance-image-repo-policy.yaml @@ -4,7 +4,7 @@ metadata: name: guidance namespace: flux-system spec: - image: gcr.io/track-compliance/services/guidance + image: northamerica-northeast1-docker.pkg.dev/track-compliance/tracker/services/guidance interval: 5m0s --- apiVersion: image.toolkit.fluxcd.io/v1alpha1 diff --git a/k8s/clusters/auto-image-update/bases/image-repo-policies/label-known-easm-assets-image-repo-policy.yaml b/k8s/clusters/auto-image-update/bases/image-repo-policies/label-known-easm-assets-image-repo-policy.yaml index b30edf09e8..e7ba594cf2 100644 --- a/k8s/clusters/auto-image-update/bases/image-repo-policies/label-known-easm-assets-image-repo-policy.yaml +++ b/k8s/clusters/auto-image-update/bases/image-repo-policies/label-known-easm-assets-image-repo-policy.yaml @@ -4,7 +4,7 @@ metadata: name: label-known-easm-assets namespace: flux-system spec: - image: gcr.io/track-compliance/label-known-easm-assets + image: northamerica-northeast1-docker.pkg.dev/track-compliance/tracker/label-known-easm-assets interval: 5m0s --- apiVersion: image.toolkit.fluxcd.io/v1alpha1 diff --git a/k8s/clusters/auto-image-update/bases/image-repo-policies/log4shell-processor-image-repo-policy.yaml b/k8s/clusters/auto-image-update/bases/image-repo-policies/log4shell-processor-image-repo-policy.yaml index c52f06d1bd..982bdd6757 100644 --- a/k8s/clusters/auto-image-update/bases/image-repo-policies/log4shell-processor-image-repo-policy.yaml +++ b/k8s/clusters/auto-image-update/bases/image-repo-policies/log4shell-processor-image-repo-policy.yaml @@ -4,7 +4,7 @@ metadata: name: log4shell-processor namespace: flux-system spec: - image: gcr.io/track-compliance/log4shell-processor + image: northamerica-northeast1-docker.pkg.dev/track-compliance/tracker/log4shell-processor interval: 1m0s --- apiVersion: image.toolkit.fluxcd.io/v1alpha1 diff --git a/k8s/clusters/auto-image-update/bases/image-repo-policies/log4shell-scanner-image-repo-policy.yaml b/k8s/clusters/auto-image-update/bases/image-repo-policies/log4shell-scanner-image-repo-policy.yaml index 7d28a9a97b..05c21261b4 100644 --- a/k8s/clusters/auto-image-update/bases/image-repo-policies/log4shell-scanner-image-repo-policy.yaml +++ b/k8s/clusters/auto-image-update/bases/image-repo-policies/log4shell-scanner-image-repo-policy.yaml @@ -4,7 +4,7 @@ metadata: name: log4shell-scanner namespace: flux-system spec: - image: gcr.io/track-compliance/log4shell-scanner + image: northamerica-northeast1-docker.pkg.dev/track-compliance/tracker/log4shell-scanner interval: 1m0s --- apiVersion: image.toolkit.fluxcd.io/v1alpha1 diff --git a/k8s/clusters/auto-image-update/bases/image-repo-policies/org-footprint-image-repo-policy.yaml b/k8s/clusters/auto-image-update/bases/image-repo-policies/org-footprint-image-repo-policy.yaml index 72e33e4e6a..2ba2d830ca 100644 --- a/k8s/clusters/auto-image-update/bases/image-repo-policies/org-footprint-image-repo-policy.yaml +++ b/k8s/clusters/auto-image-update/bases/image-repo-policies/org-footprint-image-repo-policy.yaml @@ -4,7 +4,7 @@ metadata: name: org-footprint namespace: flux-system spec: - image: gcr.io/track-compliance/services/org-footprint + image: northamerica-northeast1-docker.pkg.dev/track-compliance/tracker/services/org-footprint interval: 1m0s --- apiVersion: image.toolkit.fluxcd.io/v1alpha1 diff --git a/k8s/clusters/auto-image-update/bases/image-repo-policies/progress-report-image-repo-policy.yaml b/k8s/clusters/auto-image-update/bases/image-repo-policies/progress-report-image-repo-policy.yaml index 732eac0d8b..f1a8dbf35c 100644 --- a/k8s/clusters/auto-image-update/bases/image-repo-policies/progress-report-image-repo-policy.yaml +++ b/k8s/clusters/auto-image-update/bases/image-repo-policies/progress-report-image-repo-policy.yaml @@ -4,7 +4,7 @@ metadata: name: progress-report namespace: flux-system spec: - image: gcr.io/track-compliance/services/progress-report + image: northamerica-northeast1-docker.pkg.dev/track-compliance/tracker/services/progress-report interval: 1m0s --- apiVersion: image.toolkit.fluxcd.io/v1alpha1 diff --git a/k8s/clusters/auto-image-update/bases/image-repo-policies/spring4shell-scanner-image-repo-policy.yaml b/k8s/clusters/auto-image-update/bases/image-repo-policies/spring4shell-scanner-image-repo-policy.yaml index 4dd0b644cd..a6f407522f 100644 --- a/k8s/clusters/auto-image-update/bases/image-repo-policies/spring4shell-scanner-image-repo-policy.yaml +++ b/k8s/clusters/auto-image-update/bases/image-repo-policies/spring4shell-scanner-image-repo-policy.yaml @@ -4,7 +4,7 @@ metadata: name: spring4shell-scanner namespace: flux-system spec: - image: gcr.io/track-compliance/spring4shell-scanner + image: northamerica-northeast1-docker.pkg.dev/track-compliance/tracker/spring4shell-scanner interval: 1m0s --- apiVersion: image.toolkit.fluxcd.io/v1alpha1 diff --git a/k8s/clusters/auto-image-update/bases/image-repo-policies/summaries-image-repo-policy.yaml b/k8s/clusters/auto-image-update/bases/image-repo-policies/summaries-image-repo-policy.yaml index 944b1c066c..a10ea09c7f 100644 --- a/k8s/clusters/auto-image-update/bases/image-repo-policies/summaries-image-repo-policy.yaml +++ b/k8s/clusters/auto-image-update/bases/image-repo-policies/summaries-image-repo-policy.yaml @@ -4,7 +4,7 @@ metadata: name: summaries namespace: flux-system spec: - image: gcr.io/track-compliance/services/summaries + image: northamerica-northeast1-docker.pkg.dev/track-compliance/tracker/services/summaries interval: 5m0s --- apiVersion: image.toolkit.fluxcd.io/v1alpha1 diff --git a/k8s/clusters/auto-image-update/bases/image-repo-policies/super-admin-image-repo-policy.yaml b/k8s/clusters/auto-image-update/bases/image-repo-policies/super-admin-image-repo-policy.yaml index d0ab1f0b9f..013e13d560 100644 --- a/k8s/clusters/auto-image-update/bases/image-repo-policies/super-admin-image-repo-policy.yaml +++ b/k8s/clusters/auto-image-update/bases/image-repo-policies/super-admin-image-repo-policy.yaml @@ -4,7 +4,7 @@ metadata: name: super-admin namespace: flux-system spec: - image: gcr.io/track-compliance/super-admin + image: northamerica-northeast1-docker.pkg.dev/track-compliance/tracker/super-admin interval: 5m0s --- apiVersion: image.toolkit.fluxcd.io/v1alpha1 diff --git a/k8s/clusters/auto-image-update/bases/image-repo-policies/update-selectors-image-repo-policy.yaml b/k8s/clusters/auto-image-update/bases/image-repo-policies/update-selectors-image-repo-policy.yaml index 32571ba302..d82e1790e1 100644 --- a/k8s/clusters/auto-image-update/bases/image-repo-policies/update-selectors-image-repo-policy.yaml +++ b/k8s/clusters/auto-image-update/bases/image-repo-policies/update-selectors-image-repo-policy.yaml @@ -4,7 +4,7 @@ metadata: name: update-selectors namespace: flux-system spec: - image: gcr.io/track-compliance/services/update-selectors + image: northamerica-northeast1-docker.pkg.dev/track-compliance/tracker/services/update-selectors interval: 5m0s --- apiVersion: image.toolkit.fluxcd.io/v1alpha1 diff --git a/k8s/clusters/auto-image-update/bases/image-repo-policies/web-processor-image-repo-policy.yaml b/k8s/clusters/auto-image-update/bases/image-repo-policies/web-processor-image-repo-policy.yaml index dd6efb0ddf..4eced0a98b 100644 --- a/k8s/clusters/auto-image-update/bases/image-repo-policies/web-processor-image-repo-policy.yaml +++ b/k8s/clusters/auto-image-update/bases/image-repo-policies/web-processor-image-repo-policy.yaml @@ -4,7 +4,7 @@ metadata: name: web-processor namespace: flux-system spec: - image: gcr.io/track-compliance/web-processor + image: northamerica-northeast1-docker.pkg.dev/track-compliance/tracker/web-processor interval: 5m0s --- apiVersion: image.toolkit.fluxcd.io/v1alpha1 diff --git a/k8s/clusters/auto-image-update/bases/image-repo-policies/web-scanner-image-repo-policy.yaml b/k8s/clusters/auto-image-update/bases/image-repo-policies/web-scanner-image-repo-policy.yaml index bf4883e024..2e9a9aca30 100644 --- a/k8s/clusters/auto-image-update/bases/image-repo-policies/web-scanner-image-repo-policy.yaml +++ b/k8s/clusters/auto-image-update/bases/image-repo-policies/web-scanner-image-repo-policy.yaml @@ -4,7 +4,7 @@ metadata: name: web-scanner namespace: flux-system spec: - image: gcr.io/track-compliance/web-scanner + image: northamerica-northeast1-docker.pkg.dev/track-compliance/tracker/web-scanner interval: 5m0s --- apiVersion: image.toolkit.fluxcd.io/v1alpha1 diff --git a/k8s/jobs/bases/guidance/job.yaml b/k8s/jobs/bases/guidance/job.yaml index 1e037f4742..e63d237f67 100755 --- a/k8s/jobs/bases/guidance/job.yaml +++ b/k8s/jobs/bases/guidance/job.yaml @@ -8,7 +8,7 @@ spec: spec: containers: - name: guidance - image: gcr.io/track-compliance/services/guidance:master-1a6ce4f-1708011630 # {"$imagepolicy": "flux-system:guidance"} + image: northamerica-northeast1-docker.pkg.dev/track-compliance/tracker/services/guidance:master-1a6ce4f-1708011630 # {"$imagepolicy": "flux-system:guidance"} env: - name: DB_USER valueFrom: diff --git a/k8s/jobs/bases/super-admin/super-admin-job.yaml b/k8s/jobs/bases/super-admin/super-admin-job.yaml index 1e2aa007a9..25776979f4 100644 --- a/k8s/jobs/bases/super-admin/super-admin-job.yaml +++ b/k8s/jobs/bases/super-admin/super-admin-job.yaml @@ -8,7 +8,7 @@ spec: spec: containers: - name: super-admin - image: gcr.io/track-compliance/super-admin:master-37df416-1697546034 # {"$imagepolicy": "flux-system:super-admin"} + image: northamerica-northeast1-docker.pkg.dev/track-compliance/tracker/super-admin:master-37df416-1697546034 # {"$imagepolicy": "flux-system:super-admin"} env: - name: DB_PASS valueFrom: diff --git a/scanners/dns-processor/cloudbuild.yaml b/scanners/dns-processor/cloudbuild.yaml index 4b9c2b91d2..a4440de09c 100644 --- a/scanners/dns-processor/cloudbuild.yaml +++ b/scanners/dns-processor/cloudbuild.yaml @@ -7,7 +7,7 @@ steps: args: - '-c' - | - echo "gcr.io/$PROJECT_ID/dns-processor:$BRANCH_NAME-$SHORT_SHA-$(date +%s)" > /workspace/imagename + echo "northamerica-northeast1-docker.pkg.dev/$PROJECT_ID/tracker/dns-processor:$BRANCH_NAME-$SHORT_SHA-$(date +%s)" > /workspace/imagename - name: 'gcr.io/cloud-builders/docker' id: build-https-if-master diff --git a/scanners/dns-scanner/cloudbuild.yaml b/scanners/dns-scanner/cloudbuild.yaml index 3e17a3c111..fc856da1b6 100644 --- a/scanners/dns-scanner/cloudbuild.yaml +++ b/scanners/dns-scanner/cloudbuild.yaml @@ -7,7 +7,7 @@ steps: args: - '-c' - | - echo "gcr.io/$PROJECT_ID/dns-scanner:$BRANCH_NAME-$SHORT_SHA-$(date +%s)" > /workspace/imagename + echo "northamerica-northeast1-docker.pkg.dev/$PROJECT_ID/tracker/dns-scanner:$BRANCH_NAME-$SHORT_SHA-$(date +%s)" > /workspace/imagename - name: 'gcr.io/cloud-builders/docker' id: build-dns-if-master diff --git a/scanners/domain-discovery/cloudbuild.yaml b/scanners/domain-discovery/cloudbuild.yaml index dfc57b429e..9febc3b2c1 100644 --- a/scanners/domain-discovery/cloudbuild.yaml +++ b/scanners/domain-discovery/cloudbuild.yaml @@ -6,7 +6,7 @@ steps: args: - "-c" - | - echo "gcr.io/$PROJECT_ID/domain-discovery:$BRANCH_NAME-$SHORT_SHA-$(date +%s)" > /workspace/imagename + echo "northamerica-northeast1-docker.pkg.dev/$PROJECT_ID/tracker/domain-discovery:$BRANCH_NAME-$SHORT_SHA-$(date +%s)" > /workspace/imagename - name: "gcr.io/cloud-builders/docker" id: build-discover-if-master diff --git a/scanners/domain-dispatcher/cloudbuild.yaml b/scanners/domain-dispatcher/cloudbuild.yaml index a0410c0d10..90985e6d83 100644 --- a/scanners/domain-dispatcher/cloudbuild.yaml +++ b/scanners/domain-dispatcher/cloudbuild.yaml @@ -47,7 +47,7 @@ steps: args: - '-c' - | - echo "gcr.io/$PROJECT_ID/domain-dispatcher:$BRANCH_NAME-$SHORT_SHA-$(date +%s)" > /workspace/imagename + echo "northamerica-northeast1-docker.pkg.dev/$PROJECT_ID/tracker/domain-dispatcher:$BRANCH_NAME-$SHORT_SHA-$(date +%s)" > /workspace/imagename - name: 'gcr.io/cloud-builders/docker' id: build-if-master diff --git a/scanners/domain-dispatcher/domain-dispatcher-job.yaml b/scanners/domain-dispatcher/domain-dispatcher-job.yaml index 1655939d04..714f738599 100644 --- a/scanners/domain-dispatcher/domain-dispatcher-job.yaml +++ b/scanners/domain-dispatcher/domain-dispatcher-job.yaml @@ -12,7 +12,7 @@ spec: spec: containers: - name: domain-dispatcher - image: gcr.io/track-compliance/domain-dispatcher:master-17ff220-1697550117 # {"$imagepolicy": "flux-system:domain-dispatcher"} + image: northamerica-northeast1-docker.pkg.dev/track-compliance/tracker/domain-dispatcher:master-17ff220-1697550117 # {"$imagepolicy": "flux-system:domain-dispatcher"} env: - name: DB_PASS valueFrom: diff --git a/scanners/log4shell-processor/cloudbuild.yaml b/scanners/log4shell-processor/cloudbuild.yaml index 1be2e4137b..43f72d60b3 100644 --- a/scanners/log4shell-processor/cloudbuild.yaml +++ b/scanners/log4shell-processor/cloudbuild.yaml @@ -6,7 +6,7 @@ steps: args: - '-c' - | - echo "gcr.io/$PROJECT_ID/log4shell-processor:$BRANCH_NAME-$SHORT_SHA-$(date +%s)" > /workspace/imagename + echo "northamerica-northeast1-docker.pkg.dev/$PROJECT_ID/tracker/log4shell-processor:$BRANCH_NAME-$SHORT_SHA-$(date +%s)" > /workspace/imagename - name: 'gcr.io/cloud-builders/docker' id: build-if-master diff --git a/scanners/log4shell-scanner/cloudbuild.yaml b/scanners/log4shell-scanner/cloudbuild.yaml index 064a726f4c..3d4c89c833 100644 --- a/scanners/log4shell-scanner/cloudbuild.yaml +++ b/scanners/log4shell-scanner/cloudbuild.yaml @@ -6,7 +6,7 @@ steps: args: - '-c' - | - echo "gcr.io/$PROJECT_ID/log4shell-scanner:$BRANCH_NAME-$SHORT_SHA-$(date +%s)" > /workspace/imagename + echo "northamerica-northeast1-docker.pkg.dev/$PROJECT_ID/tracker/log4shell-scanner:$BRANCH_NAME-$SHORT_SHA-$(date +%s)" > /workspace/imagename - name: 'gcr.io/cloud-builders/docker' id: build-if-master diff --git a/scanners/spring4shell/cloudbuild.yaml b/scanners/spring4shell/cloudbuild.yaml index 3a49370578..31f03c877a 100644 --- a/scanners/spring4shell/cloudbuild.yaml +++ b/scanners/spring4shell/cloudbuild.yaml @@ -7,7 +7,7 @@ steps: args: - '-c' - | - echo "gcr.io/$PROJECT_ID/spring4shell-scanner:$BRANCH_NAME-$SHORT_SHA-$(date +%s)" > /workspace/imagename + echo "northamerica-northeast1-docker.pkg.dev/$PROJECT_ID/tracker/spring4shell-scanner:$BRANCH_NAME-$SHORT_SHA-$(date +%s)" > /workspace/imagename - name: 'gcr.io/cloud-builders/docker' id: build-if-master diff --git a/scanners/spring4shell/domain-dispatcher-job.yaml b/scanners/spring4shell/domain-dispatcher-job.yaml index 1655939d04..714f738599 100644 --- a/scanners/spring4shell/domain-dispatcher-job.yaml +++ b/scanners/spring4shell/domain-dispatcher-job.yaml @@ -12,7 +12,7 @@ spec: spec: containers: - name: domain-dispatcher - image: gcr.io/track-compliance/domain-dispatcher:master-17ff220-1697550117 # {"$imagepolicy": "flux-system:domain-dispatcher"} + image: northamerica-northeast1-docker.pkg.dev/track-compliance/tracker/domain-dispatcher:master-17ff220-1697550117 # {"$imagepolicy": "flux-system:domain-dispatcher"} env: - name: DB_PASS valueFrom: diff --git a/scanners/web-processor/cloudbuild.yaml b/scanners/web-processor/cloudbuild.yaml index 3ec06ce2a3..02fe96fad2 100644 --- a/scanners/web-processor/cloudbuild.yaml +++ b/scanners/web-processor/cloudbuild.yaml @@ -7,7 +7,7 @@ steps: args: - '-c' - | - echo "gcr.io/$PROJECT_ID/web-processor:$BRANCH_NAME-$SHORT_SHA-$(date +%s)" > /workspace/imagename + echo "northamerica-northeast1-docker.pkg.dev/$PROJECT_ID/tracker/web-processor:$BRANCH_NAME-$SHORT_SHA-$(date +%s)" > /workspace/imagename - name: 'gcr.io/cloud-builders/docker' id: build-https-if-master diff --git a/scanners/web-scanner/cloudbuild.yaml b/scanners/web-scanner/cloudbuild.yaml index 940d23ff8f..d5f101b2f8 100644 --- a/scanners/web-scanner/cloudbuild.yaml +++ b/scanners/web-scanner/cloudbuild.yaml @@ -7,7 +7,7 @@ steps: args: - '-c' - | - echo "gcr.io/$PROJECT_ID/web-scanner:$BRANCH_NAME-$SHORT_SHA-$(date +%s)" > /workspace/imagename + echo "northamerica-northeast1-docker.pkg.dev/$PROJECT_ID/tracker/web-scanner:$BRANCH_NAME-$SHORT_SHA-$(date +%s)" > /workspace/imagename - name: 'gcr.io/cloud-builders/docker' id: build-web-if-master diff --git a/services/dmarc-report/cloudbuild.yaml b/services/dmarc-report/cloudbuild.yaml index dcbf6e146b..6672318a61 100644 --- a/services/dmarc-report/cloudbuild.yaml +++ b/services/dmarc-report/cloudbuild.yaml @@ -50,7 +50,7 @@ steps: args: - '-c' - | - echo "gcr.io/$PROJECT_ID/dmarc-report:$BRANCH_NAME-$SHORT_SHA-$(date +%s)" > /workspace/imagename + echo "northamerica-northeast1-docker.pkg.dev/$PROJECT_ID/tracker/dmarc-report:$BRANCH_NAME-$SHORT_SHA-$(date +%s)" > /workspace/imagename - name: 'gcr.io/cloud-builders/docker' id: build-if-master diff --git a/services/domain-cleanup/cloudbuild.yaml b/services/domain-cleanup/cloudbuild.yaml index 4fadb5e666..59a5b2dedd 100644 --- a/services/domain-cleanup/cloudbuild.yaml +++ b/services/domain-cleanup/cloudbuild.yaml @@ -41,7 +41,7 @@ steps: args: - '-c' - | - echo "gcr.io/$PROJECT_ID/services/domain-cleanup:$BRANCH_NAME-$SHORT_SHA-$(date +%s)" > /workspace/imagename + echo "northamerica-northeast1-docker.pkg.dev/$PROJECT_ID/tracker/services/domain-cleanup:$BRANCH_NAME-$SHORT_SHA-$(date +%s)" > /workspace/imagename - name: 'gcr.io/cloud-builders/docker' id: build-if-master diff --git a/services/guidance/cloudbuild.yaml b/services/guidance/cloudbuild.yaml index f5a5257f4e..ce2b92775e 100644 --- a/services/guidance/cloudbuild.yaml +++ b/services/guidance/cloudbuild.yaml @@ -6,7 +6,7 @@ steps: args: - '-c' - | - echo "gcr.io/$PROJECT_ID/services/guidance:$BRANCH_NAME-$SHORT_SHA-$(date +%s)" > /workspace/imagename + echo "northamerica-northeast1-docker.pkg.dev/$PROJECT_ID/tracker/services/guidance:$BRANCH_NAME-$SHORT_SHA-$(date +%s)" > /workspace/imagename - name: 'gcr.io/cloud-builders/docker' id: build-results-if-master diff --git a/services/org-footprint/cloudbuild.yaml b/services/org-footprint/cloudbuild.yaml index 02b2b0a919..37ffa39b7b 100644 --- a/services/org-footprint/cloudbuild.yaml +++ b/services/org-footprint/cloudbuild.yaml @@ -46,7 +46,7 @@ steps: args: - '-c' - | - echo "gcr.io/$PROJECT_ID/services/org-footprint:$BRANCH_NAME-$SHORT_SHA-$(date +%s)" > /workspace/imagename + echo "northamerica-northeast1-docker.pkg.dev/$PROJECT_ID/tracker/services/org-footprint:$BRANCH_NAME-$SHORT_SHA-$(date +%s)" > /workspace/imagename - name: 'gcr.io/cloud-builders/docker' id: build-if-master diff --git a/services/progress-report/cloudbuild.yaml b/services/progress-report/cloudbuild.yaml index 0e3225a79f..339a54a429 100644 --- a/services/progress-report/cloudbuild.yaml +++ b/services/progress-report/cloudbuild.yaml @@ -46,7 +46,7 @@ steps: args: - '-c' - | - echo "gcr.io/$PROJECT_ID/services/progress-report:$BRANCH_NAME-$SHORT_SHA-$(date +%s)" > /workspace/imagename + echo "northamerica-northeast1-docker.pkg.dev/$PROJECT_ID/tracker/services/progress-report:$BRANCH_NAME-$SHORT_SHA-$(date +%s)" > /workspace/imagename - name: 'gcr.io/cloud-builders/docker' id: build-if-master diff --git a/services/summaries/cloudbuild.yaml b/services/summaries/cloudbuild.yaml index e28d878524..878454c0c4 100644 --- a/services/summaries/cloudbuild.yaml +++ b/services/summaries/cloudbuild.yaml @@ -8,7 +8,7 @@ steps: id: wait_testdb args: ['testdb:8529'] - - name: 'gcr.io/track-compliance/ci' + - name: 'northamerica-northeast1-docker.pkg.dev/track-compliance/tracker/ci' id: test-results dir: services/summaries entrypoint: /bin/sh @@ -21,7 +21,7 @@ steps: args: - '-c' - | - echo "gcr.io/$PROJECT_ID/services/summaries:$BRANCH_NAME-$SHORT_SHA-$(date +%s)" > /workspace/imagename + echo "northamerica-northeast1-docker.pkg.dev/$PROJECT_ID/tracker/services/summaries:$BRANCH_NAME-$SHORT_SHA-$(date +%s)" > /workspace/imagename - name: 'gcr.io/cloud-builders/docker' id: build-results-if-master diff --git a/services/summaries/summaries-job.yaml b/services/summaries/summaries-job.yaml index 45a345d765..54ede44d51 100644 --- a/services/summaries/summaries-job.yaml +++ b/services/summaries/summaries-job.yaml @@ -8,7 +8,7 @@ spec: spec: containers: - name: summaries - image: gcr.io/track-compliance/services/summaries:master-9a0d453-1697814387 # {"$imagepolicy": "flux-system:summaries"} + image: northamerica-northeast1-docker.pkg.dev/track-compliance/tracker/services/summaries:master-9a0d453-1697814387 # {"$imagepolicy": "flux-system:summaries"} env: - name: DB_USER valueFrom: diff --git a/services/super-admin/cloudbuild.yaml b/services/super-admin/cloudbuild.yaml index 35a65b28d3..e7babdd691 100644 --- a/services/super-admin/cloudbuild.yaml +++ b/services/super-admin/cloudbuild.yaml @@ -61,7 +61,7 @@ steps: args: - '-c' - | - echo "gcr.io/$PROJECT_ID/super-admin:$BRANCH_NAME-$SHORT_SHA-$(date +%s)" > /workspace/imagename + echo "northamerica-northeast1-docker.pkg.dev/$PROJECT_ID/tracker/super-admin:$BRANCH_NAME-$SHORT_SHA-$(date +%s)" > /workspace/imagename - name: 'gcr.io/cloud-builders/docker' id: build-if-master diff --git a/services/update-selectors/cloudbuild.yaml b/services/update-selectors/cloudbuild.yaml index 2e59ef9cd8..d2943864a8 100644 --- a/services/update-selectors/cloudbuild.yaml +++ b/services/update-selectors/cloudbuild.yaml @@ -17,7 +17,7 @@ steps: id: wait_test_cosmosdb args: ['cosmosdb:8081', '--timeout=180'] - - name: 'gcr.io/track-compliance/ci' + - name: 'northamerica-northeast1-docker.pkg.dev/track-compliance/tracker/ci' id: test-results dir: services/update-selectors entrypoint: /bin/sh @@ -35,7 +35,7 @@ steps: args: - '-c' - | - echo "gcr.io/$PROJECT_ID/services/update-selectors:$BRANCH_NAME-$SHORT_SHA-$(date +%s)" > /workspace/imagename + echo "northamerica-northeast1-docker.pkg.dev/$PROJECT_ID/tracker/services/update-selectors:$BRANCH_NAME-$SHORT_SHA-$(date +%s)" > /workspace/imagename - name: 'gcr.io/cloud-builders/docker' id: build-results-if-master diff --git a/skaffold.yaml b/skaffold.yaml index 07ee565873..219d2d8f60 100644 --- a/skaffold.yaml +++ b/skaffold.yaml @@ -6,58 +6,58 @@ requires: - configs: ["infrastructure"] build: artifacts: - - image: gcr.io/track-compliance/api-js + - image: northamerica-northeast1-docker.pkg.dev/track-compliance/tracker/api-js context: api docker: {} -# - image: gcr.io/track-compliance/counter +# - image: northamerica-northeast1-docker.pkg.dev/track-compliance/tracker/counter # context: scanners/counter # docker: {} - - image: gcr.io/track-compliance/database-migration + - image: northamerica-northeast1-docker.pkg.dev/track-compliance/tracker/database-migration context: database-migration docker: {} - - image: gcr.io/track-compliance/dmarc-report + - image: northamerica-northeast1-docker.pkg.dev/track-compliance/tracker/dmarc-report context: services/dmarc-report docker: {} - - image: gcr.io/track-compliance/dns-processor + - image: northamerica-northeast1-docker.pkg.dev/track-compliance/tracker/dns-processor context: scanners/dns-processor docker: {} - - image: gcr.io/track-compliance/dns-scanner + - image: northamerica-northeast1-docker.pkg.dev/track-compliance/tracker/dns-scanner context: scanners/dns-scanner docker: {} - - image: gcr.io/track-compliance/domain-dispatcher + - image: northamerica-northeast1-docker.pkg.dev/track-compliance/tracker/domain-dispatcher context: scanners/domain-dispatcher docker: {} - - image: gcr.io/track-compliance/frontend + - image: northamerica-northeast1-docker.pkg.dev/track-compliance/tracker/frontend context: frontend docker: {} -# - image: gcr.io/track-compliance/https-processor +# - image: northamerica-northeast1-docker.pkg.dev/track-compliance/tracker/https-processor # context: scanners/https-processor # docker: {} -# - image: gcr.io/track-compliance/https-scanner +# - image: northamerica-northeast1-docker.pkg.dev/track-compliance/tracker/https-scanner # context: scanners/https-scanner # docker: {} -# - image: gcr.io/track-compliance/log4shell-processor +# - image: northamerica-northeast1-docker.pkg.dev/track-compliance/tracker/log4shell-processor # context: scanners/log4shell-processor # docker: {} -# - image: gcr.io/track-compliance/log4shell-scanner +# - image: northamerica-northeast1-docker.pkg.dev/track-compliance/tracker/log4shell-scanner # context: scanners/log4shell-scanner # docker: {} - - image: gcr.io/track-compliance/services/guidance + - image: northamerica-northeast1-docker.pkg.dev/track-compliance/tracker/services/guidance context: services/guidance docker: {} - - image: gcr.io/track-compliance/services/summaries + - image: northamerica-northeast1-docker.pkg.dev/track-compliance/tracker/services/summaries context: services/summaries docker: {} -# - image: gcr.io/track-compliance/spring4shell-scanner +# - image: northamerica-northeast1-docker.pkg.dev/track-compliance/tracker/spring4shell-scanner # context: scanners/spring4shell # docker: {} - - image: gcr.io/track-compliance/super-admin + - image: northamerica-northeast1-docker.pkg.dev/track-compliance/tracker/super-admin context: services/super-admin docker: {} - - image: gcr.io/track-compliance/web-processor + - image: northamerica-northeast1-docker.pkg.dev/track-compliance/tracker/web-processor context: scanners/web-processor docker: {} - - image: gcr.io/track-compliance/web-scanner + - image: northamerica-northeast1-docker.pkg.dev/track-compliance/tracker/web-scanner context: scanners/web-scanner docker: {} #deploy: