forked from kubernetes/minikube
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
bump default/newest kubernetes versions (kubernetes#20091)
- Loading branch information
1 parent
bbd1bfb
commit d5c439e
Showing
11 changed files
with
753 additions
and
3 deletions.
There are no files selected for viewing
81 changes: 81 additions & 0 deletions
81
pkg/minikube/bootstrapper/bsutil/testdata/v1.32/containerd-api-port.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,81 @@ | ||
| apiVersion: kubeadm.k8s.io/v1beta4 | ||
| kind: InitConfiguration | ||
| localAPIEndpoint: | ||
| advertiseAddress: 1.1.1.1 | ||
| bindPort: 12345 | ||
| bootstrapTokens: | ||
| - groups: | ||
| - system:bootstrappers:kubeadm:default-node-token | ||
| ttl: 24h0m0s | ||
| usages: | ||
| - signing | ||
| - authentication | ||
| nodeRegistration: | ||
| criSocket: unix:///run/containerd/containerd.sock | ||
| name: "mk" | ||
| kubeletExtraArgs: | ||
| - name: "node-ip" | ||
| value: "1.1.1.1" | ||
| taints: [] | ||
| --- | ||
| apiVersion: kubeadm.k8s.io/v1beta4 | ||
| kind: ClusterConfiguration | ||
| apiServer: | ||
| certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] | ||
| extraArgs: | ||
| - name: "enable-admission-plugins" | ||
| value: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" | ||
| controllerManager: | ||
| extraArgs: | ||
| - name: "allocate-node-cidrs" | ||
| value: "true" | ||
| - name: "leader-elect" | ||
| value: "false" | ||
| scheduler: | ||
| extraArgs: | ||
| - name: "leader-elect" | ||
| value: "false" | ||
| certificatesDir: /var/lib/minikube/certs | ||
| clusterName: mk | ||
| controlPlaneEndpoint: control-plane.minikube.internal:12345 | ||
| etcd: | ||
| local: | ||
| dataDir: /var/lib/minikube/etcd | ||
| extraArgs: | ||
| - name: "proxy-refresh-interval" | ||
| value: "70000" | ||
| kubernetesVersion: v1.32.0 | ||
| networking: | ||
| dnsDomain: cluster.local | ||
| podSubnet: "10.244.0.0/16" | ||
| serviceSubnet: 10.96.0.0/12 | ||
| --- | ||
| apiVersion: kubelet.config.k8s.io/v1beta1 | ||
| kind: KubeletConfiguration | ||
| authentication: | ||
| x509: | ||
| clientCAFile: /var/lib/minikube/certs/ca.crt | ||
| cgroupDriver: systemd | ||
| containerRuntimeEndpoint: unix:///run/containerd/containerd.sock | ||
| hairpinMode: hairpin-veth | ||
| runtimeRequestTimeout: 15m | ||
| clusterDomain: "cluster.local" | ||
| # disable disk resource management by default | ||
| imageGCHighThresholdPercent: 100 | ||
| evictionHard: | ||
| nodefs.available: "0%" | ||
| nodefs.inodesFree: "0%" | ||
| imagefs.available: "0%" | ||
| failSwapOn: false | ||
| staticPodPath: /etc/kubernetes/manifests | ||
| --- | ||
| apiVersion: kubeproxy.config.k8s.io/v1alpha1 | ||
| kind: KubeProxyConfiguration | ||
| clusterCIDR: "10.244.0.0/16" | ||
| metricsBindAddress: 0.0.0.0:10249 | ||
| conntrack: | ||
| maxPerCore: 0 | ||
| # Skip setting "net.netfilter.nf_conntrack_tcp_timeout_established" | ||
| tcpEstablishedTimeout: 0s | ||
| # Skip setting "net.netfilter.nf_conntrack_tcp_timeout_close" | ||
| tcpCloseWaitTimeout: 0s |
81 changes: 81 additions & 0 deletions
81
pkg/minikube/bootstrapper/bsutil/testdata/v1.32/containerd-pod-network-cidr.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,81 @@ | ||
| apiVersion: kubeadm.k8s.io/v1beta4 | ||
| kind: InitConfiguration | ||
| localAPIEndpoint: | ||
| advertiseAddress: 1.1.1.1 | ||
| bindPort: 8443 | ||
| bootstrapTokens: | ||
| - groups: | ||
| - system:bootstrappers:kubeadm:default-node-token | ||
| ttl: 24h0m0s | ||
| usages: | ||
| - signing | ||
| - authentication | ||
| nodeRegistration: | ||
| criSocket: unix:///run/containerd/containerd.sock | ||
| name: "mk" | ||
| kubeletExtraArgs: | ||
| - name: "node-ip" | ||
| value: "1.1.1.1" | ||
| taints: [] | ||
| --- | ||
| apiVersion: kubeadm.k8s.io/v1beta4 | ||
| kind: ClusterConfiguration | ||
| apiServer: | ||
| certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] | ||
| extraArgs: | ||
| - name: "enable-admission-plugins" | ||
| value: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" | ||
| controllerManager: | ||
| extraArgs: | ||
| - name: "allocate-node-cidrs" | ||
| value: "true" | ||
| - name: "leader-elect" | ||
| value: "false" | ||
| scheduler: | ||
| extraArgs: | ||
| - name: "leader-elect" | ||
| value: "false" | ||
| certificatesDir: /var/lib/minikube/certs | ||
| clusterName: mk | ||
| controlPlaneEndpoint: control-plane.minikube.internal:8443 | ||
| etcd: | ||
| local: | ||
| dataDir: /var/lib/minikube/etcd | ||
| extraArgs: | ||
| - name: "proxy-refresh-interval" | ||
| value: "70000" | ||
| kubernetesVersion: v1.32.0 | ||
| networking: | ||
| dnsDomain: cluster.local | ||
| podSubnet: "192.168.32.0/20" | ||
| serviceSubnet: 10.96.0.0/12 | ||
| --- | ||
| apiVersion: kubelet.config.k8s.io/v1beta1 | ||
| kind: KubeletConfiguration | ||
| authentication: | ||
| x509: | ||
| clientCAFile: /var/lib/minikube/certs/ca.crt | ||
| cgroupDriver: systemd | ||
| containerRuntimeEndpoint: unix:///run/containerd/containerd.sock | ||
| hairpinMode: hairpin-veth | ||
| runtimeRequestTimeout: 15m | ||
| clusterDomain: "cluster.local" | ||
| # disable disk resource management by default | ||
| imageGCHighThresholdPercent: 100 | ||
| evictionHard: | ||
| nodefs.available: "0%" | ||
| nodefs.inodesFree: "0%" | ||
| imagefs.available: "0%" | ||
| failSwapOn: false | ||
| staticPodPath: /etc/kubernetes/manifests | ||
| --- | ||
| apiVersion: kubeproxy.config.k8s.io/v1alpha1 | ||
| kind: KubeProxyConfiguration | ||
| clusterCIDR: "192.168.32.0/20" | ||
| metricsBindAddress: 0.0.0.0:10249 | ||
| conntrack: | ||
| maxPerCore: 0 | ||
| # Skip setting "net.netfilter.nf_conntrack_tcp_timeout_established" | ||
| tcpEstablishedTimeout: 0s | ||
| # Skip setting "net.netfilter.nf_conntrack_tcp_timeout_close" | ||
| tcpCloseWaitTimeout: 0s |
81 changes: 81 additions & 0 deletions
81
pkg/minikube/bootstrapper/bsutil/testdata/v1.32/containerd.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,81 @@ | ||
| apiVersion: kubeadm.k8s.io/v1beta4 | ||
| kind: InitConfiguration | ||
| localAPIEndpoint: | ||
| advertiseAddress: 1.1.1.1 | ||
| bindPort: 8443 | ||
| bootstrapTokens: | ||
| - groups: | ||
| - system:bootstrappers:kubeadm:default-node-token | ||
| ttl: 24h0m0s | ||
| usages: | ||
| - signing | ||
| - authentication | ||
| nodeRegistration: | ||
| criSocket: unix:///run/containerd/containerd.sock | ||
| name: "mk" | ||
| kubeletExtraArgs: | ||
| - name: "node-ip" | ||
| value: "1.1.1.1" | ||
| taints: [] | ||
| --- | ||
| apiVersion: kubeadm.k8s.io/v1beta4 | ||
| kind: ClusterConfiguration | ||
| apiServer: | ||
| certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] | ||
| extraArgs: | ||
| - name: "enable-admission-plugins" | ||
| value: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" | ||
| controllerManager: | ||
| extraArgs: | ||
| - name: "allocate-node-cidrs" | ||
| value: "true" | ||
| - name: "leader-elect" | ||
| value: "false" | ||
| scheduler: | ||
| extraArgs: | ||
| - name: "leader-elect" | ||
| value: "false" | ||
| certificatesDir: /var/lib/minikube/certs | ||
| clusterName: mk | ||
| controlPlaneEndpoint: control-plane.minikube.internal:8443 | ||
| etcd: | ||
| local: | ||
| dataDir: /var/lib/minikube/etcd | ||
| extraArgs: | ||
| - name: "proxy-refresh-interval" | ||
| value: "70000" | ||
| kubernetesVersion: v1.32.0 | ||
| networking: | ||
| dnsDomain: cluster.local | ||
| podSubnet: "10.244.0.0/16" | ||
| serviceSubnet: 10.96.0.0/12 | ||
| --- | ||
| apiVersion: kubelet.config.k8s.io/v1beta1 | ||
| kind: KubeletConfiguration | ||
| authentication: | ||
| x509: | ||
| clientCAFile: /var/lib/minikube/certs/ca.crt | ||
| cgroupDriver: systemd | ||
| containerRuntimeEndpoint: unix:///run/containerd/containerd.sock | ||
| hairpinMode: hairpin-veth | ||
| runtimeRequestTimeout: 15m | ||
| clusterDomain: "cluster.local" | ||
| # disable disk resource management by default | ||
| imageGCHighThresholdPercent: 100 | ||
| evictionHard: | ||
| nodefs.available: "0%" | ||
| nodefs.inodesFree: "0%" | ||
| imagefs.available: "0%" | ||
| failSwapOn: false | ||
| staticPodPath: /etc/kubernetes/manifests | ||
| --- | ||
| apiVersion: kubeproxy.config.k8s.io/v1alpha1 | ||
| kind: KubeProxyConfiguration | ||
| clusterCIDR: "10.244.0.0/16" | ||
| metricsBindAddress: 0.0.0.0:10249 | ||
| conntrack: | ||
| maxPerCore: 0 | ||
| # Skip setting "net.netfilter.nf_conntrack_tcp_timeout_established" | ||
| tcpEstablishedTimeout: 0s | ||
| # Skip setting "net.netfilter.nf_conntrack_tcp_timeout_close" | ||
| tcpCloseWaitTimeout: 0s |
94 changes: 94 additions & 0 deletions
94
pkg/minikube/bootstrapper/bsutil/testdata/v1.32/crio-options-gates.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,94 @@ | ||
| apiVersion: kubeadm.k8s.io/v1beta4 | ||
| kind: InitConfiguration | ||
| localAPIEndpoint: | ||
| advertiseAddress: 1.1.1.1 | ||
| bindPort: 8443 | ||
| bootstrapTokens: | ||
| - groups: | ||
| - system:bootstrappers:kubeadm:default-node-token | ||
| ttl: 24h0m0s | ||
| usages: | ||
| - signing | ||
| - authentication | ||
| nodeRegistration: | ||
| criSocket: unix:///var/run/crio/crio.sock | ||
| name: "mk" | ||
| kubeletExtraArgs: | ||
| - name: "node-ip" | ||
| value: "1.1.1.1" | ||
| taints: [] | ||
| --- | ||
| apiVersion: kubeadm.k8s.io/v1beta4 | ||
| kind: ClusterConfiguration | ||
| apiServer: | ||
| certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] | ||
| extraArgs: | ||
| - name: "enable-admission-plugins" | ||
| value: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" | ||
| - name: "fail-no-swap" | ||
| value: "true" | ||
| - name: "feature-gates" | ||
| value: "a=b" | ||
| controllerManager: | ||
| extraArgs: | ||
| - name: "allocate-node-cidrs" | ||
| value: "true" | ||
| - name: "feature-gates" | ||
| value: "a=b" | ||
| - name: "kube-api-burst" | ||
| value: "32" | ||
| - name: "leader-elect" | ||
| value: "false" | ||
| scheduler: | ||
| extraArgs: | ||
| - name: "feature-gates" | ||
| value: "a=b" | ||
| - name: "leader-elect" | ||
| value: "false" | ||
| - name: "scheduler-name" | ||
| value: "mini-scheduler" | ||
| certificatesDir: /var/lib/minikube/certs | ||
| clusterName: mk | ||
| controlPlaneEndpoint: control-plane.minikube.internal:8443 | ||
| etcd: | ||
| local: | ||
| dataDir: /var/lib/minikube/etcd | ||
| extraArgs: | ||
| - name: "proxy-refresh-interval" | ||
| value: "70000" | ||
| kubernetesVersion: v1.32.0 | ||
| networking: | ||
| dnsDomain: cluster.local | ||
| podSubnet: "10.244.0.0/16" | ||
| serviceSubnet: 10.96.0.0/12 | ||
| --- | ||
| apiVersion: kubelet.config.k8s.io/v1beta1 | ||
| kind: KubeletConfiguration | ||
| authentication: | ||
| x509: | ||
| clientCAFile: /var/lib/minikube/certs/ca.crt | ||
| cgroupDriver: systemd | ||
| containerRuntimeEndpoint: unix:///var/run/crio/crio.sock | ||
| hairpinMode: hairpin-veth | ||
| runtimeRequestTimeout: 15m | ||
| clusterDomain: "cluster.local" | ||
| # disable disk resource management by default | ||
| imageGCHighThresholdPercent: 100 | ||
| evictionHard: | ||
| nodefs.available: "0%" | ||
| nodefs.inodesFree: "0%" | ||
| imagefs.available: "0%" | ||
| failSwapOn: false | ||
| staticPodPath: /etc/kubernetes/manifests | ||
| --- | ||
| apiVersion: kubeproxy.config.k8s.io/v1alpha1 | ||
| kind: KubeProxyConfiguration | ||
| clusterCIDR: "10.244.0.0/16" | ||
| metricsBindAddress: 0.0.0.0:10249 | ||
| conntrack: | ||
| maxPerCore: 0 | ||
| # Skip setting "net.netfilter.nf_conntrack_tcp_timeout_established" | ||
| tcpEstablishedTimeout: 0s | ||
| # Skip setting "net.netfilter.nf_conntrack_tcp_timeout_close" | ||
| tcpCloseWaitTimeout: 0s | ||
| mode: "iptables" |
Oops, something went wrong.