Merge pull request #19409 from jmontleon/add-apb

Add --enable=automation-service-broker

Author: openshift-merge-robot

install/automationservicebroker/install-rbac.yaml

@@ -0,0 +1,23 @@
+apiVersion: v1
+kind: Template
+metadata:
+  name: automation-broker-apb-rbac
+objects:
+- apiVersion: rbac.authorization.k8s.io/v1
+  kind: ClusterRoleBinding
+  metadata:
+    name: automation-broker-apb
+  roleRef:
+    name: cluster-admin
+    kind: ClusterRole
+    apiGroup: rbac.authorization.k8s.io
+  subjects:
+  - kind: ServiceAccount
+    name: automation-broker-apb
+    namespace: "${NAMESPACE}"
+
+parameters:
+- description: Namespace of the project that is being deploy
+  displayname: broker client cert key
+  name: NAMESPACE
+  value: "openshift-automation-service-broker"

install/automationservicebroker/install.yaml

@@ -0,0 +1,34 @@
+apiVersion: v1
+kind: Template
+metadata:
+  name: automation-broker-apb
+objects:
+- apiVersion: v1
+  kind: ServiceAccount
+  metadata:
+    name: automation-broker-apb
+    namespace: "${NAMESPACE}"
+
+- apiVersion: batch/v1
+  kind: Job
+  metadata:
+    name: automation-broker-apb
+    namespace: "${NAMESPACE}"
+  spec:
+    backoffLimit: 5
+    activeDeadlineSeconds: 300
+    template:
+      spec:
+        restartPolicy: OnFailure
+        serviceAccount: automation-broker-apb
+        containers:
+        - image: docker.io/automationbroker/automation-broker-apb:latest
+          name: automation-broker-apb
+          args: [ "provision", "-e", "broker_name=${NAMESPACE}" ]
+
+
+parameters:
+- description: Namespace of the project that is being deploy
+  displayname: broker client cert key
+  name: NAMESPACE
+  value: "openshift-automation-service-broker"

pkg/oc/bootstrap/bindata.go

@@ -16,6 +16,7 @@ import (
 	cmdutil "github.com/openshift/origin/pkg/cmd/util"
 	"github.com/openshift/origin/pkg/cmd/util/variable"
 	"github.com/openshift/origin/pkg/oc/bootstrap/clusteradd/componentinstall"
+	"github.com/openshift/origin/pkg/oc/bootstrap/clusteradd/components/automation-service-broker"
 	"github.com/openshift/origin/pkg/oc/bootstrap/clusteradd/components/default-imagestreams"
 	"github.com/openshift/origin/pkg/oc/bootstrap/clusteradd/components/registry"
 	"github.com/openshift/origin/pkg/oc/bootstrap/clusteradd/components/router"
@@ -48,6 +49,9 @@ var (
 
 // availableComponents lists the components that are available for installation.
 var availableComponents = map[string]func(ctx componentinstall.Context) componentinstall.Component{
+	"automation-service-broker": func(ctx componentinstall.Context) componentinstall.Component {
+		return &automation_service_broker.AutomationServiceBrokerComponentOptions{InstallContext: ctx}
+	},
 	"centos-imagestreams": func(ctx componentinstall.Context) componentinstall.Component {
 		return &default_imagestreams.CentosImageStreamsComponentOptions{InstallContext: ctx}
 	},

pkg/oc/bootstrap/clusteradd/cmd.go

@@ -0,0 +1,6 @@
+reviewers:
+  - jmontleon
+  - djzager
+approvers:
+  - jmontleon
+  - djzager

pkg/oc/bootstrap/clusteradd/components/automation-service-broker/OWNERS

@@ -0,0 +1,63 @@
+package automation_service_broker
+
+import (
+	"github.com/golang/glog"
+
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+
+	"github.com/openshift/origin/pkg/oc/bootstrap"
+	"github.com/openshift/origin/pkg/oc/bootstrap/clusteradd/componentinstall"
+	"github.com/openshift/origin/pkg/oc/bootstrap/docker/dockerhelper"
+	"github.com/openshift/origin/pkg/oc/errors"
+	"k8s.io/client-go/kubernetes"
+)
+
+const (
+	asbNamespace = "openshift-automation-service-broker"
+)
+
+type AutomationServiceBrokerComponentOptions struct {
+	InstallContext componentinstall.Context
+}
+
+func (c *AutomationServiceBrokerComponentOptions) Name() string {
+	return "automation-service-broker"
+}
+
+func (c *AutomationServiceBrokerComponentOptions) Install(dockerClient dockerhelper.Interface) error {
+	kubeAdminClient, err := kubernetes.NewForConfig(c.InstallContext.ClusterAdminClientConfig())
+	if err != nil {
+		return errors.NewError("cannot obtain API clients").WithCause(err)
+	}
+
+	params := map[string]string{
+		"NAMESPACE": asbNamespace,
+	}
+	glog.V(2).Infof("instantiating automation service broker template with parameters %v", params)
+
+	component := componentinstall.Template{
+		Name:            "automation-service-broker",
+		Namespace:       asbNamespace,
+		RBACTemplate:    bootstrap.MustAsset("install/automationservicebroker/install-rbac.yaml"),
+		InstallTemplate: bootstrap.MustAsset("install/automationservicebroker/install.yaml"),
+
+		WaitCondition: func() (bool, error) {
+			glog.V(2).Infof("polling for automation broker apb to complete")
+			job, err := kubeAdminClient.BatchV1().Jobs(asbNamespace).Get("automation-broker-apb", metav1.GetOptions{})
+			if err != nil {
+				return false, err
+			}
+			if job.Status.Succeeded > 0 {
+				return true, nil
+			}
+			return false, nil
+
+		},
+	}
+
+	return component.MakeReady(
+		c.InstallContext.ClientImage(),
+		c.InstallContext.BaseDir(),
+		params).Install(dockerClient)
+
+}

pkg/oc/bootstrap/clusteradd/components/automation-service-broker/automation_service_broker.go

@@ -205,12 +205,14 @@ var (
 		"router",
 		"sample-templates",
 		"persistent-volumes",
+		"automation-service-broker",
 		"service-catalog",
 		"template-service-broker",
 		"web-console",
 	)
 
 	componentsDisabledByDefault = sets.NewString(
+		"automation-service-broker",
 		"service-catalog",
 		"template-service-broker")
 )