-
Notifications
You must be signed in to change notification settings - Fork 42
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.
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
🐛 Fix templates to use new k8s apt repository #660
Conversation
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: cprivitere The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
- also fix incorrect posix test [ syntax Signed-off-by: Chris Privitere <23177737+cprivitere@users.noreply.github.com>
461143f
to
0fe9137
Compare
chmod a+r /etc/apt/keyrings/docker.gpg | ||
chmod a+r /etc/apt/keyrings/kubernetes-archive-keyring.gpg | ||
echo "deb [arch="$(dpkg --print-architecture)" signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/ubuntu "$(. /etc/os-release && echo "$VERSION_CODENAME")" stable" > /etc/apt/sources.list.d/docker.list | ||
echo "deb [signed-by=/etc/apt/keyrings/kubernetes-archive-keyring.gpg] https://apt.kubernetes.io/ kubernetes-xenial main" > /etc/apt/sources.list.d/kubernetes.list | ||
echo "deb [signed-by=/etc/apt/keyrings/kubernetes-apt-keyring.gpg] https://pkgs.k8s.io/core:/stable:/$${MINOR_KUBERNETES_VERSION}/deb/ /" > /etc/apt/sources.list.d/kubernetes.list |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
verified via https://kubernetes.io/docs/tasks/tools/install-kubectl-linux/
https://pkgs.k8s.io/core:/stable:/v1.28/deb/
and
$ echo v1.2.3 | cut -d. -f1-2
v1.2
@@ -193,16 +194,17 @@ spec: | |||
apt-get remove -y docker docker-engine containerd runc | |||
apt-get install -y apt-transport-https ca-certificates curl gnupg lsb-release linux-generic jq | |||
major_vers=$(lsb_release -r | awk '{ print $2 }' | cut -d. -f1) | |||
if [[ "$major_vers" -ge 20 ]]; then | |||
if [ "$major_vers" -ge 20 ]; then |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this is consistent with elsewhere in this block:
if [ -f "/run/kubeadm/kubeadm.yaml" ]; then |
patches: | ||
- patch: |- |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
was this spacing change necessary? It makes this harder to review. Perhaps if it was done in separate commits it would be easier on the reviewing eyes.
Reviewed in ignore-whitespace mode.. https://github.com/kubernetes-sigs/cluster-api-provider-packet/pull/660/files?diff=unified&w=1
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is my vscode's fault. Sorry. Figured I'd get it committed now so it stops doing it in the future.
/lgtm |
What this PR does / why we need it: