jenkins-x · May 19, 2020 · May 19, 2020 · May 19, 2020 · May 19, 2020 · May 19, 2020
diff --git a/bdd/bdd.sh b/bdd/bdd.sh
@@ -24,6 +24,8 @@ export XDG_CONFIG_HOME=$JX_HOME
 
 mkdir -p $JX_HOME/git
 
+jx install dependencies --all
+
 jx --version
 
 # replace the credentials file with a single user entry

diff --git a/bdd/boot-local/jx-requirements.yml b/bdd/boot-local/jx-requirements.yml
@@ -36,4 +36,4 @@ storage:
 versionStream:
   ref: "master"
   url: https://github.com/jenkins-x/jenkins-x-versions.git
-webhook: prow
+webhook: lighthouse
diff --git a/bdd/boot-vault/jx-requirements.yml b/bdd/boot-vault/jx-requirements.yml
@@ -39,4 +39,4 @@ versionStream:
   url: https://github.com/jenkins-x/jenkins-x-versions.git
 vault:
   disableURLDiscovery: true
-webhook: prow
+webhook: lighthouse
diff --git a/env/jenkins-x-platform/values.tmpl.yaml b/env/jenkins-x-platform/values.tmpl.yaml
@@ -181,6 +181,43 @@ controllerbuild:
   - "--verbose"
 {{- end }}
 
+{{- if hasKey .Requirements.cluster "strictPermissions" }}
+{{- if and (eq .Requirements.cluster.provider "openshift") (.Requirements.cluster.strictPermissions) }}
+gcpreviews:
+  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 }}
+{{- end }}
+
 gcactivities:
   args:
     - "gc"
@@ -190,8 +227,20 @@ gcactivities:
   cronjob:
     enabled: true
     schedule: "0/30 * * * *"
+{{- if hasKey .Requirements.cluster "strictPermissions" }}
+{{- if and (eq .Requirements.cluster.provider "openshift") (.Requirements.cluster.strictPermissions) }}
+  clusterrole:
+    enabled: false
+{{- end }}
+{{- end }}
 
 gcpods:
   cronjob:
     enabled: true
     schedule: "0/30 * * * *"
+{{- if hasKey .Requirements.cluster "strictPermissions" }}
+{{- if and (eq .Requirements.cluster.provider "openshift") (.Requirements.cluster.strictPermissions) }}
+  clusterrole:
+    enabled: false
+{{- end }}
+{{- end }}
diff --git a/env/jxboot-resources/values.tmpl.yaml b/env/jxboot-resources/values.tmpl.yaml
@@ -24,6 +24,9 @@ cluster:
   name: ""
 {{- if hasKey .Requirements.cluster "provider" }}
   provider:  {{ .Requirements.cluster.provider }}
+{{- end }}
+{{- if hasKey .Requirements.cluster "strictPermissions" }}
+  strictPermissions: {{ .Requirements.cluster.strictPermissions }}
 {{- end }}
   serverUrl: ""
 {{- if .Requirements.ingress.tls.enabled }}

diff --git a/env/lighthouse/values.tmpl.yaml b/env/lighthouse/values.tmpl.yaml
@@ -11,13 +11,20 @@ git:
   name: {{ .Requirements.cluster.gitName | default "github" }}
   server: {{ .Requirements.cluster.gitServer | default "https://github.com" }}
 
-service:
-  name: hook
-
-replicaCount: 2
+webhooks:
+  replicaCount: 2
+  service:
+    name: hook
 
 image:
+  # Deprecated in favor of image.parentRepository but retained for backwards compatibility with old value.
   repository: gcr.io/jenkinsxio/lighthouse
+  parentRepository: gcr.io/jenkinsxio
+
+# Deprecated in favor of webhooks.replicaCount and webhooks.service
+replicaCount: 2
+service:
+  name: hook
 
 vault:
 {{- if eq .Requirements.secretStorage "vault" }}
@@ -31,3 +38,11 @@ clusterName: {{ .Requirements.cluster.clusterName }}
 user: "{{ .Parameters.pipelineUser.username }}"
 
 oauthToken: "{{ .Parameters.pipelineUser.token }}"
+
+{{- if hasKey .Requirements.cluster "strictPermissions" }}
+{{- if and (eq .Requirements.cluster.provider "openshift") (.Requirements.cluster.strictPermissions) }}
+cluster:
+  crds:
+    create: false
+{{- end }}
+{{- end }}
diff --git a/env/parameters.tmpl.schema.json b/env/parameters.tmpl.schema.json
@@ -98,7 +98,7 @@
     },
     "enableDocker": {
       "type": "boolean",
-      "title": "Do you want to configure an external Docker Registry?",
+      "title": "Do you want to configure non default Docker Registry?",
       "description": "By default Jenkins X will use the docker registry from the cloud provider. If you want to configure an external docker registry such as Docker Hub or your own existing public docker registry enter Y"
     }
   },

diff --git a/env/tekton/values.tmpl.yaml b/env/tekton/values.tmpl.yaml
@@ -22,3 +22,15 @@ auth:
 {{- end }}
 
 tillerNamespace: ""
+
+{{- if hasKey .Requirements.cluster "strictPermissions" }}
+{{- if and (eq .Requirements.cluster.provider "openshift") (.Requirements.cluster.strictPermissions) }}
+rbac:
+  cluster: false
+cluster:
+  crds:
+    create: false
+  resources:
+    create: false
+{{- end }}
+{{- end }}
diff --git a/env/values.tmpl.yaml b/env/values.tmpl.yaml
@@ -6,60 +6,6 @@ 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/jenkins-x.yml b/jenkins-x.yml
@@ -267,6 +267,18 @@ pipelineConfig:
             command: jx
             dir: /workspace/source/repositories
             name: update-webhooks
+          - args:
+            - step
+            - helm
+            - apply
+            - --boot
+            - --remote
+            - --no-vault
+            - --name
+            - tekton-dashboard
+            command: jx
+            dir: /workspace/source/systems/tekton-dashboard
+            name: install-tekton-dashboard            
           - args:
             - step
             - verify

diff --git a/jx-requirements.yml b/jx-requirements.yml
@@ -32,4 +32,4 @@ storage:
 versionStream:
   ref: "master"
   url: https://github.com/jenkins-x/jenkins-x-versions.git
-webhook: prow
+webhook: lighthouse
diff --git a/kubeProviders/aks/values.tmpl.yaml b/kubeProviders/aks/values.tmpl.yaml
@@ -5,7 +5,7 @@ jenkins-x-platform:
     # lets enable ACR docker builds
     DockerConfig: |-
       {
-        "credsStore": "acr-linux"
+        "credsStore": "acr"
       }
     
 docker-registry:

diff --git a/kubeProviders/eks/values.tmpl.yaml b/kubeProviders/eks/values.tmpl.yaml
@@ -2,17 +2,26 @@
 jenkins-x-platform:
   PipelineSecrets:
 
-    # lets enable ECR docker builds
+{{- 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}}
+    # lets enable ECR Docker builds
     DockerConfig: |-
       {
-{{- if .Requirements.cluster.registry }}
         "credHelpers": {
           "{{ .Requirements.cluster.registry }}": "ecr-login"
         }
-{{- else }}
-        "credsStore": "ecr-login"
-{{- end }}
       }
-
+{{- end}}
+
 docker-registry:
   enabled: false    
diff --git a/kubeProviders/gke/values.tmpl.yaml b/kubeProviders/gke/values.tmpl.yaml
@@ -3,7 +3,19 @@
 jenkins-x-platform:
   PipelineSecrets:
 
-    # lets enable GCR docker builds
+{{- 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}}
+    # lets enable GCR Docker builds
     DockerConfig: |-
       {
           "credHelpers": {
@@ -14,6 +26,7 @@ jenkins-x-platform:
               "staging-k8s.gcr.io": "gcr"
           }
       }
+{{- end}}
 
 docker-registry:
 {{- if eq .Requirements.webhook "jenkins" }}

diff --git a/systems/acme/templates/cert-manager-prod-issuer.yaml b/systems/acme/templates/cert-manager-prod-issuer.yaml
@@ -18,6 +18,7 @@ spec:
         - "{{ .Values.cluster.domain }}"
       # ACME DNS-01 provider configurations
       dns01:
+        cnameStrategy: {{ .Values.cnameStrategy | default "None" }}
 {{- if eq .Values.cluster.provider "gke" }}
         clouddns:
           # The project in which to update the DNS zone

diff --git a/systems/acme/templates/cert-manager-staging-issuer.yaml b/systems/acme/templates/cert-manager-staging-issuer.yaml
@@ -18,6 +18,7 @@ spec:
         - "{{ .Values.cluster.domain }}"
       # ACME DNS-01 provider configurations
       dns01:
+        cnameStrategy: {{ .Values.cnameStrategy | default "None" }}
 {{- if eq .Values.cluster.provider "gke" }}
         clouddns:
           # The project in which to update the DNS zone

diff --git a/systems/acme/values.tmpl.yaml b/systems/acme/values.tmpl.yaml
@@ -18,3 +18,6 @@ certmanager:
   email:  "{{ .Requirements.ingress.tls.email }}"
   enabled: {{ .Requirements.ingress.tls.enabled }}
 {{- end }}
+
+# Valid values are 'None' and 'Follow'
+cnameStrategy: Follow
diff --git a/systems/tekton-dashboard/Chart.yaml b/systems/tekton-dashboard/Chart.yaml
@@ -0,0 +1,7 @@
+apiVersion: v1
+appVersion: 0.4.1
+description: Tekton Dashboard Chart
+maintainers:
+- name: Team
+name: tekton-dashboard
+version: "1"