Skip to content

Commit 98f93b6

Browse files
authored
CORS-3704: Create new tech preview job for user provisioned DNS installs (GCP) (openshift#58077)
1 parent f85e7d3 commit 98f93b6

File tree

6 files changed

+184
-0
lines changed

6 files changed

+184
-0
lines changed

ci-operator/config/openshift/installer/openshift-installer-master.yaml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -475,6 +475,16 @@ tests:
475475
FEATURE_SET: TechPreviewNoUpgrade
476476
workflow: openshift-e2e-gcp
477477
timeout: 6h0m0s
478+
- always_run: false
479+
as: e2e-gcp-user-provisioned-dns
480+
optional: true
481+
steps:
482+
cluster_profile: gcp
483+
env:
484+
FEATURE_SET: TechPreviewNoUpgrade
485+
USER_PROVISIONED_DNS: "yes"
486+
workflow: openshift-e2e-gcp
487+
timeout: 6h0m0s
478488
- as: e2e-gcp-secureboot
479489
optional: true
480490
run_if_changed: (gcp|google)

ci-operator/config/openshift/installer/openshift-installer-release-4.18.yaml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -475,6 +475,16 @@ tests:
475475
FEATURE_SET: TechPreviewNoUpgrade
476476
workflow: openshift-e2e-gcp
477477
timeout: 6h0m0s
478+
- always_run: false
479+
as: e2e-gcp-user-provisioned-dns
480+
optional: true
481+
steps:
482+
cluster_profile: gcp
483+
env:
484+
FEATURE_SET: TechPreviewNoUpgrade
485+
USER_PROVISIONED_DNS: "yes"
486+
workflow: openshift-e2e-gcp
487+
timeout: 6h0m0s
478488
- as: e2e-gcp-secureboot
479489
optional: true
480490
run_if_changed: (gcp|google)

ci-operator/jobs/openshift/installer/openshift-installer-master-presubmits.yaml

Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6417,6 +6417,81 @@ presubmits:
64176417
secret:
64186418
secretName: result-aggregator
64196419
trigger: (?m)^/test( | .* )e2e-gcp-upi-xpn,?($|\s.*)
6420+
- agent: kubernetes
6421+
always_run: false
6422+
branches:
6423+
- ^master$
6424+
- ^master-
6425+
cluster: build02
6426+
context: ci/prow/e2e-gcp-user-provisioned-dns
6427+
decorate: true
6428+
decoration_config:
6429+
timeout: 6h0m0s
6430+
labels:
6431+
ci-operator.openshift.io/cloud: gcp
6432+
ci-operator.openshift.io/cloud-cluster-profile: gcp
6433+
ci.openshift.io/generator: prowgen
6434+
pj-rehearse.openshift.io/can-be-rehearsed: "true"
6435+
name: pull-ci-openshift-installer-master-e2e-gcp-user-provisioned-dns
6436+
optional: true
6437+
rerun_command: /test e2e-gcp-user-provisioned-dns
6438+
spec:
6439+
containers:
6440+
- args:
6441+
- --gcs-upload-secret=/secrets/gcs/service-account.json
6442+
- --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
6443+
- --lease-server-credentials-file=/etc/boskos/credentials
6444+
- --report-credentials-file=/etc/report/credentials
6445+
- --secret-dir=/secrets/ci-pull-credentials
6446+
- --target=e2e-gcp-user-provisioned-dns
6447+
command:
6448+
- ci-operator
6449+
image: ci-operator:latest
6450+
imagePullPolicy: Always
6451+
name: ""
6452+
resources:
6453+
requests:
6454+
cpu: 10m
6455+
volumeMounts:
6456+
- mountPath: /etc/boskos
6457+
name: boskos
6458+
readOnly: true
6459+
- mountPath: /secrets/ci-pull-credentials
6460+
name: ci-pull-credentials
6461+
readOnly: true
6462+
- mountPath: /secrets/gcs
6463+
name: gcs-credentials
6464+
readOnly: true
6465+
- mountPath: /secrets/manifest-tool
6466+
name: manifest-tool-local-pusher
6467+
readOnly: true
6468+
- mountPath: /etc/pull-secret
6469+
name: pull-secret
6470+
readOnly: true
6471+
- mountPath: /etc/report
6472+
name: result-aggregator
6473+
readOnly: true
6474+
serviceAccountName: ci-operator
6475+
volumes:
6476+
- name: boskos
6477+
secret:
6478+
items:
6479+
- key: credentials
6480+
path: credentials
6481+
secretName: boskos-credentials
6482+
- name: ci-pull-credentials
6483+
secret:
6484+
secretName: ci-pull-credentials
6485+
- name: manifest-tool-local-pusher
6486+
secret:
6487+
secretName: manifest-tool-local-pusher
6488+
- name: pull-secret
6489+
secret:
6490+
secretName: registry-pull-credentials
6491+
- name: result-aggregator
6492+
secret:
6493+
secretName: result-aggregator
6494+
trigger: (?m)^/test( | .* )e2e-gcp-user-provisioned-dns,?($|\s.*)
64206495
- agent: kubernetes
64216496
always_run: false
64226497
branches:

ci-operator/jobs/openshift/installer/openshift-installer-release-4.18-presubmits.yaml

Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6414,6 +6414,81 @@ presubmits:
64146414
secret:
64156415
secretName: result-aggregator
64166416
trigger: (?m)^/test( | .* )e2e-gcp-upi-xpn,?($|\s.*)
6417+
- agent: kubernetes
6418+
always_run: false
6419+
branches:
6420+
- ^release-4\.18$
6421+
- ^release-4\.18-
6422+
cluster: build02
6423+
context: ci/prow/e2e-gcp-user-provisioned-dns
6424+
decorate: true
6425+
decoration_config:
6426+
timeout: 6h0m0s
6427+
labels:
6428+
ci-operator.openshift.io/cloud: gcp
6429+
ci-operator.openshift.io/cloud-cluster-profile: gcp
6430+
ci.openshift.io/generator: prowgen
6431+
pj-rehearse.openshift.io/can-be-rehearsed: "true"
6432+
name: pull-ci-openshift-installer-release-4.18-e2e-gcp-user-provisioned-dns
6433+
optional: true
6434+
rerun_command: /test e2e-gcp-user-provisioned-dns
6435+
spec:
6436+
containers:
6437+
- args:
6438+
- --gcs-upload-secret=/secrets/gcs/service-account.json
6439+
- --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
6440+
- --lease-server-credentials-file=/etc/boskos/credentials
6441+
- --report-credentials-file=/etc/report/credentials
6442+
- --secret-dir=/secrets/ci-pull-credentials
6443+
- --target=e2e-gcp-user-provisioned-dns
6444+
command:
6445+
- ci-operator
6446+
image: ci-operator:latest
6447+
imagePullPolicy: Always
6448+
name: ""
6449+
resources:
6450+
requests:
6451+
cpu: 10m
6452+
volumeMounts:
6453+
- mountPath: /etc/boskos
6454+
name: boskos
6455+
readOnly: true
6456+
- mountPath: /secrets/ci-pull-credentials
6457+
name: ci-pull-credentials
6458+
readOnly: true
6459+
- mountPath: /secrets/gcs
6460+
name: gcs-credentials
6461+
readOnly: true
6462+
- mountPath: /secrets/manifest-tool
6463+
name: manifest-tool-local-pusher
6464+
readOnly: true
6465+
- mountPath: /etc/pull-secret
6466+
name: pull-secret
6467+
readOnly: true
6468+
- mountPath: /etc/report
6469+
name: result-aggregator
6470+
readOnly: true
6471+
serviceAccountName: ci-operator
6472+
volumes:
6473+
- name: boskos
6474+
secret:
6475+
items:
6476+
- key: credentials
6477+
path: credentials
6478+
secretName: boskos-credentials
6479+
- name: ci-pull-credentials
6480+
secret:
6481+
secretName: ci-pull-credentials
6482+
- name: manifest-tool-local-pusher
6483+
secret:
6484+
secretName: manifest-tool-local-pusher
6485+
- name: pull-secret
6486+
secret:
6487+
secretName: registry-pull-credentials
6488+
- name: result-aggregator
6489+
secret:
6490+
secretName: result-aggregator
6491+
trigger: (?m)^/test( | .* )e2e-gcp-user-provisioned-dns,?($|\s.*)
64176492
- agent: kubernetes
64186493
always_run: false
64196494
branches:

ci-operator/step-registry/ipi/conf/gcp/ipi-conf-gcp-commands.sh

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,3 +131,13 @@ fi
131131
# yq-go m -x -i "${CONFIG}" "${PATCH}"
132132
# rm "${PATCH}"
133133
# fi
134+
135+
if [[ "${USER_PROVISIONED_DNS}" == "yes" ]]; then
136+
patch_user_provisioned_dns="${SHARED_DIR}/install-config-user-provisioned-dns.yaml.patch"
137+
cat > "${patch_user_provisioned_dns}" << EOF
138+
platform:
139+
gcp:
140+
userProvisionedDNS: Enabled
141+
EOF
142+
yq-go m -a -x -i "${CONFIG}" "${patch_user_provisioned_dns}"
143+
fi

ci-operator/step-registry/ipi/conf/gcp/ipi-conf-gcp-ref.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,10 @@ ref:
6868
default: "false"
6969
documentation: |-
7070
This flag forces the installation of real-time kernel to worker nodes.
71+
- name: USER_PROVISIONED_DNS
72+
default: ""
73+
documentation: |-
74+
Allow users to select the user provisioned dns option for GCP installations during configuration.
7175
documentation: >-
7276
This step configures an install-config.yaml file to depoloy to the GCP CI project.
7377
An existing install-config.yaml file should already exist in the shared directory.

0 commit comments

Comments
 (0)