update by comments

openshift · Feb 28, 2024 · 93142b8 · 93142b8
1 parent 59c148d
commit 93142b8
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 53 deletions.
diff --git a/...try/cucushift/hypershift-extended/cilium/cucushift-hypershift-extended-cilium-commands.sh b/...try/cucushift/hypershift-extended/cilium/cucushift-hypershift-extended-cilium-commands.sh
@@ -7,6 +7,12 @@ if [[ -f "${SHARED_DIR}/nested_kubeconfig" ]]; then
   export KUBECONFIG="${SHARED_DIR}/nested_kubeconfig"
 fi
 
+# for rosa kubeadmin kubeconfig
+if [[ -f "${SHARED_DIR}/kubeconfig.kubeadmin" ]]; then
+  export KUBECONFIG="${SHARED_DIR}/kubeconfig.kubeadmin"
+fi
+
+
 cilium_ns=$(oc get ns cilium --ignore-not-found)
 if [[ -z "$cilium_ns" ]]; then
   oc create ns cilium

diff --git a/...cluster/provision/admin-kubeconfig/osd-ccs-cluster-provision-admin-kubeconfig-commands.sh b/...cluster/provision/admin-kubeconfig/osd-ccs-cluster-provision-admin-kubeconfig-commands.sh
@@ -24,4 +24,4 @@ echo "Logging into ${OCM_LOGIN_ENV} with offline token using ocm cli ${OCM_VERSI
 ocm login --url "${OCM_LOGIN_ENV}" --token "${OCM_TOKEN}"
 
 CLUSTER_ID=$(cat "${SHARED_DIR}/cluster-id")
-ocm get /api/clusters_mgmt/v1/clusters/${CLUSTER_ID}/credentials | jq -r .kubeconfig > "${SHARED_DIR}/kubeconfig"
+ocm get /api/clusters_mgmt/v1/clusters/${CLUSTER_ID}/credentials | jq -r .kubeconfig > "${SHARED_DIR}/kubeconfig.kubeadmin"
diff --git a/...cs/cluster/provision/admin-kubeconfig/osd-ccs-cluster-provision-admin-kubeconfig-ref.yaml b/...cs/cluster/provision/admin-kubeconfig/osd-ccs-cluster-provision-admin-kubeconfig-ref.yaml
@@ -7,7 +7,6 @@ ref:
     requests:
       cpu: 100m
       memory: 300Mi
-  timeout: 2h0m0s
   env:
   - name: OCM_LOGIN_ENV
     default: "staging"

diff --git a/...egistry/rosa/aws/sts/hypershift/cilium/rosa-aws-sts-hypershift-cilium-chain.metadata.json b/...egistry/rosa/aws/sts/hypershift/cilium/rosa-aws-sts-hypershift-cilium-chain.metadata.json
diff --git a/...or/step-registry/rosa/aws/sts/hypershift/cilium/rosa-aws-sts-hypershift-cilium-chain.yaml b/...or/step-registry/rosa/aws/sts/hypershift/cilium/rosa-aws-sts-hypershift-cilium-chain.yaml
diff --git a/...step-registry/rosa/aws/sts/hypershift/cilium/rosa-aws-sts-hypershift-cilium-workflow.yaml b/...step-registry/rosa/aws/sts/hypershift/cilium/rosa-aws-sts-hypershift-cilium-workflow.yaml
@@ -9,9 +9,18 @@ workflow:
       DISABLE_WORKLOAD_MONITORING: "false"
       NO_CNI: "true"
     pre:
-      - chain: rosa-aws-sts-hypershift-cilium
-      - ref: osd-ccs-conf-idp-htpasswd-multi-users
-      - ref: rosa-cluster-wait-ready-nodes
+    - ref: aws-provision-vpc-shared
+    - ref: aws-provision-tags-for-byo-vpc-ocm-pre
+    - chain: rosa-sts-oidc-config-create
+    - ref: rosa-cluster-provision
+    - ref: osd-ccs-cluster-provision-admin-kubeconfig
+    - ref: cucushift-hypershift-extended-cilium
+    - ref: rosa-cluster-notify-error
+    - ref: rosa-cluster-wait-ready-operators
+    - ref: rosa-conf-idp-htpasswd
+    - ref: aws-provision-tags-for-byo-vpc
+    - ref: osd-ccs-conf-idp-htpasswd-multi-users
+    - ref: rosa-cluster-wait-ready-nodes
     post:
       - chain: rosa-aws-sts-hypershift-deprovision
   documentation: |-