Skip to content

Commit 7c01ad5

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

6 files changed

+196
-0
lines changed

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

+10
Original file line numberDiff line numberDiff line change
@@ -385,6 +385,16 @@ 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-user-provisioned-dns
390+
optional: true
391+
steps:
392+
cluster_profile: aws
393+
env:
394+
FEATURE_SET: TechPreviewNoUpgrade
395+
USER_PROVISIONED_DNS: "yes"
396+
workflow: openshift-e2e-aws
397+
timeout: 6h0m0s
388398
- as: e2e-aws-ovn-shared-vpc-custom-security-groups
389399
optional: true
390400
run_if_changed: aws

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

+10
Original file line numberDiff line numberDiff line change
@@ -377,6 +377,16 @@ tests:
377377
cluster_profile: aws
378378
workflow: openshift-e2e-aws-proxy
379379
timeout: 6h0m0s
380+
- always_run: false
381+
as: e2e-aws-user-provisioned-dns
382+
optional: true
383+
steps:
384+
cluster_profile: aws
385+
env:
386+
FEATURE_SET: TechPreviewNoUpgrade
387+
USER_PROVISIONED_DNS: "yes"
388+
workflow: openshift-e2e-aws
389+
timeout: 6h0m0s
380390
- always_run: false
381391
as: e2e-aws-upi-proxy
382392
optional: true

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

+81
Original file line numberDiff line numberDiff line change
@@ -4984,6 +4984,87 @@ presubmits:
49844984
secret:
49854985
secretName: result-aggregator
49864986
trigger: (?m)^/test( | .* )e2e-aws-upi-proxy,?($|\s.*)
4987+
- agent: kubernetes
4988+
always_run: false
4989+
branches:
4990+
- ^master$
4991+
- ^master-
4992+
cluster: build05
4993+
context: ci/prow/e2e-aws-user-provisioned-dns
4994+
decorate: true
4995+
decoration_config:
4996+
timeout: 6h0m0s
4997+
labels:
4998+
ci-operator.openshift.io/cloud: aws
4999+
ci-operator.openshift.io/cloud-cluster-profile: aws
5000+
ci.openshift.io/generator: prowgen
5001+
pj-rehearse.openshift.io/can-be-rehearsed: "true"
5002+
name: pull-ci-openshift-installer-master-e2e-aws-user-provisioned-dns
5003+
optional: true
5004+
rerun_command: /test e2e-aws-user-provisioned-dns
5005+
spec:
5006+
containers:
5007+
- args:
5008+
- --gcs-upload-secret=/secrets/gcs/service-account.json
5009+
- --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
5010+
- --lease-server-credentials-file=/etc/boskos/credentials
5011+
- --report-credentials-file=/etc/report/credentials
5012+
- --secret-dir=/secrets/ci-pull-credentials
5013+
- --secret-dir=/usr/local/e2e-aws-user-provisioned-dns-cluster-profile
5014+
- --target=e2e-aws-user-provisioned-dns
5015+
command:
5016+
- ci-operator
5017+
image: ci-operator:latest
5018+
imagePullPolicy: Always
5019+
name: ""
5020+
resources:
5021+
requests:
5022+
cpu: 10m
5023+
volumeMounts:
5024+
- mountPath: /etc/boskos
5025+
name: boskos
5026+
readOnly: true
5027+
- mountPath: /secrets/ci-pull-credentials
5028+
name: ci-pull-credentials
5029+
readOnly: true
5030+
- mountPath: /usr/local/e2e-aws-user-provisioned-dns-cluster-profile
5031+
name: cluster-profile
5032+
- mountPath: /secrets/gcs
5033+
name: gcs-credentials
5034+
readOnly: true
5035+
- mountPath: /secrets/manifest-tool
5036+
name: manifest-tool-local-pusher
5037+
readOnly: true
5038+
- mountPath: /etc/pull-secret
5039+
name: pull-secret
5040+
readOnly: true
5041+
- mountPath: /etc/report
5042+
name: result-aggregator
5043+
readOnly: true
5044+
serviceAccountName: ci-operator
5045+
volumes:
5046+
- name: boskos
5047+
secret:
5048+
items:
5049+
- key: credentials
5050+
path: credentials
5051+
secretName: boskos-credentials
5052+
- name: ci-pull-credentials
5053+
secret:
5054+
secretName: ci-pull-credentials
5055+
- name: cluster-profile
5056+
secret:
5057+
secretName: cluster-secrets-aws
5058+
- name: manifest-tool-local-pusher
5059+
secret:
5060+
secretName: manifest-tool-local-pusher
5061+
- name: pull-secret
5062+
secret:
5063+
secretName: registry-pull-credentials
5064+
- name: result-aggregator
5065+
secret:
5066+
secretName: result-aggregator
5067+
trigger: (?m)^/test( | .* )e2e-aws-user-provisioned-dns,?($|\s.*)
49875068
- agent: kubernetes
49885069
always_run: false
49895070
branches:

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

+81
Original file line numberDiff line numberDiff line change
@@ -4982,6 +4982,87 @@ presubmits:
49824982
secret:
49834983
secretName: result-aggregator
49844984
trigger: (?m)^/test( | .* )e2e-aws-upi-proxy,?($|\s.*)
4985+
- agent: kubernetes
4986+
always_run: false
4987+
branches:
4988+
- ^release-4\.18$
4989+
- ^release-4\.18-
4990+
cluster: build09
4991+
context: ci/prow/e2e-aws-user-provisioned-dns
4992+
decorate: true
4993+
decoration_config:
4994+
timeout: 6h0m0s
4995+
labels:
4996+
ci-operator.openshift.io/cloud: aws
4997+
ci-operator.openshift.io/cloud-cluster-profile: aws
4998+
ci.openshift.io/generator: prowgen
4999+
pj-rehearse.openshift.io/can-be-rehearsed: "true"
5000+
name: pull-ci-openshift-installer-release-4.18-e2e-aws-user-provisioned-dns
5001+
optional: true
5002+
rerun_command: /test e2e-aws-user-provisioned-dns
5003+
spec:
5004+
containers:
5005+
- args:
5006+
- --gcs-upload-secret=/secrets/gcs/service-account.json
5007+
- --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
5008+
- --lease-server-credentials-file=/etc/boskos/credentials
5009+
- --report-credentials-file=/etc/report/credentials
5010+
- --secret-dir=/secrets/ci-pull-credentials
5011+
- --secret-dir=/usr/local/e2e-aws-user-provisioned-dns-cluster-profile
5012+
- --target=e2e-aws-user-provisioned-dns
5013+
command:
5014+
- ci-operator
5015+
image: ci-operator:latest
5016+
imagePullPolicy: Always
5017+
name: ""
5018+
resources:
5019+
requests:
5020+
cpu: 10m
5021+
volumeMounts:
5022+
- mountPath: /etc/boskos
5023+
name: boskos
5024+
readOnly: true
5025+
- mountPath: /secrets/ci-pull-credentials
5026+
name: ci-pull-credentials
5027+
readOnly: true
5028+
- mountPath: /usr/local/e2e-aws-user-provisioned-dns-cluster-profile
5029+
name: cluster-profile
5030+
- mountPath: /secrets/gcs
5031+
name: gcs-credentials
5032+
readOnly: true
5033+
- mountPath: /secrets/manifest-tool
5034+
name: manifest-tool-local-pusher
5035+
readOnly: true
5036+
- mountPath: /etc/pull-secret
5037+
name: pull-secret
5038+
readOnly: true
5039+
- mountPath: /etc/report
5040+
name: result-aggregator
5041+
readOnly: true
5042+
serviceAccountName: ci-operator
5043+
volumes:
5044+
- name: boskos
5045+
secret:
5046+
items:
5047+
- key: credentials
5048+
path: credentials
5049+
secretName: boskos-credentials
5050+
- name: ci-pull-credentials
5051+
secret:
5052+
secretName: ci-pull-credentials
5053+
- name: cluster-profile
5054+
secret:
5055+
secretName: cluster-secrets-aws
5056+
- name: manifest-tool-local-pusher
5057+
secret:
5058+
secretName: manifest-tool-local-pusher
5059+
- name: pull-secret
5060+
secret:
5061+
secretName: registry-pull-credentials
5062+
- name: result-aggregator
5063+
secret:
5064+
secretName: result-aggregator
5065+
trigger: (?m)^/test( | .* )e2e-aws-user-provisioned-dns,?($|\s.*)
49855066
- agent: kubernetes
49865067
always_run: false
49875068
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

+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)