Openshift machine api #188

enxebre · 2019-01-31T10:47:12Z

Since we are migrating to use openshift.io for machine API. We want to do a backward compatible transition.
This runs controllers for both groups simultaneously
TODO:

Add actuator controllers
Update cluster-api vendored sha

enxebre · 2019-01-31T10:47:35Z

cc @bison @frobware @ingvagabund

bison · 2019-01-31T10:53:04Z

cmd/nodelink-controller/main.go

@@ -61,15 +60,15 @@ const (
 	controllerName = "nodelink"

 	// machineAnnotationKey is the annotation storing a link between a node and it's machine. Should match upstream cluster-api machine controller. (node.go)
-	machineAnnotationKey = "cluster.k8s.io/machine"
+	machineAnnotationKey = "machine.k8s.io/machine"


This seems a little weird. I feel like we should either keep this the same as upstream, or go ahead and change it to openshift.io.

sure, it was meant to be machine.openshift.io, thanks!

bison · 2019-01-31T10:57:15Z

owned-manifests/clusterapi-manager-controllers.yaml

@@ -61,6 +61,20 @@ spec:
        args:
          - --logtostderr=true
          - --v=3
+      - name: nodelink-controller-deprecated
+        image: quay.io/coreos/machine-api-operator:origin-v4.0-2019-01-31-041134


I think it would be nice to template these in after having read them from the config like we do for the others. Even if it's temporary, it would be nice for these to come from the release image. I suppose this is not a total blocker though.

this is never gonna come from the payload/release image. The ones coming from the payload are the ones built from master so adding support for the new types.
The payload CI build will replace every appearance of https://github.com/openshift/machine-api-operator/blob/master/install/image-references#L8 with the corresponding image Stream built by CI.
We could template in the configMap though but it wouldn't make any difference

frobware · 2019-01-31T11:37:03Z

With the obvious exception of the Godep mirror location for cluster-api, LGTM.

enxebre · 2019-01-31T13:29:16Z

/test all

enxebre · 2019-01-31T13:44:40Z

/test e2e-aws-operator

enxebre · 2019-01-31T13:57:37Z

/test e2e-aws

enxebre · 2019-01-31T19:23:55Z

/test e2e-aws-operator

enxebre · 2019-02-01T00:01:53Z

/test e2e-aws

paulfantom

/approve

pkg/operator/operator.go

frobware · 2019-02-01T08:49:10Z

/lgtm

openshift-ci-robot · 2019-02-01T08:49:11Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: frobware, paulfantom

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:

~~OWNERS~~ [frobware,paulfantom]

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

ingvagabund · 2019-02-01T08:51:39Z

Gopkg.toml

-  name = "sigs.k8s.io/cluster-api"
-  branch = "master"
+  name = "github.com/openshift/cluster-api"
+  revision = "91fca585a85b163ddfd119fd09c128c9feadddca"


Fine for now though let's use tags once we finish the mirroring

ingvagabund

Few nits left.

ingvagabund · 2019-02-01T08:55:35Z

owned-manifests/clusterapi-manager-controllers.yaml

@@ -61,6 +61,20 @@ spec:
        args:
          - --logtostderr=true
          - --v=3
+      - name: nodelink-controller-deprecated


+1 for naming

ingvagabund · 2019-02-01T09:00:02Z

cmd/nodelink-controller/main.go

@@ -61,15 +61,15 @@ const (
 	controllerName = "nodelink"

 	// machineAnnotationKey is the annotation storing a link between a node and it's machine. Should match upstream cluster-api machine controller. (node.go)
-	machineAnnotationKey = "cluster.k8s.io/machine"
+	machineAnnotationKey = "machine.openshift.io/machine"


Time to use https://github.com/openshift/cluster-api/blob/release-4.0/pkg/controller/node/node.go#L35 instead.

ingvagabund · 2019-02-01T09:00:16Z

pkg/controller/machinehealthcheck/machinehealthcheck_controller.go

@@ -25,7 +25,7 @@ import (
 )

 const (
-	machineAnnotationKey = "cluster.k8s.io/machine"
+	machineAnnotationKey = "machine.openshift.io/machine"


Time to use https://github.com/openshift/cluster-api/blob/release-4.0/pkg/controller/node/node.go#L35 instead.

Agreed, but that belongs to a different PR. We need to go step by step. Let's switch the api group. Then do improvements

We are transitioning the cluster API types from k8s.io over a machine.openshift.io group. https://github.com/openshift/cluster-api/tree/91fca585a85b163ddfd119fd09c128c9feadddca Although this give us a necessary level of autonomy today, we aim to consolidate back with upstream once there's a release of the API stable enough For reference: Backward compatible changes on machine api operator [openshift/machine-api-operator#185](openshift/machine-api-operator#185) [openshift/machine-api-operator#188](openshift/machine-api-operator#188) [openshift/machine-api-operator#191](openshift/machine-api-operator#191) Libvirt actuator support for new group openshift/cluster-api-provider-libvirt#111

…e-deletion Skip deletion of stop machines if there is an error

enxebre added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jan 31, 2019

openshift-ci-robot requested review from paulfantom and vikaschoudhary16 January 31, 2019 10:47

openshift-ci-robot added the size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. label Jan 31, 2019

bison reviewed Jan 31, 2019

View reviewed changes

enxebre force-pushed the openshift-machine-api branch 3 times, most recently from e5ceeea to fcc0fb9 Compare January 31, 2019 13:07

enxebre force-pushed the openshift-machine-api branch from f87aec1 to 963f70a Compare January 31, 2019 18:47

enxebre mentioned this pull request Jan 31, 2019

Openshift machine api openshift/cluster-api-provider-aws#147

Merged

enxebre added 4 commits January 31, 2019 20:38

Revendor for openshift-machine-api

0f72b89

Update controllers to use openshift machine-api

c0cdaca

Run both controllers simultaneously for k8s.io and openshift.io type

304559d

Pin provider controllers to deprecated version

3fb5ada

enxebre force-pushed the openshift-machine-api branch from 963f70a to 3fb5ada Compare January 31, 2019 19:38

enxebre removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Feb 1, 2019

paulfantom approved these changes Feb 1, 2019

View reviewed changes

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

frobware approved these changes Feb 1, 2019

View reviewed changes

pkg/operator/operator.go Show resolved Hide resolved

openshift-ci-robot assigned frobware Feb 1, 2019

openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Feb 1, 2019

openshift-merge-robot merged commit 6744cf3 into openshift:master Feb 1, 2019

ingvagabund reviewed Feb 1, 2019

View reviewed changes

This was referenced Feb 1, 2019

Openshift machine api openshift/installer#1175

Merged

Add OpenStack deprecated image for transitioning machine API groups #192

Merged

Drop cluster.k8s.io #195

Closed

enxebre mentioned this pull request Feb 7, 2019

Libvirt machine api openshift/installer#1204

Merged

ingvagabund pushed a commit to ingvagabund/machine-api-operator that referenced this pull request Jul 11, 2019

Merge pull request openshift#188 from ingvagabund/skip-stopped-machin…

cf050ed

…e-deletion Skip deletion of stop machines if there is an error

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Openshift machine api #188

Openshift machine api #188

enxebre commented Jan 31, 2019

enxebre commented Jan 31, 2019

bison Jan 31, 2019

enxebre Jan 31, 2019

bison Jan 31, 2019

enxebre Jan 31, 2019

frobware commented Jan 31, 2019

enxebre commented Jan 31, 2019

enxebre commented Jan 31, 2019

enxebre commented Jan 31, 2019

enxebre commented Jan 31, 2019

enxebre commented Feb 1, 2019

paulfantom left a comment

frobware commented Feb 1, 2019

openshift-ci-robot commented Feb 1, 2019

ingvagabund Feb 1, 2019

ingvagabund left a comment

ingvagabund Feb 1, 2019

ingvagabund Feb 1, 2019

ingvagabund Feb 1, 2019

enxebre Feb 1, 2019

Openshift machine api #188

Openshift machine api #188

Conversation

enxebre commented Jan 31, 2019

enxebre commented Jan 31, 2019

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

frobware commented Jan 31, 2019

enxebre commented Jan 31, 2019

enxebre commented Jan 31, 2019

enxebre commented Jan 31, 2019

enxebre commented Jan 31, 2019

enxebre commented Feb 1, 2019

paulfantom left a comment

Choose a reason for hiding this comment

frobware commented Feb 1, 2019

openshift-ci-robot commented Feb 1, 2019

Choose a reason for hiding this comment

ingvagabund left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment