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

ci-operator/templates/openshift: Set machineCIDR #2506

Merged
merged 1 commit into from
Jan 4, 2019
Merged

ci-operator/templates/openshift: Set machineCIDR #2506

merged 1 commit into from
Jan 4, 2019

Conversation

wking
Copy link
Member

@wking wking commented Jan 4, 2019

Preparing for openshift/installer@31952f15 (openshift/installer#983). Once that lands we can drop the vpcCIDRBlock and NetworkCIDRBlock properties.

CC @abhinavdahiya, @crawford, @vrutkovs

@wking
ci-operator/templates/openshift: Set machineCIDR
2a9a6a3 
Preparing for openshift/installer@31952f15 (pkg/types: Add
cross-platform Networking.MachineCIDR, 2019-01-03,
openshift/installer#983).  Once that lands we can drop the
vpcCIDRBlock and NetworkCIDRBlock properties.
@openshift-ci-robot openshift-ci-robot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Jan 4, 2019
@sdodson
Copy link
Member

sdodson commented Jan 4, 2019

/approve
Should be fine for CI but I asked a question here openshift/installer#983 (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 Jan 4, 2019
vrutkovs
vrutkovs approved these changes Jan 4, 2019
View reviewed changes
Copy link
Member

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

/lgtm

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

[APPROVALNOTIFIER] This PR is APPROVED

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

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

@openshift-merge-robot openshift-merge-robot merged commit 734b6e9 into openshift:master Jan 4, 2019
@openshift-ci-robot
Copy link
Contributor

@wking: Updated the following 3 configmaps:

  • 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
  • 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

In response to this:

Preparing for openshift/installer@31952f15 (openshift/installer#983). Once that lands we can drop the vpcCIDRBlock and NetworkCIDRBlock properties.

CC @abhinavdahiya, @crawford, @vrutkovs

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.

This was referenced Jan 4, 2019
Merged
Merged
@wking wking mentioned this pull request Jan 10, 2019
Merged
@wking wking deleted the set-machine-cidr branch January 10, 2019 05:18
wking added a commit to wking/openshift-release that referenced this pull request Jan 10, 2019
@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).
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@vrutkovs vrutkovs vrutkovs approved these changes

@michaelgugino michaelgugino Awaiting requested review from michaelgugino

@mtnbikenc mtnbikenc Awaiting requested review from mtnbikenc

Assignees

@vrutkovs vrutkovs

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 @sdodson @openshift-ci-robot @vrutkovs @openshift-merge-robot