Merge pull request #89 from flaper87/openstack

Add OpenStack as a supported platform

README.md

@@ -2,7 +2,7 @@
 An Operator for managing the cluster-api stack and the Openshift owned machineSets:
 - Aggregated API server
 - Controller manager
-- Machine controller (AWS/Libvirt actuator)
+- Machine controller (AWS/OpenStack/Libvirt actuator)
 
 # Manual deployment (for Kubernetes cluster)
 

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: '{"clusterAPIControllerAWS": "openshift/origin-aws-machine-controllers:v4.0.0", "clusterAPIControllerManagerAWS": "openshift/origin-aws-machine-controllers:v4.0.0" , "clusterAPIControllerManagerLibvirt": "gcr.io/k8s-cluster-api/controller-manager:0.0.7", "clusterAPIControllerLibvirt": "quay.io/coreos/cluster-api-provider-libvirt:cd386e4", "clusterAPIServer": "gcr.io/k8s-cluster-api/cluster-apiserver:0.0.6", "Etcd": "quay.io/coreos/etcd:latest"}'
+  images.json: '{"clusterAPIControllerAWS": "openshift/origin-aws-machine-controllers:v4.0.0", "clusterAPIControllerManagerAWS": "openshift/origin-aws-machine-controllers:v4.0.0", "clusterAPIControllerOpenStack": "openshift/origin-openstack-machine-controllers:v4.0.0", "clusterAPIControllerManagerOpenStack": "openshift/origin-openstack-machine-controllers:v4.0.0", "clusterAPIControllerManagerLibvirt": "gcr.io/k8s-cluster-api/controller-manager:0.0.7", "clusterAPIControllerLibvirt": "quay.io/coreos/cluster-api-provider-libvirt:cd386e4", "clusterAPIServer": "gcr.io/k8s-cluster-api/cluster-apiserver:0.0.6", "Etcd": "quay.io/coreos/etcd:latest"}'

install/image-references

@@ -10,7 +10,11 @@ spec:
     from:
       kind: DockerImage
       name: docker.io/openshift/origin-aws-machine-controllers:v4.0.0
+  - name: openstack-machine-controllers
+    from:
+      kind: DockerImage
+      name: registry.svc.ci.openshift.org/openshift/origin-v4.0:openstack-machine-controllers
   - name: libvirt-machine-controllers
     from:
       kind: DockerImage
-      name: docker.io/openshift/origin-libvirt-machine-controllers:v4.0.0
+      name: docker.io/openshift/origin-libvirt-machine-controllers:v4.0.0

machines/openstack/cluster.yaml

@@ -0,0 +1,14 @@
+---
+apiVersion: "cluster.k8s.io/v1alpha1"
+kind: Cluster
+metadata:
+  namespace: {{ .TargetNamespace }}
+spec:
+  clusterNetwork:
+    services:
+      cidrBlocks:
+      - "10.0.0.1/24"
+    pods:
+      cidrBlocks:
+      - "10.0.0.2/24"
+    serviceDomain: unused

owned-manifests/clusterapi-controller.yaml

@@ -39,6 +39,8 @@ spec:
       - name: controller-manager
       {{- if .AWS }}
         image: {{ .Images.ClusterAPIControllerManagerAWS }}
+      {{- else if .OpenStack}}
+        image: {{ .Images.ClusterAPIControllerManagerOpenStack }}
       {{- else if .Libvirt}}
         image: {{ .Images.ClusterAPIControllerManagerLibvirt }}
       {{- end}}
@@ -54,6 +56,9 @@ spec:
       {{- if .AWS }}
       - name: aws-machine-controller
         image: {{ .Images.ClusterAPIControllerAWS }}
+      {{- else if .OpenStack }}
+      - name: openstack-machine-controller
+        image: {{ .Images.ClusterAPIControllerOpenStack }}
       {{- else if .Libvirt}}
       - name: libvirt-machine-controller
         image: {{ .Images.ClusterAPIControllerLibvirt }} 

pkg/operator/operator.go

@@ -44,6 +44,7 @@ const (
 	// 5ms, 10ms, 20ms, 40ms, 80ms, 160ms, 320ms, 640ms, 1.3s, 2.6s, 5.1s, 10.2s, 20.4s, 41s, 82s
 	maxRetries        = 15
 	providerAWS       = "aws"
+	providerOpenStack = "openstack"
 	providerLibvirt   = "libvirt"
 	ownedManifestsDir = "owned-manifests"
 )

pkg/operator/sync.go

@@ -118,6 +118,10 @@ func (optr *Operator) syncCluster(config render.OperatorConfig) error {
 		clusters = []string{
 			"machines/aws/cluster.yaml",
 		}
+	case providerOpenStack:
+		clusters = []string{
+			"machines/openstack/cluster.yaml",
+		}
 	case providerLibvirt:
 		clusters = []string{
 			"machines/libvirt/cluster.yaml",

pkg/render/config.go

@@ -12,12 +12,13 @@ const (
 // OperatorConfig contains configuration for MAO
 type OperatorConfig struct {
 	metav1.TypeMeta `json:",inline"`
-	TargetNamespace string         `json:"targetNamespace"`
-	APIServiceCA    string         `json:"apiServiceCA"`
-	Provider        string         `json:"provider"`
-	AWS             *AWSConfig     `json:"aws"`
-	Libvirt         *LibvirtConfig `json:"libvirt"`
-	Images          *Images        `json:"images"`
+	TargetNamespace string           `json:"targetNamespace"`
+	APIServiceCA    string           `json:"apiServiceCA"`
+	Provider        string           `json:"provider"`
+	AWS             *AWSConfig       `json:"aws"`
+	OpenStack       *OpenStackConfig `json:"openstack,omitempty"`
+	Libvirt         *LibvirtConfig   `json:"libvirt"`
+	Images          *Images          `json:"images"`
 }
 
 // LibvirtConfig contains specific config for Libvirt
@@ -42,12 +43,17 @@ type AWSConfig struct {
 	WithCreds             bool   `json:"withCreds"`
 }
 
+type OpenStackConfig struct {
+}
+
 // Images allows build systems to inject images for MAO components.
 type Images struct {
-	ClusterAPIControllerAWS            string `json:"clusterAPIControllerAWS"`
-	ClusterAPIControllerLibvirt        string `json:"clusterAPIControllerLibvirt"`
-	ClusterAPIControllerManagerAWS     string `json:"clusterAPIControllerManagerAWS"`
-	ClusterAPIControllerManagerLibvirt string `json:"clusterAPIControllerManagerLibvirt"`
-	ClusterAPIServer                   string `json:"clusterAPIServer"`
-	Etcd                               string `json:"Etcd"`
+	ClusterAPIControllerAWS              string `json:"clusterAPIControllerAWS"`
+	ClusterAPIControllerOpenStack        string `json:"clusterAPIControllerOpenStack"`
+	ClusterAPIControllerLibvirt          string `json:"clusterAPIControllerLibvirt"`
+	ClusterAPIControllerManagerAWS       string `json:"clusterAPIControllerManagerAWS"`
+	ClusterAPIControllerManagerOpenStack string `json:"clusterAPIControllerManagerOpenStack"`
+	ClusterAPIControllerManagerLibvirt   string `json:"clusterAPIControllerManagerLibvirt"`
+	ClusterAPIServer                     string `json:"clusterAPIServer"`
+	Etcd                                 string `json:"Etcd"`
 }

pkg/render/render.go

@@ -11,8 +11,9 @@ import (
 )
 
 const (
-	providerAWS     = "aws"
-	providerLibvirt = "libvirt"
+	providerAWS       = "aws"
+	providerOpenStack = "openstack"
+	providerLibvirt   = "libvirt"
 )
 
 // Manifests takes the config object that contains the templated value,

pkg/render/render_test.go

@@ -152,6 +152,30 @@ spec:
         controlPlane: ""`)
 }
 
+func TestClusterOpenStackManifest(t *testing.T) {
+	config := OperatorConfig{
+		TargetNamespace: "go-test",
+		Provider:        "OpenStack",
+	}
+
+	testRenderManifest(t, "../../machines/openstack/cluster.yaml", &config, `
+---
+apiVersion: "cluster.k8s.io/v1alpha1"
+kind: Cluster
+metadata:
+  namespace: go-test
+spec:
+  clusterNetwork:
+    services:
+      cidrBlocks:
+      - "10.0.0.1/24"
+    pods:
+      cidrBlocks:
+      - "10.0.0.2/24"
+    serviceDomain: unused
+`)
+}
+
 func TestMachineSetLibvirtManifest(t *testing.T) {
 	config := OperatorConfig{
 		TargetNamespace: "go-test",