fix: data-plane auth support

Author: Phaow

ci-operator/step-registry/azure/provision/service-principal/hypershift/azure-provision-service-principal-hypershift-commands.sh

@@ -24,9 +24,11 @@ COMPONENTS="azure-disk azure-file ciro cloud-provider cncc cpo ingress capz"
 
 declare -A component_to_client_id
 declare -A component_to_cert_name
+declare -A component_to_credential_secret_name
 
 for component in $COMPONENTS; do
     name="${SP_NAME_PREFIX}-${component}"
+    credential_secret_name="${SP_NAME_PREFIX}-${component}-secret"
     scopes="/subscriptions/$AZURE_AUTH_SUBSCRIPTION_ID/resourceGroups/$RG_HC"
     role="b24988ac-6180-42a0-ab88-20f7382dd24c"
 
@@ -57,8 +59,25 @@ for component in $COMPONENTS; do
     client_id="$(eval "az ad sp create-for-rbac --name $name --role \"$role\" --scopes $scopes --create-cert --cert $name --keyvault $KV_NAME --output json --only-show-errors" | jq -r '.appId')"
     echo "$client_id" >> "${SHARED_DIR}/azure_sp_id"
 
+    client_secret_value="$(az keyvault secret show --vault-name "$KV_NAME" --name "$name" --query value -o tsv)"
+    not_before_timestamp=$(az keyvault secret show --vault-name ci-op-881bs2s5-12c20-kv --name ci-op-881bs2s5-12c20-azure-disk | jq -r .attributes.notBefore)
+    not_after_timestamp=$(date -u -d "$not_before_timestamp + 3 months" +"%Y-%m-%dT%H:%M:%SZ")
+    cat <<EOF >"${SHARED_DIR}"/"$credential_secret_name".json
+{
+    "authentication_endpoint": "https://login.microsoftonline.com/",
+    "client_id": "$client_id",
+    "client_secret": "$client_secret_value",
+    "tenant_id": "$AZURE_AUTH_TENANT_ID",
+    "not_after": "$not_after_timestamp",
+    "not_before": "$not_before_timestamp"
+} 
+EOF
+    echo "created secret $credential_secret_name"
+    az keyvault secret set --vault-name "$KV_NAME" --name "$credential_secret_name" --file "${SHARED_DIR}"/"$credential_secret_name".json
+
     component_to_client_id+=(["$component"]="$client_id")
     component_to_cert_name+=(["$component"]="$name")
+    component_to_credential_secret_name+=(["$component"]="$credential_secret_name")
 done
 
 # TODO: Remove this once the we used the automated role assignment by "--assign-service-principal-role"
@@ -77,35 +96,52 @@ cat <<EOF >"${SHARED_DIR}"/hypershift_azure_mi_file.json
     },
     "cloudProvider": {
         "clientID": "${component_to_client_id[cloud-provider]}",
-        "certificateName": "${component_to_cert_name[cloud-provider]}"
+        "certificateName": "${component_to_cert_name[cloud-provider]}",
+        "credentialsSecretName": "${component_to_credential_secret_name[cloud-provider]}",
     },
     "nodePoolManagement": {
         "clientID": "${component_to_client_id[capz]}",
-        "certificateName": "${component_to_cert_name[capz]}"
+        "certificateName": "${component_to_cert_name[capz]}",
+        "credentialsSecretName": "${component_to_credential_secret_name[capz]}",
     },
     "controlPlaneOperator": {
         "clientID": "${component_to_client_id[cpo]}",
-        "certificateName": "${component_to_cert_name[cpo]}"
+        "certificateName": "${component_to_cert_name[cpo]}",
+        "credentialsSecretName": "${component_to_credential_secret_name[cpo]}",
     },
     "imageRegistry": {
         "clientID": "${component_to_client_id[ciro]}",
-        "certificateName": "${component_to_cert_name[ciro]}"
+        "certificateName": "${component_to_cert_name[ciro]}",
+        "credentialsSecretName": "${component_to_credential_secret_name[ciro]}",
     },
     "ingress": {
         "clientID": "${component_to_client_id[ingress]}",
-        "certificateName": "${component_to_cert_name[ingress]}"
+        "certificateName": "${component_to_cert_name[ingress]}",
+        "credentialsSecretName": "${component_to_credential_secret_name[ingress]}",
     },
     "network": {
         "clientID": "${component_to_client_id[cncc]}",
-        "certificateName": "${component_to_cert_name[cncc]}"
+        "certificateName": "${component_to_cert_name[cncc]}",
+        "credentialsSecretName": "${component_to_credential_secret_name[cncc]}",
     },
     "disk": {
         "clientID": "${component_to_client_id[azure-disk]}",
-        "certificateName": "${component_to_cert_name[azure-disk]}"
+        "certificateName": "${component_to_cert_name[azure-disk]}",
+        "credentialsSecretName": "${component_to_credential_secret_name[azure-disk]}",
     },
     "file": {
         "clientID": "${component_to_client_id[azure-file]}",
-        "certificateName": "${component_to_cert_name[azure-file]}"
+        "certificateName": "${component_to_cert_name[azure-file]}",
+        "credentialsSecretName": "${component_to_credential_secret_name[azure-file]}",
     }
 }
 EOF
+
+
+cat <<EOF >"${SHARED_DIR}"/hypershift_azure_data_plane_identities_file.json
+{
+    "imageRegistryMSIClientID": "${component_to_client_id[ciro]}",
+    "diskMSIClientID": "${component_to_client_id[azure-disk]}",
+    "fileMSIClientID": "${component_to_client_id[azure-file]}"
+}
+EOF

ci-operator/step-registry/cucushift/installer/rehearse/azure/aks/hypershift/ephemeral-creds/provision/cucushift-installer-rehearse-azure-aks-hypershift-ephemeral-creds-provision-chain.yaml

@@ -22,6 +22,8 @@ chain:
     default: "true"
   - name: HYPERSHIFT_AZURE_CP_MI
     default: "true"
+  - name: HYPERSHIFT_AZURE_DP_MI
+    default: "true"
   - name: HYPERSHIFT_AZURE_DIAGNOSTICS_STORAGE_ACCOUNT_TYPE
     default: "Managed"
   - name: HYPERSHIFT_AZURE_LOCATION

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

@@ -30,6 +30,9 @@ chain:
     - name: HYPERSHIFT_AZURE_CP_MI
       default: "false"
       documentation: Specifies whether control plane components should authenticate to Azure using managed identities.
+    - name: HYPERSHIFT_AZURE_DP_MI
+      default: "false"
+      documentation: Specifies whether data plane components should authenticate to Azure using managed identities.
     - name: HYPERSHIFT_AZURE_DIAGNOSTICS_STORAGE_ACCOUNT_TYPE
       default: ""
       documentation: "Specifies the type of storage account for storing diagnostics data."
@@ -207,6 +210,10 @@ chain:
           COMMAND+=(--managed-identities-file "${SHARED_DIR}/hypershift_azure_mi_file.json")
         fi
       fi
+
+      if [[ $HYPERSHIFT_AZURE_DP_MI == "true" ]]; then
+        COMMAND+=(--data-plane-identities-file "${SHARED_DIR}/hypershift_azure_data_plane_identities_file.json")
+      fi
       
       HC_ANNOTATIONS_FILE="${SHARED_DIR}/hypershift_hc_annotations"
       if [[ -f "$HC_ANNOTATIONS_FILE" ]]; then
@@ -289,12 +296,12 @@ chain:
       fi
 
       echo "Running command: ${COMMAND[@]}" > /tmp/create_hc_commands
-      
-      # keep the aks for debugging
-      sleep 12h
 
       ("${COMMAND[@]}" || true)
 
+      # keep the aks for debugging
+      sleep 12h
+
       # The timeout should be much lower, this is due to https://bugzilla.redhat.com/show_bug.cgi?id=2060091
       echo "Waiting for cluster to become available"
       oc wait --timeout=30m --for=condition=Available --namespace=clusters hostedcluster/${CLUSTER_NAME}