Merge pull request #5342 from Jont828/entrypoint-custom-builds

Add template for performance testing with custom Kubernetes version

Author: k8s-ci-robot

Makefile

@@ -377,7 +377,11 @@ create-workload-cluster: $(ENVSUBST) $(KUBECTL) ## Create a workload cluster.
 	timeout --foreground 1800 bash -c "while ! $(KUBECTL) get secrets -n default | grep $(CLUSTER_NAME)-kubeconfig; do sleep 1; done"
 	# Get kubeconfig and store it locally.
 	$(KUBECTL) get secret/$(CLUSTER_NAME)-kubeconfig -n default -o json | jq -r .data.value | base64 --decode > ./kubeconfig
-	$(KUBECTL) -n default wait --for=condition=Ready --timeout=10m cluster "$(CLUSTER_NAME)"
+	# TODO: Standardize timeouts across the Makefile and make them configurable based on the job.
+	$(KUBECTL) -n default wait --for=condition=Ready --timeout=60m cluster "$(CLUSTER_NAME)"
+	
+	# Set the namespace to `default` b/c when the service account is auto mounted, the namespace is changed to `test-pods`.
+	$(KUBECTL) --kubeconfig=./kubeconfig config set-context --current --namespace="default"
 
 	@echo 'run "$(KUBECTL) --kubeconfig=./kubeconfig ..." to work with the new target cluster'
 

templates/test/ci/cluster-template-prow-load.yaml renamed to templates/test/dev/cluster-template-custom-builds-load.yaml

@@ -2,22 +2,21 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 namespace: default
 resources:
-- ../prow
+- ../custom-builds
 - storageclass-resource-set.yaml
 patches:
 - path: patches/cluster-label-storageclass.yaml
 - path: patches/cluster-label-azuredisk.yaml
 - path: patches/kcp-scheduler.yaml
-configMapGenerator:
-- files:
-  - storageclass=../../../addons/storageclass-azure-disk.yaml
-  name: storageclass-${CLUSTER_NAME}
 generatorOptions:
   annotations:
     note: generated
   disableNameSuffixHash: true
   labels:
     type: generated
-
+configMapGenerator:
+- files:
+  - storageclass=../../../addons/storageclass-azure-disk.yaml
+  name: ${CLUSTER_NAME}-storageclass
 sortOptions:
   order: fifo

templates/test/ci/prow-load/kustomization.yaml renamed to templates/test/dev/custom-builds-load/kustomization.yaml

@@ -10,5 +10,5 @@ spec:
       storageclass: "true"
   resources:
   - kind: ConfigMap
-    name: cni-${CLUSTER_NAME}-storageclass
+    name: ${CLUSTER_NAME}-storageclass
   strategy: ApplyOnce