From b9e04c5cb21a9a92c7d0663e9682a37b8e5dd7fb Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Thu, 12 May 2022 13:43:26 -0700 Subject: [PATCH] remove 1.24 yamls --- .../testdata/v1.24/containerd-api-port.yaml | 72 ----------------- .../v1.24/containerd-pod-network-cidr.yaml | 72 ----------------- .../bsutil/testdata/v1.24/containerd.yaml | 72 ----------------- .../testdata/v1.24/crio-options-gates.yaml | 79 ------------------- .../bsutil/testdata/v1.24/crio.yaml | 72 ----------------- .../bsutil/testdata/v1.24/default.yaml | 72 ----------------- .../bsutil/testdata/v1.24/dns.yaml | 72 ----------------- .../testdata/v1.24/image-repository.yaml | 73 ----------------- .../bsutil/testdata/v1.24/options.yaml | 76 ------------------ 9 files changed, 660 deletions(-) delete mode 100644 pkg/minikube/bootstrapper/bsutil/testdata/v1.24/containerd-api-port.yaml delete mode 100644 pkg/minikube/bootstrapper/bsutil/testdata/v1.24/containerd-pod-network-cidr.yaml delete mode 100644 pkg/minikube/bootstrapper/bsutil/testdata/v1.24/containerd.yaml delete mode 100644 pkg/minikube/bootstrapper/bsutil/testdata/v1.24/crio-options-gates.yaml delete mode 100644 pkg/minikube/bootstrapper/bsutil/testdata/v1.24/crio.yaml delete mode 100644 pkg/minikube/bootstrapper/bsutil/testdata/v1.24/default.yaml delete mode 100644 pkg/minikube/bootstrapper/bsutil/testdata/v1.24/dns.yaml delete mode 100644 pkg/minikube/bootstrapper/bsutil/testdata/v1.24/image-repository.yaml delete mode 100644 pkg/minikube/bootstrapper/bsutil/testdata/v1.24/options.yaml diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/containerd-api-port.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/containerd-api-port.yaml deleted file mode 100644 index c0d6a2e107..0000000000 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/containerd-api-port.yaml +++ /dev/null @@ -1,72 +0,0 @@ -apiVersion: kubeadm.k8s.io/v1beta3 -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: /run/containerd/containerd.sock - name: "mk" - kubeletExtraArgs: - node-ip: 1.1.1.1 - taints: [] ---- -apiVersion: kubeadm.k8s.io/v1beta3 -kind: ClusterConfiguration -apiServer: - certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] - extraArgs: - enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" -controllerManager: - extraArgs: - allocate-node-cidrs: "true" - leader-elect: "false" -scheduler: - extraArgs: - leader-elect: "false" -certificatesDir: /var/lib/minikube/certs -clusterName: mk -controlPlaneEndpoint: control-plane.minikube.internal:12345 -etcd: - local: - dataDir: /var/lib/minikube/etcd - extraArgs: - proxy-refresh-interval: "70000" -kubernetesVersion: v1.24.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 -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 diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/containerd-pod-network-cidr.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/containerd-pod-network-cidr.yaml deleted file mode 100644 index ad0f6e2d5f..0000000000 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/containerd-pod-network-cidr.yaml +++ /dev/null @@ -1,72 +0,0 @@ -apiVersion: kubeadm.k8s.io/v1beta3 -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: /run/containerd/containerd.sock - name: "mk" - kubeletExtraArgs: - node-ip: 1.1.1.1 - taints: [] ---- -apiVersion: kubeadm.k8s.io/v1beta3 -kind: ClusterConfiguration -apiServer: - certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] - extraArgs: - enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" -controllerManager: - extraArgs: - allocate-node-cidrs: "true" - leader-elect: "false" -scheduler: - extraArgs: - leader-elect: "false" -certificatesDir: /var/lib/minikube/certs -clusterName: mk -controlPlaneEndpoint: control-plane.minikube.internal:8443 -etcd: - local: - dataDir: /var/lib/minikube/etcd - extraArgs: - proxy-refresh-interval: "70000" -kubernetesVersion: v1.24.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 -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 diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/containerd.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/containerd.yaml deleted file mode 100644 index b57437de99..0000000000 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/containerd.yaml +++ /dev/null @@ -1,72 +0,0 @@ -apiVersion: kubeadm.k8s.io/v1beta3 -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: /run/containerd/containerd.sock - name: "mk" - kubeletExtraArgs: - node-ip: 1.1.1.1 - taints: [] ---- -apiVersion: kubeadm.k8s.io/v1beta3 -kind: ClusterConfiguration -apiServer: - certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] - extraArgs: - enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" -controllerManager: - extraArgs: - allocate-node-cidrs: "true" - leader-elect: "false" -scheduler: - extraArgs: - leader-elect: "false" -certificatesDir: /var/lib/minikube/certs -clusterName: mk -controlPlaneEndpoint: control-plane.minikube.internal:8443 -etcd: - local: - dataDir: /var/lib/minikube/etcd - extraArgs: - proxy-refresh-interval: "70000" -kubernetesVersion: v1.24.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 -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 diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/crio-options-gates.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/crio-options-gates.yaml deleted file mode 100644 index c071093bf1..0000000000 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/crio-options-gates.yaml +++ /dev/null @@ -1,79 +0,0 @@ -apiVersion: kubeadm.k8s.io/v1beta3 -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: /var/run/crio/crio.sock - name: "mk" - kubeletExtraArgs: - node-ip: 1.1.1.1 - taints: [] ---- -apiVersion: kubeadm.k8s.io/v1beta3 -kind: ClusterConfiguration -apiServer: - certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] - extraArgs: - enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" - fail-no-swap: "true" - feature-gates: "a=b" -controllerManager: - extraArgs: - allocate-node-cidrs: "true" - feature-gates: "a=b" - kube-api-burst: "32" - leader-elect: "false" -scheduler: - extraArgs: - feature-gates: "a=b" - leader-elect: "false" - scheduler-name: "mini-scheduler" -certificatesDir: /var/lib/minikube/certs -clusterName: mk -controlPlaneEndpoint: control-plane.minikube.internal:8443 -etcd: - local: - dataDir: /var/lib/minikube/etcd - extraArgs: - proxy-refresh-interval: "70000" -kubernetesVersion: v1.24.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 -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" diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/crio.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/crio.yaml deleted file mode 100644 index e610321bef..0000000000 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/crio.yaml +++ /dev/null @@ -1,72 +0,0 @@ -apiVersion: kubeadm.k8s.io/v1beta3 -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: /var/run/crio/crio.sock - name: "mk" - kubeletExtraArgs: - node-ip: 1.1.1.1 - taints: [] ---- -apiVersion: kubeadm.k8s.io/v1beta3 -kind: ClusterConfiguration -apiServer: - certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] - extraArgs: - enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" -controllerManager: - extraArgs: - allocate-node-cidrs: "true" - leader-elect: "false" -scheduler: - extraArgs: - leader-elect: "false" -certificatesDir: /var/lib/minikube/certs -clusterName: mk -controlPlaneEndpoint: control-plane.minikube.internal:8443 -etcd: - local: - dataDir: /var/lib/minikube/etcd - extraArgs: - proxy-refresh-interval: "70000" -kubernetesVersion: v1.24.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 -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 diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/default.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/default.yaml deleted file mode 100644 index a7d163f7ae..0000000000 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/default.yaml +++ /dev/null @@ -1,72 +0,0 @@ -apiVersion: kubeadm.k8s.io/v1beta3 -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: /var/run/dockershim.sock - name: "mk" - kubeletExtraArgs: - node-ip: 1.1.1.1 - taints: [] ---- -apiVersion: kubeadm.k8s.io/v1beta3 -kind: ClusterConfiguration -apiServer: - certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] - extraArgs: - enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" -controllerManager: - extraArgs: - allocate-node-cidrs: "true" - leader-elect: "false" -scheduler: - extraArgs: - leader-elect: "false" -certificatesDir: /var/lib/minikube/certs -clusterName: mk -controlPlaneEndpoint: control-plane.minikube.internal:8443 -etcd: - local: - dataDir: /var/lib/minikube/etcd - extraArgs: - proxy-refresh-interval: "70000" -kubernetesVersion: v1.24.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 -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 diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/dns.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/dns.yaml deleted file mode 100644 index f304a30dd2..0000000000 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/dns.yaml +++ /dev/null @@ -1,72 +0,0 @@ -apiVersion: kubeadm.k8s.io/v1beta3 -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: /var/run/dockershim.sock - name: "mk" - kubeletExtraArgs: - node-ip: 1.1.1.1 - taints: [] ---- -apiVersion: kubeadm.k8s.io/v1beta3 -kind: ClusterConfiguration -apiServer: - certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] - extraArgs: - enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" -controllerManager: - extraArgs: - allocate-node-cidrs: "true" - leader-elect: "false" -scheduler: - extraArgs: - leader-elect: "false" -certificatesDir: /var/lib/minikube/certs -clusterName: mk -controlPlaneEndpoint: control-plane.minikube.internal:8443 -etcd: - local: - dataDir: /var/lib/minikube/etcd - extraArgs: - proxy-refresh-interval: "70000" -kubernetesVersion: v1.24.0 -networking: - dnsDomain: minikube.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 -clusterDomain: "minikube.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 diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/image-repository.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/image-repository.yaml deleted file mode 100644 index 232c8785ab..0000000000 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/image-repository.yaml +++ /dev/null @@ -1,73 +0,0 @@ -apiVersion: kubeadm.k8s.io/v1beta3 -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: /var/run/dockershim.sock - name: "mk" - kubeletExtraArgs: - node-ip: 1.1.1.1 - taints: [] ---- -apiVersion: kubeadm.k8s.io/v1beta3 -kind: ClusterConfiguration -imageRepository: test/repo -apiServer: - certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] - extraArgs: - enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" -controllerManager: - extraArgs: - allocate-node-cidrs: "true" - leader-elect: "false" -scheduler: - extraArgs: - leader-elect: "false" -certificatesDir: /var/lib/minikube/certs -clusterName: mk -controlPlaneEndpoint: control-plane.minikube.internal:8443 -etcd: - local: - dataDir: /var/lib/minikube/etcd - extraArgs: - proxy-refresh-interval: "70000" -kubernetesVersion: v1.24.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 -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 diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/options.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/options.yaml deleted file mode 100644 index 71046482a4..0000000000 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.24/options.yaml +++ /dev/null @@ -1,76 +0,0 @@ -apiVersion: kubeadm.k8s.io/v1beta3 -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: /var/run/dockershim.sock - name: "mk" - kubeletExtraArgs: - node-ip: 1.1.1.1 - taints: [] ---- -apiVersion: kubeadm.k8s.io/v1beta3 -kind: ClusterConfiguration -apiServer: - certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] - extraArgs: - enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" - fail-no-swap: "true" -controllerManager: - extraArgs: - allocate-node-cidrs: "true" - kube-api-burst: "32" - leader-elect: "false" -scheduler: - extraArgs: - leader-elect: "false" - scheduler-name: "mini-scheduler" -certificatesDir: /var/lib/minikube/certs -clusterName: mk -controlPlaneEndpoint: control-plane.minikube.internal:8443 -etcd: - local: - dataDir: /var/lib/minikube/etcd - extraArgs: - proxy-refresh-interval: "70000" -kubernetesVersion: v1.24.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 -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"