Add additional metadata configuration options to external Openstack CCM (kubernetes-sigs#6338) #6339

Sryther · 2020-06-29T10:10:32Z

What type of PR is this?

/kind feature

What this PR does / why we need it:

Additional configuration options for external OpenStack CCM:

Added Metadata configuration in cloud.conf which can be overriden:
- Added parameter to change "search-order" value

Which issue(s) this PR fixes:

Fixes #6338

Special notes for your reviewer:

Does this PR introduce a user-facing change?:

NONE

k8s-ci-robot · 2020-06-29T10:10:40Z

Hi @Sryther. 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.

Sryther · 2020-06-29T10:34:30Z

I change the author mail on my commit.

Sryther · 2020-06-29T10:34:38Z

/retest

k8s-ci-robot · 2020-06-29T10:34:51Z

@Sryther: Cannot trigger testing until a trusted user reviews the PR and leaves an /ok-to-test message.

In response to this:

/retest

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.

floryut · 2020-06-29T10:35:15Z

@Sryther Thank you for the PR, could you please sign CLA ?
/ok-to-test
/lgtm

k8s-ci-robot · 2020-06-29T11:27:49Z

Thanks for your pull request. Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA).

📝 Please follow instructions at https://git.k8s.io/community/CLA.md#the-contributor-license-agreement to sign the CLA.

It may take a couple minutes for the CLA signature to be fully registered; after that, please reply here with a new comment and we'll verify. Thanks.

If you've already signed a CLA, it's possible we don't have your GitHub username or you're using a different email address. Check your existing CLA data and verify that your email is set on your git commits.
If you signed the CLA as a corporation, please sign in with your organization's credentials at https://identity.linuxfoundation.org/projects/cncf to be authorized.
If you have done the above and are still having issues with the CLA being reported as unsigned, please log a ticket with the Linux Foundation Helpdesk: https://support.linuxfoundation.org/
Should you encounter any issues with the Linux Foundation Helpdesk, send a message to the backup e-mail support address at: [email protected]

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. I understand the commands that are listed here.

alijahnas · 2020-06-29T12:20:26Z

Hello, you tested this against which OpenStack version? and which OpenStack CCM version? Thanks.

Sryther · 2020-06-29T13:36:54Z

I tested this with OpenStack CCM 1.18.1 and OpenStack (Nova) 2.38.

Miouge1 · 2020-06-30T09:02:49Z

...rnetes-apps/external_cloud_controller/openstack/templates/external-openstack-cloud-config.j2

@@ -57,3 +57,6 @@ internal-network-name="{{ network_name }}"
 {% for network_name in external_openstack_network_public_networks %}
 public-network-name="{{ network_name }}"
 {% endfor %}
+
+[Metadata]
+search-order="{{ external_openstack_metadata_search_order }}"


Can we wrap this with if external_openstack_metadata_search_order is defined ? and make the default value being undefined?

Anyway if the value is undefined, the cloud-provider-openstack will use by default search-order=configDrive,metadataService as mentionned here.

Are you sure you removing the default value won't be ambiguous?

What do you think @alijahnas ?

The default value of configDrive,metadataService is the right one for most deployments. I am not sure in which cases these values will need to be specifically defined. Maybe for optimization.
If the default value of the CCM is the same as the one declared in kubespray-defaults, adding the line won't affect much. I am okay with @Miouge1 to add the wrapping if external_openstack_metadata_search_order is defined and remove the default. The commented group_vars variable is enough I think.

Alright then, I did the changes :).

Miouge1 · 2020-06-30T09:31:08Z

/approve

k8s-ci-robot · 2020-06-30T09:31:17Z

[APPROVALNOTIFIER] This PR is APPROVED

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

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

alijahnas · 2020-07-01T06:57:57Z

Thanks!
/lgtm
/retest

kubernetes-sigs#6338)

…y default

Sryther · 2020-07-01T07:52:25Z

I rebased because a test was timing out.

floryut · 2020-07-01T11:51:44Z

As @alijahnas already lgtm this, let's merge
/lgtm

* 'master' of https://github.com/kubernetes-sigs/kubespray: Patch Calico for V3.14.0 missing CR and CRD (kubernetes-sigs#6276) Explicitly set ETCDCTL_API and use ETCDCTL_ENDPOINTS (kubernetes-sigs#6327) Add additional metadata configuration options to external Openstack CCM (kubernetes-sigs#6338) (kubernetes-sigs#6339)

…CM (kubernetes-sigs#6338) (kubernetes-sigs#6339) * Add additional metadata configuration option to external Openstack CCM (kubernetes-sigs#6338) * Set the variable external_openstack_metadata_search_order undefined by default

k8s-ci-robot added kind/feature Categorizes issue or PR as related to a new feature. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Jun 29, 2020

k8s-ci-robot requested review from alijahnas and EppO June 29, 2020 10:10

k8s-ci-robot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Jun 29, 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 Jun 29, 2020

k8s-ci-robot assigned floryut Jun 29, 2020

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

k8s-ci-robot added the cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. label Jun 29, 2020

Sryther force-pushed the master branch from ca7a155 to ef82462 Compare June 29, 2020 11:49

k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. and removed lgtm "Looks good to me", indicates that a PR is ready to be merged. cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. labels Jun 29, 2020

Sryther force-pushed the master branch from ef82462 to c82f93c Compare June 29, 2020 11:50

Miouge1 reviewed Jun 30, 2020

View reviewed changes

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

k8s-ci-robot assigned alijahnas Jul 1, 2020

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

Sryther added 2 commits July 1, 2020 09:51

Add additional metadata configuration option to external Openstack CCM (

8144b2f

kubernetes-sigs#6338)

Set the variable external_openstack_metadata_search_order undefined b…

49ce474

…y default

Sryther force-pushed the master branch from 084cf59 to 49ce474 Compare July 1, 2020 07:51

k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jul 1, 2020

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

k8s-ci-robot merged commit bcac3c6 into kubernetes-sigs:master Jul 1, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add additional metadata configuration options to external Openstack CCM (kubernetes-sigs#6338) #6339

Add additional metadata configuration options to external Openstack CCM (kubernetes-sigs#6338) #6339

Sryther commented Jun 29, 2020

k8s-ci-robot commented Jun 29, 2020

Sryther commented Jun 29, 2020

Sryther commented Jun 29, 2020

k8s-ci-robot commented Jun 29, 2020

floryut commented Jun 29, 2020

k8s-ci-robot commented Jun 29, 2020

alijahnas commented Jun 29, 2020

Sryther commented Jun 29, 2020

Miouge1 Jun 30, 2020

Sryther Jun 30, 2020

Sryther Jun 30, 2020

Miouge1 Jun 30, 2020

alijahnas Jun 30, 2020

Sryther Jun 30, 2020

Miouge1 commented Jun 30, 2020

k8s-ci-robot commented Jun 30, 2020

alijahnas commented Jul 1, 2020

Sryther commented Jul 1, 2020

floryut commented Jul 1, 2020

Add additional metadata configuration options to external Openstack CCM (kubernetes-sigs#6338) #6339

Add additional metadata configuration options to external Openstack CCM (kubernetes-sigs#6338) #6339

Conversation

Sryther commented Jun 29, 2020

k8s-ci-robot commented Jun 29, 2020

Sryther commented Jun 29, 2020

Sryther commented Jun 29, 2020

k8s-ci-robot commented Jun 29, 2020

floryut commented Jun 29, 2020

k8s-ci-robot commented Jun 29, 2020

alijahnas commented Jun 29, 2020

Sryther commented Jun 29, 2020

Miouge1 Jun 30, 2020

Choose a reason for hiding this comment

Sryther Jun 30, 2020

Choose a reason for hiding this comment

Sryther Jun 30, 2020

Choose a reason for hiding this comment

Miouge1 Jun 30, 2020

Choose a reason for hiding this comment

alijahnas Jun 30, 2020

Choose a reason for hiding this comment

Sryther Jun 30, 2020

Choose a reason for hiding this comment

Miouge1 commented Jun 30, 2020

k8s-ci-robot commented Jun 30, 2020

alijahnas commented Jul 1, 2020

Sryther commented Jul 1, 2020

floryut commented Jul 1, 2020