Skip to content

Commit 2a35e54

Browse files
authored
SYS-663 kubernetes upgrade to 1.34 (#224)
1 parent 81bb82d commit 2a35e54

6 files changed

Lines changed: 14 additions & 13 deletions

File tree

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ The cluster-deployment tools here include helm charts and ansible playbooks to s
7777
| mysqldump | [![](https://img.shields.io/docker/v/instantlinux/mysqldump?sort=date)](https://hub.docker.com/r/instantlinux/mysqldump "Version badge") | per-database alternative to xtrabackup |
7878
| nagios | [![](https://img.shields.io/docker/v/instantlinux/nagios?sort=date)](https://hub.docker.com/r/instantlinux/nagios "Version badge") | Nagios Core v4 for monitoring |
7979
| nagiosql | [![](https://img.shields.io/docker/v/instantlinux/nagiosql?sort=date)](https://hub.docker.com/r/instantlinux/nagiosql "Version badge") | NagiosQL for configuring Nagios Core v4 |
80+
| node-local-dns | ** | caching resolver for reliable pod DNS |
8081
| nut-upsd | [![](https://img.shields.io/docker/v/instantlinux/nut-upsd?sort=date)](https://hub.docker.com/r/instantlinux/nut-upsd "Version badge") | Network UPS Tools |
8182
| openldap | [![](https://img.shields.io/docker/v/instantlinux/openldap?sort=date)](https://hub.docker.com/r/instantlinux/openldap "Version badge") | OpenLDAP authentication server |
8283
| restic | ** | backups |

ansible/roles/docker_node/defaults/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ docker_defaults:
55
apt_repo:
66
key: 9DC858229FC7DD38854AE2D88D81803C0EBFCD88
77
package_name: docker-ce
8-
package_ver: 5:28.1.1-1~ubuntu.24.04~noble
8+
package_ver: 5:28.4.0-1~ubuntu.24.04~noble
99
repo: deb [arch=amd64 signed-by=/etc/apt/keyrings/docker.asc] https://download.docker.com/linux/ubuntu {{ ansible_distribution_release }} stable
1010
url: https://download.docker.com/linux/ubuntu/gpg
1111
certs:

ansible/roles/kubernetes/defaults/main.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ k8s_defaults:
1313
admin_config: /etc/kubernetes/admin.conf
1414
config_fetch_always: false
1515
apt_repo:
16-
# TODO parameterize hardcoded 1.32 value
17-
repo: deb [signed-by=/etc/apt/keyrings/kubernetes.asc] https://pkgs.k8s.io/core:/stable:/v1.32/deb/ /
18-
url: https://pkgs.k8s.io/core:/stable:/v1.32/deb/Release.key
16+
# TODO parameterize hardcoded 1.34 value
17+
repo: deb [signed-by=/etc/apt/keyrings/kubernetes.asc] https://pkgs.k8s.io/core:/stable:/v1.34/deb/ /
18+
url: https://pkgs.k8s.io/core:/stable:/v1.34/deb/Release.key
1919
cplane_hostip: "{{ hostvars[groups['k8s_cplane'][0]]['ansible_default_ipv4']['address'] | default(groups['k8s_cplane'][0]) }}"
2020
cplane_vip: "{{ hostvars[groups['k8s_cplane'][0]]['ansible_default_ipv4']['address'] | default(groups['k8s_cplane'][0]) }}"
2121
# TODO: might be able to retire cri-dockerd
@@ -26,20 +26,20 @@ k8s_defaults:
2626
local_vols: /var/lib/docker/k8s-volumes
2727
cplane: False
2828
pod_network: 10.244.0.0/16
29-
pod_infra_container_image: registry.k8s.io/pause:3.10
29+
pod_infra_container_image: registry.k8s.io/pause:3.10.1
3030
service:
3131
enabled: yes
3232
name: kubelet
3333
state: restarted
3434
service_network: 10.96.0.0/12
35-
version: 1.32.4
35+
version: 1.34.1
3636
coredns_version: v1.11.3
37-
cni_version: 1.6.0
37+
cni_version: 1.7.1
3838
k8s_override: {}
3939
k8s: "{{ k8s_defaults | combine(k8s_override) }}"
4040

4141
cri_dockerd:
42-
version: 0.3.15
42+
version: 0.3.20
4343

4444
oidc:
4545
client_id: client-not-yet-set

k8s/Makefile.versions

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ export VERSION_DEFAULTBACKEND ?= 1.5
99
export VERSION_FLANNEL ?= 0.26.1
1010
export VERSION_HELM ?= 3.16.2
1111
export VERSION_INGRESS_NGINX ?= 1.13.1
12-
export VERSION_METRICS ?= 2.15.0
13-
export VERSION_NODE_LOCAL_DNS ?= 1.32.6
12+
export VERSION_METRICS ?= 2.17.0
13+
export VERSION_NODE_LOCAL_DNS ?= 1.34.1
1414

1515
# Held back versions - more effort to upgrade
1616
export VERSION_CALICO ?= 3.16.5

k8s/helm/restic/Chart.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ sources:
66
- https://github.com/instantlinux/docker-tools
77
- https://github.com/restic/restic
88
type: application
9-
version: 0.1.18
9+
version: 0.1.19
1010
# Remember to update restic==<ver> in values.yaml as releases are published;
1111
# the values.yaml file is not able to reference .Chart.appVersion
12-
appVersion: "0.18.0-r2"
12+
appVersion: "0.18.0-r4"
1313
dependencies:
1414
- name: chartlib
1515
version: 0.1.8

k8s/helm/restic/values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ deployment:
1717
mkdir -p /var/log/week && tail -f -n 0 /var/log/restic.log
1818
env:
1919
# Edit the version in Chart.yaml to keep consistent
20-
app_version: 0.18.0-r2
20+
app_version: 0.18.0-r4
2121
env: /etc/profile
2222
tz: UTC
2323
nodeSelector:

0 commit comments

Comments
 (0)