Merge pull request #188 from enxebre/openshift-machine-api

Openshift machine api

Gopkg.toml

@@ -31,8 +31,8 @@ required = [
   branch = "release-1.10"
 
 [[override]]
-  name = "sigs.k8s.io/cluster-api"
-  branch = "master"
+  name = "github.com/openshift/cluster-api"
+  revision = "91fca585a85b163ddfd119fd09c128c9feadddca"
 
 [[override]]
   name = "k8s.io/code-generator"

cmd/machine-healthcheck/main.go

@@ -5,11 +5,11 @@ import (
 	"runtime"
 
 	"github.com/golang/glog"
+	mapiv1 "github.com/openshift/cluster-api/pkg/apis/machine/v1beta1"
 	"github.com/openshift/machine-api-operator/pkg/apis"
 	"github.com/openshift/machine-api-operator/pkg/controller"
 	sdkVersion "github.com/operator-framework/operator-sdk/version"
 	_ "k8s.io/client-go/plugin/pkg/client/auth/gcp"
-	capiv1 "sigs.k8s.io/cluster-api/pkg/apis/cluster/v1alpha1"
 	"sigs.k8s.io/controller-runtime/pkg/client/config"
 	"sigs.k8s.io/controller-runtime/pkg/manager"
 	"sigs.k8s.io/controller-runtime/pkg/runtime/signals"
@@ -43,7 +43,7 @@ func main() {
 	if err := apis.AddToScheme(mgr.GetScheme()); err != nil {
 		glog.Fatal(err)
 	}
-	if err := capiv1.AddToScheme(mgr.GetScheme()); err != nil {
+	if err := mapiv1.AddToScheme(mgr.GetScheme()); err != nil {
 		glog.Fatal(err)
 	}
 

cmd/nodelink-controller/controller_test.go

@@ -20,8 +20,8 @@ import (
 	"reflect"
 	"testing"
 
+	mapiv1alpha1 "github.com/openshift/cluster-api/pkg/apis/machine/v1beta1"
 	corev1 "k8s.io/api/core/v1"
-	capiv1alpha1 "sigs.k8s.io/cluster-api/pkg/apis/cluster/v1alpha1"
 )
 
 func node(taints *[]corev1.Taint) *corev1.Node {
@@ -32,9 +32,9 @@ func node(taints *[]corev1.Taint) *corev1.Node {
 	}
 }
 
-func machine(taints *[]corev1.Taint) *capiv1alpha1.Machine {
-	return &capiv1alpha1.Machine{
-		Spec: capiv1alpha1.MachineSpec{
+func machine(taints *[]corev1.Taint) *mapiv1alpha1.Machine {
+	return &mapiv1alpha1.Machine{
+		Spec: mapiv1alpha1.MachineSpec{
 			Taints: *taints,
 		},
 	}

cmd/nodelink-controller/main.go

@@ -41,12 +41,12 @@ import (
 
 	"sigs.k8s.io/controller-runtime/pkg/client/config"
 
-	capiv1 "sigs.k8s.io/cluster-api/pkg/apis/cluster/v1alpha1"
-	"sigs.k8s.io/cluster-api/pkg/client/clientset_generated/clientset"
-	capiclient "sigs.k8s.io/cluster-api/pkg/client/clientset_generated/clientset"
-	capiinformersfactory "sigs.k8s.io/cluster-api/pkg/client/informers_generated/externalversions"
-	capiinformers "sigs.k8s.io/cluster-api/pkg/client/informers_generated/externalversions/cluster/v1alpha1"
-	lister "sigs.k8s.io/cluster-api/pkg/client/listers_generated/cluster/v1alpha1"
+	mapiv1 "github.com/openshift/cluster-api/pkg/apis/machine/v1beta1"
+	"github.com/openshift/cluster-api/pkg/client/clientset_generated/clientset"
+	mapiclient "github.com/openshift/cluster-api/pkg/client/clientset_generated/clientset"
+	mapiinformersfactory "github.com/openshift/cluster-api/pkg/client/informers_generated/externalversions"
+	mapiinformers "github.com/openshift/cluster-api/pkg/client/informers_generated/externalversions/machine/v1beta1"
+	lister "github.com/openshift/cluster-api/pkg/client/listers_generated/machine/v1beta1"
 
 	kubeinformers "k8s.io/client-go/informers"
 )
@@ -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"
 )
 
 // NewController returns a new *Controller.
 func NewController(
 	nodeInformer coreinformers.NodeInformer,
-	machineInformer capiinformers.MachineInformer,
+	machineInformer mapiinformers.MachineInformer,
 	kubeClient kubeclientset.Interface,
-	capiClient capiclient.Interface,
+	capiClient mapiclient.Interface,
 ) *Controller {
 
 	eventBroadcaster := record.NewBroadcaster()
@@ -104,14 +104,14 @@ func NewController(
 	c.syncHandler = c.syncNode
 	c.enqueueNode = c.enqueue
 
-	c.machineAddress = make(map[string]*capiv1.Machine)
+	c.machineAddress = make(map[string]*mapiv1.Machine)
 
 	return c
 }
 
 // Controller monitors nodes and links them to their machines when possible, as well as applies desired labels and taints.
 type Controller struct {
-	capiClient capiclient.Interface
+	capiClient mapiclient.Interface
 	kubeClient kubeclientset.Interface
 
 	// To allow injection for testing.
@@ -130,7 +130,7 @@ type Controller struct {
 	queue workqueue.RateLimitingInterface
 
 	// machines cache map[internalIP]machine
-	machineAddress    map[string]*capiv1.Machine
+	machineAddress    map[string]*mapiv1.Machine
 	machineAddressMux sync.Mutex
 }
 
@@ -169,7 +169,7 @@ func (c *Controller) deleteNode(obj interface{}) {
 }
 
 func (c *Controller) addMachine(obj interface{}) {
-	machine := obj.(*capiv1.Machine)
+	machine := obj.(*mapiv1.Machine)
 
 	c.machineAddressMux.Lock()
 	defer c.machineAddressMux.Unlock()
@@ -185,7 +185,7 @@ func (c *Controller) addMachine(obj interface{}) {
 }
 
 func (c *Controller) updateMachine(old, cur interface{}) {
-	machine := cur.(*capiv1.Machine)
+	machine := cur.(*mapiv1.Machine)
 
 	c.machineAddressMux.Lock()
 	defer c.machineAddressMux.Unlock()
@@ -201,7 +201,7 @@ func (c *Controller) updateMachine(old, cur interface{}) {
 }
 
 func (c *Controller) deleteMachine(obj interface{}) {
-	machine := obj.(*capiv1.Machine)
+	machine := obj.(*mapiv1.Machine)
 
 	c.machineAddressMux.Lock()
 	defer c.machineAddressMux.Unlock()
@@ -332,7 +332,7 @@ func (c *Controller) processNode(node *corev1.Node) error {
 	machineKey, ok := node.Annotations[machineAnnotationKey]
 	// No machine annotation, this is likely the first time we've seen the node,
 	// need to load all machines and search for one with matching IP.
-	var matchingMachine *capiv1.Machine
+	var matchingMachine *mapiv1.Machine
 	if ok {
 		var err error
 		namespace, machineName, err := cache.SplitMetaNamespaceKey(machineKey)
@@ -408,7 +408,7 @@ func (c *Controller) processNode(node *corev1.Node) error {
 // addTaintsToNode adds taints from machine object to the node object
 // Taints are to be an authoritative list on the machine spec per cluster-api comments.
 // However, we believe many components can directly taint a node and there is no direct source of truth that should enforce a single writer of taints
-func addTaintsToNode(node *corev1.Node, machine *capiv1.Machine) {
+func addTaintsToNode(node *corev1.Node, machine *mapiv1.Machine) {
 	for _, mTaint := range machine.Spec.Taints {
 		glog.V(3).Infof("machine taint: %v", mTaint)
 		alreadyPresent := false
@@ -451,18 +451,18 @@ func main() {
 
 	// TODO(jchaloup): set the resync period reasonably
 	kubeSharedInformers := kubeinformers.NewSharedInformerFactory(kubeClient, 5*time.Second)
-	capiInformers := capiinformersfactory.NewSharedInformerFactory(client, 5*time.Second)
+	mapiInformers := mapiinformersfactory.NewSharedInformerFactory(client, 5*time.Second)
 
 	ctrl := NewController(
 		kubeSharedInformers.Core().V1().Nodes(),
-		capiInformers.Cluster().V1alpha1().Machines(),
+		mapiInformers.Machine().V1beta1().Machines(),
 		kubeClient,
 		client,
 	)
 
 	go ctrl.Run(1, wait.NeverStop)
 
-	capiInformers.Start(wait.NeverStop)
+	mapiInformers.Start(wait.NeverStop)
 	kubeSharedInformers.Start(wait.NeverStop)
 
 	select {}

install/0000_50_machine-api-operator_01_images.configmap.yaml

@@ -4,4 +4,4 @@ metadata:
   name: machine-api-operator-images
   namespace: openshift-cluster-api
 data:
-  images.json: '{"machineAPIOperator": "docker.io/openshift/origin-machine-api-operator:v4.0.0", "clusterAPIControllerAWS": "docker.io/openshift/origin-aws-machine-controllers:v4.0.0", "clusterAPIControllerOpenStack": "docker.io/openshift/origin-openstack-machine-controllers:v4.0.0", "clusterAPIControllerLibvirt": "docker.io/openshift/origin-libvirt-machine-controllers:v4.0.0"}'
+  images.json: '{"machineAPIOperator": "docker.io/openshift/origin-machine-api-operator:v4.0.0", "clusterAPIControllerAWS": "docker.io/openshift/origin-aws-machine-controllers:v4.0.0", "clusterAPIControllerOpenStack": "docker.io/openshift/origin-openstack-machine-controllers:v4.0.0", "clusterAPIControllerLibvirt": "docker.io/openshift/origin-libvirt-machine-controllers:v4.0.0", "clusterAPIControllerLibvirtDeprecated": "quay.io/coreos/cluster-api-provider-libvirt:origin-v4.0-2019-01-31-041134", "clusterAPIControllerAWSDeprecated": "quay.io/coreos/cluster-api-provider-aws:origin-v4.0-2019-01-31-041134"}'

owned-manifests/clusterapi-manager-controllers.yaml

@@ -35,8 +35,8 @@ spec:
         key: node.alpha.kubernetes.io/unreachable
         operator: Exists
       containers:
-      - name: controller-manager
-        image: {{ .Controllers.Provider }}
+      - name: controller-manager-deprecated
+        image: {{ .Controllers.ProviderDeprecated }}
         command:
         - "./manager"
         args:
@@ -49,8 +49,8 @@ spec:
           limits:
             cpu: 100m
             memory: 30Mi
-      - name: machine-controller
-        image: {{ .Controllers.Provider }}
+      - name: machine-controller-deprecated
+        image: {{ .Controllers.ProviderDeprecated }}
         env:
           - name: NODE_NAME
             valueFrom:
@@ -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
+        command:
+          - /nodelink-controller
+        args:
+          - --logtostderr=true
+          - --v=3
+        resources:
+          requests:
+            cpu: 100m
+            memory: 20Mi
+          limits:
+            cpu: 100m
+            memory: 30Mi
       - name: nodelink-controller
         image: {{ .Controllers.NodeLink }}
         command:
@@ -75,6 +89,20 @@ spec:
           limits:
             cpu: 100m
             memory: 30Mi
+      - name: machine-healthcheck-deprecated
+        image: quay.io/coreos/machine-api-operator:origin-v4.0-2019-01-31-041134
+        command:
+          - /machine-healthcheck
+        args:
+          - --logtostderr=true
+          - --v=3
+        resources:
+          requests:
+            cpu: 100m
+            memory: 20Mi
+          limits:
+            cpu: 100m
+            memory: 30Mi
       - name: machine-healthcheck
         image: {{ .Controllers.MachineHealthCheck }}
         command: