-
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 pull request #5837 from tstromberg/v1.17.0
Update NewestKubernetesVersion to v1.17.0-beta.1
- Loading branch information
Showing
13 changed files
with
410 additions
and
25 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
43 changes: 43 additions & 0 deletions
43
pkg/minikube/bootstrapper/kubeadm/testdata/v1.17/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,43 @@ | ||
| apiVersion: kubeadm.k8s.io/v1beta1 | ||
| 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 | ||
| taints: [] | ||
| --- | ||
| apiVersion: kubeadm.k8s.io/v1beta1 | ||
| kind: ClusterConfiguration | ||
| apiServer: | ||
| extraArgs: | ||
| enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" | ||
| certificatesDir: /var/lib/minikube/certs | ||
| clusterName: kubernetes | ||
| controlPlaneEndpoint: localhost:12345 | ||
| dns: | ||
| type: CoreDNS | ||
| etcd: | ||
| local: | ||
| dataDir: /var/lib/minikube/etcd | ||
| kubernetesVersion: v1.17.0 | ||
| networking: | ||
| dnsDomain: cluster.local | ||
| podSubnet: "" | ||
| serviceSubnet: 10.96.0.0/12 | ||
| --- | ||
| apiVersion: kubelet.config.k8s.io/v1beta1 | ||
| kind: KubeletConfiguration | ||
| imageGCHighThresholdPercent: 100 | ||
| evictionHard: | ||
| nodefs.available: "0%" | ||
| nodefs.inodesFree: "0%" | ||
| imagefs.available: "0%" |
43 changes: 43 additions & 0 deletions
43
pkg/minikube/bootstrapper/kubeadm/testdata/v1.17/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,43 @@ | ||
| apiVersion: kubeadm.k8s.io/v1beta1 | ||
| 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 | ||
| taints: [] | ||
| --- | ||
| apiVersion: kubeadm.k8s.io/v1beta1 | ||
| kind: ClusterConfiguration | ||
| apiServer: | ||
| extraArgs: | ||
| enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" | ||
| certificatesDir: /var/lib/minikube/certs | ||
| clusterName: kubernetes | ||
| controlPlaneEndpoint: localhost:8443 | ||
| dns: | ||
| type: CoreDNS | ||
| etcd: | ||
| local: | ||
| dataDir: /var/lib/minikube/etcd | ||
| kubernetesVersion: v1.17.0 | ||
| networking: | ||
| dnsDomain: cluster.local | ||
| podSubnet: "" | ||
| serviceSubnet: 10.96.0.0/12 | ||
| --- | ||
| apiVersion: kubelet.config.k8s.io/v1beta1 | ||
| kind: KubeletConfiguration | ||
| imageGCHighThresholdPercent: 100 | ||
| evictionHard: | ||
| nodefs.available: "0%" | ||
| nodefs.inodesFree: "0%" | ||
| imagefs.available: "0%" |
43 changes: 43 additions & 0 deletions
43
pkg/minikube/bootstrapper/kubeadm/testdata/v1.17/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,43 @@ | ||
| apiVersion: kubeadm.k8s.io/v1beta1 | ||
| 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 | ||
| taints: [] | ||
| --- | ||
| apiVersion: kubeadm.k8s.io/v1beta1 | ||
| kind: ClusterConfiguration | ||
| apiServer: | ||
| extraArgs: | ||
| enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" | ||
| certificatesDir: /var/lib/minikube/certs | ||
| clusterName: kubernetes | ||
| controlPlaneEndpoint: localhost:8443 | ||
| dns: | ||
| type: CoreDNS | ||
| etcd: | ||
| local: | ||
| dataDir: /var/lib/minikube/etcd | ||
| kubernetesVersion: v1.17.0 | ||
| networking: | ||
| dnsDomain: cluster.local | ||
| podSubnet: "" | ||
| serviceSubnet: 10.96.0.0/12 | ||
| --- | ||
| apiVersion: kubelet.config.k8s.io/v1beta1 | ||
| kind: KubeletConfiguration | ||
| imageGCHighThresholdPercent: 100 | ||
| evictionHard: | ||
| nodefs.available: "0%" | ||
| nodefs.inodesFree: "0%" | ||
| imagefs.available: "0%" |
53 changes: 53 additions & 0 deletions
53
pkg/minikube/bootstrapper/kubeadm/testdata/v1.17/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,53 @@ | ||
| apiVersion: kubeadm.k8s.io/v1beta1 | ||
| 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 | ||
| taints: [] | ||
| --- | ||
| apiVersion: kubeadm.k8s.io/v1beta1 | ||
| kind: ClusterConfiguration | ||
| apiServer: | ||
| extraArgs: | ||
| enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" | ||
| fail-no-swap: "true" | ||
| feature-gates: "a=b" | ||
| controllerManager: | ||
| extraArgs: | ||
| feature-gates: "a=b" | ||
| kube-api-burst: "32" | ||
| scheduler: | ||
| extraArgs: | ||
| feature-gates: "a=b" | ||
| scheduler-name: "mini-scheduler" | ||
| certificatesDir: /var/lib/minikube/certs | ||
| clusterName: kubernetes | ||
| controlPlaneEndpoint: localhost:8443 | ||
| dns: | ||
| type: CoreDNS | ||
| etcd: | ||
| local: | ||
| dataDir: /var/lib/minikube/etcd | ||
| kubernetesVersion: v1.17.0 | ||
| networking: | ||
| dnsDomain: cluster.local | ||
| podSubnet: "" | ||
| serviceSubnet: 10.96.0.0/12 | ||
| --- | ||
| apiVersion: kubelet.config.k8s.io/v1beta1 | ||
| kind: KubeletConfiguration | ||
| imageGCHighThresholdPercent: 100 | ||
| evictionHard: | ||
| nodefs.available: "0%" | ||
| nodefs.inodesFree: "0%" | ||
| imagefs.available: "0%" |
43 changes: 43 additions & 0 deletions
43
pkg/minikube/bootstrapper/kubeadm/testdata/v1.17/crio.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,43 @@ | ||
| apiVersion: kubeadm.k8s.io/v1beta1 | ||
| 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 | ||
| taints: [] | ||
| --- | ||
| apiVersion: kubeadm.k8s.io/v1beta1 | ||
| kind: ClusterConfiguration | ||
| apiServer: | ||
| extraArgs: | ||
| enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" | ||
| certificatesDir: /var/lib/minikube/certs | ||
| clusterName: kubernetes | ||
| controlPlaneEndpoint: localhost:8443 | ||
| dns: | ||
| type: CoreDNS | ||
| etcd: | ||
| local: | ||
| dataDir: /var/lib/minikube/etcd | ||
| kubernetesVersion: v1.17.0 | ||
| networking: | ||
| dnsDomain: cluster.local | ||
| podSubnet: "" | ||
| serviceSubnet: 10.96.0.0/12 | ||
| --- | ||
| apiVersion: kubelet.config.k8s.io/v1beta1 | ||
| kind: KubeletConfiguration | ||
| imageGCHighThresholdPercent: 100 | ||
| evictionHard: | ||
| nodefs.available: "0%" | ||
| nodefs.inodesFree: "0%" | ||
| imagefs.available: "0%" |
Oops, something went wrong.