WIP: Integrate baremetal-operator with machine-api-operator

Author: sadasu

Diff for: install/0000_30_machine-api-operator_01_images.configmap.yaml

@@ -12,4 +12,5 @@ data:
       "clusterAPIControllerLibvirt": "docker.io/openshift/origin-libvirt-machine-controllers:v4.0.0",
       "clusterAPIControllerBareMetal": "quay.io/openshift/origin-baremetal-machine-controllers:v4.0.0",
       "clusterAPIControllerAzure": "quay.io/openshift/origin-azure-machine-controllers:v4.0.0"
+      "baremetalOperator": "quay.io/metalkube/baremetal-operator:latest"
     }

Diff for: install/image-references

@@ -26,3 +26,7 @@ spec:
     from:
       kind: DockerImage
       name: quay.io/openshift/origin-azure-machine-controllers:v4.0.0
+ - name: baremetal-operator
+    from:
+      kind: DockerImage
+      name: quay.io/metalkube/baremetal-operator:latest

Diff for: owned-manifests/machine-api-controllers.yaml

@@ -84,3 +84,15 @@ spec:
             cpu: 10m
             memory: 20Mi
       {{end}}
+      {{if .Controllers.ProviderRequestEnabled }}
+      - name: baremetal-opertor
+        image: {{ .Controllers.ProviderRequest }}
+        command:
+          - /baremetal-operator
+        args:
+          - --logtostderr=true
+          - --v=3
+        resources:
+          requests:
+            cpu: 10m
+            memory: 20Mi

Diff for: pkg/operator/config.go

@@ -32,6 +32,12 @@ type Controllers struct {
 	NodeLink                  string
 	MachineHealthCheck        string
 	MachineHealthCheckEnabled bool
+	//A bool keep track of whether additional provider specific work needs to be done.
+	//Could also be called ProviderOptionalEnabled
+	ProviderRequestEnabled bool
+	//Only when ProviderRequestEnabled is true, will contain location of an image.
+	//Could also be called ProviderOptional
+	ProviderRequest string
 }
 
 // Images allows build systems to inject images for MAO components
@@ -42,6 +48,7 @@ type Images struct {
 	ClusterAPIControllerLibvirt   string `json:"clusterAPIControllerLibvirt"`
 	ClusterAPIControllerBareMetal string `json:"clusterAPIControllerBareMetal"`
 	ClusterAPIControllerAzure     string `json:"clusterAPIControllerAzure"`
+	BaremetalOperator             string `json:"baremetalOperator"`
 }
 
 func getProviderFromInfrastructure(infra *configv1.Infrastructure) (configv1.PlatformType, error) {
@@ -83,6 +90,17 @@ func getProviderControllerFromImages(platform configv1.PlatformType, images Imag
 	}
 }
 
+// When the platforme type is BareMetal, MAO is also responsible for deploying
+// the baremetal-operator pod
+func getAdditionalProviderImages(platform configv1.PlatformType, images Images) (bool, string, error) {
+	switch platform {
+	case bareMetalPlatform:
+		return true, images.BaremetalOperator, nil
+	default:
+		return false, "", nil
+	}
+}
+
 func getMachineAPIOperatorFromImages(images Images) (string, error) {
 	if images.MachineAPIOperator == "" {
 		return "", fmt.Errorf("failed gettingMachineAPIOperator image. It is empty")

Diff for: pkg/operator/operator.go

@@ -216,6 +216,12 @@ func (optr *Operator) maoConfigFromInfrastructure() (*OperatorConfig, error) {
 		return nil, err
 	}
 
+	providerRequestEnabled, providerRequestImage, err := getAdditionalProviderImages(provider, *images)
+	//Ignore error if no additional images are required.
+	if providerRequestEnabled == true && err != nil {
+		return nil, err
+	}
+
 	machineAPIOperatorImage, err := getMachineAPIOperatorFromImages(*images)
 	if err != nil {
 		return nil, err
@@ -224,9 +230,11 @@ func (optr *Operator) maoConfigFromInfrastructure() (*OperatorConfig, error) {
 	return &OperatorConfig{
 		TargetNamespace: optr.namespace,
 		Controllers: Controllers{
-			Provider:           providerControllerImage,
-			NodeLink:           machineAPIOperatorImage,
-			MachineHealthCheck: machineAPIOperatorImage,
+			Provider:               providerControllerImage,
+			NodeLink:               machineAPIOperatorImage,
+			MachineHealthCheck:     machineAPIOperatorImage,
+			ProviderRequestEnabled: providerRequestEnabled,
+			ProviderRequest:        providerRequestImage,
 		},
 	}, nil
 }