From 3f8e3dc3ed80d0d3f4f9c7590b1854d109e60029 Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Wed, 1 Dec 2021 16:15:01 -0800 Subject: [PATCH] use oci cache to get storage driver --- cmd/minikube/cmd/start_flags.go | 16 ++++++---------- pkg/minikube/reason/.reason.go.swp | Bin 0 -> 16384 bytes 2 files changed, 6 insertions(+), 10 deletions(-) create mode 100644 pkg/minikube/reason/.reason.go.swp diff --git a/cmd/minikube/cmd/start_flags.go b/cmd/minikube/cmd/start_flags.go index a7c1f51113..7f96ab0b9a 100644 --- a/cmd/minikube/cmd/start_flags.go +++ b/cmd/minikube/cmd/start_flags.go @@ -516,16 +516,9 @@ func generateNewConfigFromFlags(cmd *cobra.Command, k8sVersion string, drvName s // See https://kubernetes.io/docs/tasks/administer-cluster/kubelet-in-userns/ cc.KubernetesConfig.FeatureGates = addFeatureGate(cc.KubernetesConfig.FeatureGates, "KubeletInUserNamespace=true") } - } - - if driver.IsDockerBTRFS(drvName) { - fg := "LocalStorageCapacityIsolation=false" - if !strings.Contains(cc.KubernetesConfig.FeatureGates, fg) { - klog.Info("auto-setting LocalStorageCapacityIsolation to false") - if len(cc.KubernetesConfig.FeatureGates) != 0 { - fg = "," + fg - } - cc.KubernetesConfig.FeatureGates += fg + if si.StorageDriver == "btrfs" { + klog.Info("auto-setting LocalStorageCapacityIsolation to false because using btrfa storage driver") + cc.KubernetesConfig.FeatureGates = addFeatureGate(cc.KubernetesConfig.FeatureGates, "LocalStorageCapacityIsolation=false") } } @@ -533,6 +526,9 @@ func generateNewConfigFromFlags(cmd *cobra.Command, k8sVersion string, drvName s } func addFeatureGate(featureGates, s string) string { + if len(featureGates) == 0 { + return s + } split := strings.Split(featureGates, ",") m := make(map[string]struct{}, len(split)) for _, v := range split { diff --git a/pkg/minikube/reason/.reason.go.swp b/pkg/minikube/reason/.reason.go.swp new file mode 100644 index 0000000000000000000000000000000000000000..49bfedcbc7e045cff23e6f7bf929f9fc6f3abdb4 GIT binary patch literal 16384 zcmeHOO>87b6|O9SU?6~k1QCZ&J4rTnuxB<-4q;(|wr6(J?6}97A6rWlCNe#0d@oDH7ZfS3&@>7eG02fKB*bbb>v1S5@y-Z}0q;xxpVTuQGf-&e&f+{epO<ld+!z zuL3^qCtF3HT%M2Jj2uyTG>q2~>b(;4JVN;2z+{0{R4g0_*}`0si?x=nMQ3 zco}#Jh=CPg8F(E;ML-BV0{ra*jQtdN3b+^e{refa4y*zgC}sKR}=P^s|A%ND#ZTu(YYRy@(23ZJ{# zSlrfw@m=91a$bbiu>zcOc+%)3gO37F#;)=YtG}^XueHsFbsFUd(wCu#C69)9&jp%~ zM#6XKdoo;Kg)gW;>n-a+>p z!XCQ57Y4Ta9h^tiFp?>)*q{N>kXrN5*g@aoSc8y)GJKna4n4f>2P->1~Qr- z+l>ypXF9goI+b&J)Z;Njt|=8qaVUb|F!O7TM!VH+8k?J^4Z7;#wPa($( zP1C^+v^E?kjm&w*jcPRu%#$##-+#(co&*k!J{OP)92Ehu3}>{5TtqyEU1qqMMD9og zGcqc_=8K*ukC3uqb!(QfRz*t9L%wR&w!3t*Zq}?*x$D$zd^w&ES`oPLCK?v= z`gW-N!J6xfaBsU+pSR0)vteECu9=q6yxPV6qiuuLU@|MElY0`uQAHffQ9v^l=Jqgw zY4|pl3pI|oye91=*6c5q@nZ=d7P*e(s?SLZ_}36U#6xhHM6N&39#(h#q0@^RM;yn+G zT0~#vbv+RdmT~SHIu63Uw5G8%S6< zB*nGfBZY2V9~3|*n44wsk$*gm7~O+*2|X*s@>)#cPybNhU^0k?dbaN?&r@TBzYfDJ z3Tu8c(z2u%AB3%6n_X#WLEP!;1@A~$;x-1Nzy$EJeU@`lqh&|WQQ*1u7M_s-X&)7ULf@jni?gD z6YWOiW|QV{$;<-~J_1XzU<`X=7)hIgoEia88pd%DU8qzBZahqSc*}WIp{-NsBj%!m zHIw8Z8;IREI?Eu_%o>(d$7VhcjU&}x)Ibz zAZwG=F$-clUuG>S^A|Gy!OO&(J%nIFeGb$vL?(u?jT%ANbbjz1wr#c_YjoOt+h{fo zt8La=ywT)HH>xIWxAE%|H>|7tifL7`^n(RRA+N#kQH03_Tf_j%ol|C5n&G#-gnavu ztYpG`1MKi&(UQ^PW~;>4jF#D2W*y(7PDA-j;?k5wD@1_aZEb8%jA=YE2qo^pRa~Es zLpO#}*et1jJVu-`#_=JW!DQp{xGccxP?l9VsGuXFEvnSb^&0Z1mDMudkfpU`B=)%K z#R5HIFQ@|i>dz1>Vz!sHqa6|4HuZB_Qb2|+19%PABT6V-K~XveQTZ;)EVEjk977Ao zvpdUtONL|^4#D^$1!pO{Ra*KyW9twsbO*zjuby8$&)c|vW$KCCNaCRiBW@tU(XEI` z#P%-Prt%=8{NF+@dj|O}<^SjKMW0uY=WhXTBDa4Y_$u%Ya`m@?*MSIF1>Qh@{s(|^ z_s4<1BOmVrXMx`!&wdu@0iOfz0)C4;`*q-lz>~mL;FG{zz-y3!a_yt8IB#{81E}T^Z^&T#_ z#lm3v$&(0&wzouECK7m?mM|QNTDZ)2lo2tlgFLjvn=&hc(01__1)rv8bc%qgO<3 z6Dfnt)ttyL=nNwLl&(D5>Q)=u*5#&Ats=J