Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -364,7 +364,7 @@ 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)"
$(KUBECTL) -n default wait --for=condition=Ready --timeout=60m cluster "$(CLUSTER_NAME)"

@echo 'run "$(KUBECTL) --kubeconfig=./kubeconfig ..." to work with the new target cluster'

Expand Down
2 changes: 1 addition & 1 deletion hack/create-dev-cluster.sh
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ make envsubst

export REGISTRY="${REGISTRY:-registry.local/fake}"

export CLUSTER_CREATE_ATTEMPTS="${CLUSTER_CREATE_ATTEMPTS:-3}"
export CLUSTER_CREATE_ATTEMPTS="1"

# Cluster settings.
export CLUSTER_NAME="${CLUSTER_NAME:-capz-test}"
Expand Down
2 changes: 1 addition & 1 deletion scripts/ci-entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,7 @@ if [[ ! "${CLUSTER_TEMPLATE}" =~ "aks" ]]; then
install_addons
fi

"${KUBECTL}" --kubeconfig "${REPO_ROOT}/${KIND_CLUSTER_NAME}.kubeconfig" wait -A --for=condition=Ready --timeout=10m -l "cluster.x-k8s.io/cluster-name=${CLUSTER_NAME}" machinedeployments,machinepools
"${KUBECTL}" --kubeconfig "${REPO_ROOT}/${KIND_CLUSTER_NAME}.kubeconfig" wait -A --for=condition=Ready --timeout=60m -l "cluster.x-k8s.io/cluster-name=${CLUSTER_NAME}" machinedeployments,machinepools

echo "Cluster ${CLUSTER_NAME} created and fully operational"

Expand Down

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,24 @@ 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
- path: patches/ephemeral.yaml
target:
group: infrastructure.cluster.x-k8s.io
kind: AzureMachineTemplate
name: .*-md-0
version: v1beta1
- path: patches/ephemeral.yaml
target:
group: infrastructure.cluster.x-k8s.io
kind: AzureMachineTemplate
name: .*-control-plane
version: v1beta1
configMapGenerator:
- files:
- storageclass=../../../addons/storageclass-azure-disk.yaml
Expand Down
7 changes: 7 additions & 0 deletions templates/test/dev/custom-builds-load/patches/ephemeral.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
- op: replace
path: /spec/template/spec/osDisk/diffDiskSettings
value:
option: Local
- op: replace
path: /spec/template/spec/osDisk/cachingType
value: "ReadOnly"
Loading