honor --image-repository even if --image-mirror-country is set#8249
Merged
Conversation
k8s-ci-robot
added
cncf-cla: yes
Contributor
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: SataQiu The full list of commands accepted by this bot can be found here. DetailsNeeds approval from an approver in each of these files:Approvers can indicate their approval by writing |
Codecov Report
@@ Coverage Diff @@
## master #8249 +/- ##
=======================================
Coverage 34.46% 34.46%
=======================================
Files 147 147
Lines 9428 9426 -2
=======================================
Hits 3249 3249
+ Misses 5780 5779 -1
+ Partials 399 398 -1
|
medyagh
requested changes
May 23, 2020
Member
medyagh
left a comment
medyagh
left a comment
There was a problem hiding this comment.
this look like doing the right thing, do you mind verifying that there might be a related code in
updateExistingConfigFromFlags
that would be if user already started a cluster with a config, and then if they only do
"minikube start" without any args, we should respect the flags that was used in first start
Member
Author
|
I checked the logic about if cmd.Flags().Changed(imageRepository) {
cc.KubernetesConfig.ImageRepository = viper.GetString(imageRepository)
}I think it is fine, we should not change the If the user specifies a new Here is my test: $ ./minikube start --image-repository registry.aliyuncs.com/google_containers --image-mirror-country=cn
😄 Darwin 10.15.4 上的 minikube v1.10.1
✨ Automatically selected the hyperkit driver. Other choices: docker, parallels
💾 正在下载驱动 docker-machine-driver-hyperkit:
> docker-machine-driver-hyperkit.sha256: 65 B / 65 B [---] 100.00% ? p/s 0s
> docker-machine-driver-hyperkit: 10.90 MiB / 10.90 MiB 100.00% 68.58 KiB
🔑 The 'hyperkit' driver requires elevated permissions. The following commands will be executed:
$ sudo chown root:wheel /Users/shida/.minikube/bin/docker-machine-driver-hyperkit
$ sudo chmod u+s /Users/shida/.minikube/bin/docker-machine-driver-hyperkit
Password:
✅ 正在使用镜像存储库 registry.aliyuncs.com/google_containers
💿 正在下载 VM boot image...
> minikube-v1.10.0.iso.sha256: 65 B / 65 B [-------------] 100.00% ? p/s 0s
> minikube-v1.10.0.iso: 174.99 MiB / 174.99 MiB 100.00% 1.84 MiB p/s 1m35s
👍 Starting control plane node minikube in cluster minikube
🔥 Creating hyperkit VM (CPUs=2, Memory=4000MB, Disk=20000MB) ...
🐳 正在 Docker 19.03.8 中准备 Kubernetes v1.18.2…
> kubelet.sha256: 65 B / 65 B [--------------------------] 100.00% ? p/s 0s
> kubeadm.sha256: 65 B / 65 B [--------------------------] 100.00% ? p/s 0s
> kubectl.sha256: 65 B / 65 B [--------------------------] 100.00% ? p/s 0s
> kubectl: 41.99 MiB / 41.99 MiB [---------------] 100.00% 2.35 MiB p/s 18s
> kubeadm: 37.97 MiB / 37.97 MiB [---------------] 100.00% 1.71 MiB p/s 23s
> kubelet: 108.03 MiB / 108.03 MiB [-------------] 100.00% 2.34 MiB p/s 47s
🔎 Verifying Kubernetes components...
🌟 Enabled addons: default-storageclass, storage-provisioner
🏄 完成！kubectl 已经配置至 "minikube"
❗ /usr/local/bin/kubectl is version 1.14.7, which may be incompatible with Kubernetes 1.18.2.
💡 You can also use 'minikube kubectl -- get pods' to invoke a matching version
$ kubectl get pod -A
NAMESPACE NAME READY STATUS RESTARTS AGE
kube-system coredns-7ff77c879f-n964v 1/1 Running 0 8s
kube-system coredns-7ff77c879f-rpgk9 1/1 Running 0 8s
kube-system etcd-minikube 1/1 Running 0 14s
kube-system kube-apiserver-minikube 1/1 Running 0 14s
kube-system kube-controller-manager-minikube 1/1 Running 0 14s
kube-system kube-proxy-ljhnz 1/1 Running 0 9s
kube-system kube-scheduler-minikube 1/1 Running 0 14s
kube-system storage-provisioner 1/1 Running 1 14s
$ ./minikube stop
✋ Stopping "minikube" in hyperkit ...
🛑 Node "minikube" stopped.
$ ./minikube start
😄 Darwin 10.15.4 上的 minikube v1.10.1
✨ 根据现有的配置文件使用 hyperkit 驱动程序
👍 Starting control plane node minikube in cluster minikube
🔄 Restarting existing hyperkit VM for "minikube" ...
🐳 正在 Docker 19.03.8 中准备 Kubernetes v1.18.2…
🔎 Verifying Kubernetes components...
🌟 Enabled addons: default-storageclass, storage-provisioner
🏄 完成！kubectl 已经配置至 "minikube"
❗ /usr/local/bin/kubectl is version 1.14.7, which may be incompatible with Kubernetes 1.18.2.
💡 You can also use 'minikube kubectl -- get pods' to invoke a matching version
$ kubectl get pod -A
NAMESPACE NAME READY STATUS RESTARTS AGE
kube-system coredns-7ff77c879f-n964v 1/1 Running 1 91s
kube-system coredns-7ff77c879f-rpgk9 1/1 Running 1 91s
kube-system etcd-minikube 1/1 Running 1 97s
kube-system kube-apiserver-minikube 1/1 Running 1 97s
kube-system kube-controller-manager-minikube 1/1 Running 1 97s
kube-system kube-proxy-ljhnz 1/1 Running 1 92s
kube-system kube-scheduler-minikube 1/1 Running 1 97s
kube-system storage-provisioner 0/1 CrashLoopBackOff 2 97s
$ ./minikube ssh
_ _
_ _ ( ) ( )
___ ___ (_) ___ (_)| |/') _ _ | |_ __
/' _ ` _ `\| |/' _ `\| || , < ( ) ( )| '_`\ /'__`\
| ( ) ( ) || || ( ) || || |\`\ | (_) || |_) )( ___/
(_) (_) (_)(_)(_) (_)(_)(_) (_)`\___/'(_,__/'`\____)
$
$
$
$ docker images
REPOSITORY TAG IMAGE ID CREATED SIZE
registry.aliyuncs.com/google_containers/dashboard v2.0.0 8b32422733b3 4 weeks ago 222MB
registry.aliyuncs.com/google_containers/kube-proxy v1.18.2 0d40868643c6 5 weeks ago 117MB
registry.aliyuncs.com/google_containers/kube-scheduler v1.18.2 a3099161e137 5 weeks ago 95.3MB
registry.aliyuncs.com/google_containers/kube-controller-manager v1.18.2 ace0a8c17ba9 5 weeks ago 162MB
registry.aliyuncs.com/google_containers/kube-apiserver v1.18.2 6ed75ad404bd 5 weeks ago 173MB
registry.aliyuncs.com/google_containers/pause 3.2 80d28bedfe5d 3 months ago 683kB
registry.aliyuncs.com/google_containers/coredns 1.6.7 67da37a9a360 3 months ago 43.8MB
registry.aliyuncs.com/google_containers/etcd 3.4.3-0 303ce5db0e90 7 months ago 288MB
registry.aliyuncs.com/google_containers/metrics-scraper v1.0.2 3b08661dc379 7 months ago 40.1MB
registry.aliyuncs.com/google_containers/storage-provisioner v1.8.1 4689081edb10 2 years ago 80.8MB
$ ./minikube stop
✋ Stopping "minikube" in hyperkit ...
🛑 Node "minikube" stopped.
$ ./minikube start --image-repository registry.cn-hangzhou.aliyuncs.com/google_containers
😄 Darwin 10.15.4 上的 minikube v1.10.1
✨ 根据现有的配置文件使用 hyperkit 驱动程序
👍 Starting control plane node minikube in cluster minikube
🔄 Restarting existing hyperkit VM for "minikube" ...
🐳 正在 Docker 19.03.8 中准备 Kubernetes v1.18.2…
🔎 Verifying Kubernetes components...
🌟 Enabled addons: default-storageclass, storage-provisioner
🏄 完成！kubectl 已经配置至 "minikube"
❗ /usr/local/bin/kubectl is version 1.14.7, which may be incompatible with Kubernetes 1.18.2.
💡 You can also use 'minikube kubectl -- get pods' to invoke a matching version
$ ./minikube ssh
_ _
_ _ ( ) ( )
___ ___ (_) ___ (_)| |/') _ _ | |_ __
/' _ ` _ `\| |/' _ `\| || , < ( ) ( )| '_`\ /'__`\
| ( ) ( ) || || ( ) || || |\`\ | (_) || |_) )( ___/
(_) (_) (_)(_)(_) (_)(_)(_) (_)`\___/'(_,__/'`\____)
$ docker images
REPOSITORY TAG IMAGE ID CREATED SIZE
registry.aliyuncs.com/google_containers/dashboard v2.0.0 8b32422733b3 4 weeks ago 222MB
registry.cn-hangzhou.aliyuncs.com/google_containers/dashboard v2.0.0 8b32422733b3 4 weeks ago 222MB
registry.aliyuncs.com/google_containers/kube-proxy v1.18.2 0d40868643c6 5 weeks ago 117MB
registry.cn-hangzhou.aliyuncs.com/google_containers/kube-proxy v1.18.2 0d40868643c6 5 weeks ago 117MB
registry.cn-hangzhou.aliyuncs.com/google_containers/kube-controller-manager v1.18.2 ace0a8c17ba9 5 weeks ago 162MB
registry.aliyuncs.com/google_containers/kube-controller-manager v1.18.2 ace0a8c17ba9 5 weeks ago 162MB
registry.aliyuncs.com/google_containers/kube-apiserver v1.18.2 6ed75ad404bd 5 weeks ago 173MB
registry.cn-hangzhou.aliyuncs.com/google_containers/kube-apiserver v1.18.2 6ed75ad404bd 5 weeks ago 173MB
registry.aliyuncs.com/google_containers/kube-scheduler v1.18.2 a3099161e137 5 weeks ago 95.3MB
registry.cn-hangzhou.aliyuncs.com/google_containers/kube-scheduler v1.18.2 a3099161e137 5 weeks ago 95.3MB
registry.aliyuncs.com/google_containers/pause 3.2 80d28bedfe5d 3 months ago 683kB
registry.cn-hangzhou.aliyuncs.com/google_containers/pause 3.2 80d28bedfe5d 3 months ago 683kB
registry.aliyuncs.com/google_containers/coredns 1.6.7 67da37a9a360 3 months ago 43.8MB
registry.cn-hangzhou.aliyuncs.com/google_containers/coredns 1.6.7 67da37a9a360 3 months ago 43.8MB
registry.aliyuncs.com/google_containers/etcd 3.4.3-0 303ce5db0e90 7 months ago 288MB
registry.cn-hangzhou.aliyuncs.com/google_containers/etcd 3.4.3-0 303ce5db0e90 7 months ago 288MB
registry.aliyuncs.com/google_containers/metrics-scraper v1.0.2 3b08661dc379 7 months ago 40.1MB
registry.cn-hangzhou.aliyuncs.com/google_containers/metrics-scraper v1.0.2 3b08661dc379 7 months ago 40.1MB
registry.aliyuncs.com/google_containers/storage-provisioner v1.8.1 4689081edb10 2 years ago 80.8MB
registry.cn-hangzhou.aliyuncs.com/google_containers/storage-provisioner v1.8.1 4689081edb10 2 years ago 80.8MB |
Member
Author
|
/assign @sharifelgamal |
Member
|
/ok-to-test |
k8s-ci-robot
added
the
ok-to-test
|
kvm2 Driver |
tstromberg
approved these changes
May 29, 2020
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
7 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Currently, if I specify both
--image-mirror-countryand--image-repository, then--image-repositorywill be ignored. I think in this case, we still need to respect the user's choice about image repository.