Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Cloud controller template function #7992

Merged
merged 9 commits into from
Dec 9, 2019
Merged

Cloud controller template function #7992

merged 9 commits into from
Dec 9, 2019

Conversation

DavidSie
Copy link
Contributor

This PR fixes issue with missing setting of cluster-name in openstack-cloud-provider manifest.
There was similar PR(#7945) but Github claimed some commits were not authored by me, So I created new.

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Nov 22, 2019
@k8s-ci-robot
Copy link
Contributor

Hi @DavidSie. Thanks for your PR.

I'm waiting for a kubernetes 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.

@k8s-ci-robot k8s-ci-robot added needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Nov 22, 2019
@DavidSie DavidSie mentioned this pull request Nov 22, 2019
Closed
@k8s-ci-robot k8s-ci-robot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Nov 22, 2019
zetaab
zetaab reviewed Nov 22, 2019
View reviewed changes
Copy link
Member

@zetaab zetaab left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/ok-to-test

@k8s-ci-robot 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 Nov 22, 2019
@zetaab
Copy link
Member

zetaab commented Nov 25, 2019

@DavidSie could you please fix the tests

@DavidSie
Copy link
Contributor Author

Yes, I am about to fix the failing test, but I don't understand why test "pull-kops-bazel-test" cannot see this file: https://github.com/DavidSie/kops/blob/pr_cloud_controller_template_function/upup/models/cloudup/resources/addons/openstack.addons.k8s.io/k8s-1.11.yaml.template , Maybe you @zetaab could help me

@zetaab
Copy link
Member

zetaab commented Nov 26, 2019

you cannot refer to templates using path, instead you should use some existing template function which loads those(I think). I do not know what is the correct way to load templates

@rifelpet do you have idea how this should be handled

@mitch000001
Copy link
Contributor

@zetaab @DavidSie If I understand that test output correctly we have to add the templates which is tested against into bazel, i.e. create a BUILD.bazel file at upup/models/cloudup/resources/addons/BUILD.bazel which exposes the files used by the tests.

@k8s-ci-robot k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Nov 28, 2019
@DavidSie DavidSie force-pushed the pr_cloud_controller_template_function branch from fd8d8f9 to b0dfb21 Compare November 28, 2019 11:10
@k8s-ci-robot k8s-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Nov 28, 2019
@DavidSie DavidSie force-pushed the pr_cloud_controller_template_function branch from 2945b9c to f2912af Compare December 5, 2019 09:00
@DavidSie
Copy link
Contributor Author

DavidSie commented Dec 5, 2019

@zetaab please take a look.

rifelpet
rifelpet reviewed Dec 7, 2019
View reviewed changes
upup/pkg/fi/cloudup/template_functions_test.go Outdated
cluster: &kops.Cluster{Spec: kops.ClusterSpec{
CloudProvider: string(kops.CloudProviderOpenstack),
ExternalCloudControllerManager: &kops.CloudControllerManagerConfig{
CIDRAllocatorType: fi.String(string(ipam.RangeAllocatorType)),
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It seems like all of the new vendored code is only to use this one constant, is that correct? I know we've been trying to become less dependent on kubernetes/kubernetes, so rather than adding all of the vendored code could we just reuse the string "RangeAllocator" here?

@k8s-ci-robot k8s-ci-robot added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. and removed size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Dec 9, 2019
@DavidSie
Copy link
Contributor Author

DavidSie commented Dec 9, 2019

Hi @rifelpet, I did it

@rifelpet
Copy link
Member

rifelpet commented Dec 9, 2019

Looks good to me, thanks!

deferring to @zetaab for approval.

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Dec 9, 2019
zetaab
zetaab approved these changes Dec 9, 2019
View reviewed changes
Copy link
Member

@zetaab zetaab left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: DavidSie, zetaab

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:

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

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Dec 9, 2019
@k8s-ci-robot k8s-ci-robot merged commit b76ffb3 into kubernetes:master Dec 9, 2019
This was referenced Dec 10, 2019
Closed
Closed
Merged
DavidSie added a commit to DavidSie/kops that referenced this pull request Dec 11, 2019
@DavidSie
addapting PR kubernetes#7992 to release-1.15
e01b287
k8s-ci-robot added a commit that referenced this pull request Dec 16, 2019
@k8s-ci-robot
Merge pull request #8083 from DavidSie/automated-cherry-pick-of-#7992…
705e9e9 
…-origin-release-1.16

Automated cherry pick of #7992: Add CloudControllerConfigArgv template function, Expose
@DavidSie DavidSie mentioned this pull request Dec 20, 2019
Merged
k8s-ci-robot added a commit that referenced this pull request Jan 14, 2020
@k8s-ci-robot
Merge pull request #8166 from DavidSie/automated-cherry-pick-of-#7992…
33a14f7 
…-origin-release-1.17

Automated cherry pick of #7992: Add CloudControllerConfigArgv template function, Expose
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rifelpet rifelpet rifelpet left review comments

@zetaab zetaab zetaab approved these changes

@chrisz100 chrisz100 Awaiting requested review from chrisz100

@robinpercy robinpercy Awaiting requested review from robinpercy

Assignees

@rifelpet rifelpet

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@DavidSie @k8s-ci-robot @zetaab @mitch000001 @rifelpet