Merge pull request #1544 from Azure/ARO-15882-add-SP-IDs-to-to-cluster-service-config

ARO-15882 | Add Principal and Client IDs of required SPs to CS Configmap

Author: janboll

cluster-service/Makefile

@@ -85,8 +85,18 @@ deploy:
 
 deploy-pr-env-deps:
 	AZURE_CS_MI_CLIENT_ID=$(shell az identity show -g ${RESOURCEGROUP} -n clusters-service --query clientId -o tsv) && \
+	AZURE_FIRST_PARTY_APPLICATION_CLIENT_ID=$(shell az ad app list --display-name aro-dev-first-party2 --query '[*]'.appId -o tsv) && \
+	AZURE_ARM_HELPER_IDENTITY_CLIENT_ID=$(shell az ad app list --display-name aro-dev-arm-helper2 --query '[*]'.appId -o tsv) && \
+	AZURE_ARM_HELPER_MOCK_FPA_PRINCIPAL_ID=$(shell az ad sp list --display-name aro-dev-first-party2 --query "[*].id" -o tsv) && \
+	AZURE_MI_MOCK_SERVICE_PRINCIPAL_CLIENT_ID=$(shell az ad sp list --display-name aro-dev-msi-mock2 --query "[*].appId" -o tsv) && \
+	AZURE_MI_MOCK_SERVICE_PRINCIPAL_PRINCIPAL_ID=$(shell az ad sp list --display-name aro-dev-msi-mock2 --query "[*].id" -o tsv) && \
 	oc process --local -f cspr/cluster-service-namespace.yaml \
-		-p CLIENT_ID=$${AZURE_CS_MI_CLIENT_ID} | oc apply -f -
+		-p CLIENT_ID=$${AZURE_CS_MI_CLIENT_ID} \
+		-p FPA_CLIENT_ID=$${AZURE_FIRST_PARTY_APPLICATION_CLIENT_ID} \
+		-p ARM_HELPER_CLIENT_ID=$${AZURE_ARM_HELPER_IDENTITY_CLIENT_ID} \
+		-p ARM_HELPER_MOCK_FPA_PRINCIPAL_ID=$${AZURE_ARM_HELPER_MOCK_FPA_PRINCIPAL_ID} \
+		-p MSI_MOCK_CLIENT_ID=$${AZURE_MI_MOCK_SERVICE_PRINCIPAL_CLIENT_ID} \
+		-p MSI_MOCK_PRINCIPAL_ID=$${AZURE_MI_MOCK_SERVICE_PRINCIPAL_PRINCIPAL_ID} | oc apply -f -
 
 create-pr-env-sp:
 	CLUSTER_ID=$(shell az aks show -g ${RESOURCEGROUP} -n ${AKS_NAME} --query id -o tsv) && \

cluster-service/cspr/cluster-service-namespace.yaml

@@ -10,6 +10,21 @@ parameters:
 - name: CLIENT_ID
   description: The Azure Client ID used for federation
   required: true
+- name: FPA_CLIENT_ID
+  description: Client ID of First Party Application
+  required: true
+- name: ARM_HELPER_CLIENT_ID
+  description: Client ID of Arm Helper Identity
+  required: true
+- name: ARM_HELPER_MOCK_FPA_PRINCIPAL_ID
+  description: Principal ID of mock FPA Identity
+  required: true
+- name: MSI_MOCK_CLIENT_ID
+  description: Client ID of MSI Mock
+  required: true
+- name: MSI_MOCK_PRINCIPAL_ID
+  description: Principal ID of MSI Mock
+  required: true
 - name: ORPHANED_NAMESPACE_CLEANER_NAMESPACE
   description: The namespace to create to have a cronjob which will delete the orphaned namespace which are not deleted due to any issues with the jenkins job.
   value: orphaned-namespace-cleaner
@@ -75,6 +90,11 @@ objects:
     name: cluster-service-config
     namespace: ${NAMESPACE}
   data:
+    msi-mock-client-id: ${MSI_MOCK_CLIENT_ID}
+    msi-mock-principal-id: ${MSI_MOCK_PRINCIPAL_ID}
+    arm-helper-client-id: ${ARM_HELPER_CLIENT_ID}
+    arm-helper-mock-fpa-principal-id: ${ARM_HELPER_MOCK_FPA_PRINCIPAL_ID}
+    fpa-client-id: ${FPA_CLIENT_ID}
     cs-client-id: ${CLIENT_ID}
 - apiVersion: v1
   kind: Namespace