make metallb image repos configurable (#6671) #6672

dlouks · 2020-09-11T19:51:08Z

What type of PR is this?
/kind feature

What this PR does / why we need it: Metallb's image tag does not allow one to specify a different repo url

Which issue(s) this PR fixes:

Special notes for your reviewer:

Does this PR introduce a user-facing change?: no

NONE

k8s-ci-robot · 2020-09-11T19:51:16Z

Hi @dlouks. Thanks for your PR.

I'm waiting for a kubernetes-sigs member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

EppO · 2020-09-11T21:49:11Z

/lgtm

EppO · 2020-09-11T21:49:21Z

/ok-to-test

EppO · 2020-09-11T22:21:19Z

can you please rebase your branch on top of latest master? I think you hit a bug that has been fixed in master

floryut · 2020-09-14T08:46:12Z

@dlouks If you are still around, sorry about that but could you remove the #issue in the commit message ? (pr number will be added and with that link to the issue)

oomichi

Just few comments

/cc @oomichi

oomichi · 2020-09-14T17:55:23Z

inventory/sample/group_vars/k8s-cluster/addons.yml

@@ -122,6 +122,8 @@ cert_manager_enabled: false

 # MetalLB deployment
 metallb_enabled: false
+# metallb_speaker_image_repo: "{{ docker_image_repo }}/metallb/speaker"
+# metallb_controller_image_repo: "{{ docker_image_repo }}/metallb/controller


There is not any other addons which contain docker_image_repo under inventory/sample.
Is this necessary for metallb?

@oomichi The reasoning behind making this change for metallb is for installing it on a cluster without internet access. If there is a different or preferred way to support this I can update.

@dlouks Sorry, my previous comment was not clear.
I don't have a question about this PR itself.
I have a question about adding the above lines into inventory/sample/group_vars/k8s-cluster/addons.yml because there are not any lines which contain docker_image_repo under inventory/sample/ directory.

I see what you mean. I've removed those commented lines from the addon.yml.

oomichi · 2020-09-14T17:58:10Z

roles/kubernetes-apps/metallb/defaults/main.yml

@@ -1,5 +1,7 @@
 ---
 metallb_enabled: false
+metallb_speaker_image_repo: "{{ docker_image_repo }}/metallb/speaker"
+metallb_controller_image_repo: "{{ docker_image_repo }}/metallb/controller"


All repo definitions are written on roles/download/defaults/main.yml like

dashboard_metrics_scraper_repo: "{{ docker_image_repo }}/kubernetesui/metrics-scraper"

at this time. Why don't we write like the existing ones instead of roles/kubernetes-apps/metallb/defaults/main.yml ?

I've moved these variables to the download role's defaults

Thanks for doing that, I confirmed it.

floryut · 2020-09-15T13:29:59Z

@dlouks Could you please rebase master ? the CI error you got is now fixed

oomichi · 2020-09-15T19:30:24Z

roles/container-engine/cri-o/tasks/crio_repo.yml

    gpgcheck: yes
-    gpgkey: "http://widehat.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable:/cri-o:/{{ crio_version }}/CentOS_$releasever/repodata/repomd.xml.key"
+    gpgkey: "http://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable:/cri-o:/{{ crio_version }}/CentOS_$releasever/repodata/repomd.xml.key"


This file change has been already merged as #6682
Can you pull the latest master branch and rebase this PR based on the latest one?
That will remove this part from the PR.

I think I got it this time. I must have done a git pull --rebase before.

EppO · 2020-09-16T19:32:07Z

/lgtm

Miouge1 · 2020-09-17T09:39:51Z

/approve

k8s-ci-robot · 2020-09-17T09:40:00Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dlouks, Miouge1

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

~~OWNERS~~ [Miouge1]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

* 'master' of https://github.com/kubernetes-sigs/kubespray: (21 commits) Make sure node_ip is set if node is in etcd group (kubernetes-sigs#6719) Fix order of OS CI cleanup (kubernetes-sigs#6714) Remove vagrant.deb from docker image (kubernetes-sigs#6717) Move floruyt to approver (kubernetes-sigs#6713) Add support for periodic CI (kubernetes-sigs#6715) Ignore pause from kubeadm config images list (kubernetes-sigs#6689) Ignore error in check mode when disabling swap (kubernetes-sigs#6703) flannel image arch specific tag (kubernetes-sigs#6685) Added missing permissions for operator. (kubernetes-sigs#6683) Add Kubernetes hashes 1.19.2/1.18.9/1.17.12 and set default (kubernetes-sigs#6698) Cleanup virsh volumes in Vagrant CI (kubernetes-sigs#6688) Use "kubeadm join" to join masters to control plane (kubernetes-sigs#6661) Remove workaround with kube_proxy_remove (kubernetes-sigs#6512) fix incorrect documentation of use_access_ip (kubernetes-sigs#6674) make metallb image repos configurable (kubernetes-sigs#6671) (kubernetes-sigs#6672) fix remove node (kubernetes-sigs#6666) Allow configuration of nodelabels in local_volume_provisioner (kubernetes-sigs#6620) Add support for Calico CNI host-local IPAM plugin (kubernetes-sigs#6580) Update third party librairies and tools (kubernetes-sigs#6669) Updated KataContainers version to 1.11.3 (kubernetes-sigs#6694) ...

…tes-sigs#6672) * Make metallb image repos configurable * Moved metallb image repo definitions to download role defaults * Removed comment. These are set in download defaults

k8s-ci-robot added kind/feature Categorizes issue or PR as related to a new feature. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Sep 11, 2020

k8s-ci-robot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Sep 11, 2020

k8s-ci-robot requested review from EppO and oomichi September 11, 2020 19:51

k8s-ci-robot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Sep 11, 2020

k8s-ci-robot assigned EppO Sep 11, 2020

k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Sep 11, 2020

k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Sep 11, 2020

oomichi reviewed Sep 14, 2020

View reviewed changes

k8s-ci-robot requested a review from oomichi September 14, 2020 17:58

k8s-ci-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Sep 15, 2020

oomichi reviewed Sep 15, 2020

View reviewed changes

dlouks added 3 commits September 15, 2020 14:57

Make metallb image repos configurable

2538db4

Moved metallb image repo definitions to download role defaults

92f9717

Removed comment. These are set in download defaults

bb4ee91

k8s-ci-robot removed the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Sep 15, 2020

k8s-ci-robot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Sep 15, 2020

k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Sep 16, 2020

k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Sep 17, 2020

k8s-ci-robot merged commit 3bf40d5 into kubernetes-sigs:master Sep 17, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

make metallb image repos configurable (#6671) #6672

make metallb image repos configurable (#6671) #6672

dlouks commented Sep 11, 2020 •

edited

Loading

k8s-ci-robot commented Sep 11, 2020

EppO commented Sep 11, 2020

EppO commented Sep 11, 2020

EppO commented Sep 11, 2020 •

edited

Loading

floryut commented Sep 14, 2020

oomichi left a comment

oomichi Sep 14, 2020

dlouks Sep 14, 2020 •

edited

Loading

oomichi Sep 15, 2020

dlouks Sep 15, 2020

oomichi Sep 14, 2020

dlouks Sep 14, 2020

oomichi Sep 15, 2020

floryut commented Sep 15, 2020

oomichi Sep 15, 2020

dlouks Sep 15, 2020

EppO commented Sep 16, 2020

Miouge1 commented Sep 17, 2020

k8s-ci-robot commented Sep 17, 2020

make metallb image repos configurable (#6671) #6672

make metallb image repos configurable (#6671) #6672

Conversation

dlouks commented Sep 11, 2020 • edited Loading

k8s-ci-robot commented Sep 11, 2020

EppO commented Sep 11, 2020

EppO commented Sep 11, 2020

EppO commented Sep 11, 2020 • edited Loading

floryut commented Sep 14, 2020

oomichi left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

dlouks Sep 14, 2020 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

floryut commented Sep 15, 2020

Choose a reason for hiding this comment

Choose a reason for hiding this comment

EppO commented Sep 16, 2020

Miouge1 commented Sep 17, 2020

k8s-ci-robot commented Sep 17, 2020

dlouks commented Sep 11, 2020 •

edited

Loading

EppO commented Sep 11, 2020 •

edited

Loading

dlouks Sep 14, 2020 •

edited

Loading