diff --git a/cmd/minikube/cmd/config/configure.go b/cmd/minikube/cmd/config/configure.go index e434c9b146..b51d240063 100644 --- a/cmd/minikube/cmd/config/configure.go +++ b/cmd/minikube/cmd/config/configure.go @@ -103,8 +103,8 @@ var addonsConfigureCmd = &cobra.Command{ "aws-assume-role": awsRole, }, map[string]string{ - "app": "registry-creds", - "cloud": "ecr", + "app": "registry-creds", + "cloud": "ecr", "kubernetes.io/minikube-addons": "registry-creds", }) @@ -118,11 +118,11 @@ var addonsConfigureCmd = &cobra.Command{ "registry-creds-gcr", map[string]string{ "application_default_credentials.json": gcrApplicationDefaultCredentials, - "gcrurl": gcrURL, + "gcrurl": gcrURL, }, map[string]string{ - "app": "registry-creds", - "cloud": "gcr", + "app": "registry-creds", + "cloud": "gcr", "kubernetes.io/minikube-addons": "registry-creds", }) @@ -140,8 +140,8 @@ var addonsConfigureCmd = &cobra.Command{ "DOCKER_PRIVATE_REGISTRY_PASSWORD": dockerPass, }, map[string]string{ - "app": "registry-creds", - "cloud": "dpr", + "app": "registry-creds", + "cloud": "dpr", "kubernetes.io/minikube-addons": "registry-creds", }) diff --git a/pkg/drivers/kic/kic.go b/pkg/drivers/kic/kic.go index 62d5df1dbe..b6c10f5fbc 100644 --- a/pkg/drivers/kic/kic.go +++ b/pkg/drivers/kic/kic.go @@ -261,6 +261,5 @@ func (d *Driver) nodeID(nameOrID string) (string, error) { // BaseImage returns the image used to spin up containers. in the future might pin down nodes per version func BaseImage() (string, error) { - return "medyagh/kicbase:v0.0.1-snapshot", nil - // return "medyagh/kicbase:v0.0.1-snapshot@sha256:fdd103eae33f92673fb13da81104b67576b43ab2affc7855deda596878215a61", nil + return "medyagh/kicbase:v0.0.1-snapshot@sha256:fdd103eae33f92673fb13da81104b67576b43ab2affc7855deda596878215a61", nil } diff --git a/pkg/minikube/bootstrapper/kicbs/kicbs.go b/pkg/minikube/bootstrapper/kicbs/kicbs.go index 51b27e0f01..1d27052e76 100644 --- a/pkg/minikube/bootstrapper/kicbs/kicbs.go +++ b/pkg/minikube/bootstrapper/kicbs/kicbs.go @@ -115,6 +115,7 @@ func (k *Bootstrapper) UpdateCluster(cfg config.MachineConfig) error { files := bsutil.ConfigFileAssets(cfg.KubernetesConfig, kubeadmCfg, kubeletCfg, kubeletService, cniFile) + // TODO: add addons for kic later // if err := bsutil.AddAddons(&files, assets.GenerateTemplateData(cfg.KubernetesConfig)); err != nil { // return errors.Wrap(err, "adding addons") // } @@ -209,25 +210,8 @@ func (k *Bootstrapper) StartCluster(k8s config.KubernetesConfig) error { return errors.Wrap(err, "applying kic overlay network") } - // glog.Infof("removing master taint") - // if err := k.removeMasterTaint(); err != nil { - // return errors.Wrap(err, "remove master taint") - // } - glog.Infof("Skipping Configuring cluster permissions for kic...") - // elevate := func() error { - // client, err := k.client(k8s) - // if err != nil { - // return err - // } - // return bsutil.ElevateKubeSystemPrivileges(client) - // } - - // if err := retry.Expo(elevate, time.Millisecond*500, 120*time.Second); err != nil { - // return errors.Wrap(err, "timed out waiting to elevate kube-system RBAC privileges") - // } - if err := k.adjustResourceLimits(); err != nil { glog.Warningf("unable to adjust resource limits: %v", err) } diff --git a/pkg/minikube/config/config_test.go b/pkg/minikube/config/config_test.go index aa6f29b0af..19671ef617 100644 --- a/pkg/minikube/config/config_test.go +++ b/pkg/minikube/config/config_test.go @@ -49,10 +49,10 @@ var configTestCases = []configTestCase{ "vm-driver": "test-driver" }`, config: map[string]interface{}{ - "vm-driver": "test-driver", - "cpus": 4, - "disk-size": "20g", - "v": 5, + "vm-driver": "test-driver", + "cpus": 4, + "disk-size": "20g", + "v": 5, "show-libmachine-logs": true, "log_dir": "/etc/hosts", "ReminderWaitPeriodInHours": 99, diff --git a/pkg/minikube/config/types.go b/pkg/minikube/config/types.go index 0ba65f9f8e..d9ababe16d 100644 --- a/pkg/minikube/config/types.go +++ b/pkg/minikube/config/types.go @@ -64,13 +64,8 @@ type MachineConfig struct { KubernetesConfig KubernetesConfig HostOnlyNicType string // Only used by virtualbox NatNicType string // Only used by virtualbox -<<<<<<< HEAD Addons map[string]bool NodeBindPort int32 // Only used by kic -||||||| constructed merge base - NodeBindPort int32 // Only used by kic -======= ->>>>>>> add flag for kic host binding port } // KubernetesConfig contains the parameters used to configure the VM Kubernetes. diff --git a/pkg/minikube/service/service_test.go b/pkg/minikube/service/service_test.go index 089304c837..fe46a3df63 100644 --- a/pkg/minikube/service/service_test.go +++ b/pkg/minikube/service/service_test.go @@ -364,30 +364,30 @@ func TestOptionallyHttpsFormattedUrlString(t *testing.T) { expectedIsHTTPSchemedURL bool }{ { - description: "no https for http schemed with no https option", - bareURLString: "http://192.168.99.100:30563", - https: false, + description: "no https for http schemed with no https option", + bareURLString: "http://192.168.99.100:30563", + https: false, expectedHTTPSFormattedURLString: "http://192.168.99.100:30563", expectedIsHTTPSchemedURL: true, }, { - description: "no https for non-http schemed with no https option", - bareURLString: "xyz.http.myservice:30563", - https: false, + description: "no https for non-http schemed with no https option", + bareURLString: "xyz.http.myservice:30563", + https: false, expectedHTTPSFormattedURLString: "xyz.http.myservice:30563", expectedIsHTTPSchemedURL: false, }, { - description: "https for http schemed with https option", - bareURLString: "http://192.168.99.100:30563", - https: true, + description: "https for http schemed with https option", + bareURLString: "http://192.168.99.100:30563", + https: true, expectedHTTPSFormattedURLString: "https://192.168.99.100:30563", expectedIsHTTPSchemedURL: true, }, { - description: "no https for non-http schemed with https option and http substring", - bareURLString: "xyz.http.myservice:30563", - https: true, + description: "no https for non-http schemed with https option and http substring", + bareURLString: "xyz.http.myservice:30563", + https: true, expectedHTTPSFormattedURLString: "xyz.http.myservice:30563", expectedIsHTTPSchemedURL: false, }, diff --git a/pkg/util/crypto.go b/pkg/util/crypto.go index 500b9813e0..417417e215 100644 --- a/pkg/util/crypto.go +++ b/pkg/util/crypto.go @@ -53,7 +53,7 @@ func GenerateCACert(certPath, keyPath string, name string) error { KeyUsage: x509.KeyUsageKeyEncipherment | x509.KeyUsageDigitalSignature | x509.KeyUsageCertSign, ExtKeyUsage: []x509.ExtKeyUsage{x509.ExtKeyUsageClientAuth, x509.ExtKeyUsageServerAuth}, BasicConstraintsValid: true, - IsCA: true, + IsCA: true, } return writeCertsAndKeys(&template, certPath, priv, keyPath, &template, priv)