Skip to content
This repository has been archived by the owner on Oct 24, 2023. It is now read-only.

chore: install -proposed systemd package #630

Merged
merged 3 commits into from
Mar 5, 2019
Merged

chore: install -proposed systemd package #630

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0c5e6e9
chore: install -proposed systemd package
jackfrancis Mar 2, 2019
ffea666
chore: use standard apt_get_install func
jackfrancis Mar 4, 2019
08eba67
chore: add systemd install message
jackfrancis Mar 4, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 8 additions & 0 deletions parts/k8s/kubernetesagentcustomdata.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,14 @@ write_files:
RemainAfterExit=yes
ExecStart=/usr/local/bin/health-monitor.sh container-runtime

- path: /etc/apt/preferences.d/proposed-updates
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is there a Bionic equivalent for 18.04? Just curious on how I can integrate this with the 18.04 PR

permissions: "0644"
owner: root
content: |
Package: *
Pin: release a=xenial-proposed
Pin-Priority: 400

{{if .KubernetesConfig.RequiresDocker}}
{{if not .IsCoreOS}}
- path: /etc/systemd/system/docker.service.d/clear_mount_propagation_flags.conf
Expand Down
4 changes: 4 additions & 0 deletions parts/k8s/kubernetesinstalls.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,14 @@ installEtcd() {
}

installDeps() {
retrycmd_if_failure_no_stats 120 5 25 echo "deb http://azure.archive.ubuntu.com/ubuntu/ xenial-proposed restricted main multiverse universe" >> /etc/apt/sources.list || exit $ERR_SYSTEMD_INSTALL_FAIL
retrycmd_if_failure_no_stats 120 5 25 curl -fsSL https://packages.microsoft.com/config/ubuntu/16.04/packages-microsoft-prod.deb > /tmp/packages-microsoft-prod.deb || exit $ERR_MS_PROD_DEB_DOWNLOAD_TIMEOUT
retrycmd_if_failure 60 5 10 dpkg -i /tmp/packages-microsoft-prod.deb || exit $ERR_MS_PROD_DEB_PKG_ADD_FAIL
apt_get_update || exit $ERR_APT_UPDATE_TIMEOUT
apt_get_install 30 1 600 apt-transport-https blobfuse ca-certificates ceph-common cgroup-lite cifs-utils conntrack ebtables ethtool fuse git glusterfs-client init-system-helpers iproute2 ipset iptables jq mount nfs-common pigz socat util-linux xz-utils zip htop iotop iftop sysstat || exit $ERR_APT_INSTALL_TIMEOUT
wait_for_apt_locks
apt_get_install 20 30 120 systemd/xenial-proposed || exit $ERR_SYSTEMD_INSTALL_FAIL
wait_for_apt_locks
}

installGPUDrivers() {
Expand Down
8 changes: 8 additions & 0 deletions parts/k8s/kubernetesmastercustomdata.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,14 @@ write_files:
RemainAfterExit=yes
ExecStart=/usr/local/bin/health-monitor.sh container-runtime

- path: /etc/apt/preferences.d/proposed-updates
permissions: "0644"
owner: root
content: |
Package: *
Pin: release a=xenial-proposed
Pin-Priority: 400

{{if .OrchestratorProfile.KubernetesConfig.RequiresDocker}}
{{if not .MasterProfile.IsCoreOS}}
- path: /etc/systemd/system/docker.service.d/clear_mount_propagation_flags.conf
Expand Down
1 change: 1 addition & 0 deletions parts/k8s/kubernetesprovisionsource.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ ERR_CNI_DOWNLOAD_TIMEOUT=41 # Timeout waiting for CNI download(s)
ERR_MS_PROD_DEB_DOWNLOAD_TIMEOUT=42 # Timeout waiting for https://packages.microsoft.com/config/ubuntu/16.04/packages-microsoft-prod.deb
ERR_MS_PROD_DEB_PKG_ADD_FAIL=43 # Failed to add repo pkg file
#ERR_FLEXVOLUME_DOWNLOAD_TIMEOUT=44 # Failed to add repo pkg file -- DEPRECATED
ERR_SYSTEMD_INSTALL_FAIL=48 # Unable to install required systemd version
ERR_MODPROBE_FAIL=49 # Unable to load a kernel module using modprobe
ERR_OUTBOUND_CONN_FAIL=50 # Unable to establish outbound connection
ERR_KATA_KEY_DOWNLOAD_TIMEOUT=60 # Timeout waiting to download kata repo key
Expand Down