add deployment config creation in component S2I flow (#44)

* add deployment config creation in component S2I flow

* make gofmt happy

* refactor component controller

* fix unit test

* change deployment strategy

* make deployment triggered automatically

Author: corinnekrych

Makefile

@@ -283,10 +283,10 @@ build: prebuild-check deps check-go-format
 
 # to watch all namespaces, keep namespace empty
 APP_NAMESPACE ?= ""
+LOCAL_TEST_NAMESPACE ?= "local-test"
 .PHONY: local
 ## Run Operator locally
 local: deploy-rbac build deploy-crd
-	@-oc new-project $(APP_NAMESPACE)
 	operator-sdk up local --namespace=$(APP_NAMESPACE)
 
 .PHONY: deploy-rbac
@@ -311,13 +311,10 @@ deploy-operator: deploy-crd
 .PHONY: deploy-clean
 ## Deploy a CR as test
 deploy-clean:
-	@-oc delete component.devopsconsole.openshift.io/myapp
-	@-oc delete imagestream.image.openshift.io/myapp-builder
-	@-oc delete imagestream.image.openshift.io/myapp-output
-	@-oc delete buildconfig.build.openshift.io/myapp-bc
-	@-oc delete deploymentconfig.apps.openshift.io/myapp
+	@-oc delete project $(LOCAL_TEST_NAMESPACE)
 
 .PHONY: deploy-test
 ## Deploy a CR as test
 deploy-test:
-	oc create -f examples/devopsconsole_v1alpha1_component_cr.yaml
+	@-oc new-project $(LOCAL_TEST_NAMESPACE)
+	@-oc apply -f examples/devopsconsole_v1alpha1_component_cr.yaml

README.md

@@ -164,43 +164,4 @@ Please consult [the documentation](https://github.com/operator-framework/operato
 
 The frontend can check for the presence of the DevOpsConsole CRDs using the Kubernetes API.  Check for [the existence of a Custom Resource Definitions](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.13/#list-customresourcedefinition-v1beta1-apiextensions) with name as `gitsources.devopsconsole.openshift.io`.  If it exists, it will enable the DevOps perspective in the Openshift Console.
 
-To install the DevOps Console operator and run it using OLM
-
-```
-kubectl create -f https://raw.githubusercontent.com/operator-framework/operator-lifecycle-manager/master/deploy/upstream/quickstart/olm.yaml
-
-kubectl create -f http://operator-hub-shbose-preview1-stage.b542.starter-us-east-2a.openshiftapps.com/install/devopsconsole.v0.1.0.yaml
-```
-
-A `CatalogSource` followed by a new `Subscription` is created when the above commands are executed.
-
-```
-apiVersion: operators.coreos.com/v1alpha1
-kind: CatalogSource
-metadata:
-  name: rhd-operatorhub-catalog
-  namespace: olm
-spec:
-  sourceType: grpc
-  image: sbose78/operator-registry:latest
-  displayName: Community Operators
-  publisher: RHD Operator Hub
----
-apiVersion: operators.coreos.com/v1alpha1
-kind: Subscription
-metadata:
-  name: my-devopsconsole
-  namespace: operators
-spec:
-  channel: alpha
-  name: devopsconsole
-  source: rhd-operatorhub-catalog
-  sourceNamespace: olm
-```
-
-[dep_tool]:https://golang.github.io/dep/docs/installation.html
-[git_tool]:https://git-scm.com/downloads
-[go_tool]:https://golang.org/dl/
-[docker_tool]:https://docs.docker.com/install/
-[kubectl_tool]:https://kubernetes.io/docs/tasks/tools/install-kubectl/
-
+Refer to OLM test [README](test/README.md) to install the DevOps Console operator.

deploy/role.yaml

@@ -44,3 +44,10 @@ rules:
   verbs:
   - create
   - get
+- apiGroups:
+  - apps.openshift.io
+  resources:
+  - deploymentconfigs
+  verbs:
+  - create
+  - get

examples/devopsconsole_v1alpha1_component_cr.yaml

@@ -4,4 +4,5 @@ metadata:
   name: myapp
 spec:
   buildType: "nodejs"
-  codebase: "https://github.com/nodeshift-starters/nodejs-rest-http-crud"
+  codebase: "https://github.com/sclorg/nodejs-ex" #"https://github.com/nodeshift-starters/nodejs-rest-http-crud"
+

manifests/devopsconsole/0.1.0/devopsconsole-operator.v0.1.0.clusterserviceversion.yaml

@@ -124,6 +124,13 @@ spec:
           verbs:
           - create
           - get
+        - apiGroups:
+          - apps.openshift.io
+          resources:
+          - deploymentconfigs
+          verbs:
+          - create
+          - get
         serviceAccountName: devopsconsole-operator
     strategy: deployment
   installModes:

pkg/apis/devopsconsole/v1alpha1/component_types.go

@@ -27,10 +27,15 @@ type Component struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`
 
-	Spec   ComponentSpec   `json:"spec,omitempty"`
+	Spec ComponentSpec `json:"spec,omitempty"`
+
 	Status ComponentStatus `json:"status,omitempty"`
 }
 
+func (c *Component) GetName() string {
+	return c.Name
+}
+
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 
 // ComponentList contains a list of Component