Skip to content

Commit 94e2ec4

Browse files
sharifelgamalsharifelgamal
authored
Merge pull request #11287 from medyagh/update-k8s-v
update newest supported Kubernetes version to v1.22.0-alpha.1
2 parents 4fc2232 + 387c515 commit 94e2ec4

21 files changed

+1254
-2
lines changed

Diff for: ‎pkg/minikube/bootstrapper/bsutil/testdata/v1.21/containerd-api-port.yaml

+68
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
apiVersion: kubeadm.k8s.io/v1beta2
2+
kind: InitConfiguration
3+
localAPIEndpoint:
4+
advertiseAddress: 1.1.1.1
5+
bindPort: 12345
6+
bootstrapTokens:
7+
- groups:
8+
- system:bootstrappers:kubeadm:default-node-token
9+
ttl: 24h0m0s
10+
usages:
11+
- signing
12+
- authentication
13+
nodeRegistration:
14+
criSocket: /run/containerd/containerd.sock
15+
name: "mk"
16+
kubeletExtraArgs:
17+
node-ip: 1.1.1.1
18+
taints: []
19+
---
20+
apiVersion: kubeadm.k8s.io/v1beta2
21+
kind: ClusterConfiguration
22+
apiServer:
23+
certSANs: ["127.0.0.1", "localhost", "1.1.1.1"]
24+
extraArgs:
25+
enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
26+
controllerManager:
27+
extraArgs:
28+
allocate-node-cidrs: "true"
29+
leader-elect: "false"
30+
scheduler:
31+
extraArgs:
32+
leader-elect: "false"
33+
certificatesDir: /var/lib/minikube/certs
34+
clusterName: mk
35+
controlPlaneEndpoint: control-plane.minikube.internal:12345
36+
dns:
37+
type: CoreDNS
38+
etcd:
39+
local:
40+
dataDir: /var/lib/minikube/etcd
41+
extraArgs:
42+
proxy-refresh-interval: "70000"
43+
kubernetesVersion: v1.21.0
44+
networking:
45+
dnsDomain: cluster.local
46+
podSubnet: "10.244.0.0/16"
47+
serviceSubnet: 10.96.0.0/12
48+
---
49+
apiVersion: kubelet.config.k8s.io/v1beta1
50+
kind: KubeletConfiguration
51+
authentication:
52+
x509:
53+
clientCAFile: /var/lib/minikube/certs/ca.crt
54+
cgroupDriver: systemd
55+
clusterDomain: "cluster.local"
56+
# disable disk resource management by default
57+
imageGCHighThresholdPercent: 100
58+
evictionHard:
59+
nodefs.available: "0%"
60+
nodefs.inodesFree: "0%"
61+
imagefs.available: "0%"
62+
failSwapOn: false
63+
staticPodPath: /etc/kubernetes/manifests
64+
---
65+
apiVersion: kubeproxy.config.k8s.io/v1alpha1
66+
kind: KubeProxyConfiguration
67+
clusterCIDR: "10.244.0.0/16"
68+
metricsBindAddress: 0.0.0.0:10249

Diff for: ‎pkg/minikube/bootstrapper/bsutil/testdata/v1.21/containerd-pod-network-cidr.yaml

+68
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
apiVersion: kubeadm.k8s.io/v1beta2
2+
kind: InitConfiguration
3+
localAPIEndpoint:
4+
advertiseAddress: 1.1.1.1
5+
bindPort: 8443
6+
bootstrapTokens:
7+
- groups:
8+
- system:bootstrappers:kubeadm:default-node-token
9+
ttl: 24h0m0s
10+
usages:
11+
- signing
12+
- authentication
13+
nodeRegistration:
14+
criSocket: /run/containerd/containerd.sock
15+
name: "mk"
16+
kubeletExtraArgs:
17+
node-ip: 1.1.1.1
18+
taints: []
19+
---
20+
apiVersion: kubeadm.k8s.io/v1beta2
21+
kind: ClusterConfiguration
22+
apiServer:
23+
certSANs: ["127.0.0.1", "localhost", "1.1.1.1"]
24+
extraArgs:
25+
enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
26+
controllerManager:
27+
extraArgs:
28+
allocate-node-cidrs: "true"
29+
leader-elect: "false"
30+
scheduler:
31+
extraArgs:
32+
leader-elect: "false"
33+
certificatesDir: /var/lib/minikube/certs
34+
clusterName: mk
35+
controlPlaneEndpoint: control-plane.minikube.internal:8443
36+
dns:
37+
type: CoreDNS
38+
etcd:
39+
local:
40+
dataDir: /var/lib/minikube/etcd
41+
extraArgs:
42+
proxy-refresh-interval: "70000"
43+
kubernetesVersion: v1.21.0
44+
networking:
45+
dnsDomain: cluster.local
46+
podSubnet: "192.168.32.0/20"
47+
serviceSubnet: 10.96.0.0/12
48+
---
49+
apiVersion: kubelet.config.k8s.io/v1beta1
50+
kind: KubeletConfiguration
51+
authentication:
52+
x509:
53+
clientCAFile: /var/lib/minikube/certs/ca.crt
54+
cgroupDriver: systemd
55+
clusterDomain: "cluster.local"
56+
# disable disk resource management by default
57+
imageGCHighThresholdPercent: 100
58+
evictionHard:
59+
nodefs.available: "0%"
60+
nodefs.inodesFree: "0%"
61+
imagefs.available: "0%"
62+
failSwapOn: false
63+
staticPodPath: /etc/kubernetes/manifests
64+
---
65+
apiVersion: kubeproxy.config.k8s.io/v1alpha1
66+
kind: KubeProxyConfiguration
67+
clusterCIDR: "192.168.32.0/20"
68+
metricsBindAddress: 0.0.0.0:10249

Diff for: ‎pkg/minikube/bootstrapper/bsutil/testdata/v1.21/containerd.yaml

+68
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
apiVersion: kubeadm.k8s.io/v1beta2
2+
kind: InitConfiguration
3+
localAPIEndpoint:
4+
advertiseAddress: 1.1.1.1
5+
bindPort: 8443
6+
bootstrapTokens:
7+
- groups:
8+
- system:bootstrappers:kubeadm:default-node-token
9+
ttl: 24h0m0s
10+
usages:
11+
- signing
12+
- authentication
13+
nodeRegistration:
14+
criSocket: /run/containerd/containerd.sock
15+
name: "mk"
16+
kubeletExtraArgs:
17+
node-ip: 1.1.1.1
18+
taints: []
19+
---
20+
apiVersion: kubeadm.k8s.io/v1beta2
21+
kind: ClusterConfiguration
22+
apiServer:
23+
certSANs: ["127.0.0.1", "localhost", "1.1.1.1"]
24+
extraArgs:
25+
enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
26+
controllerManager:
27+
extraArgs:
28+
allocate-node-cidrs: "true"
29+
leader-elect: "false"
30+
scheduler:
31+
extraArgs:
32+
leader-elect: "false"
33+
certificatesDir: /var/lib/minikube/certs
34+
clusterName: mk
35+
controlPlaneEndpoint: control-plane.minikube.internal:8443
36+
dns:
37+
type: CoreDNS
38+
etcd:
39+
local:
40+
dataDir: /var/lib/minikube/etcd
41+
extraArgs:
42+
proxy-refresh-interval: "70000"
43+
kubernetesVersion: v1.21.0
44+
networking:
45+
dnsDomain: cluster.local
46+
podSubnet: "10.244.0.0/16"
47+
serviceSubnet: 10.96.0.0/12
48+
---
49+
apiVersion: kubelet.config.k8s.io/v1beta1
50+
kind: KubeletConfiguration
51+
authentication:
52+
x509:
53+
clientCAFile: /var/lib/minikube/certs/ca.crt
54+
cgroupDriver: systemd
55+
clusterDomain: "cluster.local"
56+
# disable disk resource management by default
57+
imageGCHighThresholdPercent: 100
58+
evictionHard:
59+
nodefs.available: "0%"
60+
nodefs.inodesFree: "0%"
61+
imagefs.available: "0%"
62+
failSwapOn: false
63+
staticPodPath: /etc/kubernetes/manifests
64+
---
65+
apiVersion: kubeproxy.config.k8s.io/v1alpha1
66+
kind: KubeProxyConfiguration
67+
clusterCIDR: "10.244.0.0/16"
68+
metricsBindAddress: 0.0.0.0:10249

Diff for: ‎pkg/minikube/bootstrapper/bsutil/testdata/v1.21/crio-options-gates.yaml

+75
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
1+
apiVersion: kubeadm.k8s.io/v1beta2
2+
kind: InitConfiguration
3+
localAPIEndpoint:
4+
advertiseAddress: 1.1.1.1
5+
bindPort: 8443
6+
bootstrapTokens:
7+
- groups:
8+
- system:bootstrappers:kubeadm:default-node-token
9+
ttl: 24h0m0s
10+
usages:
11+
- signing
12+
- authentication
13+
nodeRegistration:
14+
criSocket: /var/run/crio/crio.sock
15+
name: "mk"
16+
kubeletExtraArgs:
17+
node-ip: 1.1.1.1
18+
taints: []
19+
---
20+
apiVersion: kubeadm.k8s.io/v1beta2
21+
kind: ClusterConfiguration
22+
apiServer:
23+
certSANs: ["127.0.0.1", "localhost", "1.1.1.1"]
24+
extraArgs:
25+
enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
26+
fail-no-swap: "true"
27+
feature-gates: "a=b"
28+
controllerManager:
29+
extraArgs:
30+
allocate-node-cidrs: "true"
31+
feature-gates: "a=b"
32+
kube-api-burst: "32"
33+
leader-elect: "false"
34+
scheduler:
35+
extraArgs:
36+
feature-gates: "a=b"
37+
leader-elect: "false"
38+
scheduler-name: "mini-scheduler"
39+
certificatesDir: /var/lib/minikube/certs
40+
clusterName: mk
41+
controlPlaneEndpoint: control-plane.minikube.internal:8443
42+
dns:
43+
type: CoreDNS
44+
etcd:
45+
local:
46+
dataDir: /var/lib/minikube/etcd
47+
extraArgs:
48+
proxy-refresh-interval: "70000"
49+
kubernetesVersion: v1.21.0
50+
networking:
51+
dnsDomain: cluster.local
52+
podSubnet: "10.244.0.0/16"
53+
serviceSubnet: 10.96.0.0/12
54+
---
55+
apiVersion: kubelet.config.k8s.io/v1beta1
56+
kind: KubeletConfiguration
57+
authentication:
58+
x509:
59+
clientCAFile: /var/lib/minikube/certs/ca.crt
60+
cgroupDriver: systemd
61+
clusterDomain: "cluster.local"
62+
# disable disk resource management by default
63+
imageGCHighThresholdPercent: 100
64+
evictionHard:
65+
nodefs.available: "0%"
66+
nodefs.inodesFree: "0%"
67+
imagefs.available: "0%"
68+
failSwapOn: false
69+
staticPodPath: /etc/kubernetes/manifests
70+
---
71+
apiVersion: kubeproxy.config.k8s.io/v1alpha1
72+
kind: KubeProxyConfiguration
73+
clusterCIDR: "10.244.0.0/16"
74+
metricsBindAddress: 0.0.0.0:10249
75+
mode: "iptables"

Diff for: ‎pkg/minikube/bootstrapper/bsutil/testdata/v1.21/crio.yaml

+68
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
apiVersion: kubeadm.k8s.io/v1beta2
2+
kind: InitConfiguration
3+
localAPIEndpoint:
4+
advertiseAddress: 1.1.1.1
5+
bindPort: 8443
6+
bootstrapTokens:
7+
- groups:
8+
- system:bootstrappers:kubeadm:default-node-token
9+
ttl: 24h0m0s
10+
usages:
11+
- signing
12+
- authentication
13+
nodeRegistration:
14+
criSocket: /var/run/crio/crio.sock
15+
name: "mk"
16+
kubeletExtraArgs:
17+
node-ip: 1.1.1.1
18+
taints: []
19+
---
20+
apiVersion: kubeadm.k8s.io/v1beta2
21+
kind: ClusterConfiguration
22+
apiServer:
23+
certSANs: ["127.0.0.1", "localhost", "1.1.1.1"]
24+
extraArgs:
25+
enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
26+
controllerManager:
27+
extraArgs:
28+
allocate-node-cidrs: "true"
29+
leader-elect: "false"
30+
scheduler:
31+
extraArgs:
32+
leader-elect: "false"
33+
certificatesDir: /var/lib/minikube/certs
34+
clusterName: mk
35+
controlPlaneEndpoint: control-plane.minikube.internal:8443
36+
dns:
37+
type: CoreDNS
38+
etcd:
39+
local:
40+
dataDir: /var/lib/minikube/etcd
41+
extraArgs:
42+
proxy-refresh-interval: "70000"
43+
kubernetesVersion: v1.21.0
44+
networking:
45+
dnsDomain: cluster.local
46+
podSubnet: "10.244.0.0/16"
47+
serviceSubnet: 10.96.0.0/12
48+
---
49+
apiVersion: kubelet.config.k8s.io/v1beta1
50+
kind: KubeletConfiguration
51+
authentication:
52+
x509:
53+
clientCAFile: /var/lib/minikube/certs/ca.crt
54+
cgroupDriver: systemd
55+
clusterDomain: "cluster.local"
56+
# disable disk resource management by default
57+
imageGCHighThresholdPercent: 100
58+
evictionHard:
59+
nodefs.available: "0%"
60+
nodefs.inodesFree: "0%"
61+
imagefs.available: "0%"
62+
failSwapOn: false
63+
staticPodPath: /etc/kubernetes/manifests
64+
---
65+
apiVersion: kubeproxy.config.k8s.io/v1alpha1
66+
kind: KubeProxyConfiguration
67+
clusterCIDR: "10.244.0.0/16"
68+
metricsBindAddress: 0.0.0.0:10249

0 commit comments

Comments
 (0)