Skip to content

fix: add credential provider config for custom cloud network isolated… #8962

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

Open
fseldow wants to merge 1 commit into
base: main
Choose a base branch
from
+47 −1
Open

fix: add credential provider config for custom cloud network isolated… #8962

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 23 additions & 1 deletion parts/linux/cloud-init/artifacts/cse_config.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1551,7 +1551,29 @@ writeCredentialProviderConfig() {
done
fi

if [ -n "$AKS_CUSTOM_CLOUD_CONTAINER_REGISTRY_DNS_SUFFIX" ]; then
if [ -n "$AKS_CUSTOM_CLOUD_CONTAINER_REGISTRY_DNS_SUFFIX" ] && [ -n "${BOOTSTRAP_PROFILE_CONTAINER_REGISTRY_SERVER}" ]; then
echo "configure credential provider for custom cloud network isolated cluster"
MCR_REPOSITORY_BASE="${MCR_REPOSITORY_BASE:=mcr.microsoft.com}"
MCR_REPOSITORY_BASE="${MCR_REPOSITORY_BASE%/}"
tee "${config_file_path}" > /dev/null <<EOF
apiVersion: kubelet.config.k8s.io/v1
kind: CredentialProviderConfig
providers:
- name: acr-credential-provider
matchImages:
- "*.azurecr.io"
- "*.azurecr.cn"
- "*.azurecr.de"
- "*.azurecr.us"
- "*$AKS_CUSTOM_CLOUD_CONTAINER_REGISTRY_DNS_SUFFIX"
- "${MCR_REPOSITORY_BASE}"
defaultCacheDuration: "10m"
apiVersion: credentialprovider.kubelet.k8s.io/v1${ib_token_attributes}
args:
- /etc/kubernetes/azure.json
- --registry-mirror=${MCR_REPOSITORY_BASE}:$BOOTSTRAP_PROFILE_CONTAINER_REGISTRY_SERVER${ib_args}
EOF
elif [ -n "$AKS_CUSTOM_CLOUD_CONTAINER_REGISTRY_DNS_SUFFIX" ]; then
echo "configure credential provider for custom cloud"
tee "${config_file_path}" > /dev/null <<EOF
apiVersion: kubelet.config.k8s.io/v1
Expand Down
24 changes: 24 additions & 0 deletions spec/parts/linux/cloud-init/artifacts/cse_config_spec.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1066,6 +1066,30 @@ providers:
The contents of file "$TMP_DIR/credential-provider-config.yaml" should equal "$expected_config"
End

It 'should configure credential provider for custom cloud network isolated cluster'
AKS_CUSTOM_CLOUD_CONTAINER_REGISTRY_DNS_SUFFIX=".custom.registry.io"
BOOTSTRAP_PROFILE_CONTAINER_REGISTRY_SERVER="test.azurecr.io"
expected_config='apiVersion: kubelet.config.k8s.io/v1
kind: CredentialProviderConfig
providers:
- name: acr-credential-provider
matchImages:
- "*.azurecr.io"
- "*.azurecr.cn"
- "*.azurecr.de"
- "*.azurecr.us"
- "*.custom.registry.io"
- "mcr.microsoft.com"
defaultCacheDuration: "10m"
apiVersion: credentialprovider.kubelet.k8s.io/v1
args:
- /etc/kubernetes/azure.json
- --registry-mirror=mcr.microsoft.com:test.azurecr.io'
When call writeCredentialProviderConfig "$TMP_DIR/credential-provider-config.yaml"
The output should include "configure credential provider for custom cloud network isolated cluster"
The contents of file "$TMP_DIR/credential-provider-config.yaml" should equal "$expected_config"
End

It 'should configure credential provider with identity binding enabled and all args'
SERVICE_ACCOUNT_IMAGE_PULL_ENABLED="true"
IDENTITY_BINDINGS_LOCAL_AUTHORITY_SNI="test.sni.local"
Expand Down
Loading