Skip to content

Commit aeabf92

Browse files
authored
Merge pull request #7052 from nojnhuh/cas-azure-e2e-template
CAS azure e2e: add namespace to all resources in CAPZ template
2 parents a43a324 + 4104ea7 commit aeabf92

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

cluster-autoscaler/cloudprovider/azure/test/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ ARTIFACTS?=_artifacts
1616
.PHONY: test-e2e
1717
test-e2e: build-e2e
1818
go run github.com/onsi/ginkgo/v2/ginkgo -v --trace --output-dir "$(ARTIFACTS)" --junit-report="junit.e2e_suite.1.xml" e2e -- \
19-
-resource-group="$$(KUBECONFIG= kubectl get managedclusters -o jsonpath='{.items[0].status.nodeResourceGroup}')" \
20-
-cluster-name="$$(KUBECONFIG= kubectl get cluster -o jsonpath='{.items[0].metadata.name}')" \
21-
-client-id="$$(KUBECONFIG= kubectl get userassignedidentities -o jsonpath='{.items[0].status.clientId}')" \
19+
-resource-group="$$(KUBECONFIG= kubectl get managedclusters -n default -o jsonpath='{.items[0].status.nodeResourceGroup}')" \
20+
-cluster-name="$$(KUBECONFIG= kubectl get cluster -n default -o jsonpath='{.items[0].metadata.name}')" \
21+
-client-id="$$(KUBECONFIG= kubectl get userassignedidentities -n default -o jsonpath='{.items[0].status.clientId}')" \
2222
-cas-namespace="$(CLUSTER_AUTOSCALER_NAMESPACE)" \
2323
-cas-serviceaccount-name="$(CLUSTER_AUTOSCALER_SERVICEACCOUNT_NAME)" \
2424
-cas-image-repository="$(IMAGE)-$(GOARCH)" \

cluster-autoscaler/cloudprovider/azure/test/templates/cluster-template-prow-aks-aso-cluster-autoscaler.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -266,6 +266,7 @@ apiVersion: v1
266266
kind: Secret
267267
metadata:
268268
name: ${ASO_CREDENTIAL_SECRET_NAME}
269+
namespace: default
269270
stringData:
270271
AZURE_SUBSCRIPTION_ID: ${AZURE_SUBSCRIPTION_ID}
271272
AZURE_TENANT_ID: ${AZURE_TENANT_ID}
@@ -276,6 +277,7 @@ apiVersion: rbac.authorization.k8s.io/v1
276277
kind: ClusterRole
277278
metadata:
278279
name: capz-${CLUSTER_NAME}
280+
namespace: default
279281
labels:
280282
cluster.x-k8s.io/aggregate-to-capz-manager: "true"
281283
rules:

0 commit comments

Comments
 (0)