Skip to content

Commit 40f749c

Browse files
alexeldeibalexeldeib
authored
revert(ish): remove kubelet flags from cse (#2824) (#2825)
1 parent 42a95a6 commit 40f749c

File tree

106 files changed

+102
-642
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

106 files changed

+102
-642
lines changed

‎parts/linux/cloud-init/artifacts/cse_config.sh

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -354,17 +354,7 @@ ensureKubelet() {
354354
KUBE_CA_FILE="/etc/kubernetes/certs/ca.crt"
355355
mkdir -p "$(dirname "${KUBE_CA_FILE}")"
356356
echo "${KUBE_CA_CRT}" | base64 -d > "${KUBE_CA_FILE}"
357-
KUBELET_DEFAULT_FILE=/etc/default/kubelet
358-
mkdir -p /etc/default
359-
echo "KUBELET_FLAGS=${KUBELET_FLAGS}" >> "${KUBELET_DEFAULT_FILE}"
360-
echo "KUBELET_REGISTER_SCHEDULABLE=true" >> "${KUBELET_DEFAULT_FILE}"
361-
echo "NETWORK_POLICY=${NETWORK_POLICY}" >> "${KUBELET_DEFAULT_FILE}"
362-
echo "KUBELET_IMAGE=${KUBELET_IMAGE}" >> "${KUBELET_DEFAULT_FILE}"
363-
echo "KUBELET_NODE_LABELS=${KUBELET_NODE_LABELS}" >> "${KUBELET_DEFAULT_FILE}"
364-
if [ -n "${AZURE_ENVIRONMENT_FILEPATH}" ]; then
365-
echo "AZURE_ENVIRONMENT_FILEPATH=${AZURE_ENVIRONMENT_FILEPATH}" >> "${KUBELET_DEFAULT_FILE}"
366-
fi
367-
357+
368358
if [ "${CLIENT_TLS_BOOTSTRAPPING_ENABLED}" == "true" ]; then
369359
KUBELET_TLS_DROP_IN="/etc/systemd/system/kubelet.service.d/10-tlsbootstrap.conf"
370360
mkdir -p "$(dirname "${KUBELET_TLS_DROP_IN}")"

‎pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/CustomData

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

‎pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line70.sh

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -354,17 +354,7 @@ ensureKubelet() {
354354
KUBE_CA_FILE="/etc/kubernetes/certs/ca.crt"
355355
mkdir -p "$(dirname "${KUBE_CA_FILE}")"
356356
echo "${KUBE_CA_CRT}" | base64 -d > "${KUBE_CA_FILE}"
357-
KUBELET_DEFAULT_FILE=/etc/default/kubelet
358-
mkdir -p /etc/default
359-
echo "KUBELET_FLAGS=${KUBELET_FLAGS}" >> "${KUBELET_DEFAULT_FILE}"
360-
echo "KUBELET_REGISTER_SCHEDULABLE=true" >> "${KUBELET_DEFAULT_FILE}"
361-
echo "NETWORK_POLICY=${NETWORK_POLICY}" >> "${KUBELET_DEFAULT_FILE}"
362-
echo "KUBELET_IMAGE=${KUBELET_IMAGE}" >> "${KUBELET_DEFAULT_FILE}"
363-
echo "KUBELET_NODE_LABELS=${KUBELET_NODE_LABELS}" >> "${KUBELET_DEFAULT_FILE}"
364-
if [ -n "${AZURE_ENVIRONMENT_FILEPATH}" ]; then
365-
echo "AZURE_ENVIRONMENT_FILEPATH=${AZURE_ENVIRONMENT_FILEPATH}" >> "${KUBELET_DEFAULT_FILE}"
366-
fi
367-
357+
368358
if [ "${CLIENT_TLS_BOOTSTRAPPING_ENABLED}" == "true" ]; then
369359
KUBELET_TLS_DROP_IN="/etc/systemd/system/kubelet.service.d/10-tlsbootstrap.conf"
370360
mkdir -p "$(dirname "${KUBELET_TLS_DROP_IN}")"

‎pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/CustomData

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

‎pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/line70.sh

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -354,17 +354,7 @@ ensureKubelet() {
354354
KUBE_CA_FILE="/etc/kubernetes/certs/ca.crt"
355355
mkdir -p "$(dirname "${KUBE_CA_FILE}")"
356356
echo "${KUBE_CA_CRT}" | base64 -d > "${KUBE_CA_FILE}"
357-
KUBELET_DEFAULT_FILE=/etc/default/kubelet
358-
mkdir -p /etc/default
359-
echo "KUBELET_FLAGS=${KUBELET_FLAGS}" >> "${KUBELET_DEFAULT_FILE}"
360-
echo "KUBELET_REGISTER_SCHEDULABLE=true" >> "${KUBELET_DEFAULT_FILE}"
361-
echo "NETWORK_POLICY=${NETWORK_POLICY}" >> "${KUBELET_DEFAULT_FILE}"
362-
echo "KUBELET_IMAGE=${KUBELET_IMAGE}" >> "${KUBELET_DEFAULT_FILE}"
363-
echo "KUBELET_NODE_LABELS=${KUBELET_NODE_LABELS}" >> "${KUBELET_DEFAULT_FILE}"
364-
if [ -n "${AZURE_ENVIRONMENT_FILEPATH}" ]; then
365-
echo "AZURE_ENVIRONMENT_FILEPATH=${AZURE_ENVIRONMENT_FILEPATH}" >> "${KUBELET_DEFAULT_FILE}"
366-
fi
367-
357+
368358
if [ "${CLIENT_TLS_BOOTSTRAPPING_ENABLED}" == "true" ]; then
369359
KUBELET_TLS_DROP_IN="/etc/systemd/system/kubelet.service.d/10-tlsbootstrap.conf"
370360
mkdir -p "$(dirname "${KUBELET_TLS_DROP_IN}")"

‎pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/CustomData

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

‎pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/line70.sh

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -354,17 +354,7 @@ ensureKubelet() {
354354
KUBE_CA_FILE="/etc/kubernetes/certs/ca.crt"
355355
mkdir -p "$(dirname "${KUBE_CA_FILE}")"
356356
echo "${KUBE_CA_CRT}" | base64 -d > "${KUBE_CA_FILE}"
357-
KUBELET_DEFAULT_FILE=/etc/default/kubelet
358-
mkdir -p /etc/default
359-
echo "KUBELET_FLAGS=${KUBELET_FLAGS}" >> "${KUBELET_DEFAULT_FILE}"
360-
echo "KUBELET_REGISTER_SCHEDULABLE=true" >> "${KUBELET_DEFAULT_FILE}"
361-
echo "NETWORK_POLICY=${NETWORK_POLICY}" >> "${KUBELET_DEFAULT_FILE}"
362-
echo "KUBELET_IMAGE=${KUBELET_IMAGE}" >> "${KUBELET_DEFAULT_FILE}"
363-
echo "KUBELET_NODE_LABELS=${KUBELET_NODE_LABELS}" >> "${KUBELET_DEFAULT_FILE}"
364-
if [ -n "${AZURE_ENVIRONMENT_FILEPATH}" ]; then
365-
echo "AZURE_ENVIRONMENT_FILEPATH=${AZURE_ENVIRONMENT_FILEPATH}" >> "${KUBELET_DEFAULT_FILE}"
366-
fi
367-
357+
368358
if [ "${CLIENT_TLS_BOOTSTRAPPING_ENABLED}" == "true" ]; then
369359
KUBELET_TLS_DROP_IN="/etc/systemd/system/kubelet.service.d/10-tlsbootstrap.conf"
370360
mkdir -p "$(dirname "${KUBELET_TLS_DROP_IN}")"

‎pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/CustomData

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

‎pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/line70.sh

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -354,17 +354,7 @@ ensureKubelet() {
354354
KUBE_CA_FILE="/etc/kubernetes/certs/ca.crt"
355355
mkdir -p "$(dirname "${KUBE_CA_FILE}")"
356356
echo "${KUBE_CA_CRT}" | base64 -d > "${KUBE_CA_FILE}"
357-
KUBELET_DEFAULT_FILE=/etc/default/kubelet
358-
mkdir -p /etc/default
359-
echo "KUBELET_FLAGS=${KUBELET_FLAGS}" >> "${KUBELET_DEFAULT_FILE}"
360-
echo "KUBELET_REGISTER_SCHEDULABLE=true" >> "${KUBELET_DEFAULT_FILE}"
361-
echo "NETWORK_POLICY=${NETWORK_POLICY}" >> "${KUBELET_DEFAULT_FILE}"
362-
echo "KUBELET_IMAGE=${KUBELET_IMAGE}" >> "${KUBELET_DEFAULT_FILE}"
363-
echo "KUBELET_NODE_LABELS=${KUBELET_NODE_LABELS}" >> "${KUBELET_DEFAULT_FILE}"
364-
if [ -n "${AZURE_ENVIRONMENT_FILEPATH}" ]; then
365-
echo "AZURE_ENVIRONMENT_FILEPATH=${AZURE_ENVIRONMENT_FILEPATH}" >> "${KUBELET_DEFAULT_FILE}"
366-
fi
367-
357+
368358
if [ "${CLIENT_TLS_BOOTSTRAPPING_ENABLED}" == "true" ]; then
369359
KUBELET_TLS_DROP_IN="/etc/systemd/system/kubelet.service.d/10-tlsbootstrap.conf"
370360
mkdir -p "$(dirname "${KUBELET_TLS_DROP_IN}")"

‎pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/CustomData

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

‎pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/line70.sh

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -354,17 +354,7 @@ ensureKubelet() {
354354
KUBE_CA_FILE="/etc/kubernetes/certs/ca.crt"
355355
mkdir -p "$(dirname "${KUBE_CA_FILE}")"
356356
echo "${KUBE_CA_CRT}" | base64 -d > "${KUBE_CA_FILE}"
357-
KUBELET_DEFAULT_FILE=/etc/default/kubelet
358-
mkdir -p /etc/default
359-
echo "KUBELET_FLAGS=${KUBELET_FLAGS}" >> "${KUBELET_DEFAULT_FILE}"
360-
echo "KUBELET_REGISTER_SCHEDULABLE=true" >> "${KUBELET_DEFAULT_FILE}"
361-
echo "NETWORK_POLICY=${NETWORK_POLICY}" >> "${KUBELET_DEFAULT_FILE}"
362-
echo "KUBELET_IMAGE=${KUBELET_IMAGE}" >> "${KUBELET_DEFAULT_FILE}"
363-
echo "KUBELET_NODE_LABELS=${KUBELET_NODE_LABELS}" >> "${KUBELET_DEFAULT_FILE}"
364-
if [ -n "${AZURE_ENVIRONMENT_FILEPATH}" ]; then
365-
echo "AZURE_ENVIRONMENT_FILEPATH=${AZURE_ENVIRONMENT_FILEPATH}" >> "${KUBELET_DEFAULT_FILE}"
366-
fi
367-
357+
368358
if [ "${CLIENT_TLS_BOOTSTRAPPING_ENABLED}" == "true" ]; then
369359
KUBELET_TLS_DROP_IN="/etc/systemd/system/kubelet.service.d/10-tlsbootstrap.conf"
370360
mkdir -p "$(dirname "${KUBELET_TLS_DROP_IN}")"

‎pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/CustomData

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

‎pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/line70.sh

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -354,17 +354,7 @@ ensureKubelet() {
354354
KUBE_CA_FILE="/etc/kubernetes/certs/ca.crt"
355355
mkdir -p "$(dirname "${KUBE_CA_FILE}")"
356356
echo "${KUBE_CA_CRT}" | base64 -d > "${KUBE_CA_FILE}"
357-
KUBELET_DEFAULT_FILE=/etc/default/kubelet
358-
mkdir -p /etc/default
359-
echo "KUBELET_FLAGS=${KUBELET_FLAGS}" >> "${KUBELET_DEFAULT_FILE}"
360-
echo "KUBELET_REGISTER_SCHEDULABLE=true" >> "${KUBELET_DEFAULT_FILE}"
361-
echo "NETWORK_POLICY=${NETWORK_POLICY}" >> "${KUBELET_DEFAULT_FILE}"
362-
echo "KUBELET_IMAGE=${KUBELET_IMAGE}" >> "${KUBELET_DEFAULT_FILE}"
363-
echo "KUBELET_NODE_LABELS=${KUBELET_NODE_LABELS}" >> "${KUBELET_DEFAULT_FILE}"
364-
if [ -n "${AZURE_ENVIRONMENT_FILEPATH}" ]; then
365-
echo "AZURE_ENVIRONMENT_FILEPATH=${AZURE_ENVIRONMENT_FILEPATH}" >> "${KUBELET_DEFAULT_FILE}"
366-
fi
367-
357+
368358
if [ "${CLIENT_TLS_BOOTSTRAPPING_ENABLED}" == "true" ]; then
369359
KUBELET_TLS_DROP_IN="/etc/systemd/system/kubelet.service.d/10-tlsbootstrap.conf"
370360
mkdir -p "$(dirname "${KUBELET_TLS_DROP_IN}")"

‎pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/CustomData

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

‎pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line70.sh

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -354,17 +354,7 @@ ensureKubelet() {
354354
KUBE_CA_FILE="/etc/kubernetes/certs/ca.crt"
355355
mkdir -p "$(dirname "${KUBE_CA_FILE}")"
356356
echo "${KUBE_CA_CRT}" | base64 -d > "${KUBE_CA_FILE}"
357-
KUBELET_DEFAULT_FILE=/etc/default/kubelet
358-
mkdir -p /etc/default
359-
echo "KUBELET_FLAGS=${KUBELET_FLAGS}" >> "${KUBELET_DEFAULT_FILE}"
360-
echo "KUBELET_REGISTER_SCHEDULABLE=true" >> "${KUBELET_DEFAULT_FILE}"
361-
echo "NETWORK_POLICY=${NETWORK_POLICY}" >> "${KUBELET_DEFAULT_FILE}"
362-
echo "KUBELET_IMAGE=${KUBELET_IMAGE}" >> "${KUBELET_DEFAULT_FILE}"
363-
echo "KUBELET_NODE_LABELS=${KUBELET_NODE_LABELS}" >> "${KUBELET_DEFAULT_FILE}"
364-
if [ -n "${AZURE_ENVIRONMENT_FILEPATH}" ]; then
365-
echo "AZURE_ENVIRONMENT_FILEPATH=${AZURE_ENVIRONMENT_FILEPATH}" >> "${KUBELET_DEFAULT_FILE}"
366-
fi
367-
357+
368358
if [ "${CLIENT_TLS_BOOTSTRAPPING_ENABLED}" == "true" ]; then
369359
KUBELET_TLS_DROP_IN="/etc/systemd/system/kubelet.service.d/10-tlsbootstrap.conf"
370360
mkdir -p "$(dirname "${KUBELET_TLS_DROP_IN}")"

‎pkg/agent/testdata/AKSUbuntu1604+K8S115/CustomData

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

‎pkg/agent/testdata/AKSUbuntu1604+K8S115/line70.sh

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -354,17 +354,7 @@ ensureKubelet() {
354354
KUBE_CA_FILE="/etc/kubernetes/certs/ca.crt"
355355
mkdir -p "$(dirname "${KUBE_CA_FILE}")"
356356
echo "${KUBE_CA_CRT}" | base64 -d > "${KUBE_CA_FILE}"
357-
KUBELET_DEFAULT_FILE=/etc/default/kubelet
358-
mkdir -p /etc/default
359-
echo "KUBELET_FLAGS=${KUBELET_FLAGS}" >> "${KUBELET_DEFAULT_FILE}"
360-
echo "KUBELET_REGISTER_SCHEDULABLE=true" >> "${KUBELET_DEFAULT_FILE}"
361-
echo "NETWORK_POLICY=${NETWORK_POLICY}" >> "${KUBELET_DEFAULT_FILE}"
362-
echo "KUBELET_IMAGE=${KUBELET_IMAGE}" >> "${KUBELET_DEFAULT_FILE}"
363-
echo "KUBELET_NODE_LABELS=${KUBELET_NODE_LABELS}" >> "${KUBELET_DEFAULT_FILE}"
364-
if [ -n "${AZURE_ENVIRONMENT_FILEPATH}" ]; then
365-
echo "AZURE_ENVIRONMENT_FILEPATH=${AZURE_ENVIRONMENT_FILEPATH}" >> "${KUBELET_DEFAULT_FILE}"
366-
fi
367-
357+
368358
if [ "${CLIENT_TLS_BOOTSTRAPPING_ENABLED}" == "true" ]; then
369359
KUBELET_TLS_DROP_IN="/etc/systemd/system/kubelet.service.d/10-tlsbootstrap.conf"
370360
mkdir -p "$(dirname "${KUBELET_TLS_DROP_IN}")"

‎pkg/agent/testdata/AKSUbuntu1604+K8S117/CustomData

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

‎pkg/agent/testdata/AKSUbuntu1604+K8S117/line70.sh

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -354,17 +354,7 @@ ensureKubelet() {
354354
KUBE_CA_FILE="/etc/kubernetes/certs/ca.crt"
355355
mkdir -p "$(dirname "${KUBE_CA_FILE}")"
356356
echo "${KUBE_CA_CRT}" | base64 -d > "${KUBE_CA_FILE}"
357-
KUBELET_DEFAULT_FILE=/etc/default/kubelet
358-
mkdir -p /etc/default
359-
echo "KUBELET_FLAGS=${KUBELET_FLAGS}" >> "${KUBELET_DEFAULT_FILE}"
360-
echo "KUBELET_REGISTER_SCHEDULABLE=true" >> "${KUBELET_DEFAULT_FILE}"
361-
echo "NETWORK_POLICY=${NETWORK_POLICY}" >> "${KUBELET_DEFAULT_FILE}"
362-
echo "KUBELET_IMAGE=${KUBELET_IMAGE}" >> "${KUBELET_DEFAULT_FILE}"
363-
echo "KUBELET_NODE_LABELS=${KUBELET_NODE_LABELS}" >> "${KUBELET_DEFAULT_FILE}"
364-
if [ -n "${AZURE_ENVIRONMENT_FILEPATH}" ]; then
365-
echo "AZURE_ENVIRONMENT_FILEPATH=${AZURE_ENVIRONMENT_FILEPATH}" >> "${KUBELET_DEFAULT_FILE}"
366-
fi
367-
357+
368358
if [ "${CLIENT_TLS_BOOTSTRAPPING_ENABLED}" == "true" ]; then
369359
KUBELET_TLS_DROP_IN="/etc/systemd/system/kubelet.service.d/10-tlsbootstrap.conf"
370360
mkdir -p "$(dirname "${KUBELET_TLS_DROP_IN}")"

‎pkg/agent/testdata/AKSUbuntu1604+K8S118/CustomData

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

‎pkg/agent/testdata/AKSUbuntu1604+K8S118/line70.sh

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -354,17 +354,7 @@ ensureKubelet() {
354354
KUBE_CA_FILE="/etc/kubernetes/certs/ca.crt"
355355
mkdir -p "$(dirname "${KUBE_CA_FILE}")"
356356
echo "${KUBE_CA_CRT}" | base64 -d > "${KUBE_CA_FILE}"
357-
KUBELET_DEFAULT_FILE=/etc/default/kubelet
358-
mkdir -p /etc/default
359-
echo "KUBELET_FLAGS=${KUBELET_FLAGS}" >> "${KUBELET_DEFAULT_FILE}"
360-
echo "KUBELET_REGISTER_SCHEDULABLE=true" >> "${KUBELET_DEFAULT_FILE}"
361-
echo "NETWORK_POLICY=${NETWORK_POLICY}" >> "${KUBELET_DEFAULT_FILE}"
362-
echo "KUBELET_IMAGE=${KUBELET_IMAGE}" >> "${KUBELET_DEFAULT_FILE}"
363-
echo "KUBELET_NODE_LABELS=${KUBELET_NODE_LABELS}" >> "${KUBELET_DEFAULT_FILE}"
364-
if [ -n "${AZURE_ENVIRONMENT_FILEPATH}" ]; then
365-
echo "AZURE_ENVIRONMENT_FILEPATH=${AZURE_ENVIRONMENT_FILEPATH}" >> "${KUBELET_DEFAULT_FILE}"
366-
fi
367-
357+
368358
if [ "${CLIENT_TLS_BOOTSTRAPPING_ENABLED}" == "true" ]; then
369359
KUBELET_TLS_DROP_IN="/etc/systemd/system/kubelet.service.d/10-tlsbootstrap.conf"
370360
mkdir -p "$(dirname "${KUBELET_TLS_DROP_IN}")"

0 commit comments

Comments
 (0)