From 2f3ad44d788bf192a8858c8c6126479e1ca9a3b1 Mon Sep 17 00:00:00 2001 From: Medya Gh Date: Thu, 9 Jan 2020 15:14:58 -0800 Subject: [PATCH] fix test data for containerd tmpl --- .../bootstrapper/bsutil/testdata/v1.11/containerd.yaml | 1 + .../bootstrapper/bsutil/testdata/v1.12/containerd.yaml | 3 ++- .../bootstrapper/bsutil/testdata/v1.13/containerd.yaml | 3 ++- .../bootstrapper/bsutil/testdata/v1.14/containerd.yaml | 4 +++- .../bootstrapper/bsutil/testdata/v1.15/containerd.yaml | 4 +++- .../bootstrapper/bsutil/testdata/v1.16/containerd.yaml | 4 +++- .../bootstrapper/bsutil/testdata/v1.17/containerd.yaml | 4 +++- 7 files changed, 17 insertions(+), 6 deletions(-) diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.11/containerd.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.11/containerd.yaml index a78261c550..ed91117f73 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.11/containerd.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.11/containerd.yaml @@ -12,6 +12,7 @@ networking: etcd: dataDir: /var/lib/minikube/etcd nodeName: mk +apiServerCertSANs: ["127.0.0.1", "localhost", "1.1.1.1"] criSocket: /run/containerd/containerd.sock apiServerExtraArgs: enable-admission-plugins: "Initializers,NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/containerd.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/containerd.yaml index c13a251804..9beec13a4d 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/containerd.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/containerd.yaml @@ -21,6 +21,7 @@ apiServerExtraArgs: enable-admission-plugins: "Initializers,NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" certificatesDir: /var/lib/minikube/certs clusterName: kubernetes +apiServerCertSANs: ["127.0.0.1", "localhost", "1.1.1.1"] controlPlaneEndpoint: localhost:8443 etcd: local: @@ -28,7 +29,7 @@ etcd: kubernetesVersion: v1.12.0 networking: dnsDomain: cluster.local - podSubnet: 192.168.32.0/20 + podSubnet: "" serviceSubnet: 10.96.0.0/12 --- apiVersion: kubelet.config.k8s.io/v1beta1 diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/containerd.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/containerd.yaml index d5f799e56f..6994f8d92b 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/containerd.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/containerd.yaml @@ -21,6 +21,7 @@ apiServerExtraArgs: enable-admission-plugins: "Initializers,NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" certificatesDir: /var/lib/minikube/certs clusterName: kubernetes +apiServerCertSANs: ["127.0.0.1", "localhost", "1.1.1.1"] controlPlaneEndpoint: localhost:8443 etcd: local: @@ -28,7 +29,7 @@ etcd: kubernetesVersion: v1.13.0 networking: dnsDomain: cluster.local - podSubnet: 192.168.32.0/20 + podSubnet: "" serviceSubnet: 10.96.0.0/12 --- apiVersion: kubelet.config.k8s.io/v1beta1 diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/containerd.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/containerd.yaml index a449b49d1d..d96e27170c 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/containerd.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/containerd.yaml @@ -22,6 +22,8 @@ apiServer: enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" certificatesDir: /var/lib/minikube/certs clusterName: kubernetes +apiServer: + certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] controlPlaneEndpoint: localhost:8443 dns: type: CoreDNS @@ -31,7 +33,7 @@ etcd: kubernetesVersion: v1.14.0 networking: dnsDomain: cluster.local - podSubnet: 192.168.32.0/20 + podSubnet: "" serviceSubnet: 10.96.0.0/12 --- apiVersion: kubelet.config.k8s.io/v1beta1 diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/containerd.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/containerd.yaml index 1d7b070603..5fcd575dee 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/containerd.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/containerd.yaml @@ -22,6 +22,8 @@ apiServer: enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" certificatesDir: /var/lib/minikube/certs clusterName: kubernetes +apiServer: + certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] controlPlaneEndpoint: localhost:8443 dns: type: CoreDNS @@ -31,7 +33,7 @@ etcd: kubernetesVersion: v1.15.0 networking: dnsDomain: cluster.local - podSubnet: 192.168.32.0/20 + podSubnet: "" serviceSubnet: 10.96.0.0/12 --- apiVersion: kubelet.config.k8s.io/v1beta1 diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/containerd.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/containerd.yaml index 951e2a6b76..3b269defb3 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/containerd.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/containerd.yaml @@ -22,6 +22,8 @@ apiServer: enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" certificatesDir: /var/lib/minikube/certs clusterName: kubernetes +apiServer: + certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] controlPlaneEndpoint: localhost:8443 dns: type: CoreDNS @@ -31,7 +33,7 @@ etcd: kubernetesVersion: v1.16.0 networking: dnsDomain: cluster.local - podSubnet: 192.168.32.0/20 + podSubnet: "" serviceSubnet: 10.96.0.0/12 --- apiVersion: kubelet.config.k8s.io/v1beta1 diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd.yaml index 5f233307a6..1f5fb46836 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd.yaml @@ -22,6 +22,8 @@ apiServer: enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" certificatesDir: /var/lib/minikube/certs clusterName: kubernetes +apiServer: + certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] controlPlaneEndpoint: localhost:8443 dns: type: CoreDNS @@ -31,7 +33,7 @@ etcd: kubernetesVersion: v1.17.0 networking: dnsDomain: cluster.local - podSubnet: 192.168.32.0/20 + podSubnet: "" serviceSubnet: 10.96.0.0/12 --- apiVersion: kubelet.config.k8s.io/v1beta1