Skip to content

Commit de5a478

Browse files
committed
upgrade k8s
1 parent 6e65cd1 commit de5a478

4 files changed

Lines changed: 6 additions & 9 deletions

File tree

ansible/roles/cluster/tasks/cilium.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,6 @@
2727
wait: true
2828
atomic: true
2929
release_values:
30-
ipam:
31-
mode: cluster-pool
32-
operator:
33-
clusterPoolIPv4PodCIDRList: ["10.244.0.0/16"]
34-
clusterPoolIPv4MaskSize: 2
3530
ipv4:
3631
enabled: true
3732
k8sServiceHost: "{{ node_ip.stdout }}"

ansible/roles/cluster/templates/kubeadm-config.yml.j2

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ kind: ClusterConfiguration
99
clusterName: "k8s-cluster"
1010
controlPlaneEndpoint: "{{ node_ip.stdout }}"
1111
networking:
12-
podSubnet: "10.244.0.0/16"
13-
serviceSubnet: "10.96.0.0/16"
12+
podSubnet: "{{ pod_subnet }}"
13+
serviceSubnet: "{{ service_subnet }}"
1414
controllerManager:
1515
extraArgs:
1616
- name: "node-cidr-mask-size-ipv4"

ansible/setup-cluster.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
- role: common
1515
vars:
1616
os: "xUbuntu_24.04"
17-
k8s_major_version: "1.31"
17+
k8s_major_version: "1.32"
1818
when: inventory_hostname != "k3s"
1919

2020
- name: Setup cluster by kubeadm
@@ -31,4 +31,6 @@
3131
- role: cluster
3232
vars:
3333
target_env: "staging" # staging or production
34+
pod_subnet: "10.132.0.0/16"
35+
service_subnet: "11.132.0.0/16"
3436
when: inventory_hostname != "k3s"

kubernetes/k8s/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
K3S_HOST := k3s
2-
K8S_HOST := k8s-v131-control-plane
2+
K8S_HOST := k8s-v132-control-plane
33

44
.PHONY: app-k3s
55
app-k3s:

0 commit comments

Comments
 (0)