Skip to content
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

Jump to bottom

Remove hold from the docker-ce-cli package on upgrade #941

Merged
merged 2 commits into from
Jul 2, 2020
Merged

Remove hold from the docker-ce-cli package on upgrade #941

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5cadf75
Remove hold from the docker-ce-cli package on upgrade
xmudrii Jul 2, 2020
7aa0368
Update test fixtures
xmudrii Jul 2, 2020
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
2 changes: 1 addition & 1 deletion pkg/scripts/os.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ kube_ver=$(apt-cache madison kubelet | grep "{{ .KUBERNETES_VERSION }}" | head -
cni_ver=$(apt-cache madison kubernetes-cni | grep "{{ .KUBERNETES_CNI_VERSION }}" | head -1 | awk '{print $3}')

{{- if or .FORCE .UPGRADE }}
sudo apt-mark unhold docker-ce kubelet kubeadm kubectl kubernetes-cni
sudo apt-mark unhold docker-ce docker-ce-cli kubelet kubeadm kubectl kubernetes-cni
{{- end }}

sudo DEBIAN_FRONTEND=noninteractive apt-get install \
Expand Down
2 changes: 1 addition & 1 deletion pkg/scripts/testdata/TestUpgradeKubeadmAndCNIDebian.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ sudo DEBIAN_FRONTEND=noninteractive apt-get install --option "Dpkg::Options::=--

kube_ver=$(apt-cache madison kubelet | grep "v1.17.4" | head -1 | awk '{print $3}')
cni_ver=$(apt-cache madison kubernetes-cni | grep "0.8.6" | head -1 | awk '{print $3}')
sudo apt-mark unhold docker-ce kubelet kubeadm kubectl kubernetes-cni
sudo apt-mark unhold docker-ce docker-ce-cli kubelet kubeadm kubectl kubernetes-cni

sudo DEBIAN_FRONTEND=noninteractive apt-get install \
--option "Dpkg::Options::=--force-confold" \
Expand Down
2 changes: 1 addition & 1 deletion pkg/scripts/testdata/TestUpgradeKubeletAndKubectlDebian.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ sudo DEBIAN_FRONTEND=noninteractive apt-get install --option "Dpkg::Options::=--

kube_ver=$(apt-cache madison kubelet | grep "v1.17.4" | head -1 | awk '{print $3}')
cni_ver=$(apt-cache madison kubernetes-cni | grep "0.8.6" | head -1 | awk '{print $3}')
sudo apt-mark unhold docker-ce kubelet kubeadm kubectl kubernetes-cni
sudo apt-mark unhold docker-ce docker-ce-cli kubelet kubeadm kubectl kubernetes-cni

sudo DEBIAN_FRONTEND=noninteractive apt-get install \
--option "Dpkg::Options::=--force-confold" \
Expand Down