Skip to content

*: Update "MachinePool" -> "MachineConfigPool" and similar#513

Merged
openshift-merge-robot merged 1 commit intoopenshift:masterfrom
wking:machine-pool-to-machine-config-pool
Mar 20, 2019
Merged

*: Update "MachinePool" -> "MachineConfigPool" and similar#513
openshift-merge-robot merged 1 commit intoopenshift:masterfrom
wking:machine-pool-to-machine-config-pool

Conversation

@wking
Copy link
Copy Markdown
Member

@wking wking commented Feb 28, 2019

There seems to have been some initial uncertainty about what this would be called, with MachinePool first landing in 30d522f and MachineConfigPool first landing in cfc9660 (#2). This commit consolidates us around MachineConfigPool, except for the machine-pools/ bootstrap path (since changing that would require consumer updates).

There seems to have been some initial uncertainty about what this
would be called, with MachinePool first landing in 30d522f (docs: add
initial documentation of design, 2018-07-25) and MachineConfigPool
first landing in cfc9660 (pkg/apis: add
machineconfiguration.openshift.io apis, 2018-07-26, openshift#2).  This commit
consolidates us around MachineConfigPool, except for the
machine-pools/ bootstrap path (since changing that would require
consumer updates).
@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 28, 2019
@openshift-ci-robot openshift-ci-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Feb 28, 2019
@kikisdeliveryservice kikisdeliveryservice requested review from cgwalters and runcom and removed request for abhinavdahiya and smarterclayton February 28, 2019 23:16
@kikisdeliveryservice
Copy link
Copy Markdown
Contributor

kikisdeliveryservice commented Feb 28, 2019

@wking I still see MachinePool in the installer? Or are you saying that we will be using different terms in the installer and here?

@kikisdeliveryservice
Copy link
Copy Markdown
Contributor

/hold

@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 28, 2019
@wking
Copy link
Copy Markdown
Member Author

wking commented Mar 1, 2019

I still see MachinePool in the installer? Or are you saying that we will be using different terms in the installer and here?

I'm fine diverging. The installer's MachinePool feeds into Machine(Set) objects, so it's not the same as the MachineConfigPool here (as far as I understand what MachineConfigPool is ;).

@kikisdeliveryservice
Copy link
Copy Markdown
Contributor

Also since this is not a bug fix it seems like this should be against the 4.1 branch @runcom ?

@runcom
Copy link
Copy Markdown
Member

runcom commented Mar 1, 2019

Most of the changes look trivial but I'm fine deferring to 4.1.

@cgwalters
Copy link
Copy Markdown
Member

I don't see a reason not to do this now.

/lgtm

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

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: cgwalters, 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

@cgwalters
Copy link
Copy Markdown
Member

/hold cancel

@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 Mar 19, 2019
@openshift-bot
Copy link
Copy Markdown
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

2 similar comments
@openshift-bot
Copy link
Copy Markdown
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Copy Markdown
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@wking
Copy link
Copy Markdown
Member Author

wking commented Mar 20, 2019

e2e-aws:

Failing tests:

[Conformance][Area:Networking][Feature:Router] The HAProxy router should override the route host with a custom value [Suite:openshift/conformance/parallel/minimal]
[Conformance][templates] templateinstance readiness test  should report ready soon after all annotated objects are ready [Suite:openshift/conformance/parallel/minimal]
[Feature:Builds][Conformance] build can reference a cluster service  with a build being created from new-build should be able to run a build that references a cluster service [Suite:openshift/conformance/parallel/minimal]
[Feature:Builds][Conformance] build without output image  building from templates should create an image from a S2i template without an output image reference defined [Suite:openshift/conformance/parallel/minimal]
[Feature:Builds][timing] capture build stages and durations  should record build stages and durations for docker [Suite:openshift/conformance/parallel]
[Feature:ImageAppend] Image append should create images by appending them [Suite:openshift/conformance/parallel]
[Feature:Prometheus][Conformance] Prometheus when installed on the cluster should report telemetry if a cloud.openshift.com token is present [Suite:openshift/conformance/parallel/minimal]
[Feature:Prometheus][Conformance] Prometheus when installed on the cluster should start and expose a secured proxy and unsecured metrics [Suite:openshift/conformance/parallel/minimal]
[Feature:Prometheus][Feature:Builds] Prometheus when installed on the cluster should start and expose a secured proxy and verify build metrics [Suite:openshift/conformance/parallel]
[image_ecosystem][mongodb] openshift mongodb image  creating from a template should instantiate the template [Suite:openshift/conformance/parallel]
[sig-network] NetworkPolicy NetworkPolicy between server and client should enforce policy based on PodSelector [Feature:NetworkPolicy] [Suite:openshift/conformance/parallel] [Suite:k8s]
[sig-network] NetworkPolicy NetworkPolicy between server and client should enforce policy based on Ports [Feature:NetworkPolicy] [Suite:openshift/conformance/parallel] [Suite:k8s]
[sig-network] Networking Granular Checks: Pods should function for intra-pod communication: http [NodeConformance] [Conformance] [Suite:openshift/conformance/parallel/minimal] [Suite:k8s]
[sig-network] Networking Granular Checks: Pods should function for intra-pod communication: udp [NodeConformance] [Conformance] [Suite:openshift/conformance/parallel/minimal] [Suite:k8s]
[sig-storage] In-tree Volumes [Driver: nfs] [Testpattern: Dynamic PV (default fs)] subPath should support existing directories when readOnly specified in the volumeSource [Suite:openshift/conformance/parallel] [Suite:k8s]
[sig-storage] In-tree Volumes [Driver: nfs] [Testpattern: Dynamic PV (default fs)] subPath should support file as subpath [Suite:openshift/conformance/parallel] [Suite:k8s]
[sig-storage] In-tree Volumes [Driver: nfs] [Testpattern: Dynamic PV (default fs)] subPath should support non-existent path [Suite:openshift/conformance/parallel] [Suite:k8s]
[sig-storage] In-tree Volumes [Driver: nfs] [Testpattern: Dynamic PV (default fs)] subPath should support readOnly file specified in the volumeMount [Suite:openshift/conformance/parallel] [Suite:k8s]
[sig-storage] In-tree Volumes [Driver: nfs] [Testpattern: Inline-volume (default fs)] subPath should support readOnly directory specified in the volumeMount [Suite:openshift/conformance/parallel] [Suite:k8s]
[sig-storage] In-tree Volumes [Driver: nfs] [Testpattern: Pre-provisioned PV (default fs)] subPath should support existing directory [Suite:openshift/conformance/parallel] [Suite:k8s]
[sig-storage] In-tree Volumes [Driver: nfs] [Testpattern: Pre-provisioned PV (default fs)] subPath should support non-existent path [Suite:openshift/conformance/parallel] [Suite:k8s]
[sig-storage] PersistentVolumes NFS with Single PV - PVC pairs create a PVC and a pre-bound PV: test write access [Suite:openshift/conformance/parallel] [Suite:k8s]
[sig-storage] PersistentVolumes NFS with Single PV - PVC pairs create a PVC and non-pre-bound PV: test write access [Suite:openshift/conformance/parallel] [Suite:k8s]

/retest

@openshift-merge-robot openshift-merge-robot merged commit d21ccb6 into openshift:master Mar 20, 2019
@wking wking deleted the machine-pool-to-machine-config-pool branch March 20, 2019 12:54
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.

7 participants