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.

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

Modify install-config.yaml to use controlPlane and compute instead of master and worker #2787

Conversation

staebler
Copy link
Contributor

@staebler staebler commented Feb 5, 2019

In the cases where the replica count is not customizable, the controlPlane and compute have been removed to use the defaults for the machine pools.

Bump install-config.yaml apiVersion from v1beta2 to v1beta3.

See openshift/installer#1157

@openshift-ci-robot openshift-ci-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Feb 5, 2019
@staebler
Copy link
Contributor Author

staebler commented Feb 5, 2019

/hold

Depends on openshift/installer#1157

@openshift-ci-robot openshift-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Feb 5, 2019
… machines.

In the cases where the replica count is not customizable, the controlPlane and compute
have been removed to use the defaults for the machine pools.

Update the apiVersion for install-config.yaml to v1beta3, which is the version that
incorporates the controlPlane and compute fields.

See openshift/installer#1157
@staebler staebler force-pushed the install-config_controlplane-compute branch from 220d014 to e1d729c Compare February 15, 2019 19:18
@staebler
Copy link
Contributor Author

/hold cancel

openshift/installer#1157 has been merged.

@openshift-ci-robot openshift-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Feb 15, 2019
@crawford
Copy link
Contributor

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Feb 18, 2019
@sdodson
Copy link
Member

sdodson commented Feb 19, 2019

/approve
/cc @vrutkovs
I don't think this actually changes anything that we use but FYI.

@openshift-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: crawford, sdodson, staebler

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-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Feb 19, 2019
@openshift-merge-robot openshift-merge-robot merged commit c80be9e into openshift:master Feb 19, 2019
@openshift-ci-robot
Copy link
Contributor

@staebler: Updated the following 8 configmaps:

  • prow-job-cluster-scaleup-e2e-40 configmap in namespace ci-stg using the following files:
    • key cluster-scaleup-e2e-40.yaml using file ci-operator/templates/openshift/openshift-ansible/cluster-scaleup-e2e-40.yaml
  • prow-job-cluster-launch-installer-e2e configmap in namespace ci 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-e2e configmap in namespace ci-stg 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 in namespace ci 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-installer-src configmap in namespace ci-stg 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 in namespace ci 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-e2e-40 configmap in namespace ci-stg 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-scaleup-e2e-40 configmap in namespace ci using the following files:
    • key cluster-scaleup-e2e-40.yaml using file ci-operator/templates/openshift/openshift-ansible/cluster-scaleup-e2e-40.yaml

In response to this:

In the cases where the replica count is not customizable, the controlPlane and compute have been removed to use the defaults for the machine pools.

Bump install-config.yaml apiVersion from v1beta2 to v1beta3.

See openshift/installer#1157

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 added a commit to wking/openshift-installer that referenced this pull request Feb 26, 2019
When we pivoted to v1beta3 in ccdc32e (installconfig: separate
control plane and compute machine pools, 2019-01-29, openshift#1157), we
dropped support for the old 'machines' JSON property.  Instead of
silently ignoring that property in v1beta2 configs, error out to avoid
surprising users later when they notice us not picking up their
machines configuration.

Or internal consumers pivoted to v1beta3 in openshift/release@e1d729c6
(Modify install-config.yaml to use controlPlane and compute instead of
machines, 2019-02-05, openshift/release#2787) and
openshift/hive@3eda6d12 (Bump to installer master branch, 2019-02-21,
openshift/hive#228).
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants