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

[release/v1.7] fix: debian apt-get update running before configuring repositories #3084

Merged
merged 7 commits into from
Mar 13, 2024
Merged

[release/v1.7] fix: debian apt-get update running before configuring repositories #3084

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
9ad9268
fix: debian apt-get update running before configuring repositories
cnvergence Mar 11, 2024
179cfde
remove additional apt-get update
cnvergence Mar 11, 2024
382828c
update testdata
cnvergence Mar 11, 2024
1db34cd
remove old kubernetes.list from apt sources
cnvergence Mar 12, 2024
9aa8156
remove old kubernetes.list from apt sources
cnvergence Mar 12, 2024
f3d4f91
fix typos
cnvergence Mar 12, 2024
a2a725b
Update fixtures
xmudrii Mar 13, 2024
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
8 changes: 8 additions & 0 deletions pkg/scripts/os_debian.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,14 @@ Acquire::http::Proxy "{{ .HTTP_PROXY }}";
{{- end }}
EOF

# Removing deprecated Kubernetes repositories from apt sources is needed when upgrading from older KubeOne versions,
# otherwise, apt-get update will fail to upgrade the packages.
{{- if .CONFIGURE_REPOSITORIES }}
if sudo grep -q "deb http://apt.kubernetes.io/ kubernetes-xenial main" /etc/apt/sources.list.d/kubernetes.list; then
rm -f /etc/apt/sources.list.d/kubernetes.list
fi
{{- end }}

sudo apt-get update
sudo DEBIAN_FRONTEND=noninteractive apt-get install --option "Dpkg::Options::=--force-confold" -y --no-install-recommends \
apt-transport-https \
Expand Down
6 changes: 6 additions & 0 deletions pkg/scripts/testdata/TestKubeadmDebian-cilium_cluster.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,12 @@ Acquire::https::Proxy "http://https.proxy";
Acquire::http::Proxy "http://http.proxy";
EOF

# Removing deprecated Kubernetes repositories from apt sources is needed when upgrading from older KubeOne versions,
# otherwise, apt-get update will fail to upgrade the packages.
if sudo grep -q "deb http://apt.kubernetes.io/ kubernetes-xenial main" /etc/apt/sources.list.d/kubernetes.list; then
rm -f /etc/apt/sources.list.d/kubernetes.list
fi

sudo apt-get update
sudo DEBIAN_FRONTEND=noninteractive apt-get install --option "Dpkg::Options::=--force-confold" -y --no-install-recommends \
apt-transport-https \
Expand Down
6 changes: 6 additions & 0 deletions pkg/scripts/testdata/TestKubeadmDebian-nutanix_cluster.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,12 @@ Acquire::https::Proxy "http://https.proxy";
Acquire::http::Proxy "http://http.proxy";
EOF

# Removing deprecated Kubernetes repositories from apt sources is needed when upgrading from older KubeOne versions,
# otherwise, apt-get update will fail to upgrade the packages.
if sudo grep -q "deb http://apt.kubernetes.io/ kubernetes-xenial main" /etc/apt/sources.list.d/kubernetes.list; then
rm -f /etc/apt/sources.list.d/kubernetes.list
fi

sudo apt-get update
sudo DEBIAN_FRONTEND=noninteractive apt-get install --option "Dpkg::Options::=--force-confold" -y --no-install-recommends \
apt-transport-https \
Expand Down
6 changes: 6 additions & 0 deletions pkg/scripts/testdata/TestKubeadmDebian-overwrite_registry.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,12 @@ Acquire::https::Proxy "http://https.proxy";
Acquire::http::Proxy "http://http.proxy";
EOF

# Removing deprecated Kubernetes repositories from apt sources is needed when upgrading from older KubeOne versions,
# otherwise, apt-get update will fail to upgrade the packages.
if sudo grep -q "deb http://apt.kubernetes.io/ kubernetes-xenial main" /etc/apt/sources.list.d/kubernetes.list; then
rm -f /etc/apt/sources.list.d/kubernetes.list
fi

sudo apt-get update
sudo DEBIAN_FRONTEND=noninteractive apt-get install --option "Dpkg::Options::=--force-confold" -y --no-install-recommends \
apt-transport-https \
Expand Down
6 changes: 6 additions & 0 deletions pkg/scripts/testdata/TestKubeadmDebian-overwrite_registry_insecure.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,12 @@ Acquire::https::Proxy "http://https.proxy";
Acquire::http::Proxy "http://http.proxy";
EOF

# Removing deprecated Kubernetes repositories from apt sources is needed when upgrading from older KubeOne versions,
# otherwise, apt-get update will fail to upgrade the packages.
if sudo grep -q "deb http://apt.kubernetes.io/ kubernetes-xenial main" /etc/apt/sources.list.d/kubernetes.list; then
rm -f /etc/apt/sources.list.d/kubernetes.list
fi

sudo apt-get update
sudo DEBIAN_FRONTEND=noninteractive apt-get install --option "Dpkg::Options::=--force-confold" -y --no-install-recommends \
apt-transport-https \
Expand Down
6 changes: 6 additions & 0 deletions pkg/scripts/testdata/TestKubeadmDebian-simple.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,12 @@ Acquire::https::Proxy "http://https.proxy";
Acquire::http::Proxy "http://http.proxy";
EOF

# Removing deprecated Kubernetes repositories from apt sources is needed when upgrading from older KubeOne versions,
# otherwise, apt-get update will fail to upgrade the packages.
if sudo grep -q "deb http://apt.kubernetes.io/ kubernetes-xenial main" /etc/apt/sources.list.d/kubernetes.list; then
rm -f /etc/apt/sources.list.d/kubernetes.list
fi

sudo apt-get update
sudo DEBIAN_FRONTEND=noninteractive apt-get install --option "Dpkg::Options::=--force-confold" -y --no-install-recommends \
apt-transport-https \
Expand Down
6 changes: 6 additions & 0 deletions pkg/scripts/testdata/TestKubeadmDebian-with_containerd.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,12 @@ Acquire::https::Proxy "http://https.proxy";
Acquire::http::Proxy "http://http.proxy";
EOF

# Removing deprecated Kubernetes repositories from apt sources is needed when upgrading from older KubeOne versions,
# otherwise, apt-get update will fail to upgrade the packages.
if sudo grep -q "deb http://apt.kubernetes.io/ kubernetes-xenial main" /etc/apt/sources.list.d/kubernetes.list; then
rm -f /etc/apt/sources.list.d/kubernetes.list
fi

sudo apt-get update
sudo DEBIAN_FRONTEND=noninteractive apt-get install --option "Dpkg::Options::=--force-confold" -y --no-install-recommends \
apt-transport-https \
Expand Down
6 changes: 6 additions & 0 deletions pkg/scripts/testdata/TestKubeadmDebian-with_containerd_with_insecure_registry.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,12 @@ Acquire::https::Proxy "http://https.proxy";
Acquire::http::Proxy "http://http.proxy";
EOF

# Removing deprecated Kubernetes repositories from apt sources is needed when upgrading from older KubeOne versions,
# otherwise, apt-get update will fail to upgrade the packages.
if sudo grep -q "deb http://apt.kubernetes.io/ kubernetes-xenial main" /etc/apt/sources.list.d/kubernetes.list; then
rm -f /etc/apt/sources.list.d/kubernetes.list
fi

sudo apt-get update
sudo DEBIAN_FRONTEND=noninteractive apt-get install --option "Dpkg::Options::=--force-confold" -y --no-install-recommends \
apt-transport-https \
Expand Down
6 changes: 6 additions & 0 deletions pkg/scripts/testdata/TestUpgradeKubeadmAndCNIDebian.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,12 @@ Acquire::https::Proxy "http://https.proxy";
Acquire::http::Proxy "http://http.proxy";
EOF

# Removing deprecated Kubernetes repositories from apt sources is needed when upgrading from older KubeOne versions,
# otherwise, apt-get update will fail to upgrade the packages.
if sudo grep -q "deb http://apt.kubernetes.io/ kubernetes-xenial main" /etc/apt/sources.list.d/kubernetes.list; then
rm -f /etc/apt/sources.list.d/kubernetes.list
fi

sudo apt-get update
sudo DEBIAN_FRONTEND=noninteractive apt-get install --option "Dpkg::Options::=--force-confold" -y --no-install-recommends \
apt-transport-https \
Expand Down
6 changes: 6 additions & 0 deletions pkg/scripts/testdata/TestUpgradeKubeletAndKubectlDebian.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,12 @@ Acquire::https::Proxy "http://https.proxy";
Acquire::http::Proxy "http://http.proxy";
EOF

# Removing deprecated Kubernetes repositories from apt sources is needed when upgrading from older KubeOne versions,
# otherwise, apt-get update will fail to upgrade the packages.
if sudo grep -q "deb http://apt.kubernetes.io/ kubernetes-xenial main" /etc/apt/sources.list.d/kubernetes.list; then
rm -f /etc/apt/sources.list.d/kubernetes.list
fi

sudo apt-get update
sudo DEBIAN_FRONTEND=noninteractive apt-get install --option "Dpkg::Options::=--force-confold" -y --no-install-recommends \
apt-transport-https \
Expand Down