feat: make some configuration changes for Openshift

Signed-off-by: Daniel Gozalo <[email protected]>
jenkins-x · Apr 22, 2020 · e8916fd · e8916fd
1 parent 2e8a392
commit e8916fd
Show file tree

Hide file tree

Showing 2 changed files with 71 additions and 0 deletions.
diff --git a/env/values.tmpl.yaml b/env/values.tmpl.yaml
@@ -6,6 +6,60 @@ tekton:
 {{- else }}
   enabled: false
 {{- end }}
+{{- if eq .Requirements.cluster.provider "openshift" }}
+  rbac:
+    cluster: false
+  cluster:
+    crds:
+      create: false
+    resources:
+      create: false
+{{- end }}
+
+{{- if eq .Requirements.cluster.provider "openshift" }}
+jenkins-x-platform:
+  gcpreviews:
+    clusterrole:
+      enabled: false
+
+  gcactivities:
+    clusterrole:
+      enabled: false
+
+  gcpods:
+    clusterrole:
+      enabled: false
+
+  postinstalljob:
+    clusterrole:
+      enabled: false
+
+  controllerworkflow:
+    clusterrole:
+      enabled: false
+
+  controllerbuild:
+    clusterrole:
+      enabled: false
+
+  controllercommitstatus:
+    clusterrole:
+      enabled: false
+
+  controllerrole:
+    clusterrole:
+      enabled: false
+
+  controllerteam:
+    clusterrole:
+      enabled: false
+
+  heapster:
+    enabled: false
+    rbac:
+      create: false
+{{- end }}
+
 
 # Use cert-manager 0.11 CRDs/APIs with Dex
 dex:

diff --git a/kubeProviders/openshift/values.tmpl.yaml b/kubeProviders/openshift/values.tmpl.yaml
@@ -11,6 +11,23 @@ monocular:
 docker-registry:
   enabled: false
 
+jenkins-x-platform:
+  PipelineSecrets:
+{{- if eq .Parameters.enableDocker true }}
+    DockerConfig: |-
+      {
+        "auths":{
+          {{ .Parameters.docker.url | quote }}:
+            {
+              "auth": {{ printf "%s:%s" .Parameters.docker.username .Parameters.docker.password | b64enc | quote}},
+              "email": {{ .Parameters.docker.email | quote}}
+            }
+        }
+      }
+{{- else}}
+    DockerConfig: ""
+{{- end}}
+
 jenkins:
   Master:
     Image: "davidconde/jenkinsx-openshift"