-
Notifications
You must be signed in to change notification settings - Fork 4.9k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into cfgfromfile
- Loading branch information
Showing
15 changed files
with
790 additions
and
40 deletions.
There are no files selected for viewing
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
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
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
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 |
Oops, something went wrong.