From e8916fd39ddff9aa6274f17420f878f54ed8878b Mon Sep 17 00:00:00 2001 From: Daniel Gozalo Date: Wed, 22 Apr 2020 15:52:47 +0200 Subject: [PATCH] feat: make some configuration changes for Openshift Signed-off-by: Daniel Gozalo --- env/values.tmpl.yaml | 54 ++++++++++++++++++++++++ kubeProviders/openshift/values.tmpl.yaml | 17 ++++++++ 2 files changed, 71 insertions(+) diff --git a/env/values.tmpl.yaml b/env/values.tmpl.yaml index e41185b3..b3eb9370 100644 --- 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 index 12c23cb6..516a5c76 100644 --- 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"