Commit: f8fcc0707c7e6736484950ad2dd9d96456cdd82b - jenkins-x-boot-config (git)

the default GitOps source repository for booting up Jenkins X

Commit MetaInfo

• Révision: f8fcc0707c7e6736484950ad2dd9d96456cdd82b (tree)
• l'heure: 2019-08-30 00:51:08
• Auteur: James Strachan <james.strachan@gmai...>
• Commiter: James Strachan

Message de Log

fix: support jenkins server as a webhook handler

see https://github.com/jenkins-x/jx/issues/5261 for more

Change Summary

• modified: env/docker-registry/values.tmpl.yaml
• modified: env/jenkins-x-platform/values.tmpl.yaml
• modified: env/jenkins/values.tmpl.yaml
• modified: env/jxboot-resources/values.tmpl.yaml
• modified: env/parameters.schema.json
• add: env/templates/.gitignore
• modified: env/values.tmpl.yaml
• modified: kubeProviders/gke/values.tmpl.yaml

Modification

--- a/env/docker-registry/values.tmpl.yaml
+++ b/env/docker-registry/values.tmpl.yaml
@@ -1 +1,5 @@
-enabled: false
\ No newline at end of file
+{{- if eq .Requirements.webhook "jenkins" }}
+enabled: true
+{{- else }}
+enabled: false
+{{- end }}

--- a/env/jenkins-x-platform/values.tmpl.yaml
+++ b/env/jenkins-x-platform/values.tmpl.yaml
@@ -13,7 +13,11 @@ chartmuseum:
       BASIC_AUTH_PASS: "{{ .Parameters.adminUser.password }}"
 
 nexus:
-    defaultAdminPassword: "{{ .Parameters.adminUser.password }}"
+  defaultAdminPassword: "{{ .Parameters.adminUser.password }}"
+
+jenkins:
+  Master:
+    AdminPassword: "{{ .Parameters.adminUser.password }}"
 
 PipelineSecrets:
     GitCreds: https://{{ .Parameters.pipelineUser.username }}:{{ .Parameters.pipelineUser.token }}@{{ trimPrefix "https://" .Requirements.cluster.gitServer | default "https://github.com" |  }}

--- a/env/jenkins/values.tmpl.yaml
+++ b/env/jenkins/values.tmpl.yaml
@@ -2,4 +2,4 @@
 enabled: true
 {{- else }}
 enabled: false
-{{- end }}
\ No newline at end of file
+{{- end }}

--- a/env/jxboot-resources/values.tmpl.yaml
+++ b/env/jxboot-resources/values.tmpl.yaml
@@ -26,7 +26,7 @@ gitops:
   gitName: {{ .Requirements.cluster.gitName | default "github" }}
   server: {{ .Requirements.cluster.gitServer | default "https://github.com" }}
   owner: {{ .Requirements.cluster.environmentGitOwner }}
-  webhook: {{ .Requirements.webhook | default "prow" | title | quote }}
+  webhook: {{ .Requirements.webhook | default "prow" | quote }}
 {{- if eq .Requirements.cluster.gitKind "bitbucketserver" }}
   gitUrlPathPrefix: "/scm"
 {{- else }}

--- a/env/parameters.schema.json
+++ b/env/parameters.schema.json
@@ -1,3 +1,4 @@
+
 {
   "$id": "https:/jenkins-x.io/tests/descriptionAndTitle.schema.json",
   "$schema": "http://json-schema.org/draft-07/schema#",

--- /dev/null
+++ b/env/templates/.gitignore
@@ -0,0 +1 @@
+# dummy
\ No newline at end of file

--- a/env/values.tmpl.yaml
+++ b/env/values.tmpl.yaml
@@ -1 +1,8 @@
-dummy: true
\ No newline at end of file
+tekton:
+{{- if eq .Requirements.webhook "prow" }}
+  enabled: true
+{{- else if eq .Requirements.webhook "lighthouse" }}
+  enabled: true
+{{- else }}
+  enabled: false
+{{- end }}

--- a/kubeProviders/gke/values.tmpl.yaml
+++ b/kubeProviders/gke/values.tmpl.yaml
@@ -1,7 +1,11 @@
 # Override configuration from https://github.com/jenkins-x/jenkins-x-platform/blob/master/jenkins-x-platform/values.yaml
 
 jenkins-x-platform:
+{{- if eq .Requirements.webhook "jenkins" }}
+  dockerRegistry: ""
+{{- else }}
   dockerRegistry: gcr.io
+{{- end }}
 
   PipelineSecrets:
 
@@ -18,5 +22,9 @@ jenkins-x-platform:
       }
 
 docker-registry:
+{{- if eq .Requirements.webhook "jenkins" }}
+  enabled: true
+{{- else }}
   enabled: false
+{{- end }}