Skip to content

Commit

Permalink
address comments
Browse files Browse the repository at this point in the history
  • Loading branch information
@mainred
mainred committed Apr 12, 2024
1 parent 2faa9b4 commit 40d44d0
Show file tree
Hide file tree
Showing 223 changed files with 1,575 additions and 602 deletions.
2 changes: 1 addition & 1 deletion parts/linux/cloud-init/artifacts/cse_cmd.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ TARGET_CLOUD="{{- if IsAKSCustomCloud -}} AzureStackCloud {{- else -}} {{GetTarg
TARGET_ENVIRONMENT="{{GetTargetEnvironment}}"
CUSTOM_ENV_JSON="{{GetBase64EncodedEnvironmentJSON}}"
IS_CUSTOM_CLOUD="{{IsAKSCustomCloud}}"
AKSCustomCloudContainerRegistryDNSSuffix="{{- if IsAKSCustomCloud}}{{AKSCustomCloudContainerRegistryDNSSuffix}}{{end}}"
AKS_CUSTOM_CLOUD_CONTAINER_REGISTRY_DNS_SUFFIX="{{- if IsAKSCustomCloud}}{{AKSCustomCloudContainerRegistryDNSSuffix}}{{end}}"
CSE_HELPERS_FILEPATH="{{GetCSEHelpersScriptFilepath}}"
CSE_DISTRO_HELPERS_FILEPATH="{{GetCSEHelpersScriptDistroFilepath}}"
CSE_INSTALL_FILEPATH="{{GetCSEInstallScriptFilepath}}"
Expand Down
26 changes: 19 additions & 7 deletions parts/linux/cloud-init/artifacts/cse_config.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -708,6 +708,24 @@ configCredentialProvider() {
CREDENTIAL_PROVIDER_CONFIG_FILE=/var/lib/kubelet/credential-provider-config.yaml
mkdir -p "$(dirname "${CREDENTIAL_PROVIDER_CONFIG_FILE}")"
touch "${CREDENTIAL_PROVIDER_CONFIG_FILE}"
if [[ -n "$AKS_CUSTOM_CLOUD_CONTAINER_REGISTRY_DNS_SUFFIX" ]]; then
tee "${CREDENTIAL_PROVIDER_CONFIG_FILE}" > /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"
defaultCacheDuration: "10m"
apiVersion: credentialprovider.kubelet.k8s.io/v1
args:
- /etc/kubernetes/azure.json
EOF
else
tee "${CREDENTIAL_PROVIDER_CONFIG_FILE}" > /dev/null <<EOF
apiVersion: kubelet.config.k8s.io/v1
kind: CredentialProviderConfig
Expand All @@ -718,18 +736,12 @@ providers:
- "*.azurecr.cn"
- "*.azurecr.de"
- "*.azurecr.us"
$(if [[ -n "$AKSCustomCloudContainerRegistryDNSSuffix" ]]; then
echo " - \"*$AKSCustomCloudContainerRegistryDNSSuffix\""
fi)
defaultCacheDuration: "10m"
apiVersion: credentialprovider.kubelet.k8s.io/v1
args:
- /etc/kubernetes/azure.json
EOF

# remove blank lines from the config file.
sed -i '/^$/d' "${CREDENTIAL_PROVIDER_CONFIG_FILE}"
chmod 0600 "${CREDENTIAL_PROVIDER_CONFIG_FILE}"
fi
}

#EOF
4 changes: 2 additions & 2 deletions pkg/agent/baker_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1266,8 +1266,8 @@ oom_score = 0
config.KubeletConfig["--image-credential-provider-bin-dir"] = "/var/lib/kubelet/credential-provider"
}, func(o *nodeBootstrappingOutput) {

Expect(o.vars["AKSCustomCloudContainerRegistryDNSSuffix"]).NotTo(BeEmpty())
Expect(o.vars["AKSCustomCloudContainerRegistryDNSSuffix"]).To(Equal(".azurecr.microsoft.fakecustomcloud"))
Expect(o.vars["AKS_CUSTOM_CLOUD_CONTAINER_REGISTRY_DNS_SUFFIX"]).NotTo(BeEmpty())
Expect(o.vars["AKS_CUSTOM_CLOUD_CONTAINER_REGISTRY_DNS_SUFFIX"]).To(Equal(".azurecr.microsoft.fakecustomcloud"))

Expect(o.vars["KUBELET_FLAGS"]).NotTo(BeEmpty())
Expect(strings.Contains(o.vars["KUBELET_FLAGS"], "--image-credential-provider-config=/var/lib/kubelet/credential-provider-config.yaml")).To(BeTrue())
Expand Down
2 changes: 1 addition & 1 deletion pkg/agent/testdata/AKSUbuntu1604+Containerd/CSECommand
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion pkg/agent/testdata/AKSUbuntu1604+Containerd/CustomData
View file

Large diffs are not rendered by default.

25 changes: 19 additions & 6 deletions pkg/agent/testdata/AKSUbuntu1604+Containerd/line70.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -688,6 +688,24 @@ configCredentialProvider() {
CREDENTIAL_PROVIDER_CONFIG_FILE=/var/lib/kubelet/credential-provider-config.yaml
mkdir -p "$(dirname "${CREDENTIAL_PROVIDER_CONFIG_FILE}")"
touch "${CREDENTIAL_PROVIDER_CONFIG_FILE}"
if [[ -n "$AKS_CUSTOM_CLOUD_CONTAINER_REGISTRY_DNS_SUFFIX" ]]; then
tee "${CREDENTIAL_PROVIDER_CONFIG_FILE}" > /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"
defaultCacheDuration: "10m"
apiVersion: credentialprovider.kubelet.k8s.io/v1
args:
- /etc/kubernetes/azure.json
EOF
else
tee "${CREDENTIAL_PROVIDER_CONFIG_FILE}" > /dev/null <<EOF
apiVersion: kubelet.config.k8s.io/v1
kind: CredentialProviderConfig
Expand All @@ -698,17 +716,12 @@ providers:
- "*.azurecr.cn"
- "*.azurecr.de"
- "*.azurecr.us"
$(if [[ -n "$AKSCustomCloudContainerRegistryDNSSuffix" ]]; then
echo " - \"*$AKSCustomCloudContainerRegistryDNSSuffix\""
fi)
defaultCacheDuration: "10m"
apiVersion: credentialprovider.kubelet.k8s.io/v1
args:
- /etc/kubernetes/azure.json
EOF

sed -i '/^$/d' "${CREDENTIAL_PROVIDER_CONFIG_FILE}"
chmod 0600 "${CREDENTIAL_PROVIDER_CONFIG_FILE}"
fi
}

#EOF
2 changes: 1 addition & 1 deletion pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/CSECommand
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/CustomData
View file

Large diffs are not rendered by default.

25 changes: 19 additions & 6 deletions pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line70.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -688,6 +688,24 @@ configCredentialProvider() {
CREDENTIAL_PROVIDER_CONFIG_FILE=/var/lib/kubelet/credential-provider-config.yaml
mkdir -p "$(dirname "${CREDENTIAL_PROVIDER_CONFIG_FILE}")"
touch "${CREDENTIAL_PROVIDER_CONFIG_FILE}"
if [[ -n "$AKS_CUSTOM_CLOUD_CONTAINER_REGISTRY_DNS_SUFFIX" ]]; then
tee "${CREDENTIAL_PROVIDER_CONFIG_FILE}" > /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"
defaultCacheDuration: "10m"
apiVersion: credentialprovider.kubelet.k8s.io/v1
args:
- /etc/kubernetes/azure.json
EOF
else
tee "${CREDENTIAL_PROVIDER_CONFIG_FILE}" > /dev/null <<EOF
apiVersion: kubelet.config.k8s.io/v1
kind: CredentialProviderConfig
Expand All @@ -698,17 +716,12 @@ providers:
- "*.azurecr.cn"
- "*.azurecr.de"
- "*.azurecr.us"
$(if [[ -n "$AKSCustomCloudContainerRegistryDNSSuffix" ]]; then
echo " - \"*$AKSCustomCloudContainerRegistryDNSSuffix\""
fi)
defaultCacheDuration: "10m"
apiVersion: credentialprovider.kubelet.k8s.io/v1
args:
- /etc/kubernetes/azure.json
EOF

sed -i '/^$/d' "${CREDENTIAL_PROVIDER_CONFIG_FILE}"
chmod 0600 "${CREDENTIAL_PROVIDER_CONFIG_FILE}"
fi
}

#EOF
2 changes: 1 addition & 1 deletion pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/CSECommand
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/CustomData
View file

Large diffs are not rendered by default.

25 changes: 19 additions & 6 deletions pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/line70.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -688,6 +688,24 @@ configCredentialProvider() {
CREDENTIAL_PROVIDER_CONFIG_FILE=/var/lib/kubelet/credential-provider-config.yaml
mkdir -p "$(dirname "${CREDENTIAL_PROVIDER_CONFIG_FILE}")"
touch "${CREDENTIAL_PROVIDER_CONFIG_FILE}"
if [[ -n "$AKS_CUSTOM_CLOUD_CONTAINER_REGISTRY_DNS_SUFFIX" ]]; then
tee "${CREDENTIAL_PROVIDER_CONFIG_FILE}" > /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"
defaultCacheDuration: "10m"
apiVersion: credentialprovider.kubelet.k8s.io/v1
args:
- /etc/kubernetes/azure.json
EOF
else
tee "${CREDENTIAL_PROVIDER_CONFIG_FILE}" > /dev/null <<EOF
apiVersion: kubelet.config.k8s.io/v1
kind: CredentialProviderConfig
Expand All @@ -698,17 +716,12 @@ providers:
- "*.azurecr.cn"
- "*.azurecr.de"
- "*.azurecr.us"
$(if [[ -n "$AKSCustomCloudContainerRegistryDNSSuffix" ]]; then
echo " - \"*$AKSCustomCloudContainerRegistryDNSSuffix\""
fi)
defaultCacheDuration: "10m"
apiVersion: credentialprovider.kubelet.k8s.io/v1
args:
- /etc/kubernetes/azure.json
EOF

sed -i '/^$/d' "${CREDENTIAL_PROVIDER_CONFIG_FILE}"
chmod 0600 "${CREDENTIAL_PROVIDER_CONFIG_FILE}"
fi
}

#EOF
2 changes: 1 addition & 1 deletion pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/CSECommand
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/CustomData
View file

Large diffs are not rendered by default.

25 changes: 19 additions & 6 deletions pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/line70.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -688,6 +688,24 @@ configCredentialProvider() {
CREDENTIAL_PROVIDER_CONFIG_FILE=/var/lib/kubelet/credential-provider-config.yaml
mkdir -p "$(dirname "${CREDENTIAL_PROVIDER_CONFIG_FILE}")"
touch "${CREDENTIAL_PROVIDER_CONFIG_FILE}"
if [[ -n "$AKS_CUSTOM_CLOUD_CONTAINER_REGISTRY_DNS_SUFFIX" ]]; then
tee "${CREDENTIAL_PROVIDER_CONFIG_FILE}" > /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"
defaultCacheDuration: "10m"
apiVersion: credentialprovider.kubelet.k8s.io/v1
args:
- /etc/kubernetes/azure.json
EOF
else
tee "${CREDENTIAL_PROVIDER_CONFIG_FILE}" > /dev/null <<EOF
apiVersion: kubelet.config.k8s.io/v1
kind: CredentialProviderConfig
Expand All @@ -698,17 +716,12 @@ providers:
- "*.azurecr.cn"
- "*.azurecr.de"
- "*.azurecr.us"
$(if [[ -n "$AKSCustomCloudContainerRegistryDNSSuffix" ]]; then
echo " - \"*$AKSCustomCloudContainerRegistryDNSSuffix\""
fi)
defaultCacheDuration: "10m"
apiVersion: credentialprovider.kubelet.k8s.io/v1
args:
- /etc/kubernetes/azure.json
EOF

sed -i '/^$/d' "${CREDENTIAL_PROVIDER_CONFIG_FILE}"
chmod 0600 "${CREDENTIAL_PROVIDER_CONFIG_FILE}"
fi
}

#EOF
2 changes: 1 addition & 1 deletion pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/CSECommand
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/CustomData
View file

Large diffs are not rendered by default.

25 changes: 19 additions & 6 deletions pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/line70.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -688,6 +688,24 @@ configCredentialProvider() {
CREDENTIAL_PROVIDER_CONFIG_FILE=/var/lib/kubelet/credential-provider-config.yaml
mkdir -p "$(dirname "${CREDENTIAL_PROVIDER_CONFIG_FILE}")"
touch "${CREDENTIAL_PROVIDER_CONFIG_FILE}"
if [[ -n "$AKS_CUSTOM_CLOUD_CONTAINER_REGISTRY_DNS_SUFFIX" ]]; then
tee "${CREDENTIAL_PROVIDER_CONFIG_FILE}" > /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"
defaultCacheDuration: "10m"
apiVersion: credentialprovider.kubelet.k8s.io/v1
args:
- /etc/kubernetes/azure.json
EOF
else
tee "${CREDENTIAL_PROVIDER_CONFIG_FILE}" > /dev/null <<EOF
apiVersion: kubelet.config.k8s.io/v1
kind: CredentialProviderConfig
Expand All @@ -698,17 +716,12 @@ providers:
- "*.azurecr.cn"
- "*.azurecr.de"
- "*.azurecr.us"
$(if [[ -n "$AKSCustomCloudContainerRegistryDNSSuffix" ]]; then
echo " - \"*$AKSCustomCloudContainerRegistryDNSSuffix\""
fi)
defaultCacheDuration: "10m"
apiVersion: credentialprovider.kubelet.k8s.io/v1
args:
- /etc/kubernetes/azure.json
EOF

sed -i '/^$/d' "${CREDENTIAL_PROVIDER_CONFIG_FILE}"
chmod 0600 "${CREDENTIAL_PROVIDER_CONFIG_FILE}"
fi
}

#EOF
Loading

0 comments on commit 40d44d0

Please sign in to comment.