hypershift-chain: update install

ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.11__amd64-nightly.yaml

@@ -105,6 +105,7 @@ tests:
     env:
       BASE_DOMAIN: qe.devcluster.openshift.com
       E2E_RUN_TAGS: '@aws-ipi and @network-openshiftsdn and not @fips'
+      HYPERSHIFT_BASE_DOMAIN: qe.devcluster.openshift.com
       TAG_VERSION: '@4.11'
       TEST_SCENARIOS: Hypershift
     post:

ci-operator/config/openshift/openshift-tests-private/openshift-openshift-tests-private-release-4.12__amd64-nightly.yaml

@@ -177,6 +177,7 @@ tests:
     env:
       BASE_DOMAIN: qe.devcluster.openshift.com
       E2E_RUN_TAGS: '@aws-ipi and @network-ovnkubernetes and not @fips'
+      HYPERSHIFT_BASE_DOMAIN: qe.devcluster.openshift.com
       TAG_VERSION: '@4.12'
       TEST_SCENARIOS: Hypershift
     post:

ci-operator/step-registry/hypershift/aws/create/hypershift-aws-create-chain.yaml

@@ -21,6 +21,8 @@ chain:
       documentation: "Extra args to pass to the create cluster aws command"
     commands: |-
       set -exuo pipefail
+      echo "extract secret/pull-secret"
+      oc extract secret/pull-secret -n openshift-config --to="$SHARED_DIR" --confirm
 
       # We don't have the value of HYPERSHIFT_RELEASE_LATEST when we set CONTROLPLANE_OPERATOR_IMAGE so we
       # have to use a hack like this.
@@ -35,8 +37,8 @@ chain:
         --instance-type=m5.xlarge \
         --base-domain ${HYPERSHIFT_BASE_DOMAIN} \
         --region ${HYPERSHIFT_AWS_REGION} \
-        --pull-secret=/etc/ci-pull-credentials/.dockerconfigjson \
-        --aws-creds /etc/hypershift-pool-aws-credentials/credentials \
+        --pull-secret "$SHARED_DIR/.dockerconfigjson" \
+        --aws-creds ${CLUSTER_PROFILE_DIR}/.awscred \
         --release-image ${RELEASE_IMAGE_LATEST} \
         --control-plane-operator-image=${CONTROLPLANE_OPERATOR_IMAGE:-} \
         --additional-tags="expirationDate=$(date -d '4 hours' --iso=minutes --utc)"
@@ -65,13 +67,6 @@ chain:
         cpu: 100m
         memory: 100Mi
     timeout: 30m0s
-    credentials:
-    - mount_path: /etc/hypershift-pool-aws-credentials
-      name: hypershift-pool-aws-credentials
-      namespace: test-credentials
-    - mount_path: /etc/ci-pull-credentials
-      name: ci-pull-credentials
-      namespace: test-credentials
     dependencies:
     - name: "release:latest"
       env: RELEASE_IMAGE_LATEST

ci-operator/step-registry/hypershift/aws/destroy-nested-management-cluster/hypershift-aws-destroy-nested-management-cluster-chain.yaml

@@ -33,15 +33,12 @@ chain:
       CLUSTER_NAME="$(echo -n $PROW_JOB_ID|sha256sum|cut -c-20)-mgmt"
       export KUBECONFIG=/etc/hypershift-kubeconfig/hypershift-ops-admin.kubeconfig
       bin/hypershift destroy cluster aws \
-      --aws-creds=/etc/hypershift-ci-jobs-awscreds/credentials  \
+      --aws-creds=${CLUSTER_PROFILE_DIR}/.awscred  \
       --name="${CLUSTER_NAME}" \
       --namespace="${HYPERSHIFT_NAMESPACE}" \
       --infra-id=${CLUSTER_NAME} \
       --base-domain=ci.hypershift.devcluster.openshift.com
     credentials:
-    - mount_path: /etc/hypershift-ci-jobs-awscreds
-      name: hypershift-ci-jobs-awscreds
-      namespace: test-credentials
     - mount_path: /etc/hypershift-kubeconfig
       name: hypershift-ci-1
       namespace: test-credentials

ci-operator/step-registry/hypershift/aws/destroy/hypershift-aws-destroy-chain.yaml

@@ -15,7 +15,7 @@ chain:
       CLUSTER_NAME="$(echo -n $PROW_JOB_ID|sha256sum|cut -c-20)"
       echo "$(date) Deleting HyperShift cluster ${CLUSTER_NAME}"
       bin/hypershift destroy cluster aws \
-        --aws-creds=/etc/hypershift-pool-aws-credentials/credentials  \
+        --aws-creds=${CLUSTER_PROFILE_DIR}/.awscred  \
         --name ${CLUSTER_NAME} \
         --region ${HYPERSHIFT_AWS_REGION} \
         --base-domain ${HYPERSHIFT_BASE_DOMAIN} \
@@ -31,7 +31,3 @@ chain:
         cpu: 100m
         memory: 100Mi
     timeout: 15m0s
-    credentials:
-    - mount_path: /etc/hypershift-pool-aws-credentials
-      name: hypershift-pool-aws-credentials
-      namespace: test-credentials

ci-operator/step-registry/hypershift/aws/setup-nested-management-cluster/hypershift-aws-setup-nested-management-cluster-chain.yaml

@@ -18,8 +18,8 @@ chain:
       CLUSTER_NAME="$(echo -n $PROW_JOB_ID|sha256sum|cut -c-20)-mgmt"
       echo "Creating management cluster ${CLUSTER_NAME} with $((${HYPERSHIFT_NODE_COUNT} * 3)) nodes"
       bin/hypershift create cluster aws \
-        --pull-secret=/etc/ci-pull-credentials/.dockerconfigjson \
-        --aws-creds=/etc/hypershift-ci-jobs-awscreds/credentials \
+        --pull-secret "$SHARED_DIR/.dockerconfigjson" \
+        --aws-creds ${CLUSTER_PROFILE_DIR}/.awscred \
         --additional-tags="expirationDate=$(date -d '4 hours' --iso=minutes --utc)" \
         --name=${CLUSTER_NAME} \
         --region=us-east-1 \
@@ -47,12 +47,6 @@ chain:
       # Data for cluster bot.
       echo "https://$(oc -n openshift-console get routes console -o=jsonpath='{.spec.host}')" > "${SHARED_DIR}/console.url"
     credentials:
-    - mount_path: /etc/hypershift-ci-jobs-awscreds
-      name: hypershift-ci-jobs-awscreds
-      namespace: test-credentials
-    - mount_path: /etc/ci-pull-credentials
-      name: ci-pull-credentials
-      namespace: test-credentials
     - mount_path: /etc/hypershift-kubeconfig
       name: hypershift-ci-1
       namespace: test-credentials

ci-operator/step-registry/hypershift/install/hypershift-install-chain.yaml

@@ -11,19 +11,15 @@ chain:
     - name: HYPERSHIFT_AWS_REGION
       default: "us-east-1"
       documentation: "The AWS region of the cluster."
-    commands: |-
+    commands: |-      
       bin/hypershift --version
       bin/hypershift install \
-        --oidc-storage-provider-s3-credentials=/etc/hypershift-pool-aws-credentials/credentials \
+        --oidc-storage-provider-s3-credentials=${CLUSTER_PROFILE_DIR}/.awscred \
         --oidc-storage-provider-s3-bucket-name=hypershift-ci-oidc \
         --oidc-storage-provider-s3-region=us-east-1 \
         --private-platform=AWS \
-        --aws-private-creds=/etc/hypershift-pool-aws-credentials/credentials \
+        --aws-private-creds=${CLUSTER_PROFILE_DIR}/.awscred \
         --aws-private-region=${HYPERSHIFT_AWS_REGION}
-    credentials:
-    - mount_path: /etc/hypershift-pool-aws-credentials
-      name: hypershift-pool-aws-credentials
-      namespace: test-credentials
     grace_period: 1m0s
     resources:
       requests: