Drop deprecated controllers, update e2e to machine.openshift.io

install/0000_30_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", "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", "clusterAPIControllerOpenStackDeprecated": "quay.io/coreos/cluster-api-provider-openstack:origin-v4.0-2019-01-31-041134"}'
+  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"}'

owned-manifests/clusterapi-manager-controllers.yaml

@@ -61,46 +61,6 @@ spec:
         args:
           - --logtostderr=true
           - --v=3
-      - name: controller-manager-deprecated
-        image: {{ .Controllers.ProviderDeprecated }}
-        command:
-        - "./manager"
-        args:
-          - --logtostderr=true
-          - --v=3
-        resources:
-          requests:
-            cpu: 100m
-            memory: 20Mi
-          limits:
-            cpu: 100m
-            memory: 30Mi
-      - name: machine-controller-deprecated
-        image: {{ .Controllers.ProviderDeprecated }}
-        env:
-          - name: NODE_NAME
-            valueFrom:
-              fieldRef:
-                fieldPath: spec.nodeName
-        command:
-          - /machine-controller-manager
-        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:
@@ -115,20 +75,6 @@ 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:

pkg/operator/config.go

@@ -41,20 +41,16 @@ type OperatorConfig struct {
 
 type Controllers struct {
 	Provider           string
-	ProviderDeprecated string
 	NodeLink           string
 	MachineHealthCheck string
 }
 
 // Images allows build systems to inject images for MAO components
 type Images struct {
-	MachineAPIOperator                      string `json:"machineAPIOperator"`
-	ClusterAPIControllerAWS                 string `json:"clusterAPIControllerAWS"`
-	ClusterAPIControllerAWSDeprecated       string `json:"clusterAPIControllerAWSDeprecated"`
-	ClusterAPIControllerOpenStack           string `json:"clusterAPIControllerOpenStack"`
-	ClusterAPIControllerLibvirt             string `json:"clusterAPIControllerLibvirt"`
-	ClusterAPIControllerLibvirtDeprecated   string `json:"clusterAPIControllerLibvirtDeprecated"`
-	ClusterAPIControllerOpenStackDeprecated string `json:"clusterAPIControllerOpenStackDeprecated"`
+	MachineAPIOperator            string `json:"machineAPIOperator"`
+	ClusterAPIControllerAWS       string `json:"clusterAPIControllerAWS"`
+	ClusterAPIControllerOpenStack string `json:"clusterAPIControllerOpenStack"`
+	ClusterAPIControllerLibvirt   string `json:"clusterAPIControllerLibvirt"`
 }
 
 // InstallConfig contains the mao relevant config coming from the install config, i.e provider

pkg/operator/config_test.go

@@ -7,14 +7,11 @@ import (
 )
 
 var (
-	imagesJSONFile                   = "fixtures/images.json"
-	expectedAWSImage                 = "docker.io/openshift/origin-aws-machine-controllers:v4.0.0"
-	expectedLibvirtImage             = "docker.io/openshift/origin-libvirt-machine-controllers:v4.0.0"
-	expectedOpenstackImage           = "docker.io/openshift/origin-openstack-machine-controllers:v4.0.0"
-	expectedMachineAPIOperatorImage  = "docker.io/openshift/origin-machine-api-operator:v4.0.0"
-	expectedAWSImageDeprecated       = "quay.io/coreos/cluster-api-provider-aws:origin-v4.0-2019-01-31-041134"
-	expectedLibvirtImageDeprecated   = "quay.io/coreos/cluster-api-provider-libvirt:origin-v4.0-2019-01-31-041134"
-	expectedOpenstackImageDeprecated = "quay.io/coreos/cluster-api-provider-openstack:origin-v4.0-2019-01-31-041134"
+	imagesJSONFile                  = "fixtures/images.json"
+	expectedAWSImage                = "docker.io/openshift/origin-aws-machine-controllers:v4.0.0"
+	expectedLibvirtImage            = "docker.io/openshift/origin-libvirt-machine-controllers:v4.0.0"
+	expectedOpenstackImage          = "docker.io/openshift/origin-openstack-machine-controllers:v4.0.0"
+	expectedMachineAPIOperatorImage = "docker.io/openshift/origin-machine-api-operator:v4.0.0"
 )
 
 func TestInstallConfigFromClusterConfig(t *testing.T) {
@@ -137,15 +134,6 @@ func TestGetImagesFromJSONFile(t *testing.T) {
 	if img.ClusterAPIControllerOpenStack != expectedOpenstackImage {
 		t.Errorf("failed getImagesFromJSONFile. Expected: %s, got: %s", expectedOpenstackImage, img.ClusterAPIControllerOpenStack)
 	}
-	if img.ClusterAPIControllerAWSDeprecated != expectedAWSImageDeprecated {
-		t.Errorf("failed getImagesFromJSONFile. Expected: %s, got: %s", expectedAWSImageDeprecated, img.ClusterAPIControllerAWSDeprecated)
-	}
-	if img.ClusterAPIControllerLibvirtDeprecated != expectedLibvirtImageDeprecated {
-		t.Errorf("failed getImagesFromJSONFile. Expected: %s, got: %s", expectedLibvirtImageDeprecated, img.ClusterAPIControllerLibvirtDeprecated)
-	}
-	if img.ClusterAPIControllerOpenStackDeprecated != expectedOpenstackImageDeprecated {
-		t.Errorf("failed getImagesFromJSONFile. Expected: %s, got: %s", expectedOpenstackImageDeprecated, img.ClusterAPIControllerOpenStackDeprecated)
-	}
 }
 
 func TestGetProviderControllerFromImages(t *testing.T) {

pkg/operator/fixtures/images.json

@@ -2,8 +2,5 @@
   "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",
-  "machineAPIOperator": "docker.io/openshift/origin-machine-api-operator: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",
-  "clusterAPIControllerOpenStackDeprecated": "quay.io/coreos/cluster-api-provider-openstack:origin-v4.0-2019-01-31-041134"
+  "machineAPIOperator": "docker.io/openshift/origin-machine-api-operator:v4.0.0"
 }

pkg/operator/operator.go

@@ -210,22 +210,10 @@ func (optr *Operator) maoConfigFromInstallConfig() (*OperatorConfig, error) {
 		return nil, err
 	}
 
-	// TODO: Remove once we transition over machine.openshift.io group
-	var providerDreprecatedControllerImage string
-	switch provider {
-	case AWSProvider:
-		providerDreprecatedControllerImage = images.ClusterAPIControllerAWSDeprecated
-	case LibvirtProvider:
-		providerDreprecatedControllerImage = images.ClusterAPIControllerLibvirtDeprecated
-	case OpenStackProvider:
-		providerDreprecatedControllerImage = images.ClusterAPIControllerOpenStackDeprecated
-	}
-
 	return &OperatorConfig{
 		optr.namespace,
 		Controllers{
 			providerControllerImage,
-			providerDreprecatedControllerImage,
 			machineAPIOperatorImage,
 			machineAPIOperatorImage,
 		},

test/e2e/main.go

@@ -5,7 +5,7 @@ import (
 
 	"github.com/golang/glog"
 	osconfigv1 "github.com/openshift/api/config/v1"
-	capiv1alpha1 "github.com/openshift/cluster-api/pkg/apis/cluster/v1alpha1"
+	mapiv1beta1 "github.com/openshift/cluster-api/pkg/apis/machine/v1beta1"
 	caov1alpha1 "github.com/openshift/cluster-autoscaler-operator/pkg/apis"
 	"k8s.io/client-go/kubernetes/scheme"
 	"sigs.k8s.io/controller-runtime/pkg/client"
@@ -17,7 +17,7 @@ const (
 )
 
 func init() {
-	if err := capiv1alpha1.AddToScheme(scheme.Scheme); err != nil {
+	if err := mapiv1beta1.AddToScheme(scheme.Scheme); err != nil {
 		glog.Fatal(err)
 	}
 
@@ -68,9 +68,9 @@ func runSuite() error {
 	}
 	glog.Info("PASS: ExpectOperatorAvailable")
 
-	glog.Info("RUN: ExpectOneClusterObject")
-	if err := testConfig.ExpectOneClusterObject(); err != nil {
-		glog.Errorf("FAIL: ExpectOneClusterObject: %v", err)
+	glog.Info("RUN: ExpectNoClusterObject")
+	if err := testConfig.ExpectNoClusterObject(); err != nil {
+		glog.Errorf("FAIL: ExpectNoClusterObject: %v", err)
 		return err
 	}
 	glog.Info("PASS: ExpectOneClusterObject")

test/e2e/operator_expectations.go

@@ -10,7 +10,7 @@ import (
 
 	"github.com/golang/glog"
 	osconfigv1 "github.com/openshift/api/config/v1"
-	capiv1alpha1 "github.com/openshift/cluster-api/pkg/apis/cluster/v1alpha1"
+	mapiv1beta1 "github.com/openshift/cluster-api/pkg/apis/machine/v1beta1"
 	caov1alpha1 "github.com/openshift/cluster-autoscaler-operator/pkg/apis/autoscaling/v1alpha1"
 	cvoresourcemerge "github.com/openshift/cluster-version-operator/lib/resourcemerge"
 	kappsapi "k8s.io/api/apps/v1"
@@ -51,19 +51,19 @@ func (tc *testConfig) ExpectOperatorAvailable() error {
 	return err
 }
 
-func (tc *testConfig) ExpectOneClusterObject() error {
+func (tc *testConfig) ExpectNoClusterObject() error {
 	listOptions := client.ListOptions{
 		Namespace: namespace,
 	}
-	clusterList := capiv1alpha1.ClusterList{}
+	clusterList := mapiv1beta1.ClusterList{}
 
 	err := wait.PollImmediate(1*time.Second, waitShort, func() (bool, error) {
 		if err := tc.client.List(context.TODO(), &listOptions, &clusterList); err != nil {
 			glog.Errorf("error querying api for clusterList object: %v, retrying...", err)
 			return false, nil
 		}
-		if len(clusterList.Items) != 1 {
-			return false, errors.New("more than one cluster object found")
+		if len(clusterList.Items) > 0 {
+			return false, errors.New("a cluster object was found")
 		}
 		return true, nil
 	})
@@ -94,11 +94,11 @@ func (tc *testConfig) ExpectClusterOperatorStatusAvailable() error {
 }
 
 func (tc *testConfig) ExpectAllMachinesLinkedToANode() error {
-	machineAnnotationKey := "cluster.k8s.io/machine"
+	machineAnnotationKey := "machine.openshift.io/machine"
 	listOptions := client.ListOptions{
 		Namespace: namespace,
 	}
-	machineList := capiv1alpha1.MachineList{}
+	machineList := mapiv1beta1.MachineList{}
 	nodeList := corev1.NodeList{}
 
 	err := wait.PollImmediate(1*time.Second, waitShort, func() (bool, error) {
@@ -187,7 +187,7 @@ func (tc *testConfig) ExpectAdditiveReconcileMachineTaints() error {
 	listOptions := client.ListOptions{
 		Namespace: namespace,
 	}
-	machineList := capiv1alpha1.MachineList{}
+	machineList := mapiv1beta1.MachineList{}
 
 	if err := tc.client.List(context.TODO(), &listOptions, &machineList); err != nil {
 		return fmt.Errorf("error querying api for machineList object: %v", err)
@@ -255,7 +255,7 @@ func (tc *testConfig) ExpectNewNodeWhenDeletingMachine() error {
 	listOptions := client.ListOptions{
 		Namespace: namespace,
 	}
-	machineList := capiv1alpha1.MachineList{}
+	machineList := mapiv1beta1.MachineList{}
 	nodeList := corev1.NodeList{}
 
 	glog.Info("Get machineList")
@@ -284,7 +284,7 @@ func (tc *testConfig) ExpectNewNodeWhenDeletingMachine() error {
 
 	clusterInitialTotalNodes := len(nodeList.Items)
 	clusterInitialTotalMachines := len(machineList.Items)
-	var triagedWorkerMachine capiv1alpha1.Machine
+	var triagedWorkerMachine mapiv1beta1.Machine
 	var triagedWorkerNode corev1.Node
 MachineLoop:
 	for _, m := range machineList.Items {
@@ -361,7 +361,7 @@ func (tc *testConfig) ExpectAutoscalerScalesOut() error {
 		Namespace: namespace,
 	}
 	glog.Info("Get one machineSet")
-	machineSetList := capiv1alpha1.MachineSetList{}
+	machineSetList := mapiv1beta1.MachineSetList{}
 	err := wait.PollImmediate(1*time.Second, waitMedium, func() (bool, error) {
 		if err := tc.client.List(context.TODO(), &listOptions, &machineSetList); err != nil {
 			glog.Errorf("error querying api for nodeList object: %v, retrying...", err)
@@ -408,7 +408,7 @@ func (tc *testConfig) ExpectAutoscalerScalesOut() error {
 			ScaleTargetRef: caov1alpha1.CrossVersionObjectReference{
 				Name:       targetMachineSet.Name,
 				Kind:       "MachineSet",
-				APIVersion: "cluster.k8s.io/v1alpha1",
+				APIVersion: "machine.openshift.io/v1beta1",
 			},
 		},
 	}
@@ -513,7 +513,7 @@ func (tc *testConfig) ExpectAutoscalerScalesOut() error {
 			Namespace: namespace,
 			Name:      targetMachineSet.Name,
 		}
-		ms := &capiv1alpha1.MachineSet{}
+		ms := &mapiv1beta1.MachineSet{}
 		if err := tc.client.Get(context.TODO(), msKey, ms); err != nil {
 			glog.Errorf("error querying api for clusterAutoscaler object: %v, retrying...", err)
 			return false, nil
@@ -581,7 +581,7 @@ func (tc *testConfig) ExpectAutoscalerScalesOut() error {
 			Namespace: namespace,
 			Name:      targetMachineSet.Name,
 		}
-		ms := &capiv1alpha1.MachineSet{}
+		ms := &mapiv1beta1.MachineSet{}
 		if err := tc.client.Get(context.TODO(), msKey, ms); err != nil {
 			glog.Errorf("error querying api for machineSet object: %v, retrying...", err)
 			return false, nil