mirror of
https://github.com/grafana/grafana.git
synced 2025-07-31 06:52:42 +08:00
Drone: Always have image_pull_secrets
(#55530)
Having it doesn't prevent pulling any images, so it's easier if it's everywhere
This commit is contained in:
68
.drone.yml
68
.drone.yml
@ -2,6 +2,8 @@
|
|||||||
clone:
|
clone:
|
||||||
retries: 3
|
retries: 3
|
||||||
depends_on: []
|
depends_on: []
|
||||||
|
image_pull_secrets:
|
||||||
|
- dockerconfigjson
|
||||||
kind: pipeline
|
kind: pipeline
|
||||||
name: pr-verify-drone
|
name: pr-verify-drone
|
||||||
node:
|
node:
|
||||||
@ -54,6 +56,8 @@ volumes:
|
|||||||
clone:
|
clone:
|
||||||
retries: 3
|
retries: 3
|
||||||
depends_on: []
|
depends_on: []
|
||||||
|
image_pull_secrets:
|
||||||
|
- dockerconfigjson
|
||||||
kind: pipeline
|
kind: pipeline
|
||||||
name: pr-test-frontend
|
name: pr-test-frontend
|
||||||
node:
|
node:
|
||||||
@ -133,6 +137,8 @@ volumes:
|
|||||||
clone:
|
clone:
|
||||||
retries: 3
|
retries: 3
|
||||||
depends_on: []
|
depends_on: []
|
||||||
|
image_pull_secrets:
|
||||||
|
- dockerconfigjson
|
||||||
kind: pipeline
|
kind: pipeline
|
||||||
name: pr-test-backend
|
name: pr-test-backend
|
||||||
node:
|
node:
|
||||||
@ -219,6 +225,8 @@ volumes:
|
|||||||
clone:
|
clone:
|
||||||
retries: 3
|
retries: 3
|
||||||
depends_on: []
|
depends_on: []
|
||||||
|
image_pull_secrets:
|
||||||
|
- dockerconfigjson
|
||||||
kind: pipeline
|
kind: pipeline
|
||||||
name: pr-build-e2e
|
name: pr-build-e2e
|
||||||
node:
|
node:
|
||||||
@ -466,6 +474,8 @@ volumes:
|
|||||||
clone:
|
clone:
|
||||||
retries: 3
|
retries: 3
|
||||||
depends_on: []
|
depends_on: []
|
||||||
|
image_pull_secrets:
|
||||||
|
- dockerconfigjson
|
||||||
kind: pipeline
|
kind: pipeline
|
||||||
name: pr-integration-tests
|
name: pr-integration-tests
|
||||||
node:
|
node:
|
||||||
@ -589,6 +599,8 @@ volumes:
|
|||||||
clone:
|
clone:
|
||||||
retries: 3
|
retries: 3
|
||||||
depends_on: []
|
depends_on: []
|
||||||
|
image_pull_secrets:
|
||||||
|
- dockerconfigjson
|
||||||
kind: pipeline
|
kind: pipeline
|
||||||
name: pr-docs
|
name: pr-docs
|
||||||
node:
|
node:
|
||||||
@ -673,6 +685,8 @@ volumes:
|
|||||||
clone:
|
clone:
|
||||||
retries: 3
|
retries: 3
|
||||||
depends_on: []
|
depends_on: []
|
||||||
|
image_pull_secrets:
|
||||||
|
- dockerconfigjson
|
||||||
kind: pipeline
|
kind: pipeline
|
||||||
name: pr-shellcheck
|
name: pr-shellcheck
|
||||||
node:
|
node:
|
||||||
@ -714,6 +728,8 @@ volumes:
|
|||||||
clone:
|
clone:
|
||||||
retries: 3
|
retries: 3
|
||||||
depends_on: []
|
depends_on: []
|
||||||
|
image_pull_secrets:
|
||||||
|
- dockerconfigjson
|
||||||
kind: pipeline
|
kind: pipeline
|
||||||
name: main-docs
|
name: main-docs
|
||||||
node:
|
node:
|
||||||
@ -799,6 +815,8 @@ volumes:
|
|||||||
clone:
|
clone:
|
||||||
retries: 3
|
retries: 3
|
||||||
depends_on: []
|
depends_on: []
|
||||||
|
image_pull_secrets:
|
||||||
|
- dockerconfigjson
|
||||||
kind: pipeline
|
kind: pipeline
|
||||||
name: main-test-frontend
|
name: main-test-frontend
|
||||||
node:
|
node:
|
||||||
@ -875,6 +893,8 @@ volumes:
|
|||||||
clone:
|
clone:
|
||||||
retries: 3
|
retries: 3
|
||||||
depends_on: []
|
depends_on: []
|
||||||
|
image_pull_secrets:
|
||||||
|
- dockerconfigjson
|
||||||
kind: pipeline
|
kind: pipeline
|
||||||
name: main-test-backend
|
name: main-test-backend
|
||||||
node:
|
node:
|
||||||
@ -960,6 +980,8 @@ volumes:
|
|||||||
clone:
|
clone:
|
||||||
retries: 3
|
retries: 3
|
||||||
depends_on: []
|
depends_on: []
|
||||||
|
image_pull_secrets:
|
||||||
|
- dockerconfigjson
|
||||||
kind: pipeline
|
kind: pipeline
|
||||||
name: main-build-e2e-publish
|
name: main-build-e2e-publish
|
||||||
node:
|
node:
|
||||||
@ -1367,6 +1389,8 @@ volumes:
|
|||||||
clone:
|
clone:
|
||||||
retries: 3
|
retries: 3
|
||||||
depends_on: []
|
depends_on: []
|
||||||
|
image_pull_secrets:
|
||||||
|
- dockerconfigjson
|
||||||
kind: pipeline
|
kind: pipeline
|
||||||
name: main-integration-tests
|
name: main-integration-tests
|
||||||
node:
|
node:
|
||||||
@ -1488,6 +1512,8 @@ depends_on:
|
|||||||
- main-test-backend
|
- main-test-backend
|
||||||
- main-build-e2e-publish
|
- main-build-e2e-publish
|
||||||
- main-integration-tests
|
- main-integration-tests
|
||||||
|
image_pull_secrets:
|
||||||
|
- dockerconfigjson
|
||||||
kind: pipeline
|
kind: pipeline
|
||||||
name: main-windows
|
name: main-windows
|
||||||
platform:
|
platform:
|
||||||
@ -1586,6 +1612,8 @@ depends_on:
|
|||||||
- main-build-e2e-publish
|
- main-build-e2e-publish
|
||||||
- main-integration-tests
|
- main-integration-tests
|
||||||
- main-windows
|
- main-windows
|
||||||
|
image_pull_secrets:
|
||||||
|
- dockerconfigjson
|
||||||
kind: pipeline
|
kind: pipeline
|
||||||
name: main-publish
|
name: main-publish
|
||||||
node:
|
node:
|
||||||
@ -1651,6 +1679,8 @@ clone:
|
|||||||
retries: 3
|
retries: 3
|
||||||
depends_on:
|
depends_on:
|
||||||
- main-publish
|
- main-publish
|
||||||
|
image_pull_secrets:
|
||||||
|
- dockerconfigjson
|
||||||
kind: pipeline
|
kind: pipeline
|
||||||
name: main-trigger-downstream
|
name: main-trigger-downstream
|
||||||
node:
|
node:
|
||||||
@ -1727,6 +1757,8 @@ type: docker
|
|||||||
clone:
|
clone:
|
||||||
retries: 3
|
retries: 3
|
||||||
depends_on: []
|
depends_on: []
|
||||||
|
image_pull_secrets:
|
||||||
|
- dockerconfigjson
|
||||||
kind: pipeline
|
kind: pipeline
|
||||||
name: release-oss-build-e2e-publish
|
name: release-oss-build-e2e-publish
|
||||||
node:
|
node:
|
||||||
@ -2033,6 +2065,8 @@ volumes:
|
|||||||
clone:
|
clone:
|
||||||
retries: 3
|
retries: 3
|
||||||
depends_on: []
|
depends_on: []
|
||||||
|
image_pull_secrets:
|
||||||
|
- dockerconfigjson
|
||||||
kind: pipeline
|
kind: pipeline
|
||||||
name: release-oss-test
|
name: release-oss-test
|
||||||
node:
|
node:
|
||||||
@ -2137,6 +2171,8 @@ volumes:
|
|||||||
clone:
|
clone:
|
||||||
retries: 3
|
retries: 3
|
||||||
depends_on: []
|
depends_on: []
|
||||||
|
image_pull_secrets:
|
||||||
|
- dockerconfigjson
|
||||||
kind: pipeline
|
kind: pipeline
|
||||||
name: release-oss-integration-tests
|
name: release-oss-integration-tests
|
||||||
node:
|
node:
|
||||||
@ -2250,6 +2286,8 @@ depends_on:
|
|||||||
- release-oss-build-e2e-publish
|
- release-oss-build-e2e-publish
|
||||||
- release-oss-test
|
- release-oss-test
|
||||||
- release-oss-integration-tests
|
- release-oss-integration-tests
|
||||||
|
image_pull_secrets:
|
||||||
|
- dockerconfigjson
|
||||||
kind: pipeline
|
kind: pipeline
|
||||||
name: release-oss-windows
|
name: release-oss-windows
|
||||||
platform:
|
platform:
|
||||||
@ -3050,6 +3088,8 @@ volumes:
|
|||||||
clone:
|
clone:
|
||||||
retries: 3
|
retries: 3
|
||||||
depends_on: []
|
depends_on: []
|
||||||
|
image_pull_secrets:
|
||||||
|
- dockerconfigjson
|
||||||
kind: pipeline
|
kind: pipeline
|
||||||
name: publish-docker-oss-public
|
name: publish-docker-oss-public
|
||||||
node:
|
node:
|
||||||
@ -3136,6 +3176,8 @@ volumes:
|
|||||||
clone:
|
clone:
|
||||||
retries: 3
|
retries: 3
|
||||||
depends_on: []
|
depends_on: []
|
||||||
|
image_pull_secrets:
|
||||||
|
- dockerconfigjson
|
||||||
kind: pipeline
|
kind: pipeline
|
||||||
name: publish-docker-enterprise-public
|
name: publish-docker-enterprise-public
|
||||||
node:
|
node:
|
||||||
@ -3205,6 +3247,8 @@ volumes:
|
|||||||
clone:
|
clone:
|
||||||
retries: 3
|
retries: 3
|
||||||
depends_on: []
|
depends_on: []
|
||||||
|
image_pull_secrets:
|
||||||
|
- dockerconfigjson
|
||||||
kind: pipeline
|
kind: pipeline
|
||||||
name: publish-docker-oss-security
|
name: publish-docker-oss-security
|
||||||
node:
|
node:
|
||||||
@ -3292,6 +3336,8 @@ volumes:
|
|||||||
clone:
|
clone:
|
||||||
retries: 3
|
retries: 3
|
||||||
depends_on: []
|
depends_on: []
|
||||||
|
image_pull_secrets:
|
||||||
|
- dockerconfigjson
|
||||||
kind: pipeline
|
kind: pipeline
|
||||||
name: publish-docker-enterprise-security
|
name: publish-docker-enterprise-security
|
||||||
node:
|
node:
|
||||||
@ -3362,6 +3408,8 @@ volumes:
|
|||||||
clone:
|
clone:
|
||||||
retries: 3
|
retries: 3
|
||||||
depends_on: []
|
depends_on: []
|
||||||
|
image_pull_secrets:
|
||||||
|
- dockerconfigjson
|
||||||
kind: pipeline
|
kind: pipeline
|
||||||
name: publish-artifacts-security
|
name: publish-artifacts-security
|
||||||
node:
|
node:
|
||||||
@ -3402,6 +3450,8 @@ volumes:
|
|||||||
clone:
|
clone:
|
||||||
retries: 3
|
retries: 3
|
||||||
depends_on: []
|
depends_on: []
|
||||||
|
image_pull_secrets:
|
||||||
|
- dockerconfigjson
|
||||||
kind: pipeline
|
kind: pipeline
|
||||||
name: publish-artifacts-public
|
name: publish-artifacts-public
|
||||||
node:
|
node:
|
||||||
@ -3442,6 +3492,8 @@ volumes:
|
|||||||
clone:
|
clone:
|
||||||
retries: 3
|
retries: 3
|
||||||
depends_on: []
|
depends_on: []
|
||||||
|
image_pull_secrets:
|
||||||
|
- dockerconfigjson
|
||||||
kind: pipeline
|
kind: pipeline
|
||||||
name: publish-npm-packages-public
|
name: publish-npm-packages-public
|
||||||
node:
|
node:
|
||||||
@ -3502,6 +3554,8 @@ depends_on:
|
|||||||
- publish-artifacts-public
|
- publish-artifacts-public
|
||||||
- publish-docker-oss-public
|
- publish-docker-oss-public
|
||||||
- publish-docker-enterprise-public
|
- publish-docker-enterprise-public
|
||||||
|
image_pull_secrets:
|
||||||
|
- dockerconfigjson
|
||||||
kind: pipeline
|
kind: pipeline
|
||||||
name: publish-packages-oss
|
name: publish-packages-oss
|
||||||
node:
|
node:
|
||||||
@ -3581,6 +3635,8 @@ depends_on:
|
|||||||
- publish-artifacts-public
|
- publish-artifacts-public
|
||||||
- publish-docker-oss-public
|
- publish-docker-oss-public
|
||||||
- publish-docker-enterprise-public
|
- publish-docker-enterprise-public
|
||||||
|
image_pull_secrets:
|
||||||
|
- dockerconfigjson
|
||||||
kind: pipeline
|
kind: pipeline
|
||||||
name: publish-packages-enterprise
|
name: publish-packages-enterprise
|
||||||
node:
|
node:
|
||||||
@ -3658,6 +3714,8 @@ volumes:
|
|||||||
clone:
|
clone:
|
||||||
retries: 3
|
retries: 3
|
||||||
depends_on: []
|
depends_on: []
|
||||||
|
image_pull_secrets:
|
||||||
|
- dockerconfigjson
|
||||||
kind: pipeline
|
kind: pipeline
|
||||||
name: publish-artifacts-page
|
name: publish-artifacts-page
|
||||||
node:
|
node:
|
||||||
@ -3695,6 +3753,8 @@ volumes:
|
|||||||
clone:
|
clone:
|
||||||
retries: 3
|
retries: 3
|
||||||
depends_on: []
|
depends_on: []
|
||||||
|
image_pull_secrets:
|
||||||
|
- dockerconfigjson
|
||||||
kind: pipeline
|
kind: pipeline
|
||||||
name: release-branch-oss-build-e2e-publish
|
name: release-branch-oss-build-e2e-publish
|
||||||
node:
|
node:
|
||||||
@ -3970,6 +4030,8 @@ volumes:
|
|||||||
clone:
|
clone:
|
||||||
retries: 3
|
retries: 3
|
||||||
depends_on: []
|
depends_on: []
|
||||||
|
image_pull_secrets:
|
||||||
|
- dockerconfigjson
|
||||||
kind: pipeline
|
kind: pipeline
|
||||||
name: release-branch-oss-test
|
name: release-branch-oss-test
|
||||||
node:
|
node:
|
||||||
@ -4068,6 +4130,8 @@ volumes:
|
|||||||
clone:
|
clone:
|
||||||
retries: 3
|
retries: 3
|
||||||
depends_on: []
|
depends_on: []
|
||||||
|
image_pull_secrets:
|
||||||
|
- dockerconfigjson
|
||||||
kind: pipeline
|
kind: pipeline
|
||||||
name: release-branch-oss-integration-tests
|
name: release-branch-oss-integration-tests
|
||||||
node:
|
node:
|
||||||
@ -4175,6 +4239,8 @@ depends_on:
|
|||||||
- release-branch-oss-build-e2e-publish
|
- release-branch-oss-build-e2e-publish
|
||||||
- release-branch-oss-test
|
- release-branch-oss-test
|
||||||
- release-branch-oss-integration-tests
|
- release-branch-oss-integration-tests
|
||||||
|
image_pull_secrets:
|
||||||
|
- dockerconfigjson
|
||||||
kind: pipeline
|
kind: pipeline
|
||||||
name: release-branch-oss-windows
|
name: release-branch-oss-windows
|
||||||
platform:
|
platform:
|
||||||
@ -5112,6 +5178,6 @@ kind: secret
|
|||||||
name: packages_secret_access_key
|
name: packages_secret_access_key
|
||||||
---
|
---
|
||||||
kind: signature
|
kind: signature
|
||||||
hmac: 3298924f36cbab63be3873f763ead9406f47dc8b98142678d69ea83b4012541c
|
hmac: b08cb03f133c943a789bf6abf7f2645536598e4d8a5a86b34b9231db8afc8ff4
|
||||||
|
|
||||||
...
|
...
|
||||||
|
@ -50,6 +50,7 @@ def pipeline(
|
|||||||
},
|
},
|
||||||
}],
|
}],
|
||||||
'depends_on': depends_on,
|
'depends_on': depends_on,
|
||||||
|
'image_pull_secrets': [pull_secret],
|
||||||
}
|
}
|
||||||
if environment:
|
if environment:
|
||||||
pipeline.update({
|
pipeline.update({
|
||||||
@ -60,7 +61,6 @@ def pipeline(
|
|||||||
pipeline.update(platform_conf)
|
pipeline.update(platform_conf)
|
||||||
|
|
||||||
if edition in ('enterprise', 'enterprise2'):
|
if edition in ('enterprise', 'enterprise2'):
|
||||||
pipeline['image_pull_secrets'] = [pull_secret]
|
|
||||||
# We have a custom clone step for enterprise
|
# We have a custom clone step for enterprise
|
||||||
pipeline['clone'] = {
|
pipeline['clone'] = {
|
||||||
'disable': True,
|
'disable': True,
|
||||||
|
Reference in New Issue
Block a user