Skip to content

Pass cluster CIDR info to controller-manager render call during bootstrap #612

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
Merged
openshift-merge-robot merged 1 commit into from
Nov 8, 2018
Merged

Pass cluster CIDR info to controller-manager render call during bootstrap #612

openshift-merge-robot merged 1 commit into from
Nov 8, 2018

Conversation

@damemi
Copy link
Contributor

@damemi damemi commented Nov 5, 2018 •
edited
Loading

Depends on openshift/cluster-kube-controller-manager-operator#76

Pass the cluster api config file to cluster-kube-controller-manager-operator so that it can render restricted CIDRs parsed from that file for bootstrapping

@openshift-ci-robot openshift-ci-robot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Nov 5, 2018
@damemi
Copy link
Contributor Author

damemi commented Nov 5, 2018

cc @sttts

@openshift-ci-robot openshift-ci-robot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Nov 5, 2018
@damemi damemi force-pushed the bootstrap-cluster-config-kubeapiserver branch from 529e269 to 4b340a5 Compare November 5, 2018 18:58
sttts
sttts reviewed Nov 6, 2018
View reviewed changes
@damemi damemi force-pushed the bootstrap-cluster-config-kubeapiserver branch from 4b340a5 to 9c87716 Compare November 7, 2018 17:51
@openshift-bot openshift-bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Nov 7, 2018
@damemi damemi changed the title [WIP] Pass cluster-config.yaml to kube-apiserver render call during bootstrap Pass cluster CIDR info to controller-manager render call during bootstrap Nov 7, 2018
@openshift-ci-robot openshift-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Nov 7, 2018
@damemi damemi force-pushed the bootstrap-cluster-config-kubeapiserver branch from 9c87716 to 7ef0bd6 Compare November 7, 2018 17:53
@openshift-bot openshift-bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Nov 7, 2018
@damemi damemi mentioned this pull request Nov 7, 2018
Merged
@damemi damemi force-pushed the bootstrap-cluster-config-kubeapiserver branch from 7ef0bd6 to 7df3f59 Compare November 7, 2018 19:42
@sttts
Copy link
Contributor

sttts commented Nov 8, 2018

Dependency merged.

/retest

@sttts
Copy link
Contributor

sttts commented Nov 8, 2018

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Nov 8, 2018
@sttts
Copy link
Contributor

sttts commented Nov 8, 2018

/assign @squeed @abhinavdahiya

@squeed
Copy link
Contributor

squeed commented Nov 8, 2018

FYI, @deads2k wants to make a separate network configuration object; see #600.

But this looks good to me for now.

@damemi
Copy link
Contributor Author

damemi commented Nov 8, 2018

/assign @wking could you please give this an /approve?

@abhinavdahiya
Copy link
Contributor

abhinavdahiya commented Nov 8, 2018

FYI, @deads2k wants to make a separate network configuration object; see #600.

But this looks good to me for now.

/lgtm

@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Nov 8, 2018
@damemi
Copy link
Contributor Author

damemi commented Nov 8, 2018

/retest

@damemi
bootkube: pass api cluster config to controller-manager-operator
3a4d635 
this ensures that CIDR specific information is configured during bootstrap phase
@damemi damemi force-pushed the bootstrap-cluster-config-kubeapiserver branch from 7df3f59 to 3a4d635 Compare November 8, 2018 19:09
@openshift-ci-robot openshift-ci-robot removed the lgtm Indicates that a PR is ready to be merged. label Nov 8, 2018
@sttts
Copy link
Contributor

sttts commented Nov 8, 2018

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Nov 8, 2018
@abhinavdahiya
Copy link
Contributor

abhinavdahiya commented Nov 8, 2018

/approve cancel

@openshift-ci-robot openshift-ci-robot removed the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Nov 8, 2018
@abhinavdahiya
Copy link
Contributor

abhinavdahiya commented Nov 8, 2018 •
edited
Loading

@sttts @damemi why the new commit ?

once /approved prow allows merges with /lgtm from any user, even if there are changes.

@damemi
Copy link
Contributor Author

damemi commented Nov 8, 2018

@abhinavdahiya had to rebase because the bootkube template moved here: https://github.com/openshift/installer/pull/510/files#diff-ce82c1d8a44f7dfc41dfc024085ccfee

@abhinavdahiya
Copy link
Contributor

abhinavdahiya commented Nov 8, 2018 •
edited
Loading

@abhinavdahiya had to rebase because the bootkube template moved here: https://github.com/openshift/installer/pull/510/files#diff-ce82c1d8a44f7dfc41dfc024085ccfee

@wking's messages like #510 (comment)

Apparently vfsgen doesn't track the executable bit. I've pushed f45763d -> 9ebdb1d rebasing on master and switching the mode to depend on whether the file lives in a bin directory.

are very useful for us to track the changes, esp. already approved PRs with changes to same commit.

/approve

@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Nov 8, 2018

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: abhinavdahiya, damemi, sttts

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

The pull request process is described here

Details 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

@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Nov 8, 2018
@damemi
Copy link
Contributor Author

damemi commented Nov 8, 2018

/retest

@openshift-merge-robot openshift-merge-robot merged commit a2bddbd into openshift:master Nov 8, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@smarterclayton smarterclayton Awaiting requested review from smarterclayton

@staebler staebler Awaiting requested review from staebler

2 more reviewers

@sttts sttts sttts left review comments

@squeed squeed squeed approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@squeed squeed

@sttts sttts

@abhinavdahiya abhinavdahiya

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

7 participants

@damemi @sttts @squeed @abhinavdahiya @openshift-ci-robot @openshift-bot @openshift-merge-robot