Skip to content

Commit

Permalink
promoter: bump image
Browse files Browse the repository at this point in the history
The images are now referenced from the official prod registry
us.gcr.io/k8s-artifacts-prod, instead of the staging GCR. We have to use
a regional GCR for now (US region) because the global redirect mirror is
not set up yet.

There are 2 other associated changes here:

    (1) the promoter manifests are now broken up into pairs
    "promoter-manifest.yaml" and "images.yaml" in the k8s.io repo, and
    so the `run_if_changed` field is updated accordingly;

    (2) the new `-thin-manifest-dir` flag is used, which only accepts
    the more secure "thin" promoter manifests where the credentials are
    separated from the image description.
  • Loading branch information
listx committed Oct 21, 2019
1 parent c399599 commit d37fa12
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
Expand Up @@ -4,13 +4,13 @@ presubmits:
- name: pull-k8sio-cip
decorate: true
skip_report: false
run_if_changed: "k8s.gcr.io/.*/manifest.yaml"
run_if_changed: 'k8s.gcr.io/((images/.*/images\.yaml)|(manifests/.*/promoter-manifest\.yaml))'
max_concurrency: 10
branches:
- ^master$
spec:
containers:
- image: gcr.io/k8s-staging-artifact-promoter/cip:20190821-v2.2.1-2-gc29e4fc
- image: us.gcr.io/k8s-artifacts-prod/artifact-promoter/cip:20191021-v2.3.1-34-ge32056e
command:
- cip
args:
Expand Down
12 changes: 6 additions & 6 deletions config/jobs/kubernetes/test-infra/test-infra-trusted.yaml
Expand Up @@ -783,7 +783,7 @@ postsubmits:
- ^master$
spec:
containers:
- image: gcr.io/k8s-staging-artifact-promoter/cip:20190821-v2.2.1-2-gc29e4fc
- image: us.gcr.io/k8s-artifacts-prod/artifact-promoter/cip:20191021-v2.3.1-34-ge32056e
command:
- cip
args:
Expand All @@ -808,7 +808,7 @@ postsubmits:
- name: post-k8sio-cip
cluster: test-infra-trusted
decorate: true
run_if_changed: "k8s.gcr.io/.*/manifest.yaml"
run_if_changed: 'k8s.gcr.io/((images/.*/images\.yaml)|(manifests/.*/promoter-manifest\.yaml))'
# Never run more than 1 job at a time. This is because we don't want to run
# into a case where an older manifest PR merge gets run last (after a newer
# one).
Expand All @@ -817,11 +817,11 @@ postsubmits:
- ^master$
spec:
containers:
- image: gcr.io/k8s-staging-artifact-promoter/cip:20190821-v2.2.1-2-gc29e4fc
- image: us.gcr.io/k8s-artifacts-prod/artifact-promoter/cip:20191021-v2.3.1-34-ge32056e
command:
- cip
args:
- -manifest-dir=/home/prow/go/src/github.com/kubernetes/k8s.io/k8s.gcr.io
- -thin-manifest-dir=/home/prow/go/src/github.com/kubernetes/k8s.io/k8s.gcr.io
- -key-files=/etc/k8s-artifacts-prod-service-account/service-account.json
- -dry-run=false
volumeMounts:
Expand Down Expand Up @@ -1212,11 +1212,11 @@ periodics:
# interactive bash session:
#
# docker run --rm -it gcr.io/cip-demo-staging/cip:<tag> "cd /cip && bash"
- image: gcr.io/k8s-staging-artifact-promoter/cip:20190821-v2.2.1-2-gc29e4fc
- image: us.gcr.io/k8s-artifacts-prod/artifact-promoter/cip:20191021-v2.3.1-34-ge32056e
command:
- cip
args:
- -manifest-dir=/home/prow/go/src/github.com/kubernetes/k8s.io/k8s.gcr.io
- -thin-manifest-dir=/home/prow/go/src/github.com/kubernetes/k8s.io/k8s.gcr.io
- -key-files=/etc/k8s-artifacts-prod-service-account/service-account.json
- -dry-run=false
volumeMounts:
Expand Down

0 comments on commit d37fa12

Please sign in to comment.