Skip to content

ci-operator/templates/openshift: Finish machineCIDR transition #2549

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
Jan 10, 2019
Merged

ci-operator/templates/openshift: Finish machineCIDR transition #2549

openshift-merge-robot merged 1 commit into from
Jan 10, 2019

Conversation

@wking
Copy link
Member

@wking wking commented Jan 10, 2019

Now that openshift/installer@31952f15 (openshift/installer#983) has landed, we can drop the vpcCIDRBlock and NetworkCIDRBlock properties. This completes the transition started by 2a9a6a3 (#2506).

@openshift-ci-robot openshift-ci-robot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Jan 10, 2019
@wking
Copy link
Member Author

wking commented Jan 10, 2019

/assign @vrutkovs

@wking
ci-operator/templates/openshift: Finish machineCIDR transition
3803c5e 
Now that openshift/installer@31952f15 (pkg/types: Add cross-platform
Networking.MachineCIDR, 2019-01-03, openshift/installer#983) has
landed, we can drop the vpcCIDRBlock and NetworkCIDRBlock properties.
This completes the transition started by 2a9a6a3
(ci-operator/templates/openshift: Set machineCIDR, 2019-01-04, openshift#2506).
@wking wking force-pushed the finish-machine-cidr branch from 0e76dcf to 3803c5e Compare January 10, 2019 12:55
vrutkovs
vrutkovs approved these changes Jan 10, 2019
View reviewed changes
Copy link
Contributor

@vrutkovs vrutkovs left a comment

Choose a reason for hiding this comment

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

/approve

openshift-ansible changes look got, not lgtm'ing as it touches installer parts

@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 10, 2019
@wking
Copy link
Member Author

wking commented Jan 10, 2019

@crawford, can you review this too?

crawford
crawford reviewed Jan 10, 2019
View reviewed changes
Copy link
Contributor

@crawford crawford left a comment

Choose a reason for hiding this comment

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

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Jan 10, 2019
@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Jan 10, 2019

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: crawford, vrutkovs, wking

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-merge-robot openshift-merge-robot merged commit 60e0f9c into openshift:master Jan 10, 2019
@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Jan 10, 2019

@wking: Updated the following 3 configmaps:

  • prow-job-cluster-launch-installer-src configmap using the following files:
    • key cluster-launch-installer-src.yaml using file ci-operator/templates/openshift/installer/cluster-launch-installer-src.yaml
  • prow-job-cluster-launch-e2e-40 configmap using the following files:
    • key cluster-launch-e2e-40.yaml using file ci-operator/templates/openshift/openshift-ansible/cluster-launch-e2e-40.yaml
  • prow-job-cluster-launch-installer-e2e configmap using the following files:
    • key cluster-launch-installer-e2e.yaml using file ci-operator/templates/openshift/installer/cluster-launch-installer-e2e.yaml
Details

In response to this:

Now that openshift/installer@31952f15 (openshift/installer#983) has landed, we can drop the vpcCIDRBlock and NetworkCIDRBlock properties. This completes the transition started by 2a9a6a3 (#2506).

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.

@wking wking deleted the finish-machine-cidr branch January 10, 2019 13:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@michaelgugino michaelgugino Awaiting requested review from michaelgugino

@mtnbikenc mtnbikenc Awaiting requested review from mtnbikenc

2 more reviewers

@crawford crawford crawford left review comments

@vrutkovs vrutkovs vrutkovs approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@vrutkovs vrutkovs

@crawford crawford

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.

5 participants

@wking @openshift-ci-robot @vrutkovs @crawford @openshift-merge-robot