*: replace master/worker terms with control-plane/compute #1227

staebler · 2019-02-11T17:56:25Z

Replace references to master and worker with control plane and compute throughout the installer.

Remaining references:

Machine labels sigs.k8s.io/cluster-api-machine-role and sigs.k8s.io/cluster-api-machine-type still use the master and worker values.
The URL to query for ignition config files still ends in /config/master and /config/worker.
The Admin cert key is still created with an Organization value of system:masters.

openshift-ci-robot · 2019-02-11T17:57:09Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: staebler

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:

~~OWNERS~~ [staebler]

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

staebler · 2019-02-14T16:33:14Z

/hold

Pending feature exception approval.

staebler · 2019-02-14T19:49:15Z

/hold cancel

The feature exception for this has been approved.

staebler · 2019-02-15T17:38:02Z

error: could not run steps: test "release-latest" failed: pod release-latest was already deleted

/retest

staebler · 2019-02-15T22:47:43Z

openshift.service

Feb 15 21:57:48 ip-10-0-6-213 openshift.sh[4476]: kubectl create --filename ./99_openshift-cluster-api_cluster.yaml failed. Retrying in 5 seconds...
Feb 15 21:57:53 ip-10-0-6-213 openshift.sh[4476]: error: unable to recognize "./99_openshift-cluster-api_cluster.yaml": no matches for kind "Cluster" in version "cluster.k8s.io/v1alpha1"

Bootstrapping did not complete because the openshift service could not create the Cluster resource with version cluster.k8s.io/v1alpha1.

staebler · 2019-02-15T22:55:22Z

/retest

staebler · 2019-02-15T23:30:21Z

level=error msg="\t* module.vpc.aws_route.to_nat_gw[0]: 1 error occurred:"
level=error msg="\t* aws_route.to_nat_gw.0: Error creating route: timeout while waiting for state to become 'success' (timeout: 2m0s)"

Rate-limit errors

/test e2e-aws

Rename the Master and Worker machine assets to Control Plane and Compute, respectively. This is part of the overall effort to replace the terms master and worker with control plane and compute throughout the installer.

Pass in as a variable to terraform the name of the control plane machine pool. This is part of the overall effort to replace the terms master and worker with control plane and compute throughout the installer.

Rename the Master and Worker ignition assets to Control Plane and Compute, respectively. This is part of the overall effort to replace the terms master and worker with control plane and compute throughout the installer.

Replace references to master and worker in the aws terraform with control-plane and compute, respectively. This is part of the overall effort to replace the terms master and worker with control plane and compute throughout the installer.

Use the MachineRole type to differentiate between control-plane machines and compute machines. This is part of the overall effort to replace the terms master and worker with control plane and compute throughout the installer.

This is part of the overall effort to replace the terms master and worker with control plane and compute throughout the installer.

…pute This is part of the overall effort to replace the terms master and worker with control plane and compute throughout the installer.

This is part of the overall effort to replace the terms master and worker with control plane and compute throughout the installer.

The Master Machines, Worker Machines, Master Ignition, and Worker Ignition files were renamed to Control Plane Machines, Compute Machines, Control Plane Ignition, and Compute Ignition, resepctively. Consequently, the dependency graph needed to be updated. Generated with: $ openshift-install graph | dot -Tsvg >docs/design/resource_dep.svg using: $ dot -V dot - graphviz version 2.40.1 (20161225.0304)

staebler · 2019-02-16T01:53:13Z

level=fatal msg="failed to initialize the cluster: Cluster operator machine-config is reporting a failure: Failed to resync 3.11.0-665-gd2c44d7c-dirty because: error syncing: Get https://172.30.0.1:443/apis/rbac.authorization.k8s.io/v1/clusterroles/machine-config-daemon: dial tcp 172.30.0.1:443: connect: connection refused"

/retest

staebler · 2019-02-16T02:53:46Z

level=info msg="Destroying the bootstrap resources..."
level=error
level=error msg="Error: Error applying plan:"
level=error
level=error msg="1 error occurred:"
level=error msg="\t* module.bootstrap.aws_iam_role.bootstrap (destroy): 1 error occurred:"
level=error msg="\t* aws_iam_role.bootstrap: Error deleting IAM Role ci-op-ddklyji6-1d3f3-bootstrap-role: NoSuchEntity: The role with name ci-op-ddklyji6-1d3f3-bootstrap-role cannot be found."
level=error msg="\tstatus code: 404, request id: 757e8538-3193-11e9-a0b0-dfe339fc73f7"

Failure when cleaning up bootstrap resources.

/retest

cgwalters · 2019-02-17T18:40:04Z

This is part of the overall effort to replace the terms master and worker with control plane and compute throughout the installer.

I'm a fan but...it's not just the installer but (eventually) OpenShift in general right? We're going to have...a lot of work to do for that. In the MCO for example renaming everything as part of an upgrade would get...tricky.

openshift-ci-robot · 2019-02-18T03:55:31Z

@staebler: PR needs rebase.

Details

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.

staebler · 2019-02-18T15:27:13Z

This is part of the overall effort to replace the terms master and worker with control plane and compute throughout the installer.

I'm a fan but...it's not just the installer but (eventually) OpenShift in general right? We're going to have...a lot of work to do for that. In the MCO for example renaming everything as part of an upgrade would get...tricky.

My expectation is that, yes, eventually OpenShift in general will switch to using the control plane and compute terms. However, I would not expect that an update would change the names of existing resources. Code should generally not be relying on the names of resources but instead on labels on those resources. For the MCO in particular, I'm not sure what more would need to be done beyond serving the config from, for example, both master and control-plane endpoints. Can you elaborate on some other things in upgrading after terms change that you anticipate being tricky?

staebler · 2019-02-18T15:30:36Z

/hold

Hold for 4.1.

openshift-ci-robot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Feb 11, 2019

openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Feb 11, 2019

openshift-ci-robot requested review from flaper87 and hardys February 11, 2019 17:57

openshift-ci-robot added needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. and removed needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. labels Feb 12, 2019

staebler mentioned this pull request Feb 13, 2019

installconfig: separate control plane and compute machine pools #1157

Merged

openshift-ci-robot added needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. and removed needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. labels Feb 13, 2019

staebler changed the title ~~[WIP] master/worker --> control-plane/compute~~ Replace master/worker terms with control-plane/compute Feb 14, 2019

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 Feb 14, 2019

staebler changed the title ~~Replace master/worker terms with control-plane/compute~~ *: replace master/worker terms with control-plane/compute Feb 14, 2019

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 14, 2019

staebler added 6 commits February 15, 2019 19:08

terraform: parameterize the name of the control plane machine pool

f9de6ab

Pass in as a variable to terraform the name of the control plane machine pool. This is part of the overall effort to replace the terms master and worker with control plane and compute throughout the installer.

terraform/aws: replace master/worker references

32e6748

Replace references to master and worker in the aws terraform with control-plane and compute, respectively. This is part of the overall effort to replace the terms master and worker with control plane and compute throughout the installer.

terraform/libvirt: rename master to control plane in libvirt terraform

e25a410

This is part of the overall effort to replace the terms master and worker with control plane and compute throughout the installer.

staebler added 4 commits February 15, 2019 19:20

terraform/openstack: rename master to control plane and worker to com…

8e5a4b1

…pute This is part of the overall effort to replace the terms master and worker with control plane and compute throughout the installer.

data/bootstrap: replace master with control plane in bootstrap motd

097cae1

This is part of the overall effort to replace the terms master and worker with control plane and compute throughout the installer.

asset/machines: rename ConfigMasters functions to ConfigControlPlane

dd40ebc

This is part of the overall effort to replace the terms master and worker with control plane and compute throughout the installer.

openshift-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Feb 18, 2019

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 18, 2019

staebler closed this Apr 9, 2019

flyemsafe mentioned this pull request Jun 27, 2020

[BUG] replace all occurrence of master either primary or control plane Qubinode/qubinode-installer#241

Closed

*: replace master/worker terms with control-plane/compute #1227

*: replace master/worker terms with control-plane/compute #1227

Uh oh!

Conversation

staebler commented Feb 11, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

openshift-ci-robot commented Feb 11, 2019

Uh oh!

staebler commented Feb 14, 2019

Uh oh!

staebler commented Feb 14, 2019

Uh oh!

staebler commented Feb 15, 2019

Uh oh!

staebler commented Feb 15, 2019

Uh oh!

staebler commented Feb 15, 2019

Uh oh!

staebler commented Feb 15, 2019

Uh oh!

staebler commented Feb 16, 2019

Uh oh!

staebler commented Feb 16, 2019

Uh oh!

cgwalters commented Feb 17, 2019

Uh oh!

openshift-ci-robot commented Feb 18, 2019

Uh oh!

staebler commented Feb 18, 2019

Uh oh!

staebler commented Feb 18, 2019

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

staebler commented Feb 11, 2019 •

edited

Loading