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.

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

Draft: Upgrade Kubernetes to 1.25.5 #73

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
24 changes: 12 additions & 12 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,8 @@ ansible-playbook -i inventory install.yml
- Use the kubeconfig in `~/.ktrw/<cluster_name>/kubeconfig` to manage the cluster
```shell
$ KUBECONFIG=~/.ktrw/<cluster_name>/kubeconfig kubectl version --short
Client Version: v1.20.6
Server Version: v1.20.6
Client Version: v1.25.5
Server Version: v1.25.5
```

## Installing additional plugins
Expand Down Expand Up @@ -116,16 +116,16 @@ $ ansible-playbook --inventory ansible-inventory --extra-vars "serial_all=50%" i

| Name | Version | Role |
| ------------------------- | ---------- | ---------- |
| cni plugins | 0.8.7 | node |
| containerd | 1.4.1 | node |
| crictl | 1.20.0 | node |
| etcd | 3.4.13 | etcd |
| kube-apiserver | 1.20.6 | master |
| kube-controller-manager | 1.20.6 | master |
| kube-scheduler | 1.20.6 | master |
| kube-proxy | 1.20.6 | node |
| kubelet | 1.20.6 | node |
| runc | 1.0.0-rc93 | node |
| cni plugins | 0.9.1 | node |
| containerd | 1.6.12 | node |
| crictl | 1.25.0 | node |
| etcd | 3.5.6 | etcd |
| kube-apiserver | 1.25.5 | master |
| kube-controller-manager | 1.25.5 | master |
| kube-scheduler | 1.25.5 | master |
| kube-proxy | 1.25.5 | node |
| kubelet | 1.25.5 | node |
| runc | 1.1.1 | node |

# How to contribute
This project is MIT licensed and accepts contributions via GitHub pull requests.
Expand Down
4 changes: 1 addition & 3 deletions roles/cni/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,11 @@

- name: Download cni
unarchive:
src: https://github.com/containernetworking/plugins/releases/download/v0.8.7/cni-plugins-linux-amd64-v0.8.7.tgz
src: https://github.com/containernetworking/plugins/releases/download/v0.9.1/cni-plugins-linux-amd64-v0.9.1.tgz
dest: /opt/cni/bin/
remote_src: True

- name: Create loopback net
template:
src: 99-loopback.conf.j2
dest: /etc/cni/net.d/99-loopback.conf


2 changes: 1 addition & 1 deletion roles/containerd/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

- name: Download containerd
unarchive:
src: https://github.com/containerd/containerd/releases/download/v1.4.1/containerd-1.4.1-linux-amd64.tar.gz
src: https://github.com/containerd/containerd/releases/download/v1.6.12/containerd-1.6.12-linux-amd64.tar.gz
dest: /usr/local/
remote_src: True
notify:
Expand Down
8 changes: 4 additions & 4 deletions roles/crictl/tasks/main.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
- name: Download crictl
get_url:
url: https://github.com/kubernetes-sigs/cri-tools/releases/download/v1.20.0/crictl-v1.20.0-linux-amd64.tar.gz
dest: /tmp/crictl-v1.20.0-linux-amd64.tar.gz
url: https://github.com/kubernetes-sigs/cri-tools/releases/download/v1.25.0/crictl-v1.25.0-linux-amd64.tar.gz
dest: /tmp/crictl-v1.25.0-linux-amd64.tar.gz
mode: 0755
owner: root
group: root
checksum: sha256:44d5f550ef3f41f9b53155906e0229ffdbee4b19452b4df540265e29572b899c
checksum: sha256:86ab210c007f521ac4cdcbcf0ae3fb2e10923e65f16de83e0e1db191a07f0235

- name: Unarchive crictl tarball
unarchive:
src: /tmp/crictl-v1.20.0-linux-amd64.tar.gz
src: /tmp/crictl-v1.25.0-linux-amd64.tar.gz
dest: /tmp
remote_src: True

Expand Down
18 changes: 9 additions & 9 deletions roles/etcd/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

- set_fact:
cluster_hostname: "{{ cluster_hostname | default(groups['masters'][0]) }}"

- set_fact:
config_path: "{{ config_path | default(lookup('env','HOME')+'/.ktrw') }}"
delegate_to: 127.0.0.1
Expand All @@ -19,22 +19,22 @@

- name: Download etcd
get_url:
url: https://github.com/etcd-io/etcd/releases/download/v3.4.13/etcd-v3.4.13-linux-amd64.tar.gz
dest: /tmp/etcd-v3.4.13-linux-amd64.tar.gz
url: https://github.com/etcd-io/etcd/releases/download/v3.5.6/etcd-v3.5.6-linux-amd64.tar.gz
dest: /tmp/etcd-v3.5.6-linux-amd64.tar.gz
mode: 0755
owner: root
group: root
checksum: sha256:2ac029e47bab752dacdb7b30032f230f49e2f457cbc32e8f555c2210bb5ff107
checksum: sha256:4db32e3bc06dd0999e2171f76a87c1cffed8369475ec7aa7abee9023635670fb

- name: Unarchive etcd tarball
unarchive:
src: /tmp/etcd-v3.4.13-linux-amd64.tar.gz
src: /tmp/etcd-v3.5.6-linux-amd64.tar.gz
dest: /tmp
remote_src: True

- name: Move etcd binaries into place
copy:
src: "/tmp/etcd-v3.4.13-linux-amd64/{{ item }}"
src: "/tmp/etcd-v3.5.6-linux-amd64/{{ item }}"
dest: "/usr/local/bin/{{ item }}"
remote_src: True
with_items:
Expand All @@ -48,8 +48,8 @@
path: "/tmp/{{ item }}"
state: absent
with_items:
- etcd-v3.4.13-linux-amd64
- etcd-v3.4.13-linux-amd64.tar.gz
- etcd-v3.5.6-linux-amd64
- etcd-v3.5.6-linux-amd64.tar.gz

- name: Make etcd binaries executable
file:
Expand All @@ -60,7 +60,7 @@
with_items:
- etcd
- etcdctl

- name: Ensure directories exist
file:
state: directory
Expand Down
4 changes: 2 additions & 2 deletions roles/kube-apiserver/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@

- name: Download kube-apiserver
get_url:
url: https://storage.googleapis.com/kubernetes-release/release/v1.20.6/bin/linux/amd64/kube-apiserver
url: https://storage.googleapis.com/kubernetes-release/release/v1.25.5/bin/linux/amd64/kube-apiserver
dest: /usr/local/bin/kube-apiserver
mode: 0755
owner: root
group: root
checksum: sha256:17f64a9d27676599075dfa4580326b364137fb10b6949791d257e511d5b7c601
checksum: sha256:c0ff83a8a499fbefade288411a09250c92bbb234f9961c6d7787d4ef702e6a5c
notify:
- restart kube-apiserver

Expand Down
4 changes: 2 additions & 2 deletions roles/kube-controller-manager/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@

- name: Download kube-controller-manager
get_url:
url: https://storage.googleapis.com/kubernetes-release/release/v1.20.6/bin/linux/amd64/kube-controller-manager
url: https://storage.googleapis.com/kubernetes-release/release/v1.25.5/bin/linux/amd64/kube-controller-manager
dest: /usr/local/bin/kube-controller-manager
mode: 0755
owner: root
group: root
checksum: sha256:f783d4734cbe8907b96c9ebc97d1a6f3a62355472281b30180cdc00ebec4bc16
checksum: sha256:2fc15014c2fcbe5277ffae17e6b8463af0e4300b490e516d94ecccf1f6e9572a
notify:
- restart kube-controller-manager

Expand Down
4 changes: 2 additions & 2 deletions roles/kube-proxy/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@

- name: Download kube-proxy
get_url:
url: https://storage.googleapis.com/kubernetes-release/release/v1.20.6/bin/linux/amd64/kube-proxy
url: https://storage.googleapis.com/kubernetes-release/release/v1.25.5/bin/linux/amd64/kube-proxy
dest: /usr/local/bin/kube-proxy
mode: 0755
owner: root
group: root
checksum: sha256:b64375f805dec9540078f3295e77bfa339227b6c3b2b63bd4239d0c4eaf0254e
checksum: sha256:5fbd75670ae832b28023e986ec9bcf0d18450da62c1d9e0a62d741ba55c28d4e
notify:
- restart kube-proxy

Expand Down
6 changes: 3 additions & 3 deletions roles/kube-scheduler/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@

- set_fact:
cluster_config_path: "{{ config_path }}/{{ cluster_name }}"

- name: Download kube-scheduler
get_url:
url: https://storage.googleapis.com/kubernetes-release/release/v1.20.6/bin/linux/amd64/kube-scheduler
url: https://storage.googleapis.com/kubernetes-release/release/v1.25.5/bin/linux/amd64/kube-scheduler
dest: /usr/local/bin/kube-scheduler
mode: 0755
owner: root
group: root
checksum: sha256:1ff832c70d5597b5ffda1d63a737855d93cde7d1233b1afb69bcd3df027b16e6
checksum: sha256:72146943b4310ef8ccab16a195fd2a916feebafdac2bf6544db747fc2419254f
notify:
- restart kube-scheduler

Expand Down
4 changes: 2 additions & 2 deletions roles/kubelet/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@

- name: Download kubelet
get_url:
url: https://storage.googleapis.com/kubernetes-release/release/v1.20.6/bin/linux/amd64/kubelet
url: https://storage.googleapis.com/kubernetes-release/release/v1.25.5/bin/linux/amd64/kubelet
dest: /usr/local/bin/kubelet
mode: 0755
owner: root
group: root
checksum: sha256:7688a663dd06222d337c8fdb5b05e1d9377e6d64aa048c6acf484bc3f2a596a8
checksum: sha256:n16b23e1254830805b892cfccf2687eb3edb4ea54ffbadb8cc2eee6d3b1fab8e6
notify:
- restart kubelet

Expand Down
4 changes: 2 additions & 2 deletions roles/runc/tasks/main.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
---
- name: Download runc
get_url:
url: https://github.com/opencontainers/runc/releases/download/v1.0.0-rc93/runc.amd64
url: https://github.com/opencontainers/runc/releases/download/v1.1.4/runc.amd64
dest: /usr/local/bin/runc
mode: 0755
owner: root
group: root
checksum: sha256:9feaa82be15cb190cf0ed76fcb6d22841abd18088d275a47e894cd1e3a0ee4b6
checksum: sha256:db772be63147a4e747b4fe286c7c16a2edc4a8458bd3092ea46aaee77750e8ce