Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

use GAR instead of GCR for updater image #7109

Merged
merged 1 commit into from
Feb 7, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions .drone/drone.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1152,7 +1152,7 @@ depends_on:
- Publish Linux agentctl container
- Publish Linux agent-operator container
image_pull_secrets:
- dockerconfigjson
- dockerconfigjson_gar
kind: pipeline
name: Deploy to deployment_tools
platform:
Expand All @@ -1165,7 +1165,7 @@ steps:
- echo "grafana/agent:$(sh ./tools/image-tag)" > .image-tag
image: alpine
name: Create .image-tag
- image: us.gcr.io/kubernetes-dev/drone/plugins/updater
- image: us-docker.pkg.dev/grafanalabs-global/docker-deployment-tools-prod/updater
name: Update deployment_tools
settings:
config_json: |
Expand Down Expand Up @@ -1320,6 +1320,12 @@ get:
kind: secret
name: dockerconfigjson
---
get:
name: .dockerconfigjson
path: secret/data/common/gar
kind: secret
name: dockerconfigjson_gar
---
get:
name: .dockerconfigjson
path: infra/data/ci/gcr-admin
Expand Down
4 changes: 2 additions & 2 deletions .drone/pipelines/publish.jsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ linux_containers_jobs + windows_containers_jobs + [
trigger: {
ref: ['refs/heads/main'],
},
image_pull_secrets: ['dockerconfigjson'],
image_pull_secrets: ['dockerconfigjson_gar'],
steps: [
{
name: 'Create .image-tag',
Expand All @@ -109,7 +109,7 @@ linux_containers_jobs + windows_containers_jobs + [
},
{
name: 'Update deployment_tools',
image: 'us.gcr.io/kubernetes-dev/drone/plugins/updater',
image: 'us-docker.pkg.dev/grafanalabs-global/docker-deployment-tools-prod/updater',
settings: {
config_json: |||
{
Expand Down
1 change: 1 addition & 0 deletions .drone/util/secrets.jsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ local newSecret(name) = {

{
dockerconfigjson: newSecret('dockerconfigjson').getFrom(path='secret/data/common/gcr', name='.dockerconfigjson'),
dockerconfigjson_gar: newSecret('dockerconfigjson_gar').getFrom(path='secret/data/common/gar', name='.dockerconfigjson'),
gcr_admin: newSecret('gcr_admin').getFrom(path='infra/data/ci/gcr-admin', name='.dockerconfigjson'),

// Agent Github App
Expand Down
Loading