Skip to content

Commit 30c88b8

Browse files
redscholarredscholar
committed
feat: add more default kubernetes version
Signed-off-by: joyceliu <[email protected]>
1 parent fc0e991 commit 30c88b8

File tree

15 files changed

+944
-67
lines changed

15 files changed

+944
-67
lines changed

‎builtin/capkk/roles/precheck/env_check/defaults/main.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ cluster_require:
1010
- '"centos"'
1111
require_network_plugin: ['calico', 'flannel', 'cilium', 'hybridnet', 'kube-ovn']
1212
# the minimal version of kubernetes to be installed.
13-
kube_version_min_required: v1.19.10
13+
kube_version_min_required: v1.23.0
1414
# memory size for each kube_control_plane node.(unit kB)
1515
# should be greater than or equal to minimal_master_memory_mb.
1616
minimal_master_memory_mb: 10

‎builtin/core/defaults/config/v1.23.15.yaml renamed to ‎builtin/core/defaults/config/v1.23.yaml

Lines changed: 42 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,19 @@ spec:
77
# work_dir: /var/lib/kubekey/
88
# the version of kubernetes to be installed.
99
# should be greater than or equal to kube_version_min_required.
10-
kube_version: v1.23.15
10+
kube_version: {{ .kube_version }}
1111
# helm binary
12-
helm_version: v3.14.2
12+
helm_version: v3.8.2
1313
# etcd binary
14-
etcd_version: v3.5.6
14+
etcd_version: v3.5.4
1515
# ========== image registry ==========
1616
# keepalived image tag. Used for load balancing when there are multiple image registry nodes.
1717
# keepalived_version: stable
1818
# ========== image registry: harbor ==========
1919
# harbor image tag
20-
# harbor_version: v2.10.1
20+
# harbor_version: v2.6.3
2121
# docker-compose binary
22-
# dockercompose_version: v2.24.6
22+
# dockercompose_version: v2.12.2
2323
# ========== image registry: registry ==========
2424
# registry image tag
2525
# registry_version: 2.8.3
@@ -28,26 +28,26 @@ spec:
2828
crictl_version: v1.23.0
2929
# ========== cri: docker ==========
3030
# docker binary
31-
docker_version: 24.0.6
31+
docker_version: 20.10.18
3232
# cridockerd. Required when kube_version is greater than 1.24
3333
# cridockerd_version: v0.3.10
3434
# ========== cri: containerd ==========
3535
# containerd binary
36-
# containerd_version: v1.7.0
36+
# containerd_version: v1.6.8
3737
# runc binary
38-
# runc_version: v1.1.11
38+
# runc_version: v1.1.4
3939
# ========== cni ==========
4040
# cni_plugins binary
41-
# cni_plugins_version: v1.2.0
41+
# cni_plugins_version: v1.1.1
4242
# ========== cni: calico ==========
4343
# calicoctl binary
44-
calico_version: v3.28.2
44+
calico_version: v3.24.5
4545
# ========== cni: cilium ==========
4646
# cilium helm
47-
# cilium_version: 1.15.4
47+
# cilium_version: 1.12.6
4848
# ========== cni: kubeovn ==========
4949
# kubeovn helm
50-
# kubeovn_version: 0.1.0
50+
# kubeovn_version: 1.10.0
5151
# ========== cni: hybridnet ==========
5252
# hybridnet helm
5353
# hybridnet_version: 0.6.8
@@ -61,4 +61,33 @@ spec:
6161
cluster-signing-duration: 87600h
6262
cri:
6363
sandbox_image:
64-
tag: 3.5
64+
tag: 3.5
65+
# support: containerd,docker
66+
container_manager: docker
67+
68+
# image_manifests:
69+
# - docker.io/calico/apiserver:v3.24.5
70+
# - docker.io/calico/cni:v3.24.5
71+
# - docker.io/calico/csi:v3.24.5
72+
# - docker.io/calico/kube-controllers:v3.24.5
73+
# - docker.io/calico/node-driver-registrar:v3.24.5
74+
# - docker.io/calico/node:v3.24.5
75+
# - docker.io/calico/pod2daemon-flexvol:v3.24.5
76+
# - docker.io/kubesphere/k8s-dns-node-cache:1.22.20
77+
# - docker.io/openebs/provisioner-localpv:3.3.0
78+
# - docker.io/coredns/coredns:1.8.6
79+
# - docker.io/kubesphere/kube-apiserver:{{ .kube_version }}
80+
# - docker.io/kubesphere/kube-controller-manager:{{ .kube_version }}
81+
# - docker.io/kubesphere/kube-proxy:{{ .kube_version }}
82+
# - docker.io/kubesphere/kube-scheduler:{{ .kube_version }}
83+
# - docker.io/kubesphere/pause:3.5
84+
# - quay.io/tigera/operator:v1.36.5
85+
# - docker.io/calico/ctl:v3.24.5
86+
# - docker.io/calico/typha:v3.24.5
87+
# - docker.io/calico/apiserver:v3.24.5
88+
# - docker.io/calico/kube-controllers:v3.24.5
89+
# - docker.io/calico/node:v3.24.5
90+
# - docker.io/calico/pod2daemon-flexvol:v3.24.5
91+
# - docker.io/calico/cni:v3.24.5
92+
# - docker.io/calico/node-driver-registrar:v3.24.5
93+
# - docker.io/calico/csi:v3.24.5

‎builtin/core/defaults/config/v1.24.yaml

Lines changed: 93 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,93 @@
1+
apiVersion: kubekey.kubesphere.io/v1
2+
kind: Config
3+
spec:
4+
# zone for kk. how to download files
5+
# kkzone: cn
6+
# work_dir is the directory where the artifact is extracted.
7+
# work_dir: /var/lib/kubekey/
8+
# the version of kubernetes to be installed.
9+
# should be greater than or equal to kube_version_min_required.
10+
kube_version: {{ .kube_version }}
11+
# helm binary
12+
helm_version: v3.10.3
13+
# etcd binary
14+
etcd_version: v3.5.6
15+
# ========== image registry ==========
16+
# keepalived image tag. Used for load balancing when there are multiple image registry nodes.
17+
# keepalived_version: stable
18+
# ========== image registry: harbor ==========
19+
# harbor image tag
20+
# harbor_version: v2.7.1
21+
# docker-compose binary
22+
# dockercompose_version: v2.14.0
23+
# ========== image registry: registry ==========
24+
# registry image tag
25+
# registry_version: 2.8.3
26+
# ========== cri ==========
27+
# crictl binary
28+
crictl_version: v1.24.0
29+
# ========== cri: docker ==========
30+
# docker binary
31+
docker_version: 20.10.24
32+
# cridockerd. Required when kube_version is greater than 1.24
33+
cridockerd_version: v0.3.1
34+
# ========== cri: containerd ==========
35+
# containerd binary
36+
containerd_version: v1.6.16
37+
# runc binary
38+
runc_version: v1.1.4
39+
# ========== cni ==========
40+
# cni_plugins binary
41+
cni_plugins_version: v1.1.1
42+
# ========== cni: calico ==========
43+
# calicoctl binary
44+
calico_version: v3.25.1
45+
# ========== cni: cilium ==========
46+
# cilium helm
47+
# cilium_version: 1.13.5
48+
# ========== cni: kubeovn ==========
49+
# kubeovn helm
50+
# kubeovn_version: 1.10.0
51+
# ========== cni: hybridnet ==========
52+
# hybridnet helm
53+
# hybridnet_version: 0.6.8
54+
# ========== storageclass ==========
55+
# ========== storageclass: nfs ==========
56+
# nfs provisioner helm version
57+
# nfs_provisioner_version: 4.0.18
58+
kubernetes:
59+
controller_manager:
60+
extra_args:
61+
cluster-signing-duration: 87600h
62+
cri:
63+
sandbox_image:
64+
tag: 3.5
65+
# support: containerd,docker
66+
container_manager: docker
67+
68+
# image_manifests:
69+
# - docker.io/calico/apiserver:v3.25.1
70+
# - docker.io/calico/cni:v3.25.1
71+
# - docker.io/calico/csi:v3.25.1
72+
# - docker.io/calico/kube-controllers:v3.25.1
73+
# - docker.io/calico/node-driver-registrar:v3.25.1
74+
# - docker.io/calico/node:v3.25.1
75+
# - docker.io/calico/pod2daemon-flexvol:v3.25.1
76+
# - docker.io/kubesphere/k8s-dns-node-cache:1.22.20
77+
# - docker.io/openebs/provisioner-localpv:3.3.0
78+
# - docker.io/coredns/coredns:1.8.6
79+
# - docker.io/kubesphere/kube-apiserver:{{ .kube_version }}
80+
# - docker.io/kubesphere/kube-controller-manager:{{ .kube_version }}
81+
# - docker.io/kubesphere/kube-proxy:{{ .kube_version }}
82+
# - docker.io/kubesphere/kube-scheduler:{{ .kube_version }}
83+
# - docker.io/kubesphere/pause:3.5
84+
# - quay.io/tigera/operator:v1.36.5
85+
# - docker.io/calico/ctl:v3.25.1
86+
# - docker.io/calico/typha:v3.25.1
87+
# - docker.io/calico/apiserver:v3.25.1
88+
# - docker.io/calico/kube-controllers:v3.25.1
89+
# - docker.io/calico/node:v3.25.1
90+
# - docker.io/calico/pod2daemon-flexvol:v3.25.1
91+
# - docker.io/calico/cni:v3.25.1
92+
# - docker.io/calico/node-driver-registrar:v3.25.1
93+
# - docker.io/calico/csi:v3.25.1

‎builtin/core/defaults/config/v1.25.yaml

Lines changed: 93 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,93 @@
1+
apiVersion: kubekey.kubesphere.io/v1
2+
kind: Config
3+
spec:
4+
# zone for kk. how to download files
5+
# kkzone: cn
6+
# work_dir is the directory where the artifact is extracted.
7+
# work_dir: /var/lib/kubekey/
8+
# the version of kubernetes to be installed.
9+
# should be greater than or equal to kube_version_min_required.
10+
kube_version: {{ .kube_version }}
11+
# helm binary
12+
helm_version: v3.10.3
13+
# etcd binary
14+
etcd_version: v3.5.7
15+
# ========== image registry ==========
16+
# keepalived image tag. Used for load balancing when there are multiple image registry nodes.
17+
# keepalived_version: stable
18+
# ========== image registry: harbor ==========
19+
# harbor image tag
20+
# harbor_version: v2.8.1
21+
# docker-compose binary
22+
# dockercompose_version: v2.15.1
23+
# ========== image registry: registry ==========
24+
# registry image tag
25+
# registry_version: 2.8.3
26+
# ========== cri ==========
27+
# crictl binary
28+
crictl_version: v1.25.0
29+
# ========== cri: docker ==========
30+
# docker binary
31+
docker_version: 20.10.24
32+
# cridockerd. Required when kube_version is greater than 1.24
33+
cridockerd_version: v0.3.1
34+
# ========== cri: containerd ==========
35+
# containerd binary
36+
containerd_version: v1.6.19
37+
# runc binary
38+
runc_version: v1.1.4
39+
# ========== cni ==========
40+
# cni_plugins binary
41+
cni_plugins_version: v1.1.1
42+
# ========== cni: calico ==========
43+
# calicoctl binary
44+
calico_version: v3.25.1
45+
# ========== cni: cilium ==========
46+
# cilium helm
47+
# cilium_version: 1.13.5
48+
# ========== cni: kubeovn ==========
49+
# kubeovn helm
50+
# kubeovn_version: 1.10.0
51+
# ========== cni: hybridnet ==========
52+
# hybridnet helm
53+
# hybridnet_version: 0.6.8
54+
# ========== storageclass ==========
55+
# ========== storageclass: nfs ==========
56+
# nfs provisioner helm version
57+
# nfs_provisioner_version: 4.0.18
58+
kubernetes:
59+
controller_manager:
60+
extra_args:
61+
cluster-signing-duration: 87600h
62+
cri:
63+
sandbox_image:
64+
tag: 3.5
65+
# support: containerd,docker
66+
container_manager: docker
67+
68+
# image_manifests:
69+
# - docker.io/calico/apiserver:v3.25.1
70+
# - docker.io/calico/cni:v3.25.1
71+
# - docker.io/calico/csi:v3.25.1
72+
# - docker.io/calico/kube-controllers:v3.25.1
73+
# - docker.io/calico/node-driver-registrar:v3.25.1
74+
# - docker.io/calico/node:v3.25.1
75+
# - docker.io/calico/pod2daemon-flexvol:v3.25.1
76+
# - docker.io/kubesphere/k8s-dns-node-cache:1.22.20
77+
# - docker.io/openebs/provisioner-localpv:3.3.0
78+
# - docker.io/coredns/coredns:1.8.6
79+
# - docker.io/kubesphere/kube-apiserver:{{ .kube_version }}
80+
# - docker.io/kubesphere/kube-controller-manager:{{ .kube_version }}
81+
# - docker.io/kubesphere/kube-proxy:{{ .kube_version }}
82+
# - docker.io/kubesphere/kube-scheduler:{{ .kube_version }}
83+
# - docker.io/kubesphere/pause:3.5
84+
# - quay.io/tigera/operator:v1.36.5
85+
# - docker.io/calico/ctl:v3.25.1
86+
# - docker.io/calico/typha:v3.25.1
87+
# - docker.io/calico/apiserver:v3.25.1
88+
# - docker.io/calico/kube-controllers:v3.25.1
89+
# - docker.io/calico/node:v3.25.1
90+
# - docker.io/calico/pod2daemon-flexvol:v3.25.1
91+
# - docker.io/calico/cni:v3.25.1
92+
# - docker.io/calico/node-driver-registrar:v3.25.1
93+
# - docker.io/calico/csi:v3.25.1

0 commit comments

Comments
 (0)