Skip to content

Commit 7c96b3b

Browse files
Add Image Credential Provider flags for Kubelet on Azure
1 parent 398c171 commit 7c96b3b

File tree

3 files changed

+21
-1
lines changed

3 files changed

+21
-1
lines changed

pkg/controller/template/render.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -467,6 +467,8 @@ func credentialProviderConfigFlag(cfg RenderConfig) interface{} {
467467
switch cfg.Infra.Status.PlatformStatus.Type {
468468
case configv1.AWSPlatformType:
469469
return fmt.Sprintf("%s %s%s", credentialProviderBinDirFlag, credentialProviderConfigFlag, "ecr-credential-provider.yaml")
470+
case configv1.AzurePlatformType:
471+
return fmt.Sprintf("%s %s%s", credentialProviderBinDirFlag, credentialProviderConfigFlag, "acr-credential-provider.yaml")
470472
default:
471473
return ""
472474
}

pkg/controller/template/render_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,7 @@ func TestCredentialProviderConfigFlag(t *testing.T) {
311311
},
312312
{
313313
platform: configv1.AzurePlatformType,
314-
res: "",
314+
res: "--image-credential-provider-bin-dir=/usr/libexec/kubelet-image-credential-provider-plugins --image-credential-provider-config=/etc/kubernetes/credential-providers/acr-credential-provider.yaml",
315315
},
316316
{
317317
platform: configv1.GCPPlatformType,
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
mode: 0644
2+
path: "/etc/kubernetes/credential-providers/acr-credential-provider.yaml"
3+
contents:
4+
inline: |
5+
apiVersion: kubelet.config.k8s.io/v1
6+
kind: CredentialProviderConfig
7+
providers:
8+
- name: acr-credential-provider
9+
apiVersion: credentialprovider.kubelet.k8s.io/v1
10+
defaultCacheDuration: "10m"
11+
matchImages:
12+
- "*.azurecr.io"
13+
- "*.azurecr.cn"
14+
- "*.azurecr.de"
15+
- "*.azurecr.us"
16+
args:
17+
- /etc/kubernetes/cloud.conf
18+

0 commit comments

Comments
 (0)