[camel-k] 02/06: Avoid pvc in Openshift

[lburgazzoli]

This is an automated email from the ASF dual-hosted git repository.

lburgazzoli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k.git

commit adc3505b37fc0732ddff6a17e7811c995757402e
Author: nferraro <ni.ferr...@gmail.com>
AuthorDate: Fri Sep 28 12:23:35 2018 +0200

    Avoid pvc in Openshift
---
 ...nt.yaml => operator-deployment-kubernetes.yaml} |  0
 ...ent.yaml => operator-deployment-openshift.yaml} |  7 -------
 pkg/install/operator.go                            | 23 ++++++++++++++++------
 3 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/deploy/operator-deployment.yaml 
b/deploy/operator-deployment-kubernetes.yaml
similarity index 100%
copy from deploy/operator-deployment.yaml
copy to deploy/operator-deployment-kubernetes.yaml
diff --git a/deploy/operator-deployment.yaml 
b/deploy/operator-deployment-openshift.yaml
similarity index 80%
rename from deploy/operator-deployment.yaml
rename to deploy/operator-deployment-openshift.yaml
index c6e259f..e7a5180 100644
--- a/deploy/operator-deployment.yaml
+++ b/deploy/operator-deployment-openshift.yaml
@@ -33,10 +33,3 @@ spec:
                   fieldPath: metadata.namespace
             - name: OPERATOR_NAME
               value: "camel-k-operator"
-          volumeMounts:
-          - mountPath: /workspace
-            name: camel-k-builder
-      volumes:
-      - name: camel-k-builder
-        persistentVolumeClaim:
-          claimName: camel-k-builder
diff --git a/pkg/install/operator.go b/pkg/install/operator.go
index f0ec970..59d5a13 100644
--- a/pkg/install/operator.go
+++ b/pkg/install/operator.go
@@ -32,18 +32,29 @@ func Operator(namespace string) error {
        if err != nil {
                return err
        }
-       var operatorRole string
        if isOpenshift {
-               operatorRole = "operator-role-openshift.yaml"
-       } else {
-               operatorRole = "operator-role-kubernetes.yaml"
+               return installOpenshift(namespace)
        }
+       return installKubernetes(namespace)
+}
+
+func installOpenshift(namespace string) error {
+       return Resources(namespace,
+               "operator-service-account.yaml",
+               "operator-role-openshift.yaml",
+               "operator-role-binding.yaml",
+               "operator-deployment-openshift.yaml",
+               "operator-service.yaml",
+       )
+}
+
+func installKubernetes(namespace string) error {
        return Resources(namespace,
                "operator-service-account.yaml",
-               operatorRole,
+               "operator-role-kubernetes.yaml",
                "operator-role-binding.yaml",
                "builder-pvc.yaml",
-               "operator-deployment.yaml",
+               "operator-deployment-kubernetes.yaml",
                "operator-service.yaml",
        )
 }