Skip to content

fix(bootstrap): OOT credential provider support in 1.30+ #429

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 10 commits into from
Jul 17, 2024
Merged

fix(bootstrap): OOT credential provider support in 1.30+ #429

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
7e64978
test: 1.30.0
Bryce-Soghigian Jul 10, 2024
00d806f
fix: credential provider URL
tallaxes Jul 16, 2024
6e7db32
test: associated tests
tallaxes Jul 16, 2024
1d45452
chore: remove unused function
tallaxes Jul 16, 2024
59d9b52
fix: minor unrelated log fix
tallaxes Jul 16, 2024
2e8cfb7
chore: undo AKS version choice
tallaxes Jul 16, 2024
0e0c52b
Merge branch 'main' into bsoghigian/chore-adding-missed-cherry-pick
tallaxes Jul 16, 2024
d5863a9
Merge branch 'main' into bsoghigian/chore-adding-missed-cherry-pick
tallaxes Jul 16, 2024
3038cb0
Merge branch 'main' into bsoghigian/chore-adding-missed-cherry-pick
tallaxes Jul 17, 2024
76f9a69
Merge branch 'main' into bsoghigian/chore-adding-missed-cherry-pick
tallaxes Jul 17, 2024
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-az.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ az-mkaks: az-mkacr ## Create test AKS cluster (with --vm-set-type AvailabilitySe
az-mkaks-cilium: az-mkacr ## Create test AKS cluster (with --network-dataplane cilium, --network-plugin cilium, and --network-plugin-mode overlay)
az aks create --name $(AZURE_CLUSTER_NAME) --resource-group $(AZURE_RESOURCE_GROUP) --attach-acr $(AZURE_ACR_NAME) \
--enable-managed-identity --node-count 3 --generate-ssh-keys -o none --network-dataplane cilium --network-plugin azure --network-plugin-mode overlay \
--enable-oidc-issuer --enable-workload-identity
--enable-oidc-issuer --enable-workload-identity -k 1.30.0
az aks get-credentials --name $(AZURE_CLUSTER_NAME) --resource-group $(AZURE_RESOURCE_GROUP) --overwrite-existing
skaffold config set default-repo $(AZURE_ACR_NAME).azurecr.io/karpenter

Expand Down
2 changes: 1 addition & 1 deletion pkg/providers/imagefamily/bootstrap/aksbootstrap.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -466,7 +466,7 @@ func (a AKS) applyOptions(nbv *NodeBootstrapVariables) {
// Assign Per K8s version kubelet flags
minorVersion := semver.MustParse(a.KubernetesVersion).Minor
if utils.UseOOTCredential(minorVersion) {
nbv.CredentialProviderDownloadURL = fmt.Sprintf("https://acs-mirror.azureedge.net/cloud-provider-azure/%s/binaries/azure-acr-credential-provider-linux-amd64-v%s.tar.gz", nbv.KubernetesVersion, nbv.KubernetesVersion)
nbv.CredentialProviderDownloadURL = fmt.Sprintf("https://acs-mirror.azureedge.net/cloud-provider-azure/v%s/binaries/azure-acr-credential-provider-linux-amd64-v%s.tar.gz", nbv.KubernetesVersion, nbv.KubernetesVersion)
kubeletFlagsBase["--image-credential-provider-config"] = "/var/lib/kubelet/credential-provider-config.yaml"
kubeletFlagsBase["--image-credential-provider-bin-dir"] = "/var/lib/kubelet/credential-provider"
} else { // Versions Less than 1.30
Expand Down
Loading