Skip to content

Commit 6105a66

Browse files
barbacbdbarbacbd
committed
CORS-3699: Create new tech preview job for user provisioned DNS installs (Aws)
1 parent 58b05c8 commit 6105a66

6 files changed

+194
-0
lines changed

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

+10
Original file line numberDiff line numberDiff line change
@@ -380,6 +380,16 @@ tests:
380380
cluster_profile: aws
381381
workflow: openshift-e2e-aws-upi-proxy
382382
timeout: 6h0m0s
383+
- always_run: false
384+
as: e2e-aws-user-provisioned-dns
385+
optional: true
386+
steps:
387+
cluster_profile: aws
388+
env:
389+
FEATURE_SET: TechPreviewNoUpgrade
390+
USER_PROVISIONED_DNS: "yes"
391+
workflow: openshift-e2e-aws
392+
timeout: 6h0m0s
383393
- as: e2e-aws-ovn-shared-vpc-custom-security-groups
384394
optional: true
385395
run_if_changed: aws

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

+10
Original file line numberDiff line numberDiff line change
@@ -374,6 +374,16 @@ tests:
374374
cluster_profile: aws
375375
workflow: openshift-e2e-aws-proxy
376376
timeout: 6h0m0s
377+
- always_run: false
378+
as: e2e-aws-user-provisioned-dns
379+
optional: true
380+
steps:
381+
cluster_profile: aws
382+
env:
383+
FEATURE_SET: TechPreviewNoUpgrade
384+
USER_PROVISIONED_DNS: "yes"
385+
workflow: openshift-e2e-aws
386+
timeout: 6h0m0s
377387
- always_run: false
378388
as: e2e-aws-upi-proxy
379389
optional: true

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

+80
Original file line numberDiff line numberDiff line change
@@ -5210,6 +5210,86 @@ presubmits:
52105210
secret:
52115211
secretName: result-aggregator
52125212
trigger: (?m)^/test( | .* )e2e-aws-upi-proxy,?($|\s.*)
5213+
- agent: kubernetes
5214+
always_run: false
5215+
branches:
5216+
- ^master$
5217+
- ^master-
5218+
context: ci/prow/e2e-aws-user-provisioned-dns
5219+
decorate: true
5220+
decoration_config:
5221+
timeout: 6h0m0s
5222+
labels:
5223+
ci-operator.openshift.io/cloud: aws
5224+
ci-operator.openshift.io/cloud-cluster-profile: aws
5225+
ci.openshift.io/generator: prowgen
5226+
pj-rehearse.openshift.io/can-be-rehearsed: "true"
5227+
name: pull-ci-openshift-installer-master-e2e-aws-user-provisioned-dns
5228+
optional: true
5229+
rerun_command: /test e2e-aws-user-provisioned-dns
5230+
spec:
5231+
containers:
5232+
- args:
5233+
- --gcs-upload-secret=/secrets/gcs/service-account.json
5234+
- --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
5235+
- --lease-server-credentials-file=/etc/boskos/credentials
5236+
- --report-credentials-file=/etc/report/credentials
5237+
- --secret-dir=/secrets/ci-pull-credentials
5238+
- --secret-dir=/usr/local/e2e-aws-user-provisioned-dns-cluster-profile
5239+
- --target=e2e-aws-user-provisioned-dns
5240+
command:
5241+
- ci-operator
5242+
image: ci-operator:latest
5243+
imagePullPolicy: Always
5244+
name: ""
5245+
resources:
5246+
requests:
5247+
cpu: 10m
5248+
volumeMounts:
5249+
- mountPath: /etc/boskos
5250+
name: boskos
5251+
readOnly: true
5252+
- mountPath: /secrets/ci-pull-credentials
5253+
name: ci-pull-credentials
5254+
readOnly: true
5255+
- mountPath: /usr/local/e2e-aws-user-provisioned-dns-cluster-profile
5256+
name: cluster-profile
5257+
- mountPath: /secrets/gcs
5258+
name: gcs-credentials
5259+
readOnly: true
5260+
- mountPath: /secrets/manifest-tool
5261+
name: manifest-tool-local-pusher
5262+
readOnly: true
5263+
- mountPath: /etc/pull-secret
5264+
name: pull-secret
5265+
readOnly: true
5266+
- mountPath: /etc/report
5267+
name: result-aggregator
5268+
readOnly: true
5269+
serviceAccountName: ci-operator
5270+
volumes:
5271+
- name: boskos
5272+
secret:
5273+
items:
5274+
- key: credentials
5275+
path: credentials
5276+
secretName: boskos-credentials
5277+
- name: ci-pull-credentials
5278+
secret:
5279+
secretName: ci-pull-credentials
5280+
- name: cluster-profile
5281+
secret:
5282+
secretName: cluster-secrets-aws
5283+
- name: manifest-tool-local-pusher
5284+
secret:
5285+
secretName: manifest-tool-local-pusher
5286+
- name: pull-secret
5287+
secret:
5288+
secretName: registry-pull-credentials
5289+
- name: result-aggregator
5290+
secret:
5291+
secretName: result-aggregator
5292+
trigger: (?m)^/test( | .* )e2e-aws-user-provisioned-dns,?($|\s.*)
52135293
- agent: kubernetes
52145294
always_run: false
52155295
branches:

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

+80
Original file line numberDiff line numberDiff line change
@@ -5208,6 +5208,86 @@ presubmits:
52085208
secret:
52095209
secretName: result-aggregator
52105210
trigger: (?m)^/test( | .* )e2e-aws-upi-proxy,?($|\s.*)
5211+
- agent: kubernetes
5212+
always_run: false
5213+
branches:
5214+
- ^release-4\.18$
5215+
- ^release-4\.18-
5216+
context: ci/prow/e2e-aws-user-provisioned-dns
5217+
decorate: true
5218+
decoration_config:
5219+
timeout: 6h0m0s
5220+
labels:
5221+
ci-operator.openshift.io/cloud: aws
5222+
ci-operator.openshift.io/cloud-cluster-profile: aws
5223+
ci.openshift.io/generator: prowgen
5224+
pj-rehearse.openshift.io/can-be-rehearsed: "true"
5225+
name: pull-ci-openshift-installer-release-4.18-e2e-aws-user-provisioned-dns
5226+
optional: true
5227+
rerun_command: /test e2e-aws-user-provisioned-dns
5228+
spec:
5229+
containers:
5230+
- args:
5231+
- --gcs-upload-secret=/secrets/gcs/service-account.json
5232+
- --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
5233+
- --lease-server-credentials-file=/etc/boskos/credentials
5234+
- --report-credentials-file=/etc/report/credentials
5235+
- --secret-dir=/secrets/ci-pull-credentials
5236+
- --secret-dir=/usr/local/e2e-aws-user-provisioned-dns-cluster-profile
5237+
- --target=e2e-aws-user-provisioned-dns
5238+
command:
5239+
- ci-operator
5240+
image: ci-operator:latest
5241+
imagePullPolicy: Always
5242+
name: ""
5243+
resources:
5244+
requests:
5245+
cpu: 10m
5246+
volumeMounts:
5247+
- mountPath: /etc/boskos
5248+
name: boskos
5249+
readOnly: true
5250+
- mountPath: /secrets/ci-pull-credentials
5251+
name: ci-pull-credentials
5252+
readOnly: true
5253+
- mountPath: /usr/local/e2e-aws-user-provisioned-dns-cluster-profile
5254+
name: cluster-profile
5255+
- mountPath: /secrets/gcs
5256+
name: gcs-credentials
5257+
readOnly: true
5258+
- mountPath: /secrets/manifest-tool
5259+
name: manifest-tool-local-pusher
5260+
readOnly: true
5261+
- mountPath: /etc/pull-secret
5262+
name: pull-secret
5263+
readOnly: true
5264+
- mountPath: /etc/report
5265+
name: result-aggregator
5266+
readOnly: true
5267+
serviceAccountName: ci-operator
5268+
volumes:
5269+
- name: boskos
5270+
secret:
5271+
items:
5272+
- key: credentials
5273+
path: credentials
5274+
secretName: boskos-credentials
5275+
- name: ci-pull-credentials
5276+
secret:
5277+
secretName: ci-pull-credentials
5278+
- name: cluster-profile
5279+
secret:
5280+
secretName: cluster-secrets-aws
5281+
- name: manifest-tool-local-pusher
5282+
secret:
5283+
secretName: manifest-tool-local-pusher
5284+
- name: pull-secret
5285+
secret:
5286+
secretName: registry-pull-credentials
5287+
- name: result-aggregator
5288+
secret:
5289+
secretName: result-aggregator
5290+
trigger: (?m)^/test( | .* )e2e-aws-user-provisioned-dns,?($|\s.*)
52115291
- agent: kubernetes
52125292
always_run: false
52135293
branches:

‎ci-operator/step-registry/ipi/conf/aws/ipi-conf-aws-commands.sh

+10
Original file line numberDiff line numberDiff line change
@@ -380,3 +380,13 @@ platform:
380380
EOF
381381
yq-go m -a -x -i "${CONFIG}" "${patch_bootstrap_ignition}"
382382
fi
383+
384+
if [[ "${USER_PROVISIONED_DNS}" == "yes" ]]; then
385+
patch_user_provisioned_dns="${SHARED_DIR}/install-config-user-provisioned-dns.yaml.patch"
386+
cat > "${patch_user_provisioned_dns}" << EOF
387+
platform:
388+
aws:
389+
userProvisionedDNS: Enabled
390+
EOF
391+
yq-go m -a -x -i "${CONFIG}" "${patch_user_provisioned_dns}"
392+
fi

‎ci-operator/step-registry/ipi/conf/aws/ipi-conf-aws-ref.yaml

+4
Original file line numberDiff line numberDiff line change
@@ -96,5 +96,9 @@ ref:
9696
default: ""
9797
documentation: |-
9898
Allow users to make S3 deletion optional
99+
- name: USER_PROVISIONED_DNS
100+
default: ""
101+
documentation: |-
102+
Allow users to select the user provisioned dns option for AWS installations during configuration.
99103
documentation: |-
100104
The IPI AWS configure step generates the AWS-specific install-config.yaml contents based on the cluster profile and optional input files.

0 commit comments

Comments
 (0)