Skip to content

ci: Allow manual overwrite of k8s version in CI/CD #3575

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Apr 8, 2025
Merged

ci: Allow manual overwrite of k8s version in CI/CD #3575

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a4edc13
ci: add K8S_VER to output for make vars
jpayne3506 Apr 7, 2025
d65e986
ci: Allow manual overwrite of k8s version in CI/CD
jpayne3506 Apr 7, 2025
8390ab5
chore: rephrase terminal output
jpayne3506 Apr 7, 2025
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
5 changes: 5 additions & 0 deletions .pipelines/cni/load-test-templates/create-cluster-template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,11 @@ steps:
addSpnToEnvironment: true
inlineScript: |
set -ex
if ! [ -z ${K8S_VERSION} ]; then
echo "Default k8s version, $(make -C ./hack/aks vars | grep K8S | cut -d'=' -f 2), is manually set to ${K8S_VERSION}"
export K8S_VER=${K8S_VERSION}
fi
make -C ./hack/aks azcfg AZCLI=az REGION=${{ parameters.region }}
make -C ./hack/aks ${{ parameters.clusterType }} \
AZCLI=az REGION=${{ parameters.region }} SUB=$(SUB_AZURE_NETWORK_AGENT_BUILD_VALIDATIONS) \
Expand Down
6 changes: 6 additions & 0 deletions .pipelines/templates/create-cluster.jobs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,12 @@ jobs:
az extension add --name aks-preview
az extension update --name aks-preview
fi

if ! [ -z ${K8S_VERSION} ]; then
echo "Default k8s version, $(make -C ./hack/aks vars | grep K8S | cut -d'=' -f 2), is manually set to ${K8S_VERSION}"
export K8S_VER=${K8S_VERSION}
fi

mkdir -p ~/.kube/
make -C ./hack/aks azcfg AZCLI=az REGION=${{ parameters.region }}

Expand Down
6 changes: 6 additions & 0 deletions .pipelines/templates/create-cluster.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,12 @@ jobs:
az extension add --name aks-preview
az extension update --name aks-preview
fi

if ! [ -z ${K8S_VERSION} ]; then
echo "Default k8s version, $(make -C ./hack/aks vars | grep K8S | cut -d'=' -f 2), is manually set to ${K8S_VERSION}"
export K8S_VER=${K8S_VERSION}
fi

mkdir -p ~/.kube/
make -C ./hack/aks azcfg AZCLI=az REGION=${{ parameters.region }}

Expand Down
1 change: 1 addition & 0 deletions hack/aks/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ vars: ## Show the input vars configured for the cluster commands
@echo VM_SIZE=$(VM_SIZE)
@echo NODE_COUNT=$(NODE_COUNT)
@echo VMSS_NAME=$(VMSS_NAME)
@echo K8S_VER=$(K8S_VER)


##@ SWIFT Infra
Expand Down
Loading