зеркало из https://github.com/Azure/aks-engine.git
chore: reduce CSE by optimizing var/func names (#3034)
This commit is contained in:
Jack Francis
GitHub
Родитель
76cd730778
Коммит
8fc62ac825
|
|
@ -12,7 +12,7 @@ systemctlEnableAndStart() {
|
|||
if [ $RESTART_STATUS -ne 0 ]; then
|
||||
return 1
|
||||
fi
|
||||
if ! retrycmd_if_failure 120 5 25 systemctl enable $1; then
|
||||
if ! retrycmd 120 5 25 systemctl enable $1; then
|
||||
return 1
|
||||
fi
|
||||
}
|
||||
|
|
@ -95,7 +95,7 @@ configureEtcd() {
|
|||
sleep 1
|
||||
fi
|
||||
done
|
||||
retrycmd_if_failure 120 5 25 sudo -E etcdctl member update $MEMBER ${ETCD_PEER_URL} || exit {{GetCSEErrorCode "ERR_ETCD_CONFIG_FAIL"}}
|
||||
retrycmd 120 5 25 sudo -E etcdctl member update $MEMBER ${ETCD_PEER_URL} || exit {{GetCSEErrorCode "ERR_ETCD_CONFIG_FAIL"}}
|
||||
}
|
||||
ensureNTP() {
|
||||
systemctlEnableAndStart ntp || exit {{GetCSEErrorCode "ERR_SYSTEMCTL_START_FAIL"}}
|
||||
|
|
@ -228,7 +228,7 @@ installAzureCNI() {
|
|||
{{end}}
|
||||
configureCNI() {
|
||||
{{/* needed for the iptables rules to work on bridges */}}
|
||||
retrycmd_if_failure 120 5 25 modprobe br_netfilter || exit {{GetCSEErrorCode "ERR_MODPROBE_FAIL"}}
|
||||
retrycmd 120 5 25 modprobe br_netfilter || exit {{GetCSEErrorCode "ERR_MODPROBE_FAIL"}}
|
||||
echo -n "br_netfilter" >/etc/modules-load.d/br_netfilter.conf
|
||||
configureCNIIPTables
|
||||
{{if HasCiliumNetworkPlugin}}
|
||||
|
|
@ -271,9 +271,9 @@ installContainerd() {
|
|||
fi
|
||||
removeContainerd
|
||||
echo "deb [arch=amd64,arm64,armhf] https://packages.microsoft.com/${url_path} testing main" >/tmp/microsoft-prod-testing.list
|
||||
retrycmd_if_failure 10 5 10 cp /tmp/microsoft-prod-testing.list /etc/apt/sources.list.d/ || exit 25
|
||||
retrycmd_if_failure_no_stats 120 5 25 curl https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor >/tmp/microsoft.gpg || exit 26
|
||||
retrycmd_if_failure 10 5 10 cp /tmp/microsoft.gpg /etc/apt/trusted.gpg.d/ || exit 26
|
||||
retrycmd 10 5 10 cp /tmp/microsoft-prod-testing.list /etc/apt/sources.list.d/ || exit 25
|
||||
retrycmd_no_stats 120 5 25 curl https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor >/tmp/microsoft.gpg || exit 26
|
||||
retrycmd 10 5 10 cp /tmp/microsoft.gpg /etc/apt/trusted.gpg.d/ || exit 26
|
||||
apt_get_update || exit 99
|
||||
apt_get_install 20 30 120 moby-containerd=${CONTAINERD_VERSION}* --allow-downgrades || exit 27
|
||||
fi
|
||||
|
|
@ -320,7 +320,7 @@ ensureDHCPv6() {
|
|||
wait_for_file 3600 1 {{GetDHCPv6ServiceCSEScriptFilepath}} || exit {{GetCSEErrorCode "ERR_FILE_WATCH_TIMEOUT"}}
|
||||
wait_for_file 3600 1 {{GetDHCPv6ConfigCSEScriptFilepath}} || exit {{GetCSEErrorCode "ERR_FILE_WATCH_TIMEOUT"}}
|
||||
systemctlEnableAndStart dhcpv6 || exit {{GetCSEErrorCode "ERR_SYSTEMCTL_START_FAIL"}}
|
||||
retrycmd_if_failure 120 5 25 modprobe ip6_tables || exit {{GetCSEErrorCode "ERR_MODPROBE_FAIL"}}
|
||||
retrycmd 120 5 25 modprobe ip6_tables || exit {{GetCSEErrorCode "ERR_MODPROBE_FAIL"}}
|
||||
}
|
||||
{{end}}
|
||||
ensureKubelet() {
|
||||
|
|
@ -386,18 +386,18 @@ ensureK8sControlPlane() {
|
|||
if $REBOOTREQUIRED || [ "$NO_OUTBOUND" = "true" ]; then
|
||||
return
|
||||
fi
|
||||
retrycmd_if_failure 120 5 25 $KUBECTL 2>/dev/null cluster-info || exit {{GetCSEErrorCode "ERR_K8S_RUNNING_TIMEOUT"}}
|
||||
retrycmd 120 5 25 $KUBECTL 2>/dev/null cluster-info || exit {{GetCSEErrorCode "ERR_K8S_RUNNING_TIMEOUT"}}
|
||||
}
|
||||
{{- if IsAzurePolicyAddonEnabled}}
|
||||
ensureLabelExclusionForAzurePolicyAddon() {
|
||||
GATEKEEPER_NAMESPACE="gatekeeper-system"
|
||||
retrycmd_if_failure 120 5 25 $KUBECTL create ns --save-config $GATEKEEPER_NAMESPACE 2>/dev/null || exit {{GetCSEErrorCode "ERR_K8S_RUNNING_TIMEOUT"}}
|
||||
retrycmd 120 5 25 $KUBECTL create ns --save-config $GATEKEEPER_NAMESPACE 2>/dev/null || exit {{GetCSEErrorCode "ERR_K8S_RUNNING_TIMEOUT"}}
|
||||
|
||||
retrycmd_if_failure 120 5 25 $KUBECTL label ns kube-system control-plane=controller-manager 2>/dev/null || exit {{GetCSEErrorCode "ERR_K8S_RUNNING_TIMEOUT"}}
|
||||
retrycmd 120 5 25 $KUBECTL label ns kube-system control-plane=controller-manager 2>/dev/null || exit {{GetCSEErrorCode "ERR_K8S_RUNNING_TIMEOUT"}}
|
||||
}
|
||||
{{end}}
|
||||
ensureEtcd() {
|
||||
retrycmd_if_failure 120 5 25 curl --cacert /etc/kubernetes/certs/ca.crt --cert /etc/kubernetes/certs/etcdclient.crt --key /etc/kubernetes/certs/etcdclient.key ${ETCD_CLIENT_URL}/v2/machines || exit {{GetCSEErrorCode "ERR_ETCD_RUNNING_TIMEOUT"}}
|
||||
retrycmd 120 5 25 curl --cacert /etc/kubernetes/certs/ca.crt --cert /etc/kubernetes/certs/etcdclient.crt --key /etc/kubernetes/certs/etcdclient.key ${ETCD_CLIENT_URL}/v2/machines || exit {{GetCSEErrorCode "ERR_ETCD_RUNNING_TIMEOUT"}}
|
||||
}
|
||||
createKubeManifestDir() {
|
||||
KUBEMANIFESTDIR=/etc/kubernetes/manifests
|
||||
|
|
@ -502,9 +502,9 @@ configGPUDrivers() {
|
|||
{{/* we will manually install nvidia-docker2 */}}
|
||||
rmmod nouveau
|
||||
echo blacklist nouveau >>/etc/modprobe.d/blacklist.conf
|
||||
retrycmd_if_failure_no_stats 120 5 25 update-initramfs -u || exit {{GetCSEErrorCode "ERR_GPU_DRIVERS_CONFIG"}}
|
||||
retrycmd_no_stats 120 5 25 update-initramfs -u || exit {{GetCSEErrorCode "ERR_GPU_DRIVERS_CONFIG"}}
|
||||
wait_for_apt_locks
|
||||
retrycmd_if_failure 30 5 3600 apt-get -o Dpkg::Options::="--force-confold" install -y nvidia-container-runtime="${NVIDIA_CONTAINER_RUNTIME_VERSION}+${NVIDIA_DOCKER_SUFFIX}" || exit {{GetCSEErrorCode "ERR_GPU_DRIVERS_CONFIG"}}
|
||||
retrycmd 30 5 3600 apt-get -o Dpkg::Options::="--force-confold" install -y nvidia-container-runtime="${NVIDIA_CONTAINER_RUNTIME_VERSION}+${NVIDIA_DOCKER_SUFFIX}" || exit {{GetCSEErrorCode "ERR_GPU_DRIVERS_CONFIG"}}
|
||||
tmpDir=$GPU_DEST/tmp
|
||||
(
|
||||
set -e -o pipefail
|
||||
|
|
@ -514,17 +514,17 @@ configGPUDrivers() {
|
|||
cp -r ${tmpDir}/pkg/usr/* /usr/ || exit {{GetCSEErrorCode "ERR_GPU_DRIVERS_CONFIG"}}
|
||||
)
|
||||
rm -rf $GPU_DEST/tmp
|
||||
retrycmd_if_failure 120 5 25 pkill -SIGHUP dockerd || exit {{GetCSEErrorCode "ERR_GPU_DRIVERS_CONFIG"}}
|
||||
retrycmd 120 5 25 pkill -SIGHUP dockerd || exit {{GetCSEErrorCode "ERR_GPU_DRIVERS_CONFIG"}}
|
||||
mkdir -p $GPU_DEST/lib64 $GPU_DEST/overlay-workdir
|
||||
retrycmd_if_failure 120 5 25 mount -t overlay -o lowerdir=/usr/lib/x86_64-linux-gnu,upperdir=${GPU_DEST}/lib64,workdir=${GPU_DEST}/overlay-workdir none /usr/lib/x86_64-linux-gnu || exit {{GetCSEErrorCode "ERR_GPU_DRIVERS_CONFIG"}}
|
||||
retrycmd 120 5 25 mount -t overlay -o lowerdir=/usr/lib/x86_64-linux-gnu,upperdir=${GPU_DEST}/lib64,workdir=${GPU_DEST}/overlay-workdir none /usr/lib/x86_64-linux-gnu || exit {{GetCSEErrorCode "ERR_GPU_DRIVERS_CONFIG"}}
|
||||
export -f installNvidiaDrivers
|
||||
retrycmd_if_failure 3 1 600 bash -c installNvidiaDrivers || exit {{GetCSEErrorCode "ERR_GPU_DRIVERS_START_FAIL"}}
|
||||
retrycmd 3 1 600 bash -c installNvidiaDrivers || exit {{GetCSEErrorCode "ERR_GPU_DRIVERS_START_FAIL"}}
|
||||
echo "${GPU_DEST}/lib64" >/etc/ld.so.conf.d/nvidia.conf
|
||||
retrycmd_if_failure 120 5 25 ldconfig || exit {{GetCSEErrorCode "ERR_GPU_DRIVERS_START_FAIL"}}
|
||||
retrycmd 120 5 25 ldconfig || exit {{GetCSEErrorCode "ERR_GPU_DRIVERS_START_FAIL"}}
|
||||
umount -l /usr/lib/x86_64-linux-gnu
|
||||
retrycmd_if_failure 120 5 25 nvidia-modprobe -u -c0 || exit {{GetCSEErrorCode "ERR_GPU_DRIVERS_START_FAIL"}}
|
||||
retrycmd_if_failure 120 5 25 $GPU_DEST/bin/nvidia-smi || exit {{GetCSEErrorCode "ERR_GPU_DRIVERS_START_FAIL"}}
|
||||
retrycmd_if_failure 120 5 25 ldconfig || exit {{GetCSEErrorCode "ERR_GPU_DRIVERS_START_FAIL"}}
|
||||
retrycmd 120 5 25 nvidia-modprobe -u -c0 || exit {{GetCSEErrorCode "ERR_GPU_DRIVERS_START_FAIL"}}
|
||||
retrycmd 120 5 25 $GPU_DEST/bin/nvidia-smi || exit {{GetCSEErrorCode "ERR_GPU_DRIVERS_START_FAIL"}}
|
||||
retrycmd 120 5 25 ldconfig || exit {{GetCSEErrorCode "ERR_GPU_DRIVERS_START_FAIL"}}
|
||||
}
|
||||
ensureGPUDrivers() {
|
||||
configGPUDrivers
|
||||
|
|
@ -537,16 +537,16 @@ installSGXDrivers() {
|
|||
|
||||
local packages="make gcc dkms"
|
||||
wait_for_apt_locks
|
||||
retrycmd_if_failure 30 5 3600 apt-get -y install "$packages" || exit 90
|
||||
retrycmd 30 5 3600 apt-get -y install "$packages" || exit 90
|
||||
|
||||
local oe_dir=/opt/azure/containers/oe
|
||||
rm -rf ${oe_dir}
|
||||
mkdir -p ${oe_dir}
|
||||
pushd ${oe_dir} || exit
|
||||
retrycmd_if_failure 10 10 120 curl -fsSL -O "https://download.01.org/intel-sgx/latest/version.xml" || exit 90
|
||||
retrycmd 10 10 120 curl -fsSL -O "https://download.01.org/intel-sgx/latest/version.xml" || exit 90
|
||||
dcap_version="$(grep dcap version.xml | grep -o -E "[.0-9]+")"
|
||||
sgx_driver_folder_url="https://download.01.org/intel-sgx/sgx-dcap/$dcap_version/linux"
|
||||
retrycmd_if_failure 10 10 120 curl -fsSL -O "$sgx_driver_folder_url/SHA256SUM_dcap_$dcap_version" || exit 90
|
||||
retrycmd 10 10 120 curl -fsSL -O "$sgx_driver_folder_url/SHA256SUM_dcap_$dcap_version" || exit 90
|
||||
matched_line="$(grep "distro/ubuntuServer$UBUNTU_RELEASE/sgx_linux_x64_driver_.*bin" SHA256SUM_dcap_$dcap_version)"
|
||||
read -ra tmp_array <<<"$matched_line"
|
||||
sgx_driver_sha256sum_expected="${tmp_array[0]}"
|
||||
|
|
@ -554,7 +554,7 @@ installSGXDrivers() {
|
|||
sgx_driver_url="${sgx_driver_folder_url}/${sgx_driver_remote_path}"
|
||||
sgx_driver=$(basename "$sgx_driver_url")
|
||||
|
||||
retrycmd_if_failure 10 10 120 curl -fsSL -O "${sgx_driver_url}" || exit 90
|
||||
retrycmd 10 10 120 curl -fsSL -O "${sgx_driver_url}" || exit 90
|
||||
read -ra tmp_array <<<"$(sha256sum ./"$sgx_driver")"
|
||||
sgx_driver_sha256sum_real="${tmp_array[0]}"
|
||||
[[ $sgx_driver_sha256sum_real == "$sgx_driver_sha256sum_expected" ]] || exit 93
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ ensureCertificates() {
|
|||
|
||||
configureK8sCustomCloud() {
|
||||
export -f ensureCertificates
|
||||
retrycmd_if_failure 60 10 30 bash -c ensureCertificates
|
||||
retrycmd 60 10 30 bash -c ensureCertificates
|
||||
set +x
|
||||
# When AUTHENTICATION_METHOD is client_certificate, the certificate is stored into key valut,
|
||||
# And SERVICE_PRINCIPAL_CLIENT_SECRET will be the following json payload with based64 encode
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ configure_prerequisites() {
|
|||
|
||||
aptmarkWALinuxAgent() {
|
||||
wait_for_apt_locks
|
||||
retrycmd_if_failure 120 5 25 apt-mark $1 walinuxagent ||
|
||||
retrycmd 120 5 25 apt-mark $1 walinuxagent ||
|
||||
if [[ $1 == "hold" ]]; then
|
||||
exit 7
|
||||
elif [[ $1 == "unhold" ]]; then
|
||||
|
|
@ -38,7 +38,7 @@ aptmarkWALinuxAgent() {
|
|||
fi
|
||||
}
|
||||
|
||||
retrycmd_if_failure() {
|
||||
retrycmd() {
|
||||
retries=$1; wait_sleep=$2; timeout=$3; shift && shift && shift
|
||||
for i in $(seq 1 $retries); do
|
||||
timeout $timeout ${@} && break ||
|
||||
|
|
@ -51,7 +51,7 @@ retrycmd_if_failure() {
|
|||
done
|
||||
echo Executed \"$@\" $i times
|
||||
}
|
||||
retrycmd_if_failure_no_stats() {
|
||||
retrycmd_no_stats() {
|
||||
retries=$1; wait_sleep=$2; timeout=$3; shift && shift && shift
|
||||
for i in $(seq 1 $retries); do
|
||||
timeout $timeout ${@} && break ||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,5 @@
|
|||
#!/bin/bash
|
||||
|
||||
CC_SERVICE_IN_TMP=/opt/azure/containers/cc-proxy.service.in
|
||||
CC_SOCKET_IN_TMP=/opt/azure/containers/cc-proxy.socket.in
|
||||
CNI_CONFIG_DIR="/etc/cni/net.d"
|
||||
CNI_BIN_DIR="/opt/cni/bin"
|
||||
CNI_DOWNLOADS_DIR="/opt/cni/downloads"
|
||||
|
|
@ -14,7 +12,7 @@ UBUNTU_CODENAME=$(lsb_release -c -s)
|
|||
|
||||
disableTimeSyncd() {
|
||||
systemctl_stop 20 5 10 systemd-timesyncd || exit 3
|
||||
retrycmd_if_failure 120 5 25 systemctl disable systemd-timesyncd || exit 3
|
||||
retrycmd 120 5 25 systemctl disable systemd-timesyncd || exit 3
|
||||
}
|
||||
installEtcd() {
|
||||
CURRENT_VERSION=$(etcd --version | grep "etcd Version" | cut -d ":" -f 2 | tr -d '[:space:]')
|
||||
|
|
@ -40,8 +38,8 @@ installEtcd() {
|
|||
installDeps() {
|
||||
packages="apache2-utils apt-transport-https blobfuse ca-certificates cifs-utils conntrack cracklib-runtime dbus dkms ebtables ethtool fuse gcc git htop iftop init-system-helpers iotop iproute2 ipset iptables jq libpam-pwquality libpwquality-tools linux-headers-$(uname -r) make mount nfs-common pigz socat sysstat traceroute util-linux xz-utils zip"
|
||||
if [[ ${OS} == "${UBUNTU_OS_NAME}" ]]; then
|
||||
retrycmd_if_failure_no_stats 120 5 25 curl -fsSL https://packages.microsoft.com/config/ubuntu/${UBUNTU_RELEASE}/packages-microsoft-prod.deb >/tmp/packages-microsoft-prod.deb || exit 42
|
||||
retrycmd_if_failure 60 5 10 dpkg -i /tmp/packages-microsoft-prod.deb || exit 43
|
||||
retrycmd_no_stats 120 5 25 curl -fsSL https://packages.microsoft.com/config/ubuntu/${UBUNTU_RELEASE}/packages-microsoft-prod.deb >/tmp/packages-microsoft-prod.deb || exit 42
|
||||
retrycmd 60 5 10 dpkg -i /tmp/packages-microsoft-prod.deb || exit 43
|
||||
aptmarkWALinuxAgent hold
|
||||
packages+=" cgroup-lite ceph-common glusterfs-client"
|
||||
if [[ $UBUNTU_RELEASE == "18.04" ]]; then
|
||||
|
|
@ -70,20 +68,20 @@ installDeps() {
|
|||
}
|
||||
downloadGPUDrivers() {
|
||||
mkdir -p $GPU_DEST/tmp
|
||||
retrycmd_if_failure_no_stats 120 5 25 curl -fsSL https://nvidia.github.io/nvidia-docker/gpgkey >$GPU_DEST/tmp/aptnvidia.gpg || exit 85
|
||||
retrycmd_no_stats 120 5 25 curl -fsSL https://nvidia.github.io/nvidia-docker/gpgkey >$GPU_DEST/tmp/aptnvidia.gpg || exit 85
|
||||
wait_for_apt_locks
|
||||
retrycmd_if_failure 120 5 25 apt-key add $GPU_DEST/tmp/aptnvidia.gpg || exit 85
|
||||
retrycmd 120 5 25 apt-key add $GPU_DEST/tmp/aptnvidia.gpg || exit 85
|
||||
wait_for_apt_locks
|
||||
retrycmd_if_failure_no_stats 120 5 25 curl -fsSL https://nvidia.github.io/nvidia-docker/ubuntu${UBUNTU_RELEASE}/nvidia-docker.list >$GPU_DEST/tmp/nvidia-docker.list || exit 85
|
||||
retrycmd_no_stats 120 5 25 curl -fsSL https://nvidia.github.io/nvidia-docker/ubuntu${UBUNTU_RELEASE}/nvidia-docker.list >$GPU_DEST/tmp/nvidia-docker.list || exit 85
|
||||
wait_for_apt_locks
|
||||
retrycmd_if_failure_no_stats 120 5 25 cat $GPU_DEST/tmp/nvidia-docker.list >/etc/apt/sources.list.d/nvidia-docker.list || exit 85
|
||||
retrycmd_no_stats 120 5 25 cat $GPU_DEST/tmp/nvidia-docker.list >/etc/apt/sources.list.d/nvidia-docker.list || exit 85
|
||||
apt_get_update
|
||||
retrycmd_if_failure 30 5 60 curl -fLS https://us.download.nvidia.com/tesla/$GPU_DV/NVIDIA-Linux-x86_64-${GPU_DV}.run -o ${GPU_DEST}/nvidia-drivers-${GPU_DV} || exit 85
|
||||
retrycmd 30 5 60 curl -fLS https://us.download.nvidia.com/tesla/$GPU_DV/NVIDIA-Linux-x86_64-${GPU_DV}.run -o ${GPU_DEST}/nvidia-drivers-${GPU_DV} || exit 85
|
||||
tmpDir=$GPU_DEST/tmp
|
||||
if ! (
|
||||
set -e -o pipefail
|
||||
cd "${tmpDir}"
|
||||
retrycmd_if_failure 30 5 3600 apt-get download nvidia-docker2="${NVIDIA_DOCKER_VERSION}+${NVIDIA_DOCKER_SUFFIX}" || exit 85
|
||||
retrycmd 30 5 3600 apt-get download nvidia-docker2="${NVIDIA_DOCKER_VERSION}+${NVIDIA_DOCKER_SUFFIX}" || exit 85
|
||||
); then
|
||||
exit 85
|
||||
fi
|
||||
|
|
@ -93,10 +91,10 @@ installMoby() {
|
|||
CURRENT_VERSION=$(dockerd --version | grep "Docker version" | cut -d "," -f 1 | cut -d " " -f 3 | cut -d "+" -f 1)
|
||||
if [[ $CURRENT_VERSION != "${MOBY_VERSION}" ]]; then
|
||||
removeMoby
|
||||
retrycmd_if_failure_no_stats 120 5 25 curl https://packages.microsoft.com/config/ubuntu/${UBUNTU_RELEASE}/prod.list >/tmp/microsoft-prod.list || exit 25
|
||||
retrycmd_if_failure 10 5 10 cp /tmp/microsoft-prod.list /etc/apt/sources.list.d/ || exit 25
|
||||
retrycmd_if_failure_no_stats 120 5 25 curl https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor >/tmp/microsoft.gpg || exit 26
|
||||
retrycmd_if_failure 10 5 10 cp /tmp/microsoft.gpg /etc/apt/trusted.gpg.d/ || exit 26
|
||||
retrycmd_no_stats 120 5 25 curl https://packages.microsoft.com/config/ubuntu/${UBUNTU_RELEASE}/prod.list >/tmp/microsoft-prod.list || exit 25
|
||||
retrycmd 10 5 10 cp /tmp/microsoft-prod.list /etc/apt/sources.list.d/ || exit 25
|
||||
retrycmd_no_stats 120 5 25 curl https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor >/tmp/microsoft.gpg || exit 26
|
||||
retrycmd 10 5 10 cp /tmp/microsoft.gpg /etc/apt/trusted.gpg.d/ || exit 26
|
||||
apt_get_update || exit 99
|
||||
MOBY_CLI=${MOBY_VERSION}
|
||||
if [[ ${MOBY_CLI} == "3.0.4" ]]; then
|
||||
|
|
@ -108,9 +106,9 @@ installMoby() {
|
|||
installBcc() {
|
||||
IOVISOR_KEY_TMP=/tmp/iovisor-release.key
|
||||
IOVISOR_URL=https://repo.iovisor.org/GPG-KEY
|
||||
retrycmd_if_failure_no_stats 120 5 25 curl -fsSL $IOVISOR_URL >$IOVISOR_KEY_TMP || exit 166
|
||||
retrycmd_no_stats 120 5 25 curl -fsSL $IOVISOR_URL >$IOVISOR_KEY_TMP || exit 166
|
||||
wait_for_apt_locks
|
||||
retrycmd_if_failure 30 5 30 apt-key add $IOVISOR_KEY_TMP || exit 167
|
||||
retrycmd 30 5 30 apt-key add $IOVISOR_KEY_TMP || exit 167
|
||||
echo "deb https://repo.iovisor.org/apt/${UBUNTU_CODENAME} ${UBUNTU_CODENAME} main" >/etc/apt/sources.list.d/iovisor.list
|
||||
apt_get_update || exit 99
|
||||
apt_get_install 120 5 25 bcc-tools libbcc-examples linux-headers-$(uname -r) || exit 168
|
||||
|
|
@ -164,8 +162,8 @@ installBpftrace() {
|
|||
install_dir="$BPFTRACE_DOWNLOADS_DIR/$version"
|
||||
mkdir -p "$install_dir"
|
||||
download_path="$install_dir/$bpftrace_tools"
|
||||
retrycmd_if_failure 30 5 60 curl -fSL -o "$bpftrace_filepath" "$bpftrace_url/$bpftrace_bin" || exit 169
|
||||
retrycmd_if_failure 30 5 60 curl -fSL -o "$download_path" "$bpftrace_url/$bpftrace_tools" || exit 170
|
||||
retrycmd 30 5 60 curl -fSL -o "$bpftrace_filepath" "$bpftrace_url/$bpftrace_bin" || exit 169
|
||||
retrycmd 30 5 60 curl -fSL -o "$download_path" "$bpftrace_url/$bpftrace_tools" || exit 170
|
||||
tar -xvf "$download_path" -C "$tools_filepath"
|
||||
chmod +x "$bpftrace_filepath"
|
||||
chmod -R +x "$tools_filepath/tools"
|
||||
|
|
@ -206,7 +204,7 @@ extractKubeBinaries() {
|
|||
pullContainerImage() {
|
||||
CLI_TOOL=$1
|
||||
DOCKER_IMAGE_URL=$2
|
||||
retrycmd_if_failure 60 1 1200 $CLI_TOOL pull $DOCKER_IMAGE_URL || exit 35
|
||||
retrycmd 60 1 1200 $CLI_TOOL pull $DOCKER_IMAGE_URL || exit 35
|
||||
}
|
||||
overrideNetworkConfig() {
|
||||
CONFIG_FILEPATH="/etc/cloud/cloud.cfg.d/80_azure_net_config.cfg"
|
||||
|
|
|
|||
|
|
@ -259,7 +259,7 @@ fi
|
|||
VALIDATION_ERR=0
|
||||
|
||||
{{- if IsHostedMaster }}
|
||||
RES=$(retrycmd_if_failure 20 1 3 nslookup ${API_SERVER_NAME})
|
||||
RES=$(retrycmd 20 1 3 nslookup ${API_SERVER_NAME})
|
||||
STS=$?
|
||||
if [[ $STS != 0 ]]; then
|
||||
if [[ $RES == *"168.63.129.16"* ]]; then
|
||||
|
|
@ -268,7 +268,7 @@ if [[ $STS != 0 ]]; then
|
|||
VALIDATION_ERR={{GetCSEErrorCode "ERR_K8S_API_SERVER_DNS_LOOKUP_FAIL"}}
|
||||
fi
|
||||
fi
|
||||
retrycmd_if_failure 50 1 3 nc -vz ${API_SERVER_NAME} 443 || VALIDATION_ERR={{GetCSEErrorCode "ERR_K8S_API_SERVER_CONN_FAIL"}}
|
||||
retrycmd 50 1 3 nc -vz ${API_SERVER_NAME} 443 || VALIDATION_ERR={{GetCSEErrorCode "ERR_K8S_API_SERVER_CONN_FAIL"}}
|
||||
{{end}}
|
||||
|
||||
if $REBOOTREQUIRED; then
|
||||
|
|
|
|||
|
|
@ -5,6 +5,6 @@ source {{GetCSEHelpersScriptFilepath}}
|
|||
echo " dns-search {{GetSearchDomainName}}" | tee -a /etc/network/interfaces.d/50-cloud-init.cfg
|
||||
systemctl_restart 20 5 10 networking
|
||||
wait_for_apt_locks
|
||||
retrycmd_if_failure 10 5 120 apt-get -y install realmd sssd sssd-tools samba-common samba samba-common python2.7 samba-libs packagekit
|
||||
retrycmd 10 5 120 apt-get -y install realmd sssd sssd-tools samba-common samba samba-common python2.7 samba-libs packagekit
|
||||
wait_for_apt_locks
|
||||
echo "{{GetSearchDomainRealmPassword}}" | realm join -U {{GetSearchDomainRealmUser}}@$(echo "{{GetSearchDomainName}}" | tr /a-z/ /A-Z/) $(echo "{{GetSearchDomainName}}" | tr /a-z/ /A-Z/)
|
||||
|
|
|
|||
|
|
@ -39754,7 +39754,7 @@ systemctlEnableAndStart() {
|
|||
if [ $RESTART_STATUS -ne 0 ]; then
|
||||
return 1
|
||||
fi
|
||||
if ! retrycmd_if_failure 120 5 25 systemctl enable $1; then
|
||||
if ! retrycmd 120 5 25 systemctl enable $1; then
|
||||
return 1
|
||||
fi
|
||||
}
|
||||
|
|
@ -39837,7 +39837,7 @@ configureEtcd() {
|
|||
sleep 1
|
||||
fi
|
||||
done
|
||||
retrycmd_if_failure 120 5 25 sudo -E etcdctl member update $MEMBER ${ETCD_PEER_URL} || exit {{GetCSEErrorCode "ERR_ETCD_CONFIG_FAIL"}}
|
||||
retrycmd 120 5 25 sudo -E etcdctl member update $MEMBER ${ETCD_PEER_URL} || exit {{GetCSEErrorCode "ERR_ETCD_CONFIG_FAIL"}}
|
||||
}
|
||||
ensureNTP() {
|
||||
systemctlEnableAndStart ntp || exit {{GetCSEErrorCode "ERR_SYSTEMCTL_START_FAIL"}}
|
||||
|
|
@ -39970,7 +39970,7 @@ installAzureCNI() {
|
|||
{{end}}
|
||||
configureCNI() {
|
||||
{{/* needed for the iptables rules to work on bridges */}}
|
||||
retrycmd_if_failure 120 5 25 modprobe br_netfilter || exit {{GetCSEErrorCode "ERR_MODPROBE_FAIL"}}
|
||||
retrycmd 120 5 25 modprobe br_netfilter || exit {{GetCSEErrorCode "ERR_MODPROBE_FAIL"}}
|
||||
echo -n "br_netfilter" >/etc/modules-load.d/br_netfilter.conf
|
||||
configureCNIIPTables
|
||||
{{if HasCiliumNetworkPlugin}}
|
||||
|
|
@ -40013,9 +40013,9 @@ installContainerd() {
|
|||
fi
|
||||
removeContainerd
|
||||
echo "deb [arch=amd64,arm64,armhf] https://packages.microsoft.com/${url_path} testing main" >/tmp/microsoft-prod-testing.list
|
||||
retrycmd_if_failure 10 5 10 cp /tmp/microsoft-prod-testing.list /etc/apt/sources.list.d/ || exit 25
|
||||
retrycmd_if_failure_no_stats 120 5 25 curl https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor >/tmp/microsoft.gpg || exit 26
|
||||
retrycmd_if_failure 10 5 10 cp /tmp/microsoft.gpg /etc/apt/trusted.gpg.d/ || exit 26
|
||||
retrycmd 10 5 10 cp /tmp/microsoft-prod-testing.list /etc/apt/sources.list.d/ || exit 25
|
||||
retrycmd_no_stats 120 5 25 curl https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor >/tmp/microsoft.gpg || exit 26
|
||||
retrycmd 10 5 10 cp /tmp/microsoft.gpg /etc/apt/trusted.gpg.d/ || exit 26
|
||||
apt_get_update || exit 99
|
||||
apt_get_install 20 30 120 moby-containerd=${CONTAINERD_VERSION}* --allow-downgrades || exit 27
|
||||
fi
|
||||
|
|
@ -40062,7 +40062,7 @@ ensureDHCPv6() {
|
|||
wait_for_file 3600 1 {{GetDHCPv6ServiceCSEScriptFilepath}} || exit {{GetCSEErrorCode "ERR_FILE_WATCH_TIMEOUT"}}
|
||||
wait_for_file 3600 1 {{GetDHCPv6ConfigCSEScriptFilepath}} || exit {{GetCSEErrorCode "ERR_FILE_WATCH_TIMEOUT"}}
|
||||
systemctlEnableAndStart dhcpv6 || exit {{GetCSEErrorCode "ERR_SYSTEMCTL_START_FAIL"}}
|
||||
retrycmd_if_failure 120 5 25 modprobe ip6_tables || exit {{GetCSEErrorCode "ERR_MODPROBE_FAIL"}}
|
||||
retrycmd 120 5 25 modprobe ip6_tables || exit {{GetCSEErrorCode "ERR_MODPROBE_FAIL"}}
|
||||
}
|
||||
{{end}}
|
||||
ensureKubelet() {
|
||||
|
|
@ -40128,18 +40128,18 @@ ensureK8sControlPlane() {
|
|||
if $REBOOTREQUIRED || [ "$NO_OUTBOUND" = "true" ]; then
|
||||
return
|
||||
fi
|
||||
retrycmd_if_failure 120 5 25 $KUBECTL 2>/dev/null cluster-info || exit {{GetCSEErrorCode "ERR_K8S_RUNNING_TIMEOUT"}}
|
||||
retrycmd 120 5 25 $KUBECTL 2>/dev/null cluster-info || exit {{GetCSEErrorCode "ERR_K8S_RUNNING_TIMEOUT"}}
|
||||
}
|
||||
{{- if IsAzurePolicyAddonEnabled}}
|
||||
ensureLabelExclusionForAzurePolicyAddon() {
|
||||
GATEKEEPER_NAMESPACE="gatekeeper-system"
|
||||
retrycmd_if_failure 120 5 25 $KUBECTL create ns --save-config $GATEKEEPER_NAMESPACE 2>/dev/null || exit {{GetCSEErrorCode "ERR_K8S_RUNNING_TIMEOUT"}}
|
||||
retrycmd 120 5 25 $KUBECTL create ns --save-config $GATEKEEPER_NAMESPACE 2>/dev/null || exit {{GetCSEErrorCode "ERR_K8S_RUNNING_TIMEOUT"}}
|
||||
|
||||
retrycmd_if_failure 120 5 25 $KUBECTL label ns kube-system control-plane=controller-manager 2>/dev/null || exit {{GetCSEErrorCode "ERR_K8S_RUNNING_TIMEOUT"}}
|
||||
retrycmd 120 5 25 $KUBECTL label ns kube-system control-plane=controller-manager 2>/dev/null || exit {{GetCSEErrorCode "ERR_K8S_RUNNING_TIMEOUT"}}
|
||||
}
|
||||
{{end}}
|
||||
ensureEtcd() {
|
||||
retrycmd_if_failure 120 5 25 curl --cacert /etc/kubernetes/certs/ca.crt --cert /etc/kubernetes/certs/etcdclient.crt --key /etc/kubernetes/certs/etcdclient.key ${ETCD_CLIENT_URL}/v2/machines || exit {{GetCSEErrorCode "ERR_ETCD_RUNNING_TIMEOUT"}}
|
||||
retrycmd 120 5 25 curl --cacert /etc/kubernetes/certs/ca.crt --cert /etc/kubernetes/certs/etcdclient.crt --key /etc/kubernetes/certs/etcdclient.key ${ETCD_CLIENT_URL}/v2/machines || exit {{GetCSEErrorCode "ERR_ETCD_RUNNING_TIMEOUT"}}
|
||||
}
|
||||
createKubeManifestDir() {
|
||||
KUBEMANIFESTDIR=/etc/kubernetes/manifests
|
||||
|
|
@ -40244,9 +40244,9 @@ configGPUDrivers() {
|
|||
{{/* we will manually install nvidia-docker2 */}}
|
||||
rmmod nouveau
|
||||
echo blacklist nouveau >>/etc/modprobe.d/blacklist.conf
|
||||
retrycmd_if_failure_no_stats 120 5 25 update-initramfs -u || exit {{GetCSEErrorCode "ERR_GPU_DRIVERS_CONFIG"}}
|
||||
retrycmd_no_stats 120 5 25 update-initramfs -u || exit {{GetCSEErrorCode "ERR_GPU_DRIVERS_CONFIG"}}
|
||||
wait_for_apt_locks
|
||||
retrycmd_if_failure 30 5 3600 apt-get -o Dpkg::Options::="--force-confold" install -y nvidia-container-runtime="${NVIDIA_CONTAINER_RUNTIME_VERSION}+${NVIDIA_DOCKER_SUFFIX}" || exit {{GetCSEErrorCode "ERR_GPU_DRIVERS_CONFIG"}}
|
||||
retrycmd 30 5 3600 apt-get -o Dpkg::Options::="--force-confold" install -y nvidia-container-runtime="${NVIDIA_CONTAINER_RUNTIME_VERSION}+${NVIDIA_DOCKER_SUFFIX}" || exit {{GetCSEErrorCode "ERR_GPU_DRIVERS_CONFIG"}}
|
||||
tmpDir=$GPU_DEST/tmp
|
||||
(
|
||||
set -e -o pipefail
|
||||
|
|
@ -40256,17 +40256,17 @@ configGPUDrivers() {
|
|||
cp -r ${tmpDir}/pkg/usr/* /usr/ || exit {{GetCSEErrorCode "ERR_GPU_DRIVERS_CONFIG"}}
|
||||
)
|
||||
rm -rf $GPU_DEST/tmp
|
||||
retrycmd_if_failure 120 5 25 pkill -SIGHUP dockerd || exit {{GetCSEErrorCode "ERR_GPU_DRIVERS_CONFIG"}}
|
||||
retrycmd 120 5 25 pkill -SIGHUP dockerd || exit {{GetCSEErrorCode "ERR_GPU_DRIVERS_CONFIG"}}
|
||||
mkdir -p $GPU_DEST/lib64 $GPU_DEST/overlay-workdir
|
||||
retrycmd_if_failure 120 5 25 mount -t overlay -o lowerdir=/usr/lib/x86_64-linux-gnu,upperdir=${GPU_DEST}/lib64,workdir=${GPU_DEST}/overlay-workdir none /usr/lib/x86_64-linux-gnu || exit {{GetCSEErrorCode "ERR_GPU_DRIVERS_CONFIG"}}
|
||||
retrycmd 120 5 25 mount -t overlay -o lowerdir=/usr/lib/x86_64-linux-gnu,upperdir=${GPU_DEST}/lib64,workdir=${GPU_DEST}/overlay-workdir none /usr/lib/x86_64-linux-gnu || exit {{GetCSEErrorCode "ERR_GPU_DRIVERS_CONFIG"}}
|
||||
export -f installNvidiaDrivers
|
||||
retrycmd_if_failure 3 1 600 bash -c installNvidiaDrivers || exit {{GetCSEErrorCode "ERR_GPU_DRIVERS_START_FAIL"}}
|
||||
retrycmd 3 1 600 bash -c installNvidiaDrivers || exit {{GetCSEErrorCode "ERR_GPU_DRIVERS_START_FAIL"}}
|
||||
echo "${GPU_DEST}/lib64" >/etc/ld.so.conf.d/nvidia.conf
|
||||
retrycmd_if_failure 120 5 25 ldconfig || exit {{GetCSEErrorCode "ERR_GPU_DRIVERS_START_FAIL"}}
|
||||
retrycmd 120 5 25 ldconfig || exit {{GetCSEErrorCode "ERR_GPU_DRIVERS_START_FAIL"}}
|
||||
umount -l /usr/lib/x86_64-linux-gnu
|
||||
retrycmd_if_failure 120 5 25 nvidia-modprobe -u -c0 || exit {{GetCSEErrorCode "ERR_GPU_DRIVERS_START_FAIL"}}
|
||||
retrycmd_if_failure 120 5 25 $GPU_DEST/bin/nvidia-smi || exit {{GetCSEErrorCode "ERR_GPU_DRIVERS_START_FAIL"}}
|
||||
retrycmd_if_failure 120 5 25 ldconfig || exit {{GetCSEErrorCode "ERR_GPU_DRIVERS_START_FAIL"}}
|
||||
retrycmd 120 5 25 nvidia-modprobe -u -c0 || exit {{GetCSEErrorCode "ERR_GPU_DRIVERS_START_FAIL"}}
|
||||
retrycmd 120 5 25 $GPU_DEST/bin/nvidia-smi || exit {{GetCSEErrorCode "ERR_GPU_DRIVERS_START_FAIL"}}
|
||||
retrycmd 120 5 25 ldconfig || exit {{GetCSEErrorCode "ERR_GPU_DRIVERS_START_FAIL"}}
|
||||
}
|
||||
ensureGPUDrivers() {
|
||||
configGPUDrivers
|
||||
|
|
@ -40279,16 +40279,16 @@ installSGXDrivers() {
|
|||
|
||||
local packages="make gcc dkms"
|
||||
wait_for_apt_locks
|
||||
retrycmd_if_failure 30 5 3600 apt-get -y install "$packages" || exit 90
|
||||
retrycmd 30 5 3600 apt-get -y install "$packages" || exit 90
|
||||
|
||||
local oe_dir=/opt/azure/containers/oe
|
||||
rm -rf ${oe_dir}
|
||||
mkdir -p ${oe_dir}
|
||||
pushd ${oe_dir} || exit
|
||||
retrycmd_if_failure 10 10 120 curl -fsSL -O "https://download.01.org/intel-sgx/latest/version.xml" || exit 90
|
||||
retrycmd 10 10 120 curl -fsSL -O "https://download.01.org/intel-sgx/latest/version.xml" || exit 90
|
||||
dcap_version="$(grep dcap version.xml | grep -o -E "[.0-9]+")"
|
||||
sgx_driver_folder_url="https://download.01.org/intel-sgx/sgx-dcap/$dcap_version/linux"
|
||||
retrycmd_if_failure 10 10 120 curl -fsSL -O "$sgx_driver_folder_url/SHA256SUM_dcap_$dcap_version" || exit 90
|
||||
retrycmd 10 10 120 curl -fsSL -O "$sgx_driver_folder_url/SHA256SUM_dcap_$dcap_version" || exit 90
|
||||
matched_line="$(grep "distro/ubuntuServer$UBUNTU_RELEASE/sgx_linux_x64_driver_.*bin" SHA256SUM_dcap_$dcap_version)"
|
||||
read -ra tmp_array <<<"$matched_line"
|
||||
sgx_driver_sha256sum_expected="${tmp_array[0]}"
|
||||
|
|
@ -40296,7 +40296,7 @@ installSGXDrivers() {
|
|||
sgx_driver_url="${sgx_driver_folder_url}/${sgx_driver_remote_path}"
|
||||
sgx_driver=$(basename "$sgx_driver_url")
|
||||
|
||||
retrycmd_if_failure 10 10 120 curl -fsSL -O "${sgx_driver_url}" || exit 90
|
||||
retrycmd 10 10 120 curl -fsSL -O "${sgx_driver_url}" || exit 90
|
||||
read -ra tmp_array <<<"$(sha256sum ./"$sgx_driver")"
|
||||
sgx_driver_sha256sum_real="${tmp_array[0]}"
|
||||
[[ $sgx_driver_sha256sum_real == "$sgx_driver_sha256sum_expected" ]] || exit 93
|
||||
|
|
@ -40395,7 +40395,7 @@ ensureCertificates() {
|
|||
|
||||
configureK8sCustomCloud() {
|
||||
export -f ensureCertificates
|
||||
retrycmd_if_failure 60 10 30 bash -c ensureCertificates
|
||||
retrycmd 60 10 30 bash -c ensureCertificates
|
||||
set +x
|
||||
# When AUTHENTICATION_METHOD is client_certificate, the certificate is stored into key valut,
|
||||
# And SERVICE_PRINCIPAL_CLIENT_SECRET will be the following json payload with based64 encode
|
||||
|
|
@ -40585,7 +40585,7 @@ configure_prerequisites() {
|
|||
|
||||
aptmarkWALinuxAgent() {
|
||||
wait_for_apt_locks
|
||||
retrycmd_if_failure 120 5 25 apt-mark $1 walinuxagent ||
|
||||
retrycmd 120 5 25 apt-mark $1 walinuxagent ||
|
||||
if [[ $1 == "hold" ]]; then
|
||||
exit 7
|
||||
elif [[ $1 == "unhold" ]]; then
|
||||
|
|
@ -40593,7 +40593,7 @@ aptmarkWALinuxAgent() {
|
|||
fi
|
||||
}
|
||||
|
||||
retrycmd_if_failure() {
|
||||
retrycmd() {
|
||||
retries=$1; wait_sleep=$2; timeout=$3; shift && shift && shift
|
||||
for i in $(seq 1 $retries); do
|
||||
timeout $timeout ${@} && break ||
|
||||
|
|
@ -40606,7 +40606,7 @@ retrycmd_if_failure() {
|
|||
done
|
||||
echo Executed \"$@\" $i times
|
||||
}
|
||||
retrycmd_if_failure_no_stats() {
|
||||
retrycmd_no_stats() {
|
||||
retries=$1; wait_sleep=$2; timeout=$3; shift && shift && shift
|
||||
for i in $(seq 1 $retries); do
|
||||
timeout $timeout ${@} && break ||
|
||||
|
|
@ -40796,8 +40796,6 @@ func k8sCloudInitArtifactsCse_helpersSh() (*asset, error) {
|
|||
|
||||
var _k8sCloudInitArtifactsCse_installSh = []byte(`#!/bin/bash
|
||||
|
||||
CC_SERVICE_IN_TMP=/opt/azure/containers/cc-proxy.service.in
|
||||
CC_SOCKET_IN_TMP=/opt/azure/containers/cc-proxy.socket.in
|
||||
CNI_CONFIG_DIR="/etc/cni/net.d"
|
||||
CNI_BIN_DIR="/opt/cni/bin"
|
||||
CNI_DOWNLOADS_DIR="/opt/cni/downloads"
|
||||
|
|
@ -40810,7 +40808,7 @@ UBUNTU_CODENAME=$(lsb_release -c -s)
|
|||
|
||||
disableTimeSyncd() {
|
||||
systemctl_stop 20 5 10 systemd-timesyncd || exit 3
|
||||
retrycmd_if_failure 120 5 25 systemctl disable systemd-timesyncd || exit 3
|
||||
retrycmd 120 5 25 systemctl disable systemd-timesyncd || exit 3
|
||||
}
|
||||
installEtcd() {
|
||||
CURRENT_VERSION=$(etcd --version | grep "etcd Version" | cut -d ":" -f 2 | tr -d '[:space:]')
|
||||
|
|
@ -40836,8 +40834,8 @@ installEtcd() {
|
|||
installDeps() {
|
||||
packages="apache2-utils apt-transport-https blobfuse ca-certificates cifs-utils conntrack cracklib-runtime dbus dkms ebtables ethtool fuse gcc git htop iftop init-system-helpers iotop iproute2 ipset iptables jq libpam-pwquality libpwquality-tools linux-headers-$(uname -r) make mount nfs-common pigz socat sysstat traceroute util-linux xz-utils zip"
|
||||
if [[ ${OS} == "${UBUNTU_OS_NAME}" ]]; then
|
||||
retrycmd_if_failure_no_stats 120 5 25 curl -fsSL https://packages.microsoft.com/config/ubuntu/${UBUNTU_RELEASE}/packages-microsoft-prod.deb >/tmp/packages-microsoft-prod.deb || exit 42
|
||||
retrycmd_if_failure 60 5 10 dpkg -i /tmp/packages-microsoft-prod.deb || exit 43
|
||||
retrycmd_no_stats 120 5 25 curl -fsSL https://packages.microsoft.com/config/ubuntu/${UBUNTU_RELEASE}/packages-microsoft-prod.deb >/tmp/packages-microsoft-prod.deb || exit 42
|
||||
retrycmd 60 5 10 dpkg -i /tmp/packages-microsoft-prod.deb || exit 43
|
||||
aptmarkWALinuxAgent hold
|
||||
packages+=" cgroup-lite ceph-common glusterfs-client"
|
||||
if [[ $UBUNTU_RELEASE == "18.04" ]]; then
|
||||
|
|
@ -40866,20 +40864,20 @@ installDeps() {
|
|||
}
|
||||
downloadGPUDrivers() {
|
||||
mkdir -p $GPU_DEST/tmp
|
||||
retrycmd_if_failure_no_stats 120 5 25 curl -fsSL https://nvidia.github.io/nvidia-docker/gpgkey >$GPU_DEST/tmp/aptnvidia.gpg || exit 85
|
||||
retrycmd_no_stats 120 5 25 curl -fsSL https://nvidia.github.io/nvidia-docker/gpgkey >$GPU_DEST/tmp/aptnvidia.gpg || exit 85
|
||||
wait_for_apt_locks
|
||||
retrycmd_if_failure 120 5 25 apt-key add $GPU_DEST/tmp/aptnvidia.gpg || exit 85
|
||||
retrycmd 120 5 25 apt-key add $GPU_DEST/tmp/aptnvidia.gpg || exit 85
|
||||
wait_for_apt_locks
|
||||
retrycmd_if_failure_no_stats 120 5 25 curl -fsSL https://nvidia.github.io/nvidia-docker/ubuntu${UBUNTU_RELEASE}/nvidia-docker.list >$GPU_DEST/tmp/nvidia-docker.list || exit 85
|
||||
retrycmd_no_stats 120 5 25 curl -fsSL https://nvidia.github.io/nvidia-docker/ubuntu${UBUNTU_RELEASE}/nvidia-docker.list >$GPU_DEST/tmp/nvidia-docker.list || exit 85
|
||||
wait_for_apt_locks
|
||||
retrycmd_if_failure_no_stats 120 5 25 cat $GPU_DEST/tmp/nvidia-docker.list >/etc/apt/sources.list.d/nvidia-docker.list || exit 85
|
||||
retrycmd_no_stats 120 5 25 cat $GPU_DEST/tmp/nvidia-docker.list >/etc/apt/sources.list.d/nvidia-docker.list || exit 85
|
||||
apt_get_update
|
||||
retrycmd_if_failure 30 5 60 curl -fLS https://us.download.nvidia.com/tesla/$GPU_DV/NVIDIA-Linux-x86_64-${GPU_DV}.run -o ${GPU_DEST}/nvidia-drivers-${GPU_DV} || exit 85
|
||||
retrycmd 30 5 60 curl -fLS https://us.download.nvidia.com/tesla/$GPU_DV/NVIDIA-Linux-x86_64-${GPU_DV}.run -o ${GPU_DEST}/nvidia-drivers-${GPU_DV} || exit 85
|
||||
tmpDir=$GPU_DEST/tmp
|
||||
if ! (
|
||||
set -e -o pipefail
|
||||
cd "${tmpDir}"
|
||||
retrycmd_if_failure 30 5 3600 apt-get download nvidia-docker2="${NVIDIA_DOCKER_VERSION}+${NVIDIA_DOCKER_SUFFIX}" || exit 85
|
||||
retrycmd 30 5 3600 apt-get download nvidia-docker2="${NVIDIA_DOCKER_VERSION}+${NVIDIA_DOCKER_SUFFIX}" || exit 85
|
||||
); then
|
||||
exit 85
|
||||
fi
|
||||
|
|
@ -40889,10 +40887,10 @@ installMoby() {
|
|||
CURRENT_VERSION=$(dockerd --version | grep "Docker version" | cut -d "," -f 1 | cut -d " " -f 3 | cut -d "+" -f 1)
|
||||
if [[ $CURRENT_VERSION != "${MOBY_VERSION}" ]]; then
|
||||
removeMoby
|
||||
retrycmd_if_failure_no_stats 120 5 25 curl https://packages.microsoft.com/config/ubuntu/${UBUNTU_RELEASE}/prod.list >/tmp/microsoft-prod.list || exit 25
|
||||
retrycmd_if_failure 10 5 10 cp /tmp/microsoft-prod.list /etc/apt/sources.list.d/ || exit 25
|
||||
retrycmd_if_failure_no_stats 120 5 25 curl https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor >/tmp/microsoft.gpg || exit 26
|
||||
retrycmd_if_failure 10 5 10 cp /tmp/microsoft.gpg /etc/apt/trusted.gpg.d/ || exit 26
|
||||
retrycmd_no_stats 120 5 25 curl https://packages.microsoft.com/config/ubuntu/${UBUNTU_RELEASE}/prod.list >/tmp/microsoft-prod.list || exit 25
|
||||
retrycmd 10 5 10 cp /tmp/microsoft-prod.list /etc/apt/sources.list.d/ || exit 25
|
||||
retrycmd_no_stats 120 5 25 curl https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor >/tmp/microsoft.gpg || exit 26
|
||||
retrycmd 10 5 10 cp /tmp/microsoft.gpg /etc/apt/trusted.gpg.d/ || exit 26
|
||||
apt_get_update || exit 99
|
||||
MOBY_CLI=${MOBY_VERSION}
|
||||
if [[ ${MOBY_CLI} == "3.0.4" ]]; then
|
||||
|
|
@ -40904,9 +40902,9 @@ installMoby() {
|
|||
installBcc() {
|
||||
IOVISOR_KEY_TMP=/tmp/iovisor-release.key
|
||||
IOVISOR_URL=https://repo.iovisor.org/GPG-KEY
|
||||
retrycmd_if_failure_no_stats 120 5 25 curl -fsSL $IOVISOR_URL >$IOVISOR_KEY_TMP || exit 166
|
||||
retrycmd_no_stats 120 5 25 curl -fsSL $IOVISOR_URL >$IOVISOR_KEY_TMP || exit 166
|
||||
wait_for_apt_locks
|
||||
retrycmd_if_failure 30 5 30 apt-key add $IOVISOR_KEY_TMP || exit 167
|
||||
retrycmd 30 5 30 apt-key add $IOVISOR_KEY_TMP || exit 167
|
||||
echo "deb https://repo.iovisor.org/apt/${UBUNTU_CODENAME} ${UBUNTU_CODENAME} main" >/etc/apt/sources.list.d/iovisor.list
|
||||
apt_get_update || exit 99
|
||||
apt_get_install 120 5 25 bcc-tools libbcc-examples linux-headers-$(uname -r) || exit 168
|
||||
|
|
@ -40960,8 +40958,8 @@ installBpftrace() {
|
|||
install_dir="$BPFTRACE_DOWNLOADS_DIR/$version"
|
||||
mkdir -p "$install_dir"
|
||||
download_path="$install_dir/$bpftrace_tools"
|
||||
retrycmd_if_failure 30 5 60 curl -fSL -o "$bpftrace_filepath" "$bpftrace_url/$bpftrace_bin" || exit 169
|
||||
retrycmd_if_failure 30 5 60 curl -fSL -o "$download_path" "$bpftrace_url/$bpftrace_tools" || exit 170
|
||||
retrycmd 30 5 60 curl -fSL -o "$bpftrace_filepath" "$bpftrace_url/$bpftrace_bin" || exit 169
|
||||
retrycmd 30 5 60 curl -fSL -o "$download_path" "$bpftrace_url/$bpftrace_tools" || exit 170
|
||||
tar -xvf "$download_path" -C "$tools_filepath"
|
||||
chmod +x "$bpftrace_filepath"
|
||||
chmod -R +x "$tools_filepath/tools"
|
||||
|
|
@ -41002,7 +41000,7 @@ extractKubeBinaries() {
|
|||
pullContainerImage() {
|
||||
CLI_TOOL=$1
|
||||
DOCKER_IMAGE_URL=$2
|
||||
retrycmd_if_failure 60 1 1200 $CLI_TOOL pull $DOCKER_IMAGE_URL || exit 35
|
||||
retrycmd 60 1 1200 $CLI_TOOL pull $DOCKER_IMAGE_URL || exit 35
|
||||
}
|
||||
overrideNetworkConfig() {
|
||||
CONFIG_FILEPATH="/etc/cloud/cloud.cfg.d/80_azure_net_config.cfg"
|
||||
|
|
@ -41292,7 +41290,7 @@ fi
|
|||
VALIDATION_ERR=0
|
||||
|
||||
{{- if IsHostedMaster }}
|
||||
RES=$(retrycmd_if_failure 20 1 3 nslookup ${API_SERVER_NAME})
|
||||
RES=$(retrycmd 20 1 3 nslookup ${API_SERVER_NAME})
|
||||
STS=$?
|
||||
if [[ $STS != 0 ]]; then
|
||||
if [[ $RES == *"168.63.129.16"* ]]; then
|
||||
|
|
@ -41301,7 +41299,7 @@ if [[ $STS != 0 ]]; then
|
|||
VALIDATION_ERR={{GetCSEErrorCode "ERR_K8S_API_SERVER_DNS_LOOKUP_FAIL"}}
|
||||
fi
|
||||
fi
|
||||
retrycmd_if_failure 50 1 3 nc -vz ${API_SERVER_NAME} 443 || VALIDATION_ERR={{GetCSEErrorCode "ERR_K8S_API_SERVER_CONN_FAIL"}}
|
||||
retrycmd 50 1 3 nc -vz ${API_SERVER_NAME} 443 || VALIDATION_ERR={{GetCSEErrorCode "ERR_K8S_API_SERVER_CONN_FAIL"}}
|
||||
{{end}}
|
||||
|
||||
if $REBOOTREQUIRED; then
|
||||
|
|
@ -42314,7 +42312,7 @@ source {{GetCSEHelpersScriptFilepath}}
|
|||
echo " dns-search {{GetSearchDomainName}}" | tee -a /etc/network/interfaces.d/50-cloud-init.cfg
|
||||
systemctl_restart 20 5 10 networking
|
||||
wait_for_apt_locks
|
||||
retrycmd_if_failure 10 5 120 apt-get -y install realmd sssd sssd-tools samba-common samba samba-common python2.7 samba-libs packagekit
|
||||
retrycmd 10 5 120 apt-get -y install realmd sssd sssd-tools samba-common samba samba-common python2.7 samba-libs packagekit
|
||||
wait_for_apt_locks
|
||||
echo "{{GetSearchDomainRealmPassword}}" | realm join -U {{GetSearchDomainRealmUser}}@$(echo "{{GetSearchDomainName}}" | tr /a-z/ /A-Z/) $(echo "{{GetSearchDomainName}}" | tr /a-z/ /A-Z/)
|
||||
`)
|
||||
|
|
|
|||
|
|
@ -4,14 +4,14 @@ go 1.13
|
|||
|
||||
require (
|
||||
github.com/Azure/aks-engine v0.43.0
|
||||
github.com/Azure/azure-sdk-for-go v36.2.0+incompatible
|
||||
github.com/Azure/azure-sdk-for-go v41.0.0+incompatible
|
||||
github.com/Azure/go-autorest/autorest/to v0.3.0
|
||||
github.com/influxdata/influxdb v1.7.9
|
||||
github.com/kelseyhightower/envconfig v1.4.0
|
||||
github.com/onsi/ginkgo v1.10.3
|
||||
github.com/onsi/gomega v1.4.3
|
||||
github.com/pkg/errors v0.8.1
|
||||
golang.org/x/crypto v0.0.0-20191105034135-c7e5f84aec59
|
||||
golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413
|
||||
)
|
||||
|
||||
replace github.com/Azure/aks-engine v0.43.0 => ../..
|
||||
|
|
|
|||
|
|
@ -2,13 +2,19 @@ cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMT
|
|||
github.com/Azure/aks-engine/test/e2e v0.0.0-20200318043210-65f753070203/go.mod h1:l2ouajPEF2NOAKpMaTgxYsf5+1mhbcHgXyuV4vVOBzs=
|
||||
github.com/Azure/azure-sdk-for-go v36.2.0+incompatible h1:09cv2WoH0g6jl6m2iT+R9qcIPZKhXEL0sbmLhxP895s=
|
||||
github.com/Azure/azure-sdk-for-go v36.2.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc=
|
||||
github.com/Azure/azure-sdk-for-go v41.0.0+incompatible h1:nQc4CAuBSr8rO0aZ90NvHoKyWYodhtzSAS4DPDrCtqo=
|
||||
github.com/Azure/azure-sdk-for-go v41.0.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc=
|
||||
github.com/Azure/go-autorest/autorest v0.9.0/go.mod h1:xyHB1BMZT0cuDHU7I0+g046+BFDTQ8rEZB0s4Yfa6bI=
|
||||
github.com/Azure/go-autorest/autorest v0.9.2 h1:6AWuh3uWrsZJcNoCHrCF/+g4aKPCU39kaMO6/qrnK/4=
|
||||
github.com/Azure/go-autorest/autorest v0.9.2/go.mod h1:xyHB1BMZT0cuDHU7I0+g046+BFDTQ8rEZB0s4Yfa6bI=
|
||||
github.com/Azure/go-autorest/autorest v0.9.6 h1:5YWtOnckcudzIw8lPPBcWOnmIFWMtHci1ZWAZulMSx0=
|
||||
github.com/Azure/go-autorest/autorest v0.9.6/go.mod h1:/FALq9T/kS7b5J5qsQ+RSTUdAmGFqi0vUdVNNx8q630=
|
||||
github.com/Azure/go-autorest/autorest/adal v0.5.0/go.mod h1:8Z9fGy2MpX0PvDjB1pEgQTmVqjGhiHBW7RJJEciWzS0=
|
||||
github.com/Azure/go-autorest/autorest/adal v0.6.0/go.mod h1:Z6vX6WXXuyieHAXwMj0S6HY6e6wcHn37qQMBQlvY3lc=
|
||||
github.com/Azure/go-autorest/autorest/adal v0.8.0 h1:CxTzQrySOxDnKpLjFJeZAS5Qrv/qFPkgLjx5bOAi//I=
|
||||
github.com/Azure/go-autorest/autorest/adal v0.8.0/go.mod h1:Z6vX6WXXuyieHAXwMj0S6HY6e6wcHn37qQMBQlvY3lc=
|
||||
github.com/Azure/go-autorest/autorest/adal v0.8.2 h1:O1X4oexUxnZCaEUGsvMnr8ZGj8HI37tNezwY4npRqA0=
|
||||
github.com/Azure/go-autorest/autorest/adal v0.8.2/go.mod h1:ZjhuQClTqx435SRJ2iMlOxPYt3d2C/T/7TiQCVZSn3Q=
|
||||
github.com/Azure/go-autorest/autorest/azure/cli v0.3.0/go.mod h1:rNYMNAefZMRowqCV0cVhr/YDW5dD7afFq9nXAXL4ykE=
|
||||
github.com/Azure/go-autorest/autorest/date v0.1.0/go.mod h1:plvfp3oPSKwf2DNjlBjWF/7vwR+cUD/ELuzDCXwHUVA=
|
||||
github.com/Azure/go-autorest/autorest/date v0.2.0 h1:yW+Zlqf26583pE43KhfnhFcdmSWlm5Ew6bxipnr/tbM=
|
||||
|
|
@ -120,6 +126,8 @@ github.com/x-cray/logrus-prefixed-formatter v0.5.2/go.mod h1:2duySbKsL6M18s5GU7V
|
|||
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
|
||||
golang.org/x/crypto v0.0.0-20191105034135-c7e5f84aec59 h1:PyXRxSVbvzDGuqYXjHndV7xDzJ7w2K8KD9Ef8GB7KOE=
|
||||
golang.org/x/crypto v0.0.0-20191105034135-c7e5f84aec59/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
|
||||
golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413 h1:ULYEB3JvPRE/IfO+9uO7vKV/xzVTO7XPAwm8xbf4w2g=
|
||||
golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
|
||||
golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
|
||||
golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
|
||||
golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче