Skip to content

Commit

Permalink
CCO-401: Include azure-workload-identity images configuration.
Browse files Browse the repository at this point in the history
  • Loading branch information
abutcher committed Aug 1, 2023
1 parent 2cf780f commit 2374a26
Show file tree
Hide file tree
Showing 4 changed files with 134 additions and 20 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,21 @@ base_images:
name: "4.14"
namespace: ocp
tag: base
ocp_builder_rhel-8-golang-1.20-openshift-4.14:
name: builder
namespace: ocp
tag: rhel-8-golang-1.20-openshift-4.14
build_root:
image_stream_tag:
name: release
namespace: openshift
tag: golang-1.20
from_repository: true
canonical_go_repository: github.com/azure/azure-workload-identity
images:
- dockerfile_path: Dockerfile.rhel7
from: base
inputs:
ocp_builder_rhel-8-golang-1.20-openshift-4.14:
as:
- registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.20-openshift-4.14
to: azure-workload-identity-webhook
promotion:
name: "4.14"
namespace: ocp
Expand All @@ -29,10 +39,10 @@ resources:
cpu: 100m
memory: 200Mi
tests:
- as: e2e-aws
- as: e2e-azure
steps:
cluster_profile: aws
workflow: openshift-e2e-aws
cluster_profile: azure4
workflow: openshift-e2e-azure
zz_generated_metadata:
branch: main
org: openshift
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
postsubmits:
openshift/azure-workload-identity:
- agent: kubernetes
always_run: true
branches:
- ^main$
cluster: build01
decorate: true
labels:
ci-operator.openshift.io/is-promotion: "true"
ci.openshift.io/generator: prowgen
max_concurrency: 1
name: branch-ci-openshift-azure-workload-identity-main-images
path_alias: github.com/azure/azure-workload-identity
spec:
containers:
- args:
- --gcs-upload-secret=/secrets/gcs/service-account.json
- --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
- --image-mirror-push-secret=/etc/push-secret/.dockerconfigjson
- --promote
- --report-credentials-file=/etc/report/credentials
- --target=[images]
command:
- ci-operator
image: ci-operator:latest
imagePullPolicy: Always
name: ""
resources:
requests:
cpu: 10m
volumeMounts:
- mountPath: /secrets/gcs
name: gcs-credentials
readOnly: true
- mountPath: /etc/pull-secret
name: pull-secret
readOnly: true
- mountPath: /etc/push-secret
name: push-secret
readOnly: true
- mountPath: /etc/report
name: result-aggregator
readOnly: true
serviceAccountName: ci-operator
volumes:
- name: pull-secret
secret:
secretName: registry-pull-credentials
- name: push-secret
secret:
secretName: registry-push-credentials-ci-central
- name: result-aggregator
secret:
secretName: result-aggregator
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,17 @@ presubmits:
branches:
- ^main$
- ^main-
cluster: build01
context: ci/prow/e2e-aws
cluster: build03
context: ci/prow/e2e-azure
decorate: true
decoration_config:
skip_cloning: true
labels:
ci-operator.openshift.io/cloud: aws
ci-operator.openshift.io/cloud-cluster-profile: aws
ci-operator.openshift.io/cloud: azure4
ci-operator.openshift.io/cloud-cluster-profile: azure4
ci.openshift.io/generator: prowgen
pj-rehearse.openshift.io/can-be-rehearsed: "true"
name: pull-ci-openshift-azure-workload-identity-main-e2e-aws
rerun_command: /test e2e-aws
name: pull-ci-openshift-azure-workload-identity-main-e2e-azure
path_alias: github.com/azure/azure-workload-identity
rerun_command: /test e2e-azure
spec:
containers:
- args:
Expand All @@ -25,8 +24,8 @@ presubmits:
- --lease-server-credentials-file=/etc/boskos/credentials
- --report-credentials-file=/etc/report/credentials
- --secret-dir=/secrets/ci-pull-credentials
- --secret-dir=/usr/local/e2e-aws-cluster-profile
- --target=e2e-aws
- --secret-dir=/usr/local/e2e-azure-cluster-profile
- --target=e2e-azure
command:
- ci-operator
image: ci-operator:latest
Expand All @@ -42,7 +41,7 @@ presubmits:
- mountPath: /secrets/ci-pull-credentials
name: ci-pull-credentials
readOnly: true
- mountPath: /usr/local/e2e-aws-cluster-profile
- mountPath: /usr/local/e2e-azure-cluster-profile
name: cluster-profile
- mountPath: /secrets/gcs
name: gcs-credentials
Expand All @@ -66,11 +65,60 @@ presubmits:
secretName: ci-pull-credentials
- name: cluster-profile
secret:
secretName: cluster-secrets-aws
secretName: cluster-secrets-azure4
- name: pull-secret
secret:
secretName: registry-pull-credentials
- name: result-aggregator
secret:
secretName: result-aggregator
trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*)
trigger: (?m)^/test( | .* )e2e-azure,?($|\s.*)
- agent: kubernetes
always_run: true
branches:
- ^main$
- ^main-
cluster: build03
context: ci/prow/images
decorate: true
labels:
ci.openshift.io/generator: prowgen
pj-rehearse.openshift.io/can-be-rehearsed: "true"
name: pull-ci-openshift-azure-workload-identity-main-images
path_alias: github.com/azure/azure-workload-identity
rerun_command: /test images
spec:
containers:
- args:
- --gcs-upload-secret=/secrets/gcs/service-account.json
- --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
- --report-credentials-file=/etc/report/credentials
- --target=[images]
- --target=[release:latest]
command:
- ci-operator
image: ci-operator:latest
imagePullPolicy: Always
name: ""
resources:
requests:
cpu: 10m
volumeMounts:
- mountPath: /secrets/gcs
name: gcs-credentials
readOnly: true
- mountPath: /etc/pull-secret
name: pull-secret
readOnly: true
- mountPath: /etc/report
name: result-aggregator
readOnly: true
serviceAccountName: ci-operator
volumes:
- name: pull-secret
secret:
secretName: registry-pull-credentials
- name: result-aggregator
secret:
secretName: result-aggregator
trigger: (?m)^/test( | .* )images,?($|\s.*)
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ registry.ci.openshift.org/origin/4.14:azure-file-csi-driver quay.io/openshift/or
registry.ci.openshift.org/origin/4.14:azure-file-csi-driver-operator quay.io/openshift/origin-azure-file-csi-driver-operator:4.14 quay.io/openshift/origin-azure-file-csi-driver-operator:4.14.0 quay.io/openshift/origin-azure-file-csi-driver-operator:latest
registry.ci.openshift.org/origin/4.14:azure-file-csi-driver-operator-test quay.io/openshift/origin-azure-file-csi-driver-operator-test:4.14 quay.io/openshift/origin-azure-file-csi-driver-operator-test:4.14.0 quay.io/openshift/origin-azure-file-csi-driver-operator-test:latest
registry.ci.openshift.org/origin/4.14:azure-machine-controllers quay.io/openshift/origin-azure-machine-controllers:4.14 quay.io/openshift/origin-azure-machine-controllers:4.14.0 quay.io/openshift/origin-azure-machine-controllers:latest
registry.ci.openshift.org/origin/4.14:azure-workload-identity-webhook quay.io/openshift/origin-azure-workload-identity-webhook:4.14 quay.io/openshift/origin-azure-workload-identity-webhook:4.14.0 quay.io/openshift/origin-azure-workload-identity-webhook:latest
registry.ci.openshift.org/origin/4.14:baremetal-hardware-event-proxy quay.io/openshift/origin-baremetal-hardware-event-proxy:4.14 quay.io/openshift/origin-baremetal-hardware-event-proxy:4.14.0 quay.io/openshift/origin-baremetal-hardware-event-proxy:latest
registry.ci.openshift.org/origin/4.14:baremetal-hardware-event-proxy-operator quay.io/openshift/origin-baremetal-hardware-event-proxy-operator:4.14 quay.io/openshift/origin-baremetal-hardware-event-proxy-operator:4.14.0 quay.io/openshift/origin-baremetal-hardware-event-proxy-operator:latest
registry.ci.openshift.org/origin/4.14:baremetal-hardware-event-proxy-operator-bundle quay.io/openshift/origin-baremetal-hardware-event-proxy-operator-bundle:4.14 quay.io/openshift/origin-baremetal-hardware-event-proxy-operator-bundle:4.14.0 quay.io/openshift/origin-baremetal-hardware-event-proxy-operator-bundle:latest
Expand Down

0 comments on commit 2374a26

Please sign in to comment.