Skip to content

Commit

Permalink
Switch to Artifact Registry (#5119)
Browse files Browse the repository at this point in the history
* Switch to artifact registry

* Wait for up to 3 min for cosmos emulator
  • Loading branch information
FestiveKyle committed Feb 21, 2024
1 parent 2e8a1ce commit b71916e
Show file tree
Hide file tree
Showing 73 changed files with 98 additions and 98 deletions.
2 changes: 1 addition & 1 deletion api/cloudbuild.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion azure-defender-easm/add-domain-to-easm/cloudbuild.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions ci/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
```
4 changes: 2 additions & 2 deletions ci/cloudbuild.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
8 changes: 4 additions & 4 deletions clients/python/cloudbuild.yaml
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
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
args: ['sync', '-d', '--bare']
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
Expand All @@ -26,4 +26,4 @@ steps:
timeout: 1200s
options:
machineType: 'E2_HIGHCPU_8'

2 changes: 1 addition & 1 deletion frontend-maintenance/cloudbuild.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion frontend/cloudbuild.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions k8s/apps/bases/api/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion k8s/apps/bases/api/domain-cleanup-cronjob.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion k8s/apps/bases/api/org-footprint-cronjob/cronjob.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion k8s/apps/bases/api/progress-report-cronjob/cronjob.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion k8s/apps/bases/frontend/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion k8s/apps/bases/frontend/maintenance-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion k8s/apps/bases/scanners/dmarc-report-cronjob/cronjob.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion k8s/apps/bases/scanners/dns-processor/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion k8s/apps/bases/scanners/dns-scanner/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion k8s/apps/bases/scanners/domain-discovery/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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: {}
2 changes: 1 addition & 1 deletion k8s/apps/bases/scanners/log4shell-scanner/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.*
Expand Down
2 changes: 1 addition & 1 deletion k8s/apps/bases/scanners/summaries-cronjob/cronjob.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion k8s/apps/bases/scanners/web-processor/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion k8s/apps/bases/scanners/web-scanner/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading

0 comments on commit b71916e

Please sign in to comment.