update account and operator roles prefix & rebase upstream

openshift · May 27, 2024 · 2ce9e71 · 2ce9e71
1 parent 9952e9d
commit 2ce9e71
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 8 deletions.
diff --git a/...pershift-extended/capi/provision/cucushift-hypershift-extended-capi-provision-commands.sh b/...pershift-extended/capi/provision/cucushift-hypershift-extended-capi-provision-commands.sh
@@ -158,10 +158,11 @@ function export_envs() {
     OIDC_CONFIG_ID=$(cat "${SHARED_DIR}/oidc-config" | jq -r '.id')
     export OIDC_CONFIG_ID=${OIDC_CONFIG_ID}
 
-    ACCOUNT_ROLES_PREFIX=$(cat "${SHARED_DIR}/account-roles-prefix")
+    CLUSTER_PREFIX=$(head -n 1 "${SHARED_DIR}/cluster-prefix")
+    ACCOUNT_ROLES_PREFIX=$CLUSTER_PREFIX
     export ACCOUNT_ROLES_PREFIX=${ACCOUNT_ROLES_PREFIX}
 
-    OPERATOR_ROLES_PREFIX=$(cat "${SHARED_DIR}/operator-roles-prefix")
+    OPERATOR_ROLES_PREFIX=$CLUSTER_PREFIX
     export OPERATOR_ROLES_PREFIX=${OPERATOR_ROLES_PREFIX}
 
     OPERATOR_ROLES_ARNS_FILE="${SHARED_DIR}/operator-roles-arns"

diff --git a/.../hypershift-extended/capi/provision/cucushift-hypershift-extended-capi-provision-ref.yaml b/.../hypershift-extended/capi/provision/cucushift-hypershift-extended-capi-provision-ref.yaml
@@ -29,12 +29,6 @@ ref:
     - name: AVAILABILITY_ZONES
       default: ""
       documentation: The availability zones to use when installing a non-BYOVPC cluster. Format should be a comma-separated list, etc. 'a,b'.
-    - name: ACCOUNT_ROLES_PREFIX
-      default: ""
-      documentation: User-defined prefix for all generated AWS resources. if not specified, will use the namespace name as the prefix.
-    - name: OPERATOR_ROLES_PREFIX
-      default: ""
-      documentation: User-defined prefix for generated AWS operator policies.
     - name: REGION
       default: "us-west-2"
       documentation: "The AWS region of the cluster."