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

the default GitOps source repository for booting up Jenkins X

Commit MetaInfo

• Révision: c5728786f1a9713440b0367df33468b21365021d (tree)
• l'heure: 2019-07-24 13:50:59
• Auteur: James Strachan <james.strachan@gmai...>
• Commiter: James Strachan

Message de Log

fix: support different git servers + kinds

* let make it easier to support different kinds of git provider kinds; by moving the git server, name and kind into the requirements and removing the 'github' complexity and hard coding in the parameters schema + yaml.
* populate the values.cluster.* values for helm charts from the requirements

Change Summary

• modified: env/jenkins-x-platform/values.tmpl.yaml
• modified: env/lighthouse/values.tmpl.yaml
• modified: env/parameters.schema.json
• modified: env/prow/values.tmpl.yaml
• modified: env/tekton/values.tmpl.yaml
• modified: env/templates/gh-secret.yaml
• modified: env/values.tmpl.yaml

Modification

--- a/env/jenkins-x-platform/values.tmpl.yaml
+++ b/env/jenkins-x-platform/values.tmpl.yaml
@@ -19,8 +19,8 @@ nexus:
     defaultAdminPassword: "{{ .Parameters.adminUser.password }}"
 
 PipelineSecrets:
-    GitCreds: "https://{{ .Parameters.pipelineUser.github.username }}:{{ .Parameters.pipelineUser.github.token }}@{{ .Parameters.pipelineUser.github.host }}"
-    GithubToken: "{{ .Parameters.pipelineUser.github.token }}"
+    GitCreds: https://{{ .Parameters.pipelineUser.username }}:{{ .Parameters.pipelineUser.token }}@{{ trimPrefix "https://" .Requirements.cluster.gitServer | default "https://github.com" |  }}
+    GithubToken: "{{ .Parameters.pipelineUser.token }}"
     MavenSettingsXML: |-
         <settings>
             <localRepository>/home/jenkins/.mvnrepository</localRepository>

--- a/env/lighthouse/values.tmpl.yaml
+++ b/env/lighthouse/values.tmpl.yaml
@@ -7,9 +7,9 @@ enabled: false
 hmacToken: "{{ .Parameters.prow.hmacToken }}"
 
 git:
-  kind: github
-  name: github
-  server: ""
+  kind: {{ .Requirements.cluster.gitKind | default "github" }}
+  name: {{ .Requirements.cluster.gitName | default "github" }}
+  server: {{ .Requirements.cluster.gitServer | default "https://github.com" }}
 
 service:
   name: hook

--- a/env/parameters.schema.json
+++ b/env/parameters.schema.json
@@ -26,6 +26,30 @@
         }
       }
     },
+    "pipelineUser": {
+      "type": "object",
+      "required": [
+        "host",
+        "username",
+        "token"
+      ],
+      "properties": {
+        "username": {
+          "type": "string",
+          "title": "Pipeline bot Git username",
+          "description": "The Git user that will perform git operations inside a pipeline. It should be a user within the Git organisation/owner where environment repositories will live. This is normally a bot."
+        },
+        "token": {
+          "type": "string",
+          "format": "token",
+          "title": "Pipeline bot Git token",
+          "description": "A token for the Git user that will perform git operations inside a pipeline. This includes environment repository creation, and so this token should have full repository permissions. To create a token go to https://github.com/settings/tokens/new?scopes=repo,read:user,read:org,user:email,write:repo_hook,delete_repo then enter a name, click Generate token, and copy and paste the token into this prompt.",
+          "minLength": 40,
+          "maxLength": 40,
+          "pattern": "^[0-9a-f]{40}$"
+        }
+      }
+    },
     "prow": {
       "type": "object",
       "properties": {
@@ -38,13 +62,6 @@
         }
       }
     },
-    "gitProvider": {
-      "type": "string",
-      "title": "Select the git provider to use",
-      "enum": [
-        "github"
-      ]
-    },
     "enableDocker": {
       "type": "boolean",
       "title": "Do you want to configure an external Docker Registry?",

--- a/env/prow/values.tmpl.yaml
+++ b/env/prow/values.tmpl.yaml
@@ -5,8 +5,8 @@ enabled: false
 {{- end }}
 
 hmacToken: "{{ .Parameters.prow.hmacToken }}"
-oauthToken: "{{ .Parameters.pipelineUser.github.token }}"
-user: "{{ .Parameters.pipelineUser.github.username }}"
+oauthToken: "{{ .Parameters.pipelineUser.token }}"
+user: "{{ .Parameters.pipelineUser.username }}"
 
 buildnum:
   enabled: false

--- a/env/tekton/values.tmpl.yaml
+++ b/env/tekton/values.tmpl.yaml
@@ -3,8 +3,9 @@ webhook:
 
 auth:
   git:
-    username: "{{ .Parameters.pipelineUser.github.username }}"
-    password: "{{ .Parameters.pipelineUser.github.token }}"
+    username: "{{ .Parameters.pipelineUser.username }}"
+    password: "{{ .Parameters.pipelineUser.token }}"
+    url: {{ .Requirements.cluster.gitServer | default "https://github.com" }}
 
 {{- if hasKey .Parameters "docker" }}
 docker:

--- a/env/templates/gh-secret.yaml
+++ b/env/templates/gh-secret.yaml
@@ -5,18 +5,17 @@ data:
   username: {{ .Values.JenkinsXGitHub.username | b64enc | quote }}
 kind: Secret
 metadata:
-  name: jx-pipeline-git-github-github
+  name: jx-pipeline-git-{{ .Values.gitops.gitKind | default "github" }}-{{ .Values.gitops.gitName | default "github" }}
   annotations:
-    build.knative.dev/git-0: https://github.com
-    jenkins.io/credentials-description: API Token for acccessing https://github.com
+    build.knative.dev/git-0: {{ .Values.gitops.server | default "https://github.com" }}
+    jenkins.io/credentials-description: API Token for acccessing {{ .Values.gitops.server | default "https://github.com" }}
       Git service inside pipelines
-    jenkins.io/foo: bar
-    jenkins.io/name: GitHub
-    jenkins.io/url: https://github.com
+    jenkins.io/name: {{ .Values.gitops.gitName | default "github" }}
+    jenkins.io/url: {{ .Values.gitops.server | default "https://github.com" }}
   labels:
     jenkins.io/created-by: jx
     jenkins.io/credentials-type: usernamePassword
     jenkins.io/kind: git
-    jenkins.io/service-kind: github
+    jenkins.io/service-kind: {{ .Values.gitops.gitKind | default "github" }}
 type: Opaque
 {{- end }}
\ No newline at end of file

--- a/env/values.tmpl.yaml
+++ b/env/values.tmpl.yaml
@@ -11,8 +11,9 @@ cluster:
 {{- end }}
 
 gitops:
-  gitKind: github
-  server: https://github.com
+  gitKind: {{ .Requirements.cluster.gitKind | default "github" }}
+  gitName: {{ .Requirements.cluster.gitName | default "github" }}
+  server: {{ .Requirements.cluster.gitServer | default "https://github.com" }}
   owner: ""
   webhook: {{ .Requirements.webhook | default "prow" | title | quote }}
 
@@ -123,8 +124,8 @@ tekton:
     enabled: false
 
 JenkinsXGitHub:
-  username: "{{ .Parameters.pipelineUser.github.username }}"
-  password: "{{ .Parameters.pipelineUser.github.token }}"
+  username: "{{ .Parameters.pipelineUser.username }}"
+  password: "{{ .Parameters.pipelineUser.token }}"
 
 {{- if .Requirements.ingress.tls }}
 certmanager: