From 7ff41cfb7b729405a09778371d56c8a9b441252c Mon Sep 17 00:00:00 2001 From: tstromberg Date: Fri, 7 Feb 2020 10:53:57 -0800 Subject: [PATCH] Combine apiserver options with extraArgs --- .../bootstrapper/bsutil/extraconfig.go | 33 +++++++++++++------ .../bootstrapper/bsutil/ktmpl/v1alpha1.go | 2 +- .../bootstrapper/bsutil/ktmpl/v1alpha3.go | 2 +- .../bootstrapper/bsutil/ktmpl/v1beta1.go | 9 ++--- .../bootstrapper/bsutil/ktmpl/v1beta2.go | 9 ++--- pkg/minikube/bootstrapper/bsutil/kubeadm.go | 18 +++++----- .../testdata/v1.14/containerd-api-port.yaml | 3 +- .../v1.14/containerd-pod-network-cidr.yaml | 3 +- .../bsutil/testdata/v1.14/containerd.yaml | 3 +- .../testdata/v1.14/crio-options-gates.yaml | 3 +- .../bsutil/testdata/v1.14/crio.yaml | 3 +- .../bsutil/testdata/v1.14/default.yaml | 3 +- .../bsutil/testdata/v1.14/dns.yaml | 3 +- .../testdata/v1.14/image-repository.yaml | 3 +- .../bsutil/testdata/v1.14/options.yaml | 3 +- .../testdata/v1.15/containerd-api-port.yaml | 3 +- .../v1.15/containerd-pod-network-cidr.yaml | 3 +- .../bsutil/testdata/v1.15/containerd.yaml | 3 +- .../testdata/v1.15/crio-options-gates.yaml | 3 +- .../bsutil/testdata/v1.15/crio.yaml | 3 +- .../bsutil/testdata/v1.15/default.yaml | 3 +- .../bsutil/testdata/v1.15/dns.yaml | 3 +- .../testdata/v1.15/image-repository.yaml | 3 +- .../bsutil/testdata/v1.15/options.yaml | 3 +- .../testdata/v1.16/containerd-api-port.yaml | 3 +- .../v1.16/containerd-pod-network-cidr.yaml | 3 +- .../bsutil/testdata/v1.16/containerd.yaml | 3 +- .../testdata/v1.16/crio-options-gates.yaml | 3 +- .../bsutil/testdata/v1.16/crio.yaml | 3 +- .../bsutil/testdata/v1.16/default.yaml | 3 +- .../bsutil/testdata/v1.16/dns.yaml | 3 +- .../testdata/v1.16/image-repository.yaml | 3 +- .../bsutil/testdata/v1.16/options.yaml | 3 +- .../testdata/v1.17/containerd-api-port.yaml | 3 +- .../v1.17/containerd-pod-network-cidr.yaml | 3 +- .../bsutil/testdata/v1.17/containerd.yaml | 3 +- .../testdata/v1.17/crio-options-gates.yaml | 3 +- .../bsutil/testdata/v1.17/crio.yaml | 3 +- .../bsutil/testdata/v1.17/default.yaml | 3 +- .../bsutil/testdata/v1.17/dns.yaml | 3 +- .../testdata/v1.17/image-repository.yaml | 3 +- .../bsutil/testdata/v1.17/options.yaml | 3 +- .../testdata/v1.18/containerd-api-port.yaml | 3 +- .../v1.18/containerd-pod-network-cidr.yaml | 3 +- .../bsutil/testdata/v1.18/containerd.yaml | 3 +- .../testdata/v1.18/crio-options-gates.yaml | 3 +- .../bsutil/testdata/v1.18/crio.yaml | 3 +- .../bsutil/testdata/v1.18/default.yaml | 3 +- .../bsutil/testdata/v1.18/dns.yaml | 3 +- .../testdata/v1.18/image-repository.yaml | 3 +- .../bsutil/testdata/v1.18/options.yaml | 3 +- .../testdata/v1.19/containerd-api-port.yaml | 3 +- .../v1.19/containerd-pod-network-cidr.yaml | 3 +- .../bsutil/testdata/v1.19/containerd.yaml | 3 +- .../testdata/v1.19/crio-options-gates.yaml | 3 +- .../bsutil/testdata/v1.19/crio.yaml | 3 +- .../bsutil/testdata/v1.19/default.yaml | 3 +- .../bsutil/testdata/v1.19/dns.yaml | 3 +- .../testdata/v1.19/image-repository.yaml | 3 +- .../bsutil/testdata/v1.19/options.yaml | 3 +- 60 files changed, 99 insertions(+), 136 deletions(-) diff --git a/pkg/minikube/bootstrapper/bsutil/extraconfig.go b/pkg/minikube/bootstrapper/bsutil/extraconfig.go index 0136fea42c90..109bb45f0737 100644 --- a/pkg/minikube/bootstrapper/bsutil/extraconfig.go +++ b/pkg/minikube/bootstrapper/bsutil/extraconfig.go @@ -33,10 +33,11 @@ const ( KubeadmConfigParam = iota ) -// componentExtraArgs holds extra args for a component -type componentExtraArgs struct { +// componentOptions holds extra args for a component +type componentOptions struct { Component string - Options map[string]string + ExtraArgs map[string]string + Pairs map[string]string } // mapping of component to the section name in kubeadm. @@ -122,9 +123,9 @@ func defaultOptionsForComponentAndVersion(component string, version semver.Versi return versionedOpts, nil } -// newComponentExtraArgs creates a new ComponentExtraArgs -func newComponentExtraArgs(opts config.ExtraOptionSlice, version semver.Version, featureGates string) ([]componentExtraArgs, error) { - var kubeadmExtraArgs []componentExtraArgs +// newComponentOptions creates a new componentOptions +func newComponentOptions(opts config.ExtraOptionSlice, version semver.Version, featureGates string, cp config.Node) ([]componentOptions, error) { + var kubeadmExtraArgs []componentOptions for _, extraOpt := range opts { if _, ok := componentToKubeadmConfigKey[extraOpt.Component]; !ok { return nil, fmt.Errorf("unknown component %q. valid components are: %v", componentToKubeadmConfigKey, componentToKubeadmConfigKey) @@ -150,9 +151,10 @@ func newComponentExtraArgs(opts config.ExtraOptionSlice, version semver.Version, extraConfig["feature-gates"] = featureGates } if len(extraConfig) > 0 { - kubeadmExtraArgs = append(kubeadmExtraArgs, componentExtraArgs{ + kubeadmExtraArgs = append(kubeadmExtraArgs, componentOptions{ Component: kubeadmComponentKey, - Options: extraConfig, + ExtraArgs: extraConfig, + Pairs: optionPairsForComponent(component, version, cp), }) } } @@ -160,9 +162,20 @@ func newComponentExtraArgs(opts config.ExtraOptionSlice, version semver.Version, return kubeadmExtraArgs, nil } +// optionPairsForComponent generates a map of value pairs for a k8s component +func optionPairsForComponent(component string, version semver.Version, cp config.Node) map[string]string { + // For the ktmpl.V1Beta1 users + if component == Apiserver && version.GTE(semver.MustParse("1.14.0-alpha.0")) { + return map[string]string{ + "certSANs": fmt.Sprintf(`["127.0.0.1", "localhost", "%s"]`, cp.IP), + } + } + return nil +} + // createExtraComponentConfig generates a map of component to extra args for all of the components except kubeadm -func createExtraComponentConfig(extraOptions config.ExtraOptionSlice, version semver.Version, componentFeatureArgs string) ([]componentExtraArgs, error) { - extraArgsSlice, err := newComponentExtraArgs(extraOptions, version, componentFeatureArgs) +func createExtraComponentConfig(extraOptions config.ExtraOptionSlice, version semver.Version, componentFeatureArgs string, cp config.Node) ([]componentOptions, error) { + extraArgsSlice, err := newComponentOptions(extraOptions, version, componentFeatureArgs, cp) if err != nil { return nil, err } diff --git a/pkg/minikube/bootstrapper/bsutil/ktmpl/v1alpha1.go b/pkg/minikube/bootstrapper/bsutil/ktmpl/v1alpha1.go index 2576bf07ffb8..cd90b31f23b4 100644 --- a/pkg/minikube/bootstrapper/bsutil/ktmpl/v1alpha1.go +++ b/pkg/minikube/bootstrapper/bsutil/ktmpl/v1alpha1.go @@ -38,7 +38,7 @@ nodeName: {{.NodeName}} apiServerCertSANs: ["127.0.0.1", "localhost", "{{.AdvertiseAddress}}"] {{if .ImageRepository}}imageRepository: {{.ImageRepository}} {{end}}{{if .CRISocket}}criSocket: {{.CRISocket}} -{{end}}{{range .ExtraArgs}}{{.Component}}ExtraArgs:{{range $i, $val := printMapInOrder .Options ": " }} +{{end}}{{range .ComponentOptions}}{{.Component}}ExtraArgs:{{range $i, $val := printMapInOrder .ExtraArgs ": " }} {{$val}}{{end}} {{end}}{{if .FeatureArgs}}featureGates: {{range $i, $val := .FeatureArgs}} {{$i}}: {{$val}}{{end}} diff --git a/pkg/minikube/bootstrapper/bsutil/ktmpl/v1alpha3.go b/pkg/minikube/bootstrapper/bsutil/ktmpl/v1alpha3.go index adf9d98ad711..8dfadae215e8 100644 --- a/pkg/minikube/bootstrapper/bsutil/ktmpl/v1alpha3.go +++ b/pkg/minikube/bootstrapper/bsutil/ktmpl/v1alpha3.go @@ -41,7 +41,7 @@ nodeRegistration: apiVersion: kubeadm.k8s.io/v1alpha3 kind: ClusterConfiguration {{if .ImageRepository}}imageRepository: {{.ImageRepository}} -{{end}}{{range .ExtraArgs}}{{.Component}}ExtraArgs:{{range $i, $val := printMapInOrder .Options ": " }} +{{end}}{{range .ComponentOptions}}{{.Component}}ExtraArgs:{{range $i, $val := printMapInOrder .ExtraArgs ": " }} {{$val}}{{end}} {{end -}} {{if .FeatureArgs}}featureGates: {{range $i, $val := .FeatureArgs}} diff --git a/pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta1.go b/pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta1.go index ec1123a6f28b..3a271bce7564 100644 --- a/pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta1.go +++ b/pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta1.go @@ -41,9 +41,12 @@ nodeRegistration: apiVersion: kubeadm.k8s.io/v1beta1 kind: ClusterConfiguration {{ if .ImageRepository}}imageRepository: {{.ImageRepository}} -{{end}}{{range .ExtraArgs}}{{.Component}}: +{{end}}{{range .ComponentOptions}}{{.Component}}: +{{- range $k, $v := .Pairs }} + {{$k}}: {{$v}} +{{- end}} extraArgs: -{{- range $i, $val := printMapInOrder .Options ": " }} +{{- range $i, $val := printMapInOrder .ExtraArgs ": " }} {{$val}} {{- end}} {{end -}} @@ -52,8 +55,6 @@ kind: ClusterConfiguration {{end -}}{{end -}} certificatesDir: {{.CertDir}} clusterName: {{.ClusterName}} -apiServer: - certSANs: ["127.0.0.1", "localhost", "{{.AdvertiseAddress}}"] controlPlaneEndpoint: localhost:{{.APIServerPort}} dns: type: CoreDNS diff --git a/pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta2.go b/pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta2.go index 9b4e29a91117..38cfc61956a0 100644 --- a/pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta2.go +++ b/pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta2.go @@ -41,9 +41,12 @@ nodeRegistration: apiVersion: kubeadm.k8s.io/v1beta2 kind: ClusterConfiguration {{ if .ImageRepository}}imageRepository: {{.ImageRepository}} -{{end}}{{range .ExtraArgs}}{{.Component}}: +{{end}}{{range .ComponentOptions}}{{.Component}}: +{{- range $k, $v := .Pairs }} + {{$k}}: {{$v}} +{{- end}} extraArgs: -{{- range $i, $val := printMapInOrder .Options ": " }} +{{- range $i, $val := printMapInOrder .ExtraArgs ": " }} {{$val}} {{- end}} {{end -}} @@ -52,8 +55,6 @@ kind: ClusterConfiguration {{end -}}{{end -}} certificatesDir: {{.CertDir}} clusterName: kubernetes -apiServer: - certSANs: ["127.0.0.1", "localhost", "{{.AdvertiseAddress}}"] controlPlaneEndpoint: localhost:{{.APIServerPort}} controllerManager: {} dns: diff --git a/pkg/minikube/bootstrapper/bsutil/kubeadm.go b/pkg/minikube/bootstrapper/bsutil/kubeadm.go index 357c4e579d83..c2f5366e672b 100644 --- a/pkg/minikube/bootstrapper/bsutil/kubeadm.go +++ b/pkg/minikube/bootstrapper/bsutil/kubeadm.go @@ -23,6 +23,7 @@ import ( "path" "github.com/blang/semver" + "github.com/golang/glog" "github.com/pkg/errors" "k8s.io/minikube/pkg/minikube/bootstrapper/bsutil/ktmpl" "k8s.io/minikube/pkg/minikube/config" @@ -48,11 +49,6 @@ func GenerateKubeadmYAML(mc config.MachineConfig, r cruntime.Manager) ([]byte, e return nil, errors.Wrap(err, "parses feature gate config for kubeadm and component") } - extraComponentConfig, err := createExtraComponentConfig(k8s.ExtraOptions, version, componentFeatureArgs) - if err != nil { - return nil, errors.Wrap(err, "generating extra component config for kubeadm") - } - // In case of no port assigned, use default cp, err := config.PrimaryControlPlane(mc) if err != nil { @@ -63,6 +59,11 @@ func GenerateKubeadmYAML(mc config.MachineConfig, r cruntime.Manager) ([]byte, e nodePort = constants.APIServerPort } + componentOpts, err := createExtraComponentConfig(k8s.ExtraOptions, version, componentFeatureArgs, cp) + if err != nil { + return nil, errors.Wrap(err, "generating extra component config for kubeadm") + } + opts := struct { CertDir string ServiceCIDR string @@ -76,7 +77,7 @@ func GenerateKubeadmYAML(mc config.MachineConfig, r cruntime.Manager) ([]byte, e DNSDomain string CRISocket string ImageRepository string - ExtraArgs []componentExtraArgs + ComponentOptions []componentOptions FeatureArgs map[string]bool NoTaintMaster bool }{ @@ -91,7 +92,7 @@ func GenerateKubeadmYAML(mc config.MachineConfig, r cruntime.Manager) ([]byte, e NodeName: cp.Name, CRISocket: r.SocketPath(), ImageRepository: k8s.ImageRepository, - ExtraArgs: extraComponentConfig, + ComponentOptions: componentOpts, FeatureArgs: kubeadmFeatureArgs, NoTaintMaster: false, // That does not work with k8s 1.12+ DNSDomain: k8s.DNSDomain, @@ -115,10 +116,11 @@ func GenerateKubeadmYAML(mc config.MachineConfig, r cruntime.Manager) ([]byte, e if version.GTE(semver.MustParse("1.17.0")) { configTmpl = ktmpl.V1Beta2 } + glog.Infof("kubeadm options: %+v", opts) if err := configTmpl.Execute(&b, opts); err != nil { return nil, err } - + glog.Infof("kubeadm config:\n%s\n", b.String()) return b.Bytes(), nil } diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/containerd-api-port.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/containerd-api-port.yaml index c8cab84ec549..95c1fb0c59f8 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/containerd-api-port.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/containerd-api-port.yaml @@ -18,12 +18,11 @@ nodeRegistration: apiVersion: kubeadm.k8s.io/v1beta1 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" certificatesDir: /var/lib/minikube/certs clusterName: kubernetes -apiServer: - certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] controlPlaneEndpoint: localhost:12345 dns: type: CoreDNS diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/containerd-pod-network-cidr.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/containerd-pod-network-cidr.yaml index 6d316486d18f..53077ef4eb55 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/containerd-pod-network-cidr.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/containerd-pod-network-cidr.yaml @@ -18,12 +18,11 @@ nodeRegistration: apiVersion: kubeadm.k8s.io/v1beta1 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" certificatesDir: /var/lib/minikube/certs clusterName: kubernetes -apiServer: - certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] controlPlaneEndpoint: localhost:8443 dns: type: CoreDNS diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/containerd.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/containerd.yaml index 4d8c50928d48..7b7a6b544355 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/containerd.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/containerd.yaml @@ -18,12 +18,11 @@ nodeRegistration: apiVersion: kubeadm.k8s.io/v1beta1 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" certificatesDir: /var/lib/minikube/certs clusterName: kubernetes -apiServer: - certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] controlPlaneEndpoint: localhost:8443 dns: type: CoreDNS diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/crio-options-gates.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/crio-options-gates.yaml index 3e27f96cb01d..9fdfe4f67925 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/crio-options-gates.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/crio-options-gates.yaml @@ -18,6 +18,7 @@ nodeRegistration: apiVersion: kubeadm.k8s.io/v1beta1 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" @@ -32,8 +33,6 @@ scheduler: scheduler-name: "mini-scheduler" certificatesDir: /var/lib/minikube/certs clusterName: kubernetes -apiServer: - certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] controlPlaneEndpoint: localhost:8443 dns: type: CoreDNS diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/crio.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/crio.yaml index 56baf17506b4..6c69bdc90d77 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/crio.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/crio.yaml @@ -18,12 +18,11 @@ nodeRegistration: apiVersion: kubeadm.k8s.io/v1beta1 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" certificatesDir: /var/lib/minikube/certs clusterName: kubernetes -apiServer: - certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] controlPlaneEndpoint: localhost:8443 dns: type: CoreDNS diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/default.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/default.yaml index f6f4595ed197..d14ce69bc41e 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/default.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/default.yaml @@ -18,12 +18,11 @@ nodeRegistration: apiVersion: kubeadm.k8s.io/v1beta1 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" certificatesDir: /var/lib/minikube/certs clusterName: kubernetes -apiServer: - certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] controlPlaneEndpoint: localhost:8443 dns: type: CoreDNS diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/dns.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/dns.yaml index d347333d8d03..2056fb7631a6 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/dns.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/dns.yaml @@ -18,12 +18,11 @@ nodeRegistration: apiVersion: kubeadm.k8s.io/v1beta1 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" certificatesDir: /var/lib/minikube/certs clusterName: kubernetes -apiServer: - certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] controlPlaneEndpoint: localhost:8443 dns: type: CoreDNS diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/image-repository.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/image-repository.yaml index 8b419a73a8ac..132612747a99 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/image-repository.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/image-repository.yaml @@ -19,12 +19,11 @@ apiVersion: kubeadm.k8s.io/v1beta1 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" certificatesDir: /var/lib/minikube/certs clusterName: kubernetes -apiServer: - certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] controlPlaneEndpoint: localhost:8443 dns: type: CoreDNS diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/options.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/options.yaml index a0065ab85422..1505f69920eb 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/options.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/options.yaml @@ -18,6 +18,7 @@ nodeRegistration: apiVersion: kubeadm.k8s.io/v1beta1 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" @@ -29,8 +30,6 @@ scheduler: scheduler-name: "mini-scheduler" certificatesDir: /var/lib/minikube/certs clusterName: kubernetes -apiServer: - certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] controlPlaneEndpoint: localhost:8443 dns: type: CoreDNS diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/containerd-api-port.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/containerd-api-port.yaml index 790d0f172d8c..d9402c815f1a 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/containerd-api-port.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/containerd-api-port.yaml @@ -18,12 +18,11 @@ nodeRegistration: apiVersion: kubeadm.k8s.io/v1beta1 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" certificatesDir: /var/lib/minikube/certs clusterName: kubernetes -apiServer: - certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] controlPlaneEndpoint: localhost:12345 dns: type: CoreDNS diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/containerd-pod-network-cidr.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/containerd-pod-network-cidr.yaml index 466f5cf1e0c3..9a11e8429288 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/containerd-pod-network-cidr.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/containerd-pod-network-cidr.yaml @@ -18,12 +18,11 @@ nodeRegistration: apiVersion: kubeadm.k8s.io/v1beta1 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" certificatesDir: /var/lib/minikube/certs clusterName: kubernetes -apiServer: - certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] controlPlaneEndpoint: localhost:8443 dns: type: CoreDNS diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/containerd.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/containerd.yaml index ca4e5ac535c3..24901912b630 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/containerd.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/containerd.yaml @@ -18,12 +18,11 @@ nodeRegistration: apiVersion: kubeadm.k8s.io/v1beta1 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" certificatesDir: /var/lib/minikube/certs clusterName: kubernetes -apiServer: - certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] controlPlaneEndpoint: localhost:8443 dns: type: CoreDNS diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/crio-options-gates.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/crio-options-gates.yaml index 0f4e499a2c1a..9a278fc9f574 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/crio-options-gates.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/crio-options-gates.yaml @@ -18,6 +18,7 @@ nodeRegistration: apiVersion: kubeadm.k8s.io/v1beta1 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" @@ -32,8 +33,6 @@ scheduler: scheduler-name: "mini-scheduler" certificatesDir: /var/lib/minikube/certs clusterName: kubernetes -apiServer: - certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] controlPlaneEndpoint: localhost:8443 dns: type: CoreDNS diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/crio.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/crio.yaml index 01f0bef6517f..ccfed491fe11 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/crio.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/crio.yaml @@ -18,12 +18,11 @@ nodeRegistration: apiVersion: kubeadm.k8s.io/v1beta1 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" certificatesDir: /var/lib/minikube/certs clusterName: kubernetes -apiServer: - certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] controlPlaneEndpoint: localhost:8443 dns: type: CoreDNS diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/default.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/default.yaml index d2745820b412..7ae97e1ea81f 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/default.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/default.yaml @@ -18,12 +18,11 @@ nodeRegistration: apiVersion: kubeadm.k8s.io/v1beta1 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" certificatesDir: /var/lib/minikube/certs clusterName: kubernetes -apiServer: - certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] controlPlaneEndpoint: localhost:8443 dns: type: CoreDNS diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/dns.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/dns.yaml index c89c44845f95..12d3d16b98bf 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/dns.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/dns.yaml @@ -18,12 +18,11 @@ nodeRegistration: apiVersion: kubeadm.k8s.io/v1beta1 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" certificatesDir: /var/lib/minikube/certs clusterName: kubernetes -apiServer: - certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] controlPlaneEndpoint: localhost:8443 dns: type: CoreDNS diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/image-repository.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/image-repository.yaml index d4a4663a08f0..02fac89c94f9 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/image-repository.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/image-repository.yaml @@ -19,12 +19,11 @@ apiVersion: kubeadm.k8s.io/v1beta1 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" certificatesDir: /var/lib/minikube/certs clusterName: kubernetes -apiServer: - certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] controlPlaneEndpoint: localhost:8443 dns: type: CoreDNS diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/options.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/options.yaml index a690ef381a60..fe17557c4e14 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/options.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/options.yaml @@ -18,6 +18,7 @@ nodeRegistration: apiVersion: kubeadm.k8s.io/v1beta1 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" @@ -29,8 +30,6 @@ scheduler: scheduler-name: "mini-scheduler" certificatesDir: /var/lib/minikube/certs clusterName: kubernetes -apiServer: - certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] controlPlaneEndpoint: localhost:8443 dns: type: CoreDNS diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/containerd-api-port.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/containerd-api-port.yaml index f02a7815aa20..948cbfa1e5ea 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/containerd-api-port.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/containerd-api-port.yaml @@ -18,12 +18,11 @@ nodeRegistration: apiVersion: kubeadm.k8s.io/v1beta1 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" certificatesDir: /var/lib/minikube/certs clusterName: kubernetes -apiServer: - certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] controlPlaneEndpoint: localhost:12345 dns: type: CoreDNS diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/containerd-pod-network-cidr.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/containerd-pod-network-cidr.yaml index 0171cf876d5c..672c3838c4c6 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/containerd-pod-network-cidr.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/containerd-pod-network-cidr.yaml @@ -18,12 +18,11 @@ nodeRegistration: apiVersion: kubeadm.k8s.io/v1beta1 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" certificatesDir: /var/lib/minikube/certs clusterName: kubernetes -apiServer: - certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] controlPlaneEndpoint: localhost:8443 dns: type: CoreDNS diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/containerd.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/containerd.yaml index 0f6ac8a836bc..bee7e4b3b6c5 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/containerd.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/containerd.yaml @@ -18,12 +18,11 @@ nodeRegistration: apiVersion: kubeadm.k8s.io/v1beta1 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" certificatesDir: /var/lib/minikube/certs clusterName: kubernetes -apiServer: - certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] controlPlaneEndpoint: localhost:8443 dns: type: CoreDNS diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/crio-options-gates.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/crio-options-gates.yaml index 6e175a4982a0..c332938f1172 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/crio-options-gates.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/crio-options-gates.yaml @@ -18,6 +18,7 @@ nodeRegistration: apiVersion: kubeadm.k8s.io/v1beta1 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" @@ -32,8 +33,6 @@ scheduler: scheduler-name: "mini-scheduler" certificatesDir: /var/lib/minikube/certs clusterName: kubernetes -apiServer: - certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] controlPlaneEndpoint: localhost:8443 dns: type: CoreDNS diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/crio.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/crio.yaml index d663fcffad1b..1d684b48e786 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/crio.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/crio.yaml @@ -18,12 +18,11 @@ nodeRegistration: apiVersion: kubeadm.k8s.io/v1beta1 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" certificatesDir: /var/lib/minikube/certs clusterName: kubernetes -apiServer: - certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] controlPlaneEndpoint: localhost:8443 dns: type: CoreDNS diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/default.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/default.yaml index 00649d728afb..a5f29b0f7ed0 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/default.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/default.yaml @@ -18,12 +18,11 @@ nodeRegistration: apiVersion: kubeadm.k8s.io/v1beta1 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" certificatesDir: /var/lib/minikube/certs clusterName: kubernetes -apiServer: - certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] controlPlaneEndpoint: localhost:8443 dns: type: CoreDNS diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/dns.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/dns.yaml index 9800569fe400..a05a319a920b 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/dns.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/dns.yaml @@ -18,12 +18,11 @@ nodeRegistration: apiVersion: kubeadm.k8s.io/v1beta1 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" certificatesDir: /var/lib/minikube/certs clusterName: kubernetes -apiServer: - certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] controlPlaneEndpoint: localhost:8443 dns: type: CoreDNS diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/image-repository.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/image-repository.yaml index 1d04d64ccef4..89465d9e4c18 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/image-repository.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/image-repository.yaml @@ -19,12 +19,11 @@ apiVersion: kubeadm.k8s.io/v1beta1 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" certificatesDir: /var/lib/minikube/certs clusterName: kubernetes -apiServer: - certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] controlPlaneEndpoint: localhost:8443 dns: type: CoreDNS diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/options.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/options.yaml index 72303f9860cc..24403f0d9d0e 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/options.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/options.yaml @@ -18,6 +18,7 @@ nodeRegistration: apiVersion: kubeadm.k8s.io/v1beta1 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" @@ -29,8 +30,6 @@ scheduler: scheduler-name: "mini-scheduler" certificatesDir: /var/lib/minikube/certs clusterName: kubernetes -apiServer: - certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] controlPlaneEndpoint: localhost:8443 dns: type: CoreDNS diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd-api-port.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd-api-port.yaml index 1575c57a0219..1687279613c0 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd-api-port.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd-api-port.yaml @@ -18,12 +18,11 @@ nodeRegistration: apiVersion: kubeadm.k8s.io/v1beta2 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" certificatesDir: /var/lib/minikube/certs clusterName: kubernetes -apiServer: - certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] controlPlaneEndpoint: localhost:12345 controllerManager: {} dns: diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd-pod-network-cidr.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd-pod-network-cidr.yaml index ea21f58f3778..16872467336e 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd-pod-network-cidr.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd-pod-network-cidr.yaml @@ -18,12 +18,11 @@ nodeRegistration: apiVersion: kubeadm.k8s.io/v1beta2 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" certificatesDir: /var/lib/minikube/certs clusterName: kubernetes -apiServer: - certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] controlPlaneEndpoint: localhost:8443 controllerManager: {} dns: diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd.yaml index 28f6a74db63d..5887f5b6aa45 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd.yaml @@ -18,12 +18,11 @@ nodeRegistration: apiVersion: kubeadm.k8s.io/v1beta2 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" certificatesDir: /var/lib/minikube/certs clusterName: kubernetes -apiServer: - certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] controlPlaneEndpoint: localhost:8443 controllerManager: {} dns: diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/crio-options-gates.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/crio-options-gates.yaml index 146033c9d8ef..bb9911f57f43 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/crio-options-gates.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/crio-options-gates.yaml @@ -18,6 +18,7 @@ nodeRegistration: apiVersion: kubeadm.k8s.io/v1beta2 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" @@ -32,8 +33,6 @@ scheduler: scheduler-name: "mini-scheduler" certificatesDir: /var/lib/minikube/certs clusterName: kubernetes -apiServer: - certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] controlPlaneEndpoint: localhost:8443 controllerManager: {} dns: diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/crio.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/crio.yaml index 80fd7db008be..ba380dc9f964 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/crio.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/crio.yaml @@ -18,12 +18,11 @@ nodeRegistration: apiVersion: kubeadm.k8s.io/v1beta2 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" certificatesDir: /var/lib/minikube/certs clusterName: kubernetes -apiServer: - certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] controlPlaneEndpoint: localhost:8443 controllerManager: {} dns: diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/default.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/default.yaml index a455889881d1..2f6a47b7050f 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/default.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/default.yaml @@ -18,12 +18,11 @@ nodeRegistration: apiVersion: kubeadm.k8s.io/v1beta2 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" certificatesDir: /var/lib/minikube/certs clusterName: kubernetes -apiServer: - certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] controlPlaneEndpoint: localhost:8443 controllerManager: {} dns: diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/dns.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/dns.yaml index 325fd34bc94e..0005dc69390c 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/dns.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/dns.yaml @@ -18,12 +18,11 @@ nodeRegistration: apiVersion: kubeadm.k8s.io/v1beta2 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" certificatesDir: /var/lib/minikube/certs clusterName: kubernetes -apiServer: - certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] controlPlaneEndpoint: localhost:8443 controllerManager: {} dns: diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/image-repository.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/image-repository.yaml index 7bc63a9bc289..50ba184b28ed 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/image-repository.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/image-repository.yaml @@ -19,12 +19,11 @@ apiVersion: kubeadm.k8s.io/v1beta2 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" certificatesDir: /var/lib/minikube/certs clusterName: kubernetes -apiServer: - certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] controlPlaneEndpoint: localhost:8443 controllerManager: {} dns: diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/options.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/options.yaml index e12e28dedb68..ca68e6e39f4d 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/options.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/options.yaml @@ -18,6 +18,7 @@ nodeRegistration: apiVersion: kubeadm.k8s.io/v1beta2 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" @@ -29,8 +30,6 @@ scheduler: scheduler-name: "mini-scheduler" certificatesDir: /var/lib/minikube/certs clusterName: kubernetes -apiServer: - certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] controlPlaneEndpoint: localhost:8443 controllerManager: {} dns: diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/containerd-api-port.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/containerd-api-port.yaml index 81364800ed5d..e5eb8d2d5ee1 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/containerd-api-port.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/containerd-api-port.yaml @@ -18,12 +18,11 @@ nodeRegistration: apiVersion: kubeadm.k8s.io/v1beta2 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" certificatesDir: /var/lib/minikube/certs clusterName: kubernetes -apiServer: - certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] controlPlaneEndpoint: localhost:12345 controllerManager: {} dns: diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/containerd-pod-network-cidr.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/containerd-pod-network-cidr.yaml index aa8f05e98f32..8d3cd1d2c97b 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/containerd-pod-network-cidr.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/containerd-pod-network-cidr.yaml @@ -18,12 +18,11 @@ nodeRegistration: apiVersion: kubeadm.k8s.io/v1beta2 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" certificatesDir: /var/lib/minikube/certs clusterName: kubernetes -apiServer: - certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] controlPlaneEndpoint: localhost:8443 controllerManager: {} dns: diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/containerd.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/containerd.yaml index a17d26a8d62d..eba01c91f235 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/containerd.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/containerd.yaml @@ -18,12 +18,11 @@ nodeRegistration: apiVersion: kubeadm.k8s.io/v1beta2 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" certificatesDir: /var/lib/minikube/certs clusterName: kubernetes -apiServer: - certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] controlPlaneEndpoint: localhost:8443 controllerManager: {} dns: diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/crio-options-gates.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/crio-options-gates.yaml index ccca34a4a083..1c46d2e7ec6f 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/crio-options-gates.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/crio-options-gates.yaml @@ -18,6 +18,7 @@ nodeRegistration: apiVersion: kubeadm.k8s.io/v1beta2 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" @@ -32,8 +33,6 @@ scheduler: scheduler-name: "mini-scheduler" certificatesDir: /var/lib/minikube/certs clusterName: kubernetes -apiServer: - certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] controlPlaneEndpoint: localhost:8443 controllerManager: {} dns: diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/crio.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/crio.yaml index 4797e7a7d03d..bd29ae5875dd 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/crio.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/crio.yaml @@ -18,12 +18,11 @@ nodeRegistration: apiVersion: kubeadm.k8s.io/v1beta2 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" certificatesDir: /var/lib/minikube/certs clusterName: kubernetes -apiServer: - certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] controlPlaneEndpoint: localhost:8443 controllerManager: {} dns: diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/default.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/default.yaml index 9076038c356b..a3f4deab94fe 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/default.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/default.yaml @@ -18,12 +18,11 @@ nodeRegistration: apiVersion: kubeadm.k8s.io/v1beta2 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" certificatesDir: /var/lib/minikube/certs clusterName: kubernetes -apiServer: - certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] controlPlaneEndpoint: localhost:8443 controllerManager: {} dns: diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/dns.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/dns.yaml index 1c3b6e1e1402..de9851d20418 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/dns.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/dns.yaml @@ -18,12 +18,11 @@ nodeRegistration: apiVersion: kubeadm.k8s.io/v1beta2 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" certificatesDir: /var/lib/minikube/certs clusterName: kubernetes -apiServer: - certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] controlPlaneEndpoint: localhost:8443 controllerManager: {} dns: diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/image-repository.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/image-repository.yaml index 8c1c1ff6a91f..acd3b6d111f1 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/image-repository.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/image-repository.yaml @@ -19,12 +19,11 @@ apiVersion: kubeadm.k8s.io/v1beta2 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" certificatesDir: /var/lib/minikube/certs clusterName: kubernetes -apiServer: - certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] controlPlaneEndpoint: localhost:8443 controllerManager: {} dns: diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/options.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/options.yaml index c2d123f473c5..e8b7b28d05a1 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/options.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/options.yaml @@ -18,6 +18,7 @@ nodeRegistration: apiVersion: kubeadm.k8s.io/v1beta2 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" @@ -29,8 +30,6 @@ scheduler: scheduler-name: "mini-scheduler" certificatesDir: /var/lib/minikube/certs clusterName: kubernetes -apiServer: - certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] controlPlaneEndpoint: localhost:8443 controllerManager: {} dns: diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/containerd-api-port.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/containerd-api-port.yaml index 0f76dc8dbbdc..30dd50136c69 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/containerd-api-port.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/containerd-api-port.yaml @@ -18,12 +18,11 @@ nodeRegistration: apiVersion: kubeadm.k8s.io/v1beta2 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" certificatesDir: /var/lib/minikube/certs clusterName: kubernetes -apiServer: - certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] controlPlaneEndpoint: localhost:12345 controllerManager: {} dns: diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/containerd-pod-network-cidr.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/containerd-pod-network-cidr.yaml index bb1c5e4cc13b..fd1b6aba4340 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/containerd-pod-network-cidr.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/containerd-pod-network-cidr.yaml @@ -18,12 +18,11 @@ nodeRegistration: apiVersion: kubeadm.k8s.io/v1beta2 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" certificatesDir: /var/lib/minikube/certs clusterName: kubernetes -apiServer: - certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] controlPlaneEndpoint: localhost:8443 controllerManager: {} dns: diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/containerd.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/containerd.yaml index 77db4e13aa07..acde6e12ec34 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/containerd.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/containerd.yaml @@ -18,12 +18,11 @@ nodeRegistration: apiVersion: kubeadm.k8s.io/v1beta2 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" certificatesDir: /var/lib/minikube/certs clusterName: kubernetes -apiServer: - certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] controlPlaneEndpoint: localhost:8443 controllerManager: {} dns: diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/crio-options-gates.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/crio-options-gates.yaml index b137cc4f4045..9faec4d8213d 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/crio-options-gates.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/crio-options-gates.yaml @@ -18,6 +18,7 @@ nodeRegistration: apiVersion: kubeadm.k8s.io/v1beta2 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" @@ -32,8 +33,6 @@ scheduler: scheduler-name: "mini-scheduler" certificatesDir: /var/lib/minikube/certs clusterName: kubernetes -apiServer: - certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] controlPlaneEndpoint: localhost:8443 controllerManager: {} dns: diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/crio.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/crio.yaml index 3fd6b7923cdb..f4025a2de6d4 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/crio.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/crio.yaml @@ -18,12 +18,11 @@ nodeRegistration: apiVersion: kubeadm.k8s.io/v1beta2 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" certificatesDir: /var/lib/minikube/certs clusterName: kubernetes -apiServer: - certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] controlPlaneEndpoint: localhost:8443 controllerManager: {} dns: diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/default.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/default.yaml index 45cec67f3617..dbc01e3c63bb 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/default.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/default.yaml @@ -18,12 +18,11 @@ nodeRegistration: apiVersion: kubeadm.k8s.io/v1beta2 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" certificatesDir: /var/lib/minikube/certs clusterName: kubernetes -apiServer: - certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] controlPlaneEndpoint: localhost:8443 controllerManager: {} dns: diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/dns.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/dns.yaml index fc714050c4db..a8644fa298d2 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/dns.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/dns.yaml @@ -18,12 +18,11 @@ nodeRegistration: apiVersion: kubeadm.k8s.io/v1beta2 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" certificatesDir: /var/lib/minikube/certs clusterName: kubernetes -apiServer: - certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] controlPlaneEndpoint: localhost:8443 controllerManager: {} dns: diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/image-repository.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/image-repository.yaml index e766699a11d0..1cf68cf362d9 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/image-repository.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/image-repository.yaml @@ -19,12 +19,11 @@ apiVersion: kubeadm.k8s.io/v1beta2 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" certificatesDir: /var/lib/minikube/certs clusterName: kubernetes -apiServer: - certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] controlPlaneEndpoint: localhost:8443 controllerManager: {} dns: diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/options.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/options.yaml index bf9dd87666a5..40f770699585 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/options.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/options.yaml @@ -18,6 +18,7 @@ nodeRegistration: apiVersion: kubeadm.k8s.io/v1beta2 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" @@ -29,8 +30,6 @@ scheduler: scheduler-name: "mini-scheduler" certificatesDir: /var/lib/minikube/certs clusterName: kubernetes -apiServer: - certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] controlPlaneEndpoint: localhost:8443 controllerManager: {} dns: