kubernetes
/
minikube
mirror of https://github.com/kubernetes/minikube.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix unit tests and go tempalte block

pull/6151/head
Medya Gh 2020-01-08 17:08:11 -08:00
parent 40a011c49a
commit 890878b469
7 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
go.sum
View File

@ -724,7 +724,6 @@ k8s.io/klog v0.3.1 h1:RVgyDHY/kFKtLqh67NvEWIgkMneNoIrdkN0CxDSQc68=
k8s.io/klog v0.3.1/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk= k8s.io/klog v0.3.1/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
k8s.io/klog v0.3.3 h1:niceAagH1tzskmaie/icWd7ci1wbG7Bf2c6YGcQv+3c= k8s.io/klog v0.3.3 h1:niceAagH1tzskmaie/icWd7ci1wbG7Bf2c6YGcQv+3c=
k8s.io/klog v0.3.3/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk= k8s.io/klog v0.3.3/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
k8s.io/klog v1.0.0 h1:Pt+yjF5aB1xDSVbau4VsWe+dQNzA0qv1LlXdC2dF6Q8=
k8s.io/kube-openapi v0.0.0-20190228160746-b3a7cee44a30 h1:TRb4wNWoBVrH9plmkp2q86FIDppkbrEXdXlxU3a3BMI= k8s.io/kube-openapi v0.0.0-20190228160746-b3a7cee44a30 h1:TRb4wNWoBVrH9plmkp2q86FIDppkbrEXdXlxU3a3BMI=
k8s.io/kube-openapi v0.0.0-20190228160746-b3a7cee44a30/go.mod h1:BXM9ceUBTj2QnfH2MK1odQs778ajze1RxcmP6S8RVVc= k8s.io/kube-openapi v0.0.0-20190228160746-b3a7cee44a30/go.mod h1:BXM9ceUBTj2QnfH2MK1odQs778ajze1RxcmP6S8RVVc=
k8s.io/kubernetes v1.15.2 h1:RO9EuRw5vlN3oa/lnmPxmywOoJRtg9o40KcklHXNIAQ= k8s.io/kubernetes v1.15.2 h1:RO9EuRw5vlN3oa/lnmPxmywOoJRtg9o40KcklHXNIAQ=

4
pkg/minikube/bootstrapper/bsutil/ktmpl/v1alpha1.go
View File

@ -31,8 +31,8 @@ api:
kubernetesVersion: {{.KubernetesVersion}} kubernetesVersion: {{.KubernetesVersion}}
certificatesDir: {{.CertDir}} certificatesDir: {{.CertDir}}
networking: networking:
serviceSubnet: {{.ServiceCIDR}} serviceSubnet: {{.ServiceCIDR}}{{if ne .PodSubnet ""}}
podSubnet: {{if .PodSubnet}}{{.PodSubnet}}{{else}}""{{end}} podSubnet: {{.PodSubnet}}{{end}}
etcd: etcd:
dataDir: {{.EtcdDataDir}} dataDir: {{.EtcdDataDir}}
nodeName: {{.NodeName}} nodeName: {{.NodeName}}

4
pkg/minikube/bootstrapper/bsutil/ktmpl/v1alpha3.go
View File

@ -56,8 +56,8 @@ etcd:
dataDir: {{.EtcdDataDir}} dataDir: {{.EtcdDataDir}}
kubernetesVersion: {{.KubernetesVersion}} kubernetesVersion: {{.KubernetesVersion}}
networking: networking:
dnsDomain: {{if .DNSDomain}}{{.DNSDomain}}{{else}}cluster.local{{end}} dnsDomain: {{if .DNSDomain}}{{.DNSDomain}}{{else}}cluster.local{{end}}{{if ne .PodSubnet ""}}
podSubnet: {{if .PodSubnet}}{{.PodSubnet}}{{else}}""{{end}} podSubnet: {{.PodSubnet}}{{end}}
serviceSubnet: {{.ServiceCIDR}} serviceSubnet: {{.ServiceCIDR}}
--- ---
apiVersion: kubelet.config.k8s.io/v1beta1 apiVersion: kubelet.config.k8s.io/v1beta1

4
pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta1.go
View File

@ -60,8 +60,8 @@ etcd:
dataDir: {{.EtcdDataDir}} dataDir: {{.EtcdDataDir}}
kubernetesVersion: {{.KubernetesVersion}} kubernetesVersion: {{.KubernetesVersion}}
networking: networking:
dnsDomain: {{if .DNSDomain}}{{.DNSDomain}}{{else}}cluster.local{{end}} dnsDomain: {{if .DNSDomain}}{{.DNSDomain}}{{else}}cluster.local{{end}}{{if ne .PodSubnet ""}}
podSubnet: {{if .PodSubnet}}{{.PodSubnet}}{{else}}""{{end}} podSubnet: {{.PodSubnet}}{{end}}
serviceSubnet: {{.ServiceCIDR}} serviceSubnet: {{.ServiceCIDR}}
--- ---
apiVersion: kubelet.config.k8s.io/v1beta1 apiVersion: kubelet.config.k8s.io/v1beta1

1
pkg/minikube/bootstrapper/bsutil/testdata/v1.11/image-repository.yaml vendored
View File

@ -12,6 +12,7 @@ networking:
etcd: etcd:
dataDir: /var/lib/minikube/etcd dataDir: /var/lib/minikube/etcd
nodeName: mk nodeName: mk
apiServerCertSANs: ["127.0.0.1", "localhost", "1.1.1.1"]
imageRepository: test/repo imageRepository: test/repo
apiServerExtraArgs: apiServerExtraArgs:
enable-admission-plugins: "Initializers,NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" enable-admission-plugins: "Initializers,NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"

2
pkg/minikube/driver/driver_test.go
View File

@ -72,7 +72,7 @@ func TestFlagDefaults(t *testing.T) {
expected = FlagHints{ expected = FlagHints{
CacheImages: false, CacheImages: false,
ExtraOptions: fmt.Sprintf("kubelet.resolv-conf=%s", tf.Name()), ExtraOptions: []string{fmt.Sprintf("kubelet.resolv-conf=%s", tf.Name())},
} }
systemdResolvConf = tf.Name() systemdResolvConf = tf.Name()
if diff := cmp.Diff(FlagDefaults(None), expected); diff != "" { if diff := cmp.Diff(FlagDefaults(None), expected); diff != "" {

1
site/.gitignore vendored Normal file
View File

@ -0,0 +1 @@
node_modules