From c84d26d0663fe03b7dac60bfe856677924f61155 Mon Sep 17 00:00:00 2001 From: Hongkai Liu Date: Fri, 20 Dec 2019 11:53:16 -0500 Subject: [PATCH] Revert "Merge pull request #6508 from hongkailiu/revertMigration" This reverts commit 187ac9d14a5c71802542ca44a5155ae101b5190a, reversing changes made to 993d3c1caa73f1fa08ca5d6116505748a176d82d. --- ...ci-secret-mirroring-controller-master.yaml | 15 +- .../origin/openshift-origin-master.yaml | 13 +- .../openshift-origin-master-postsubmits.yaml | 17 + .../openshift-origin-master-presubmits.yaml | 601 +++++++++++++++++- 4 files changed, 619 insertions(+), 27 deletions(-) diff --git a/ci-operator/config/openshift/ci-secret-mirroring-controller/openshift-ci-secret-mirroring-controller-master.yaml b/ci-operator/config/openshift/ci-secret-mirroring-controller/openshift-ci-secret-mirroring-controller-master.yaml index 87718ddb884fc..83f173666843f 100644 --- a/ci-operator/config/openshift/ci-secret-mirroring-controller/openshift-ci-secret-mirroring-controller-master.yaml +++ b/ci-operator/config/openshift/ci-secret-mirroring-controller/openshift-ci-secret-mirroring-controller-master.yaml @@ -3,8 +3,14 @@ base_images: cluster: https://api.ci.openshift.org name: centos namespace: openshift - tag: '7' + tag: "7" binary_build_commands: make install +build_root: + image_stream_tag: + cluster: https://api.ci.openshift.org + name: release + namespace: openshift + tag: golang-1.12 images: - context_dir: image/ from: os @@ -15,6 +21,7 @@ images: source_path: /go/bin/ci-secret-mirroring-controller to: ci-secret-mirroring-controller promotion: + name: "" namespace: ci tag: latest resources: @@ -24,12 +31,6 @@ resources: requests: cpu: 100m memory: 200Mi -build_root: - image_stream_tag: - cluster: https://api.ci.openshift.org - name: release - namespace: openshift - tag: golang-1.12 tag_specification: cluster: https://api.ci.openshift.org name: "4.3" diff --git a/ci-operator/config/openshift/origin/openshift-origin-master.yaml b/ci-operator/config/openshift/origin/openshift-origin-master.yaml index 4e3d8d382e7d1..9ca3c549d3d85 100644 --- a/ci-operator/config/openshift/origin/openshift-origin-master.yaml +++ b/ci-operator/config/openshift/origin/openshift-origin-master.yaml @@ -1,27 +1,33 @@ base_images: base: + cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tag: base base-machine: + cluster: https://api.ci.openshift.org name: fedora namespace: openshift tag: "29" cli: + cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tag: cli machine-os-content-base: + cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tag: machine-os-content oc-rpms: + cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tag: oc-rpms binary_build_commands: make build build_root: image_stream_tag: + cluster: https://api.ci.openshift.org name: release namespace: openshift tag: golang-1.13 @@ -110,10 +116,10 @@ resources: memory: 4Gi artifacts: limits: - memory: 1Gi + memory: 6Gi requests: - cpu: 100m - memory: 100Mi + cpu: 500m + memory: 3Gi bin: limits: memory: 12Gi @@ -182,6 +188,7 @@ resources: memory: 8Gi rpm_build_commands: make build-rpms tag_specification: + cluster: https://api.ci.openshift.org name: "4.4" namespace: ocp tests: diff --git a/ci-operator/jobs/openshift/origin/openshift-origin-master-postsubmits.yaml b/ci-operator/jobs/openshift/origin/openshift-origin-master-postsubmits.yaml index af866be63218f..d4922723dfe13 100644 --- a/ci-operator/jobs/openshift/origin/openshift-origin-master-postsubmits.yaml +++ b/ci-operator/jobs/openshift/origin/openshift-origin-master-postsubmits.yaml @@ -21,6 +21,8 @@ postsubmits: - --artifact-dir=$(ARTIFACTS) - --branch=master - --give-pr-author-access-to-namespace=true + - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson + - --kubeconfig=/etc/apici/kubeconfig - --org=openshift - --promote - --repo=origin @@ -43,11 +45,26 @@ postsubmits: requests: cpu: 10m volumeMounts: + - mountPath: /etc/apici + name: apici-ci-operator-credentials + readOnly: true + - mountPath: /etc/pull-secret + name: pull-secret + readOnly: true - mountPath: /etc/sentry-dsn name: sentry-dsn readOnly: true serviceAccountName: ci-operator volumes: + - name: apici-ci-operator-credentials + secret: + items: + - key: sa.ci-operator.apici.config + path: kubeconfig + secretName: apici-ci-operator-credentials + - name: pull-secret + secret: + secretName: regcred - name: sentry-dsn secret: secretName: sentry-dsn diff --git a/ci-operator/jobs/openshift/origin/openshift-origin-master-presubmits.yaml b/ci-operator/jobs/openshift/origin/openshift-origin-master-presubmits.yaml index 7b75afe544fa6..fb4fe8293ba23 100644 --- a/ci-operator/jobs/openshift/origin/openshift-origin-master-presubmits.yaml +++ b/ci-operator/jobs/openshift/origin/openshift-origin-master-presubmits.yaml @@ -4,6 +4,7 @@ presubmits: always_run: false branches: - master + cluster: ci/api-build01-ci-devcluster-openshift-com:6443 context: ci/prow/artifacts decorate: true name: pull-ci-openshift-origin-master-artifacts @@ -14,6 +15,8 @@ presubmits: - args: - --artifact-dir=$(ARTIFACTS) - --give-pr-author-access-to-namespace=true + - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson + - --kubeconfig=/etc/apici/kubeconfig - --target=artifacts command: - ci-operator @@ -29,12 +32,30 @@ presubmits: resources: requests: cpu: 10m + volumeMounts: + - mountPath: /etc/apici + name: apici-ci-operator-credentials + readOnly: true + - mountPath: /etc/pull-secret + name: pull-secret + readOnly: true serviceAccountName: ci-operator + volumes: + - name: apici-ci-operator-credentials + secret: + items: + - key: sa.ci-operator.apici.config + path: kubeconfig + secretName: apici-ci-operator-credentials + - name: pull-secret + secret: + secretName: regcred trigger: (?m)^/test( | .* )artifacts,?($|\s.*) - agent: kubernetes always_run: false branches: - master + cluster: ci/api-build01-ci-devcluster-openshift-com:6443 context: ci/prow/e2e-aws decorate: true decoration_config: @@ -50,7 +71,11 @@ presubmits: - --artifact-dir=$(ARTIFACTS) - --branch=master - --give-pr-author-access-to-namespace=true - - --lease-server=http://boskos + - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson + - --kubeconfig=/etc/apici/kubeconfig + - --lease-server-password-file=/etc/boskos/password + - --lease-server-username=ci + - --lease-server=https://boskos-ci.svc.ci.openshift.org - --org=openshift - --repo=origin - --resolver-address=http://ci-operator-configresolver-ci.svc.ci.openshift.org @@ -79,16 +104,37 @@ presubmits: requests: cpu: 10m volumeMounts: + - mountPath: /etc/apici + name: apici-ci-operator-credentials + readOnly: true + - mountPath: /etc/boskos + name: boskos + readOnly: true - mountPath: /usr/local/e2e-aws-cluster-profile name: cluster-profile - mountPath: /usr/local/e2e-aws name: job-definition subPath: cluster-launch-installer-e2e.yaml + - mountPath: /etc/pull-secret + name: pull-secret + readOnly: true - mountPath: /etc/sentry-dsn name: sentry-dsn readOnly: true serviceAccountName: ci-operator volumes: + - name: apici-ci-operator-credentials + secret: + items: + - key: sa.ci-operator.apici.config + path: kubeconfig + secretName: apici-ci-operator-credentials + - name: boskos + secret: + items: + - key: password + path: password + secretName: boskos-credentials - name: cluster-profile projected: sources: @@ -97,6 +143,9 @@ presubmits: - configMap: name: prow-job-cluster-launch-installer-e2e name: job-definition + - name: pull-secret + secret: + secretName: regcred - name: sentry-dsn secret: secretName: sentry-dsn @@ -105,6 +154,7 @@ presubmits: always_run: false branches: - master + cluster: ci/api-build01-ci-devcluster-openshift-com:6443 context: ci/prow/e2e-aws-disruptive decorate: true decoration_config: @@ -121,7 +171,11 @@ presubmits: - --artifact-dir=$(ARTIFACTS) - --branch=master - --give-pr-author-access-to-namespace=true - - --lease-server=http://boskos + - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson + - --kubeconfig=/etc/apici/kubeconfig + - --lease-server-password-file=/etc/boskos/password + - --lease-server-username=ci + - --lease-server=https://boskos-ci.svc.ci.openshift.org - --org=openshift - --repo=origin - --resolver-address=http://ci-operator-configresolver-ci.svc.ci.openshift.org @@ -151,16 +205,37 @@ presubmits: requests: cpu: 10m volumeMounts: + - mountPath: /etc/apici + name: apici-ci-operator-credentials + readOnly: true + - mountPath: /etc/boskos + name: boskos + readOnly: true - mountPath: /usr/local/e2e-aws-disruptive-cluster-profile name: cluster-profile - mountPath: /usr/local/e2e-aws-disruptive name: job-definition subPath: cluster-launch-installer-e2e.yaml + - mountPath: /etc/pull-secret + name: pull-secret + readOnly: true - mountPath: /etc/sentry-dsn name: sentry-dsn readOnly: true serviceAccountName: ci-operator volumes: + - name: apici-ci-operator-credentials + secret: + items: + - key: sa.ci-operator.apici.config + path: kubeconfig + secretName: apici-ci-operator-credentials + - name: boskos + secret: + items: + - key: password + path: password + secretName: boskos-credentials - name: cluster-profile projected: sources: @@ -169,6 +244,9 @@ presubmits: - configMap: name: prow-job-cluster-launch-installer-e2e name: job-definition + - name: pull-secret + secret: + secretName: regcred - name: sentry-dsn secret: secretName: sentry-dsn @@ -177,6 +255,7 @@ presubmits: always_run: true branches: - master + cluster: ci/api-build01-ci-devcluster-openshift-com:6443 context: ci/prow/e2e-aws-fips decorate: true decoration_config: @@ -192,7 +271,11 @@ presubmits: - --artifact-dir=$(ARTIFACTS) - --branch=master - --give-pr-author-access-to-namespace=true - - --lease-server=http://boskos + - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson + - --kubeconfig=/etc/apici/kubeconfig + - --lease-server-password-file=/etc/boskos/password + - --lease-server-username=ci + - --lease-server=https://boskos-ci.svc.ci.openshift.org - --org=openshift - --repo=origin - --resolver-address=http://ci-operator-configresolver-ci.svc.ci.openshift.org @@ -225,16 +308,37 @@ presubmits: requests: cpu: 10m volumeMounts: + - mountPath: /etc/apici + name: apici-ci-operator-credentials + readOnly: true + - mountPath: /etc/boskos + name: boskos + readOnly: true - mountPath: /usr/local/e2e-aws-fips-cluster-profile name: cluster-profile - mountPath: /usr/local/e2e-aws-fips name: job-definition subPath: cluster-launch-installer-e2e.yaml + - mountPath: /etc/pull-secret + name: pull-secret + readOnly: true - mountPath: /etc/sentry-dsn name: sentry-dsn readOnly: true serviceAccountName: ci-operator volumes: + - name: apici-ci-operator-credentials + secret: + items: + - key: sa.ci-operator.apici.config + path: kubeconfig + secretName: apici-ci-operator-credentials + - name: boskos + secret: + items: + - key: password + path: password + secretName: boskos-credentials - name: cluster-profile projected: sources: @@ -243,6 +347,9 @@ presubmits: - configMap: name: prow-job-cluster-launch-installer-e2e name: job-definition + - name: pull-secret + secret: + secretName: regcred - name: sentry-dsn secret: secretName: sentry-dsn @@ -251,6 +358,7 @@ presubmits: always_run: false branches: - master + cluster: ci/api-build01-ci-devcluster-openshift-com:6443 context: ci/prow/e2e-aws-image-registry decorate: true decoration_config: @@ -267,7 +375,11 @@ presubmits: - --artifact-dir=$(ARTIFACTS) - --branch=master - --give-pr-author-access-to-namespace=true - - --lease-server=http://boskos + - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson + - --kubeconfig=/etc/apici/kubeconfig + - --lease-server-password-file=/etc/boskos/password + - --lease-server-username=ci + - --lease-server=https://boskos-ci.svc.ci.openshift.org - --org=openshift - --repo=origin - --resolver-address=http://ci-operator-configresolver-ci.svc.ci.openshift.org @@ -296,16 +408,37 @@ presubmits: requests: cpu: 10m volumeMounts: + - mountPath: /etc/apici + name: apici-ci-operator-credentials + readOnly: true + - mountPath: /etc/boskos + name: boskos + readOnly: true - mountPath: /usr/local/e2e-aws-image-registry-cluster-profile name: cluster-profile - mountPath: /usr/local/e2e-aws-image-registry name: job-definition subPath: cluster-launch-installer-e2e.yaml + - mountPath: /etc/pull-secret + name: pull-secret + readOnly: true - mountPath: /etc/sentry-dsn name: sentry-dsn readOnly: true serviceAccountName: ci-operator volumes: + - name: apici-ci-operator-credentials + secret: + items: + - key: sa.ci-operator.apici.config + path: kubeconfig + secretName: apici-ci-operator-credentials + - name: boskos + secret: + items: + - key: password + path: password + secretName: boskos-credentials - name: cluster-profile projected: sources: @@ -314,6 +447,9 @@ presubmits: - configMap: name: prow-job-cluster-launch-installer-e2e name: job-definition + - name: pull-secret + secret: + secretName: regcred - name: sentry-dsn secret: secretName: sentry-dsn @@ -322,6 +458,7 @@ presubmits: always_run: false branches: - master + cluster: ci/api-build01-ci-devcluster-openshift-com:6443 context: ci/prow/e2e-aws-jenkins decorate: true decoration_config: @@ -337,7 +474,11 @@ presubmits: - --artifact-dir=$(ARTIFACTS) - --branch=master - --give-pr-author-access-to-namespace=true - - --lease-server=http://boskos + - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson + - --kubeconfig=/etc/apici/kubeconfig + - --lease-server-password-file=/etc/boskos/password + - --lease-server-username=ci + - --lease-server=https://boskos-ci.svc.ci.openshift.org - --org=openshift - --repo=origin - --resolver-address=http://ci-operator-configresolver-ci.svc.ci.openshift.org @@ -366,16 +507,37 @@ presubmits: requests: cpu: 10m volumeMounts: + - mountPath: /etc/apici + name: apici-ci-operator-credentials + readOnly: true + - mountPath: /etc/boskos + name: boskos + readOnly: true - mountPath: /usr/local/e2e-aws-jenkins-cluster-profile name: cluster-profile - mountPath: /usr/local/e2e-aws-jenkins name: job-definition subPath: cluster-launch-installer-e2e.yaml + - mountPath: /etc/pull-secret + name: pull-secret + readOnly: true - mountPath: /etc/sentry-dsn name: sentry-dsn readOnly: true serviceAccountName: ci-operator volumes: + - name: apici-ci-operator-credentials + secret: + items: + - key: sa.ci-operator.apici.config + path: kubeconfig + secretName: apici-ci-operator-credentials + - name: boskos + secret: + items: + - key: password + path: password + secretName: boskos-credentials - name: cluster-profile projected: sources: @@ -384,6 +546,9 @@ presubmits: - configMap: name: prow-job-cluster-launch-installer-e2e name: job-definition + - name: pull-secret + secret: + secretName: regcred - name: sentry-dsn secret: secretName: sentry-dsn @@ -392,6 +557,7 @@ presubmits: always_run: false branches: - master + cluster: ci/api-build01-ci-devcluster-openshift-com:6443 context: ci/prow/e2e-aws-multitenant decorate: true decoration_config: @@ -406,7 +572,11 @@ presubmits: - args: - --artifact-dir=$(ARTIFACTS) - --give-pr-author-access-to-namespace=true - - --lease-server=http://boskos + - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson + - --kubeconfig=/etc/apici/kubeconfig + - --lease-server-password-file=/etc/boskos/password + - --lease-server-username=ci + - --lease-server=https://boskos-ci.svc.ci.openshift.org - --secret-dir=/usr/local/e2e-aws-multitenant-cluster-profile - --sentry-dsn-path=/etc/sentry-dsn/ci-operator - --target=e2e-aws-multitenant @@ -443,16 +613,37 @@ presubmits: requests: cpu: 10m volumeMounts: + - mountPath: /etc/apici + name: apici-ci-operator-credentials + readOnly: true + - mountPath: /etc/boskos + name: boskos + readOnly: true - mountPath: /usr/local/e2e-aws-multitenant-cluster-profile name: cluster-profile - mountPath: /usr/local/e2e-aws-multitenant name: job-definition subPath: cluster-launch-installer-e2e.yaml + - mountPath: /etc/pull-secret + name: pull-secret + readOnly: true - mountPath: /etc/sentry-dsn name: sentry-dsn readOnly: true serviceAccountName: ci-operator volumes: + - name: apici-ci-operator-credentials + secret: + items: + - key: sa.ci-operator.apici.config + path: kubeconfig + secretName: apici-ci-operator-credentials + - name: boskos + secret: + items: + - key: password + path: password + secretName: boskos-credentials - name: cluster-profile projected: sources: @@ -461,6 +652,9 @@ presubmits: - configMap: name: prow-job-cluster-launch-installer-e2e name: job-definition + - name: pull-secret + secret: + secretName: regcred - name: sentry-dsn secret: secretName: sentry-dsn @@ -469,6 +663,7 @@ presubmits: always_run: false branches: - master + cluster: ci/api-build01-ci-devcluster-openshift-com:6443 context: ci/prow/e2e-aws-ovn decorate: true decoration_config: @@ -483,7 +678,11 @@ presubmits: - args: - --artifact-dir=$(ARTIFACTS) - --give-pr-author-access-to-namespace=true - - --lease-server=http://boskos + - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson + - --kubeconfig=/etc/apici/kubeconfig + - --lease-server-password-file=/etc/boskos/password + - --lease-server-username=ci + - --lease-server=https://boskos-ci.svc.ci.openshift.org - --secret-dir=/usr/local/e2e-aws-ovn-cluster-profile - --sentry-dsn-path=/etc/sentry-dsn/ci-operator - --target=e2e-aws-ovn @@ -511,16 +710,37 @@ presubmits: requests: cpu: 10m volumeMounts: + - mountPath: /etc/apici + name: apici-ci-operator-credentials + readOnly: true + - mountPath: /etc/boskos + name: boskos + readOnly: true - mountPath: /usr/local/e2e-aws-ovn-cluster-profile name: cluster-profile - mountPath: /usr/local/e2e-aws-ovn name: job-definition subPath: cluster-launch-installer-e2e.yaml + - mountPath: /etc/pull-secret + name: pull-secret + readOnly: true - mountPath: /etc/sentry-dsn name: sentry-dsn readOnly: true serviceAccountName: ci-operator volumes: + - name: apici-ci-operator-credentials + secret: + items: + - key: sa.ci-operator.apici.config + path: kubeconfig + secretName: apici-ci-operator-credentials + - name: boskos + secret: + items: + - key: password + path: password + secretName: boskos-credentials - name: cluster-profile projected: sources: @@ -529,6 +749,9 @@ presubmits: - configMap: name: prow-job-cluster-launch-installer-e2e name: job-definition + - name: pull-secret + secret: + secretName: regcred - name: sentry-dsn secret: secretName: sentry-dsn @@ -537,6 +760,7 @@ presubmits: always_run: true branches: - master + cluster: ci/api-build01-ci-devcluster-openshift-com:6443 context: ci/prow/e2e-aws-serial decorate: true decoration_config: @@ -552,7 +776,11 @@ presubmits: - --artifact-dir=$(ARTIFACTS) - --branch=master - --give-pr-author-access-to-namespace=true - - --lease-server=http://boskos + - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson + - --kubeconfig=/etc/apici/kubeconfig + - --lease-server-password-file=/etc/boskos/password + - --lease-server-username=ci + - --lease-server=https://boskos-ci.svc.ci.openshift.org - --org=openshift - --repo=origin - --resolver-address=http://ci-operator-configresolver-ci.svc.ci.openshift.org @@ -581,16 +809,37 @@ presubmits: requests: cpu: 10m volumeMounts: + - mountPath: /etc/apici + name: apici-ci-operator-credentials + readOnly: true + - mountPath: /etc/boskos + name: boskos + readOnly: true - mountPath: /usr/local/e2e-aws-serial-cluster-profile name: cluster-profile - mountPath: /usr/local/e2e-aws-serial name: job-definition subPath: cluster-launch-installer-e2e.yaml + - mountPath: /etc/pull-secret + name: pull-secret + readOnly: true - mountPath: /etc/sentry-dsn name: sentry-dsn readOnly: true serviceAccountName: ci-operator volumes: + - name: apici-ci-operator-credentials + secret: + items: + - key: sa.ci-operator.apici.config + path: kubeconfig + secretName: apici-ci-operator-credentials + - name: boskos + secret: + items: + - key: password + path: password + secretName: boskos-credentials - name: cluster-profile projected: sources: @@ -599,6 +848,9 @@ presubmits: - configMap: name: prow-job-cluster-launch-installer-e2e name: job-definition + - name: pull-secret + secret: + secretName: regcred - name: sentry-dsn secret: secretName: sentry-dsn @@ -607,6 +859,7 @@ presubmits: always_run: false branches: - master + cluster: ci/api-build01-ci-devcluster-openshift-com:6443 context: ci/prow/e2e-azure decorate: true decoration_config: @@ -623,7 +876,11 @@ presubmits: - --artifact-dir=$(ARTIFACTS) - --branch=master - --give-pr-author-access-to-namespace=true - - --lease-server=http://boskos + - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson + - --kubeconfig=/etc/apici/kubeconfig + - --lease-server-password-file=/etc/boskos/password + - --lease-server-username=ci + - --lease-server=https://boskos-ci.svc.ci.openshift.org - --org=openshift - --repo=origin - --resolver-address=http://ci-operator-configresolver-ci.svc.ci.openshift.org @@ -652,16 +909,37 @@ presubmits: requests: cpu: 10m volumeMounts: + - mountPath: /etc/apici + name: apici-ci-operator-credentials + readOnly: true + - mountPath: /etc/boskos + name: boskos + readOnly: true - mountPath: /usr/local/e2e-azure-cluster-profile name: cluster-profile - mountPath: /usr/local/e2e-azure name: job-definition subPath: cluster-launch-installer-e2e.yaml + - mountPath: /etc/pull-secret + name: pull-secret + readOnly: true - mountPath: /etc/sentry-dsn name: sentry-dsn readOnly: true serviceAccountName: ci-operator volumes: + - name: apici-ci-operator-credentials + secret: + items: + - key: sa.ci-operator.apici.config + path: kubeconfig + secretName: apici-ci-operator-credentials + - name: boskos + secret: + items: + - key: password + path: password + secretName: boskos-credentials - name: cluster-profile projected: sources: @@ -670,6 +948,9 @@ presubmits: - configMap: name: prow-job-cluster-launch-installer-e2e name: job-definition + - name: pull-secret + secret: + secretName: regcred - name: sentry-dsn secret: secretName: sentry-dsn @@ -678,6 +959,7 @@ presubmits: always_run: true branches: - master + cluster: ci/api-build01-ci-devcluster-openshift-com:6443 context: ci/prow/e2e-cmd decorate: true decoration_config: @@ -693,7 +975,11 @@ presubmits: - --artifact-dir=$(ARTIFACTS) - --branch=master - --give-pr-author-access-to-namespace=true - - --lease-server=http://boskos + - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson + - --kubeconfig=/etc/apici/kubeconfig + - --lease-server-password-file=/etc/boskos/password + - --lease-server-username=ci + - --lease-server=https://boskos-ci.svc.ci.openshift.org - --org=openshift - --repo=origin - --resolver-address=http://ci-operator-configresolver-ci.svc.ci.openshift.org @@ -722,16 +1008,37 @@ presubmits: requests: cpu: 10m volumeMounts: + - mountPath: /etc/apici + name: apici-ci-operator-credentials + readOnly: true + - mountPath: /etc/boskos + name: boskos + readOnly: true - mountPath: /usr/local/e2e-cmd-cluster-profile name: cluster-profile - mountPath: /usr/local/e2e-cmd name: job-definition subPath: cluster-launch-installer-e2e.yaml + - mountPath: /etc/pull-secret + name: pull-secret + readOnly: true - mountPath: /etc/sentry-dsn name: sentry-dsn readOnly: true serviceAccountName: ci-operator volumes: + - name: apici-ci-operator-credentials + secret: + items: + - key: sa.ci-operator.apici.config + path: kubeconfig + secretName: apici-ci-operator-credentials + - name: boskos + secret: + items: + - key: password + path: password + secretName: boskos-credentials - name: cluster-profile projected: sources: @@ -742,6 +1049,9 @@ presubmits: - configMap: name: prow-job-cluster-launch-installer-e2e name: job-definition + - name: pull-secret + secret: + secretName: regcred - name: sentry-dsn secret: secretName: sentry-dsn @@ -750,6 +1060,7 @@ presubmits: always_run: false branches: - master + cluster: ci/api-build01-ci-devcluster-openshift-com:6443 context: ci/prow/e2e-conformance-k8s decorate: true decoration_config: @@ -765,7 +1076,11 @@ presubmits: - --artifact-dir=$(ARTIFACTS) - --branch=master - --give-pr-author-access-to-namespace=true - - --lease-server=http://boskos + - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson + - --kubeconfig=/etc/apici/kubeconfig + - --lease-server-password-file=/etc/boskos/password + - --lease-server-username=ci + - --lease-server=https://boskos-ci.svc.ci.openshift.org - --org=openshift - --repo=origin - --resolver-address=http://ci-operator-configresolver-ci.svc.ci.openshift.org @@ -794,16 +1109,37 @@ presubmits: requests: cpu: 10m volumeMounts: + - mountPath: /etc/apici + name: apici-ci-operator-credentials + readOnly: true + - mountPath: /etc/boskos + name: boskos + readOnly: true - mountPath: /usr/local/e2e-conformance-k8s-cluster-profile name: cluster-profile - mountPath: /usr/local/e2e-conformance-k8s name: job-definition subPath: cluster-launch-installer-src.yaml + - mountPath: /etc/pull-secret + name: pull-secret + readOnly: true - mountPath: /etc/sentry-dsn name: sentry-dsn readOnly: true serviceAccountName: ci-operator volumes: + - name: apici-ci-operator-credentials + secret: + items: + - key: sa.ci-operator.apici.config + path: kubeconfig + secretName: apici-ci-operator-credentials + - name: boskos + secret: + items: + - key: password + path: password + secretName: boskos-credentials - name: cluster-profile projected: sources: @@ -812,6 +1148,9 @@ presubmits: - configMap: name: prow-job-cluster-launch-installer-src name: job-definition + - name: pull-secret + secret: + secretName: regcred - name: sentry-dsn secret: secretName: sentry-dsn @@ -820,6 +1159,7 @@ presubmits: always_run: true branches: - master + cluster: ci/api-build01-ci-devcluster-openshift-com:6443 context: ci/prow/e2e-gcp decorate: true decoration_config: @@ -835,7 +1175,11 @@ presubmits: - --artifact-dir=$(ARTIFACTS) - --branch=master - --give-pr-author-access-to-namespace=true - - --lease-server=http://boskos + - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson + - --kubeconfig=/etc/apici/kubeconfig + - --lease-server-password-file=/etc/boskos/password + - --lease-server-username=ci + - --lease-server=https://boskos-ci.svc.ci.openshift.org - --org=openshift - --repo=origin - --resolver-address=http://ci-operator-configresolver-ci.svc.ci.openshift.org @@ -864,16 +1208,37 @@ presubmits: requests: cpu: 10m volumeMounts: + - mountPath: /etc/apici + name: apici-ci-operator-credentials + readOnly: true + - mountPath: /etc/boskos + name: boskos + readOnly: true - mountPath: /usr/local/e2e-gcp-cluster-profile name: cluster-profile - mountPath: /usr/local/e2e-gcp name: job-definition subPath: cluster-launch-installer-e2e.yaml + - mountPath: /etc/pull-secret + name: pull-secret + readOnly: true - mountPath: /etc/sentry-dsn name: sentry-dsn readOnly: true serviceAccountName: ci-operator volumes: + - name: apici-ci-operator-credentials + secret: + items: + - key: sa.ci-operator.apici.config + path: kubeconfig + secretName: apici-ci-operator-credentials + - name: boskos + secret: + items: + - key: password + path: password + secretName: boskos-credentials - name: cluster-profile projected: sources: @@ -884,6 +1249,9 @@ presubmits: - configMap: name: prow-job-cluster-launch-installer-e2e name: job-definition + - name: pull-secret + secret: + secretName: regcred - name: sentry-dsn secret: secretName: sentry-dsn @@ -892,6 +1260,7 @@ presubmits: always_run: false branches: - master + cluster: ci/api-build01-ci-devcluster-openshift-com:6443 context: ci/prow/e2e-gcp-builds decorate: true decoration_config: @@ -908,7 +1277,11 @@ presubmits: - --artifact-dir=$(ARTIFACTS) - --branch=master - --give-pr-author-access-to-namespace=true - - --lease-server=http://boskos + - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson + - --kubeconfig=/etc/apici/kubeconfig + - --lease-server-password-file=/etc/boskos/password + - --lease-server-username=ci + - --lease-server=https://boskos-ci.svc.ci.openshift.org - --org=openshift - --repo=origin - --resolver-address=http://ci-operator-configresolver-ci.svc.ci.openshift.org @@ -937,16 +1310,37 @@ presubmits: requests: cpu: 10m volumeMounts: + - mountPath: /etc/apici + name: apici-ci-operator-credentials + readOnly: true + - mountPath: /etc/boskos + name: boskos + readOnly: true - mountPath: /usr/local/e2e-gcp-builds-cluster-profile name: cluster-profile - mountPath: /usr/local/e2e-gcp-builds name: job-definition subPath: cluster-launch-installer-e2e.yaml + - mountPath: /etc/pull-secret + name: pull-secret + readOnly: true - mountPath: /etc/sentry-dsn name: sentry-dsn readOnly: true serviceAccountName: ci-operator volumes: + - name: apici-ci-operator-credentials + secret: + items: + - key: sa.ci-operator.apici.config + path: kubeconfig + secretName: apici-ci-operator-credentials + - name: boskos + secret: + items: + - key: password + path: password + secretName: boskos-credentials - name: cluster-profile projected: sources: @@ -957,6 +1351,9 @@ presubmits: - configMap: name: prow-job-cluster-launch-installer-e2e name: job-definition + - name: pull-secret + secret: + secretName: regcred - name: sentry-dsn secret: secretName: sentry-dsn @@ -965,6 +1362,7 @@ presubmits: always_run: false branches: - master + cluster: ci/api-build01-ci-devcluster-openshift-com:6443 context: ci/prow/e2e-gcp-image-ecosystem decorate: true decoration_config: @@ -981,7 +1379,11 @@ presubmits: - --artifact-dir=$(ARTIFACTS) - --branch=master - --give-pr-author-access-to-namespace=true - - --lease-server=http://boskos + - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson + - --kubeconfig=/etc/apici/kubeconfig + - --lease-server-password-file=/etc/boskos/password + - --lease-server-username=ci + - --lease-server=https://boskos-ci.svc.ci.openshift.org - --org=openshift - --repo=origin - --resolver-address=http://ci-operator-configresolver-ci.svc.ci.openshift.org @@ -1010,16 +1412,37 @@ presubmits: requests: cpu: 10m volumeMounts: + - mountPath: /etc/apici + name: apici-ci-operator-credentials + readOnly: true + - mountPath: /etc/boskos + name: boskos + readOnly: true - mountPath: /usr/local/e2e-gcp-image-ecosystem-cluster-profile name: cluster-profile - mountPath: /usr/local/e2e-gcp-image-ecosystem name: job-definition subPath: cluster-launch-installer-e2e.yaml + - mountPath: /etc/pull-secret + name: pull-secret + readOnly: true - mountPath: /etc/sentry-dsn name: sentry-dsn readOnly: true serviceAccountName: ci-operator volumes: + - name: apici-ci-operator-credentials + secret: + items: + - key: sa.ci-operator.apici.config + path: kubeconfig + secretName: apici-ci-operator-credentials + - name: boskos + secret: + items: + - key: password + path: password + secretName: boskos-credentials - name: cluster-profile projected: sources: @@ -1030,6 +1453,9 @@ presubmits: - configMap: name: prow-job-cluster-launch-installer-e2e name: job-definition + - name: pull-secret + secret: + secretName: regcred - name: sentry-dsn secret: secretName: sentry-dsn @@ -1038,6 +1464,7 @@ presubmits: always_run: true branches: - master + cluster: ci/api-build01-ci-devcluster-openshift-com:6443 context: ci/prow/e2e-gcp-upgrade decorate: true decoration_config: @@ -1053,7 +1480,11 @@ presubmits: - --artifact-dir=$(ARTIFACTS) - --branch=master - --give-pr-author-access-to-namespace=true - - --lease-server=http://boskos + - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson + - --kubeconfig=/etc/apici/kubeconfig + - --lease-server-password-file=/etc/boskos/password + - --lease-server-username=ci + - --lease-server=https://boskos-ci.svc.ci.openshift.org - --org=openshift - --repo=origin - --resolver-address=http://ci-operator-configresolver-ci.svc.ci.openshift.org @@ -1075,13 +1506,34 @@ presubmits: requests: cpu: 10m volumeMounts: + - mountPath: /etc/apici + name: apici-ci-operator-credentials + readOnly: true + - mountPath: /etc/boskos + name: boskos + readOnly: true - mountPath: /usr/local/e2e-gcp-upgrade-cluster-profile name: cluster-profile + - mountPath: /etc/pull-secret + name: pull-secret + readOnly: true - mountPath: /etc/sentry-dsn name: sentry-dsn readOnly: true serviceAccountName: ci-operator volumes: + - name: apici-ci-operator-credentials + secret: + items: + - key: sa.ci-operator.apici.config + path: kubeconfig + secretName: apici-ci-operator-credentials + - name: boskos + secret: + items: + - key: password + path: password + secretName: boskos-credentials - name: cluster-profile projected: sources: @@ -1089,6 +1541,9 @@ presubmits: name: cluster-secrets-gcp - configMap: name: cluster-profile-gcp + - name: pull-secret + secret: + secretName: regcred - name: sentry-dsn secret: secretName: sentry-dsn @@ -1097,6 +1552,7 @@ presubmits: always_run: false branches: - master + cluster: ci/api-build01-ci-devcluster-openshift-com:6443 context: ci/prow/e2e-vsphere decorate: true decoration_config: @@ -1113,7 +1569,11 @@ presubmits: - --artifact-dir=$(ARTIFACTS) - --branch=master - --give-pr-author-access-to-namespace=true - - --lease-server=http://boskos + - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson + - --kubeconfig=/etc/apici/kubeconfig + - --lease-server-password-file=/etc/boskos/password + - --lease-server-username=ci + - --lease-server=https://boskos-ci.svc.ci.openshift.org - --org=openshift - --repo=origin - --resolver-address=http://ci-operator-configresolver-ci.svc.ci.openshift.org @@ -1142,16 +1602,37 @@ presubmits: requests: cpu: 10m volumeMounts: + - mountPath: /etc/apici + name: apici-ci-operator-credentials + readOnly: true + - mountPath: /etc/boskos + name: boskos + readOnly: true - mountPath: /usr/local/e2e-vsphere-cluster-profile name: cluster-profile - mountPath: /usr/local/e2e-vsphere name: job-definition subPath: cluster-launch-installer-upi-e2e.yaml + - mountPath: /etc/pull-secret + name: pull-secret + readOnly: true - mountPath: /etc/sentry-dsn name: sentry-dsn readOnly: true serviceAccountName: ci-operator volumes: + - name: apici-ci-operator-credentials + secret: + items: + - key: sa.ci-operator.apici.config + path: kubeconfig + secretName: apici-ci-operator-credentials + - name: boskos + secret: + items: + - key: password + path: password + secretName: boskos-credentials - name: cluster-profile projected: sources: @@ -1160,6 +1641,9 @@ presubmits: - configMap: name: prow-job-cluster-launch-installer-upi-e2e name: job-definition + - name: pull-secret + secret: + secretName: regcred - name: sentry-dsn secret: secretName: sentry-dsn @@ -1168,6 +1652,7 @@ presubmits: always_run: true branches: - master + cluster: ci/api-build01-ci-devcluster-openshift-com:6443 context: ci/prow/images decorate: true decoration_config: @@ -1183,6 +1668,8 @@ presubmits: - --artifact-dir=$(ARTIFACTS) - --branch=master - --give-pr-author-access-to-namespace=true + - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson + - --kubeconfig=/etc/apici/kubeconfig - --org=openshift - --repo=origin - --resolver-address=http://ci-operator-configresolver-ci.svc.ci.openshift.org @@ -1205,11 +1692,26 @@ presubmits: requests: cpu: 10m volumeMounts: + - mountPath: /etc/apici + name: apici-ci-operator-credentials + readOnly: true + - mountPath: /etc/pull-secret + name: pull-secret + readOnly: true - mountPath: /etc/sentry-dsn name: sentry-dsn readOnly: true serviceAccountName: ci-operator volumes: + - name: apici-ci-operator-credentials + secret: + items: + - key: sa.ci-operator.apici.config + path: kubeconfig + secretName: apici-ci-operator-credentials + - name: pull-secret + secret: + secretName: regcred - name: sentry-dsn secret: secretName: sentry-dsn @@ -1218,6 +1720,7 @@ presubmits: always_run: false branches: - master + cluster: ci/api-build01-ci-devcluster-openshift-com:6443 context: ci/prow/launch-vsphere decorate: true decoration_config: @@ -1234,7 +1737,11 @@ presubmits: - --artifact-dir=$(ARTIFACTS) - --branch=master - --give-pr-author-access-to-namespace=true - - --lease-server=http://boskos + - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson + - --kubeconfig=/etc/apici/kubeconfig + - --lease-server-password-file=/etc/boskos/password + - --lease-server-username=ci + - --lease-server=https://boskos-ci.svc.ci.openshift.org - --org=openshift - --repo=origin - --resolver-address=http://ci-operator-configresolver-ci.svc.ci.openshift.org @@ -1263,16 +1770,37 @@ presubmits: requests: cpu: 10m volumeMounts: + - mountPath: /etc/apici + name: apici-ci-operator-credentials + readOnly: true + - mountPath: /etc/boskos + name: boskos + readOnly: true - mountPath: /usr/local/launch-vsphere-cluster-profile name: cluster-profile - mountPath: /usr/local/launch-vsphere name: job-definition subPath: cluster-launch-installer-upi-e2e.yaml + - mountPath: /etc/pull-secret + name: pull-secret + readOnly: true - mountPath: /etc/sentry-dsn name: sentry-dsn readOnly: true serviceAccountName: ci-operator volumes: + - name: apici-ci-operator-credentials + secret: + items: + - key: sa.ci-operator.apici.config + path: kubeconfig + secretName: apici-ci-operator-credentials + - name: boskos + secret: + items: + - key: password + path: password + secretName: boskos-credentials - name: cluster-profile projected: sources: @@ -1281,6 +1809,9 @@ presubmits: - configMap: name: prow-job-cluster-launch-installer-upi-e2e name: job-definition + - name: pull-secret + secret: + secretName: regcred - name: sentry-dsn secret: secretName: sentry-dsn @@ -1289,6 +1820,7 @@ presubmits: always_run: true branches: - master + cluster: ci/api-build01-ci-devcluster-openshift-com:6443 context: ci/prow/unit decorate: true decoration_config: @@ -1304,6 +1836,8 @@ presubmits: - --artifact-dir=$(ARTIFACTS) - --branch=master - --give-pr-author-access-to-namespace=true + - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson + - --kubeconfig=/etc/apici/kubeconfig - --org=openshift - --repo=origin - --resolver-address=http://ci-operator-configresolver-ci.svc.ci.openshift.org @@ -1324,11 +1858,26 @@ presubmits: requests: cpu: 10m volumeMounts: + - mountPath: /etc/apici + name: apici-ci-operator-credentials + readOnly: true + - mountPath: /etc/pull-secret + name: pull-secret + readOnly: true - mountPath: /etc/sentry-dsn name: sentry-dsn readOnly: true serviceAccountName: ci-operator volumes: + - name: apici-ci-operator-credentials + secret: + items: + - key: sa.ci-operator.apici.config + path: kubeconfig + secretName: apici-ci-operator-credentials + - name: pull-secret + secret: + secretName: regcred - name: sentry-dsn secret: secretName: sentry-dsn @@ -1337,6 +1886,7 @@ presubmits: always_run: true branches: - master + cluster: ci/api-build01-ci-devcluster-openshift-com:6443 context: ci/prow/verify decorate: true decoration_config: @@ -1352,6 +1902,8 @@ presubmits: - --artifact-dir=$(ARTIFACTS) - --branch=master - --give-pr-author-access-to-namespace=true + - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson + - --kubeconfig=/etc/apici/kubeconfig - --org=openshift - --repo=origin - --resolver-address=http://ci-operator-configresolver-ci.svc.ci.openshift.org @@ -1372,11 +1924,26 @@ presubmits: requests: cpu: 10m volumeMounts: + - mountPath: /etc/apici + name: apici-ci-operator-credentials + readOnly: true + - mountPath: /etc/pull-secret + name: pull-secret + readOnly: true - mountPath: /etc/sentry-dsn name: sentry-dsn readOnly: true serviceAccountName: ci-operator volumes: + - name: apici-ci-operator-credentials + secret: + items: + - key: sa.ci-operator.apici.config + path: kubeconfig + secretName: apici-ci-operator-credentials + - name: pull-secret + secret: + secretName: regcred - name: sentry-dsn secret: secretName: sentry-dsn