diff --git a/ci-operator/config/openshift/meta-cluster-api-operator/OWNERS b/ci-operator/config/openshift/cluster-capi-operator/OWNERS similarity index 100% rename from ci-operator/config/openshift/meta-cluster-api-operator/OWNERS rename to ci-operator/config/openshift/cluster-capi-operator/OWNERS diff --git a/ci-operator/config/openshift/cluster-capi-operator/openshift-cluster-capi-operator-main.yaml b/ci-operator/config/openshift/cluster-capi-operator/openshift-cluster-capi-operator-main.yaml new file mode 100644 index 0000000000000..9551df0cd55ed --- /dev/null +++ b/ci-operator/config/openshift/cluster-capi-operator/openshift-cluster-capi-operator-main.yaml @@ -0,0 +1,68 @@ +base_images: + base: + name: "4.10" + namespace: ocp + tag: base + ocp_builder_rhel-8-golang-1.16-openshift-4.10: + name: builder + namespace: ocp + tag: rhel-8-golang-1.16-openshift-4.10 +binary_build_commands: go build -o bin/cluster-capi-operator cmd/cluster-capi-operator +build_root: + image_stream_tag: + name: release + namespace: openshift + tag: golang-1.16 +images: +- dockerfile_path: Dockerfile.rhel + from: base + inputs: + ocp_builder_rhel-8-golang-1.16-openshift-4.10: + as: + - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.16-openshift-4.10 + to: cluster-capi-operator +- from: src + inputs: + ocp_builder_rhel-8-golang-1.16-openshift-4.10: + as: + - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.16-openshift-4.10 + to: cluster-capi-operator-src +promotion: + name: "4.10" + namespace: ocp +releases: + initial: + integration: + name: "4.10" + namespace: ocp + latest: + integration: + include_built_images: true + name: "4.10" + namespace: ocp +resources: + '*': + limits: + memory: 4Gi + requests: + cpu: 100m + memory: 200Mi +tests: +- as: lint + commands: | + make fmt + make vet + container: + from: src +- as: vendor + commands: make verify-vendor + container: + from: src +- as: unit + commands: make unit + container: + from: src +zz_generated_metadata: + branch: main + org: openshift + repo: cluster-capi-operator diff --git a/ci-operator/jobs/openshift/meta-cluster-api-operator/OWNERS b/ci-operator/jobs/openshift/cluster-capi-operator/OWNERS similarity index 100% rename from ci-operator/jobs/openshift/meta-cluster-api-operator/OWNERS rename to ci-operator/jobs/openshift/cluster-capi-operator/OWNERS diff --git a/ci-operator/jobs/openshift/cluster-capi-operator/openshift-cluster-capi-operator-main-postsubmits.yaml b/ci-operator/jobs/openshift/cluster-capi-operator/openshift-cluster-capi-operator-main-postsubmits.yaml new file mode 100644 index 0000000000000..a846b31890596 --- /dev/null +++ b/ci-operator/jobs/openshift/cluster-capi-operator/openshift-cluster-capi-operator-main-postsubmits.yaml @@ -0,0 +1,55 @@ +postsubmits: + openshift/cluster-capi-operator: + - agent: kubernetes + branches: + - ^main$ + cluster: build02 + decorate: true + decoration_config: + skip_cloning: true + labels: + ci-operator.openshift.io/is-promotion: "true" + ci.openshift.io/generator: prowgen + max_concurrency: 1 + name: branch-ci-openshift-cluster-capi-operator-main-images + 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 diff --git a/ci-operator/jobs/openshift/cluster-capi-operator/openshift-cluster-capi-operator-main-presubmits.yaml b/ci-operator/jobs/openshift/cluster-capi-operator/openshift-cluster-capi-operator-main-presubmits.yaml new file mode 100644 index 0000000000000..6dd1565ab5d08 --- /dev/null +++ b/ci-operator/jobs/openshift/cluster-capi-operator/openshift-cluster-capi-operator-main-presubmits.yaml @@ -0,0 +1,199 @@ +presubmits: + openshift/cluster-capi-operator: + - agent: kubernetes + always_run: true + branches: + - ^main$ + - ^main- + cluster: build01 + context: ci/prow/images + decorate: true + decoration_config: + skip_cloning: true + labels: + ci.openshift.io/generator: prowgen + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-openshift-cluster-capi-operator-main-images + 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.*) + - agent: kubernetes + always_run: true + branches: + - ^main$ + - ^main- + cluster: build01 + context: ci/prow/lint + decorate: true + decoration_config: + skip_cloning: true + labels: + ci.openshift.io/generator: prowgen + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-openshift-cluster-capi-operator-main-lint + rerun_command: /test lint + 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=lint + 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( | .* )lint,?($|\s.*) + - agent: kubernetes + always_run: true + branches: + - ^main$ + - ^main- + cluster: build01 + context: ci/prow/unit + decorate: true + decoration_config: + skip_cloning: true + labels: + ci.openshift.io/generator: prowgen + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-openshift-cluster-capi-operator-main-unit + rerun_command: /test unit + 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=unit + 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( | .* )unit,?($|\s.*) + - agent: kubernetes + always_run: true + branches: + - ^main$ + - ^main- + cluster: build01 + context: ci/prow/vendor + decorate: true + decoration_config: + skip_cloning: true + labels: + ci.openshift.io/generator: prowgen + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-openshift-cluster-capi-operator-main-vendor + rerun_command: /test vendor + 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=vendor + 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( | .* )vendor,?($|\s.*) diff --git a/core-services/image-mirroring/openshift/mapping_origin_4_10 b/core-services/image-mirroring/openshift/mapping_origin_4_10 index c1a5dcc0e9140..ce962f00e982c 100644 --- a/core-services/image-mirroring/openshift/mapping_origin_4_10 +++ b/core-services/image-mirroring/openshift/mapping_origin_4_10 @@ -43,6 +43,8 @@ registry.ci.openshift.org/origin/4.10:cluster-autoscaler-operator quay.io/opensh registry.ci.openshift.org/origin/4.10:cluster-baremetal-operator quay.io/openshift/origin-cluster-baremetal-operator:4.10 quay.io/openshift/origin-cluster-baremetal-operator:4.10.0 quay.io/openshift/origin-cluster-baremetal-operator:latest registry.ci.openshift.org/origin/4.10:cluster-bootstrap quay.io/openshift/origin-cluster-bootstrap:4.10 quay.io/openshift/origin-cluster-bootstrap:4.10.0 quay.io/openshift/origin-cluster-bootstrap:latest registry.ci.openshift.org/origin/4.10:cluster-capacity quay.io/openshift/origin-cluster-capacity:4.10 quay.io/openshift/origin-cluster-capacity:4.10.0 quay.io/openshift/origin-cluster-capacity:latest +registry.ci.openshift.org/origin/4.10:cluster-capi-operator quay.io/openshift/origin-cluster-capi-operator:4.10 quay.io/openshift/origin-cluster-capi-operator:4.10.0 quay.io/openshift/origin-cluster-capi-operator:latest +registry.ci.openshift.org/origin/4.10:cluster-capi-operator-src quay.io/openshift/origin-cluster-capi-operator-src:4.10 quay.io/openshift/origin-cluster-capi-operator-src:4.10.0 quay.io/openshift/origin-cluster-capi-operator-src:latest registry.ci.openshift.org/origin/4.10:cluster-cloud-controller-manager-operator quay.io/openshift/origin-cluster-cloud-controller-manager-operator:4.10 quay.io/openshift/origin-cluster-cloud-controller-manager-operator:4.10.0 quay.io/openshift/origin-cluster-cloud-controller-manager-operator:latest registry.ci.openshift.org/origin/4.10:cluster-cloud-controller-manager-operator-src quay.io/openshift/origin-cluster-cloud-controller-manager-operator-src:4.10 quay.io/openshift/origin-cluster-cloud-controller-manager-operator-src:4.10.0 quay.io/openshift/origin-cluster-cloud-controller-manager-operator-src:latest registry.ci.openshift.org/origin/4.10:cluster-config-operator quay.io/openshift/origin-cluster-config-operator:4.10 quay.io/openshift/origin-cluster-config-operator:4.10.0 quay.io/openshift/origin-cluster-config-operator:latest diff --git a/core-services/prow/02_config/openshift/meta-cluster-api-operator/OWNERS b/core-services/prow/02_config/openshift/cluster-capi-operator/OWNERS similarity index 100% rename from core-services/prow/02_config/openshift/meta-cluster-api-operator/OWNERS rename to core-services/prow/02_config/openshift/cluster-capi-operator/OWNERS diff --git a/core-services/prow/02_config/openshift/meta-cluster-api-operator/_pluginconfig.yaml b/core-services/prow/02_config/openshift/cluster-capi-operator/_pluginconfig.yaml similarity index 55% rename from core-services/prow/02_config/openshift/meta-cluster-api-operator/_pluginconfig.yaml rename to core-services/prow/02_config/openshift/cluster-capi-operator/_pluginconfig.yaml index a23339af0d2eb..f2d605301b234 100644 --- a/core-services/prow/02_config/openshift/meta-cluster-api-operator/_pluginconfig.yaml +++ b/core-services/prow/02_config/openshift/cluster-capi-operator/_pluginconfig.yaml @@ -1,13 +1,13 @@ approve: - commandHelpLink: "" repos: - - openshift/meta-cluster-api-operator + - openshift/cluster-capi-operator require_self_approval: true lgtm: - repos: - - openshift/meta-cluster-api-operator + - openshift/cluster-capi-operator review_acts_as_lgtm: true plugins: - openshift/meta-cluster-api-operator: + openshift/cluster-capi-operator: plugins: - approve diff --git a/core-services/prow/02_config/openshift/meta-cluster-api-operator/_prowconfig.yaml b/core-services/prow/02_config/openshift/cluster-capi-operator/_prowconfig.yaml similarity index 92% rename from core-services/prow/02_config/openshift/meta-cluster-api-operator/_prowconfig.yaml rename to core-services/prow/02_config/openshift/cluster-capi-operator/_prowconfig.yaml index c36236369cf18..99eb6da7f7205 100644 --- a/core-services/prow/02_config/openshift/meta-cluster-api-operator/_prowconfig.yaml +++ b/core-services/prow/02_config/openshift/cluster-capi-operator/_prowconfig.yaml @@ -34,7 +34,7 @@ tide: - do-not-merge/work-in-progress - needs-rebase repos: - - openshift/meta-cluster-api-operator + - openshift/cluster-capi-operator - includedBranches: - openshift-4.9 - release-4.9 @@ -51,7 +51,7 @@ tide: - do-not-merge/work-in-progress - needs-rebase repos: - - openshift/meta-cluster-api-operator + - openshift/cluster-capi-operator - includedBranches: - main - master @@ -67,7 +67,7 @@ tide: - keep-main-query-separate - needs-rebase repos: - - openshift/meta-cluster-api-operator + - openshift/cluster-capi-operator - excludedBranches: - feature-es6x - feature-prom-connector @@ -104,4 +104,4 @@ tide: - do-not-merge/work-in-progress - needs-rebase repos: - - openshift/meta-cluster-api-operator + - openshift/cluster-capi-operator