Skip to content

Commit 7eeebc1

Browse files
barbacbdbarbacbd
committed
CORS-3699: Create new tech preview job for user provisioned DNS installs (Aws)
1 parent d7c1ed4 commit 7eeebc1

6 files changed

+187
-0
lines changed

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

+11
Original file line numberDiff line numberDiff line change
@@ -385,6 +385,17 @@ tests:
385385
AWS_INSTALL_USE_MINIMAL_PERMISSIONS: "yes"
386386
workflow: openshift-e2e-aws-upi-proxy
387387
timeout: 6h0m0s
388+
- always_run: false
389+
as: e2e-aws-ovn-user-provisioned-dns
390+
optional: true
391+
steps:
392+
cluster_profile: aws
393+
env:
394+
AWS_INSTALL_USE_MINIMAL_PERMISSIONS: "yes"
395+
FEATURE_SET: TechPreviewNoUpgrade
396+
USER_PROVISIONED_DNS: "yes"
397+
workflow: openshift-e2e-aws
398+
timeout: 6h0m0s
388399
- as: e2e-aws-ovn-shared-vpc-custom-security-groups
389400
optional: true
390401
run_if_changed: aws

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

+11
Original file line numberDiff line numberDiff line change
@@ -377,6 +377,17 @@ tests:
377377
cluster_profile: aws
378378
workflow: openshift-e2e-aws-proxy
379379
timeout: 6h0m0s
380+
- always_run: false
381+
as: e2e-aws-ovn-user-provisioned-dns
382+
optional: true
383+
steps:
384+
cluster_profile: aws
385+
env:
386+
AWS_INSTALL_USE_MINIMAL_PERMISSIONS: "yes"
387+
FEATURE_SET: TechPreviewNoUpgrade
388+
USER_PROVISIONED_DNS: "yes"
389+
workflow: openshift-e2e-aws
390+
timeout: 6h0m0s
380391
- always_run: false
381392
as: e2e-aws-upi-proxy
382393
optional: true

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

+75
Original file line numberDiff line numberDiff line change
@@ -4834,6 +4834,81 @@ presubmits:
48344834
secret:
48354835
secretName: result-aggregator
48364836
trigger: (?m)^/test( | .* )e2e-aws-ovn-upi,?($|\s.*)
4837+
- agent: kubernetes
4838+
always_run: false
4839+
branches:
4840+
- ^master$
4841+
- ^master-
4842+
cluster: build05
4843+
context: ci/prow/e2e-aws-ovn-user-provisioned-dns
4844+
decorate: true
4845+
decoration_config:
4846+
timeout: 6h0m0s
4847+
labels:
4848+
ci-operator.openshift.io/cloud: aws
4849+
ci-operator.openshift.io/cloud-cluster-profile: aws
4850+
ci.openshift.io/generator: prowgen
4851+
pj-rehearse.openshift.io/can-be-rehearsed: "true"
4852+
name: pull-ci-openshift-installer-master-e2e-aws-ovn-user-provisioned-dns
4853+
optional: true
4854+
rerun_command: /test e2e-aws-ovn-user-provisioned-dns
4855+
spec:
4856+
containers:
4857+
- args:
4858+
- --gcs-upload-secret=/secrets/gcs/service-account.json
4859+
- --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
4860+
- --lease-server-credentials-file=/etc/boskos/credentials
4861+
- --report-credentials-file=/etc/report/credentials
4862+
- --secret-dir=/secrets/ci-pull-credentials
4863+
- --target=e2e-aws-ovn-user-provisioned-dns
4864+
command:
4865+
- ci-operator
4866+
image: ci-operator:latest
4867+
imagePullPolicy: Always
4868+
name: ""
4869+
resources:
4870+
requests:
4871+
cpu: 10m
4872+
volumeMounts:
4873+
- mountPath: /etc/boskos
4874+
name: boskos
4875+
readOnly: true
4876+
- mountPath: /secrets/ci-pull-credentials
4877+
name: ci-pull-credentials
4878+
readOnly: true
4879+
- mountPath: /secrets/gcs
4880+
name: gcs-credentials
4881+
readOnly: true
4882+
- mountPath: /secrets/manifest-tool
4883+
name: manifest-tool-local-pusher
4884+
readOnly: true
4885+
- mountPath: /etc/pull-secret
4886+
name: pull-secret
4887+
readOnly: true
4888+
- mountPath: /etc/report
4889+
name: result-aggregator
4890+
readOnly: true
4891+
serviceAccountName: ci-operator
4892+
volumes:
4893+
- name: boskos
4894+
secret:
4895+
items:
4896+
- key: credentials
4897+
path: credentials
4898+
secretName: boskos-credentials
4899+
- name: ci-pull-credentials
4900+
secret:
4901+
secretName: ci-pull-credentials
4902+
- name: manifest-tool-local-pusher
4903+
secret:
4904+
secretName: manifest-tool-local-pusher
4905+
- name: pull-secret
4906+
secret:
4907+
secretName: registry-pull-credentials
4908+
- name: result-aggregator
4909+
secret:
4910+
secretName: result-aggregator
4911+
trigger: (?m)^/test( | .* )e2e-aws-ovn-user-provisioned-dns,?($|\s.*)
48374912
- agent: kubernetes
48384913
always_run: false
48394914
branches:

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

+75
Original file line numberDiff line numberDiff line change
@@ -4832,6 +4832,81 @@ presubmits:
48324832
secret:
48334833
secretName: result-aggregator
48344834
trigger: (?m)^/test( | .* )e2e-aws-ovn-upi,?($|\s.*)
4835+
- agent: kubernetes
4836+
always_run: false
4837+
branches:
4838+
- ^release-4\.18$
4839+
- ^release-4\.18-
4840+
cluster: build09
4841+
context: ci/prow/e2e-aws-ovn-user-provisioned-dns
4842+
decorate: true
4843+
decoration_config:
4844+
timeout: 6h0m0s
4845+
labels:
4846+
ci-operator.openshift.io/cloud: aws
4847+
ci-operator.openshift.io/cloud-cluster-profile: aws
4848+
ci.openshift.io/generator: prowgen
4849+
pj-rehearse.openshift.io/can-be-rehearsed: "true"
4850+
name: pull-ci-openshift-installer-release-4.18-e2e-aws-ovn-user-provisioned-dns
4851+
optional: true
4852+
rerun_command: /test e2e-aws-ovn-user-provisioned-dns
4853+
spec:
4854+
containers:
4855+
- args:
4856+
- --gcs-upload-secret=/secrets/gcs/service-account.json
4857+
- --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
4858+
- --lease-server-credentials-file=/etc/boskos/credentials
4859+
- --report-credentials-file=/etc/report/credentials
4860+
- --secret-dir=/secrets/ci-pull-credentials
4861+
- --target=e2e-aws-ovn-user-provisioned-dns
4862+
command:
4863+
- ci-operator
4864+
image: ci-operator:latest
4865+
imagePullPolicy: Always
4866+
name: ""
4867+
resources:
4868+
requests:
4869+
cpu: 10m
4870+
volumeMounts:
4871+
- mountPath: /etc/boskos
4872+
name: boskos
4873+
readOnly: true
4874+
- mountPath: /secrets/ci-pull-credentials
4875+
name: ci-pull-credentials
4876+
readOnly: true
4877+
- mountPath: /secrets/gcs
4878+
name: gcs-credentials
4879+
readOnly: true
4880+
- mountPath: /secrets/manifest-tool
4881+
name: manifest-tool-local-pusher
4882+
readOnly: true
4883+
- mountPath: /etc/pull-secret
4884+
name: pull-secret
4885+
readOnly: true
4886+
- mountPath: /etc/report
4887+
name: result-aggregator
4888+
readOnly: true
4889+
serviceAccountName: ci-operator
4890+
volumes:
4891+
- name: boskos
4892+
secret:
4893+
items:
4894+
- key: credentials
4895+
path: credentials
4896+
secretName: boskos-credentials
4897+
- name: ci-pull-credentials
4898+
secret:
4899+
secretName: ci-pull-credentials
4900+
- name: manifest-tool-local-pusher
4901+
secret:
4902+
secretName: manifest-tool-local-pusher
4903+
- name: pull-secret
4904+
secret:
4905+
secretName: registry-pull-credentials
4906+
- name: result-aggregator
4907+
secret:
4908+
secretName: result-aggregator
4909+
trigger: (?m)^/test( | .* )e2e-aws-ovn-user-provisioned-dns,?($|\s.*)
48354910
- agent: kubernetes
48364911
always_run: false
48374912
branches:

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

+10
Original file line numberDiff line numberDiff line change
@@ -375,3 +375,13 @@ platform:
375375
EOF
376376
yq-go m -a -x -i "${CONFIG}" "${patch_bootstrap_ignition}"
377377
fi
378+
379+
if [[ "${USER_PROVISIONED_DNS}" == "yes" ]]; then
380+
patch_user_provisioned_dns="${SHARED_DIR}/install-config-user-provisioned-dns.yaml.patch"
381+
cat > "${patch_user_provisioned_dns}" << EOF
382+
platform:
383+
aws:
384+
userProvisionedDNS: Enabled
385+
EOF
386+
yq-go m -a -x -i "${CONFIG}" "${patch_user_provisioned_dns}"
387+
fi

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

+5
Original file line numberDiff line numberDiff line change
@@ -96,5 +96,10 @@ ref:
9696
default: ""
9797
documentation: |-
9898
Allow users to make S3 deletion optional
99+
- name: USER_PROVISIONED_DNS
100+
default: "no"
101+
documentation: |-
102+
Allow users to select the user provisioned dns option for AWS installations during configuration. Valid options are "yes" and "no". When "yes", the
103+
configuration will enable the user provisioned dns option through the install configuration file.
99104
documentation: |-
100105
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)