Merge pull request #7052 from nojnhuh/cas-azure-e2e-template

CAS azure e2e: add namespace to all resources in CAPZ template
kubernetes · Jul 15, 2024 · aeabf92 · aeabf92
2 parents a43a324 + 4104ea7
commit aeabf92
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/cluster-autoscaler/cloudprovider/azure/test/Makefile b/cluster-autoscaler/cloudprovider/azure/test/Makefile
@@ -16,9 +16,9 @@ ARTIFACTS?=_artifacts
 .PHONY: test-e2e
 test-e2e: build-e2e
 	go run github.com/onsi/ginkgo/v2/ginkgo -v --trace --output-dir "$(ARTIFACTS)" --junit-report="junit.e2e_suite.1.xml" e2e -- \
-		-resource-group="$$(KUBECONFIG= kubectl get managedclusters -o jsonpath='{.items[0].status.nodeResourceGroup}')" \
-		-cluster-name="$$(KUBECONFIG= kubectl get cluster -o jsonpath='{.items[0].metadata.name}')" \
-		-client-id="$$(KUBECONFIG= kubectl get userassignedidentities -o jsonpath='{.items[0].status.clientId}')" \
+		-resource-group="$$(KUBECONFIG= kubectl get managedclusters -n default -o jsonpath='{.items[0].status.nodeResourceGroup}')" \
+		-cluster-name="$$(KUBECONFIG= kubectl get cluster -n default -o jsonpath='{.items[0].metadata.name}')" \
+		-client-id="$$(KUBECONFIG= kubectl get userassignedidentities -n default -o jsonpath='{.items[0].status.clientId}')" \
 		-cas-namespace="$(CLUSTER_AUTOSCALER_NAMESPACE)" \
 		-cas-serviceaccount-name="$(CLUSTER_AUTOSCALER_SERVICEACCOUNT_NAME)" \
 		-cas-image-repository="$(IMAGE)-$(GOARCH)" \

diff --git a/.../cloudprovider/azure/test/templates/cluster-template-prow-aks-aso-cluster-autoscaler.yaml b/.../cloudprovider/azure/test/templates/cluster-template-prow-aks-aso-cluster-autoscaler.yaml
@@ -266,6 +266,7 @@ apiVersion: v1
 kind: Secret
 metadata:
   name: ${ASO_CREDENTIAL_SECRET_NAME}
+  namespace: default
 stringData:
   AZURE_SUBSCRIPTION_ID: ${AZURE_SUBSCRIPTION_ID}
   AZURE_TENANT_ID:       ${AZURE_TENANT_ID}
@@ -276,6 +277,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
   name: capz-${CLUSTER_NAME}
+  namespace: default
   labels:
     cluster.x-k8s.io/aggregate-to-capz-manager: "true"
 rules: