提交: 3a7765f180557f719e63ef51e9f5877caa2dee53 - jenkins-x-boot-config (git)

the default GitOps source repository for booting up Jenkins X

Commit MetaInfo

• 修訂: 3a7765f180557f719e63ef51e9f5877caa2dee53 (tree)
• 時間: 2019-07-24 17:01:34
• 作者: James Strachan <james.strachan@gmai...>
• Commiter: GitHub

Log Message

Merge pull request #24 from jstrachan/stuff

fixes for bitbucket server + latest lighthouse

Change Summary

• modified: env/requirements.yaml
• modified: env/templates/dev-env.yaml
• modified: env/templates/production-env.yaml
• modified: env/templates/production-repo.yaml
• modified: env/templates/staging-env.yaml
• modified: env/templates/staging-repo.yaml
• modified: env/values.tmpl.yaml

差異

--- a/env/requirements.yaml
+++ b/env/requirements.yaml
@@ -12,7 +12,7 @@ dependencies:
   alias: lighthouse
   name: lighthouse
   repository: http://chartmuseum.jenkins-x.io
-  version: 0.0.52
+  version: 0.0.53
 - name: jenkins-x-platform
   repository: http://chartmuseum.jenkins-x.io
   version:  2.0.872

--- a/env/templates/dev-env.yaml
+++ b/env/templates/dev-env.yaml
@@ -15,7 +15,7 @@ spec:
 {{- if  and .Values.gitops.dev.repo .Values.gitops.dev.owner }}
   source:
     ref: master
-    url: "{{ .Values.gitops.dev.server | default .Values.gitops.server }}/{{ .Values.gitops.dev.owner }}/{{ .Values.gitops.dev.repo }}.git"
+    url: "{{ .Values.gitops.dev.server | default .Values.gitops.server }}{{ .Values.gitops.gitUrlPathPrefix}}/{{ .Values.gitops.dev.owner }}/{{ .Values.gitops.dev.repo }}.git"
 {{- end }}
   teamSettings:
     appsRepository: http://chartmuseum.jenkins-x.io

--- a/env/templates/production-env.yaml
+++ b/env/templates/production-env.yaml
@@ -14,5 +14,5 @@ spec:
   promotionStrategy: Manual
   source:
     ref: master
-    url: "{{ .Values.gitops.production.server | default .Values.gitops.server }}/{{ .Values.gitops.production.owner | default .Values.gitops.owner }}/{{ .Values.gitops.production.repo }}.git"
+    url: "{{ .Values.gitops.production.server | default .Values.gitops.server }}{{ .Values.gitops.gitUrlPathPrefix}}/{{ .Values.gitops.production.owner | default .Values.gitops.owner }}/{{ .Values.gitops.production.repo }}.git"
 {{- end }}
\ No newline at end of file

--- a/env/templates/production-repo.yaml
+++ b/env/templates/production-repo.yaml
@@ -7,7 +7,10 @@ metadata:
     jenkins.io/gitSync: "false"
 spec:
   provider: "{{ .Values.gitops.production.server | default .Values.gitops.server }}"
-  providerName: '{{ .Values.gitops.gitKind | default "github" }}'
+  providerName: '{{ .Values.gitops.gitName | default .Values.gitops.gitKind | default "github" }}'
+  providerKind: '{{ .Values.gitops.gitKind | default "github" }}'
+  httpCloneURL: "{{ .Values.gitops.production.server | default .Values.gitops.server }}{{ .Values.gitops.gitUrlPathPrefix}}/{{ .Values.gitops.production.owner | default .Values.gitops.owner }}/{{ .Values.gitops.production.repo }}.git"
+  url: "{{ .Values.gitops.production.server | default .Values.gitops.server }}{{ .Values.gitops.gitUrlPathPrefix}}/{{ .Values.gitops.production.owner | default .Values.gitops.owner }}/{{ .Values.gitops.production.repo }}.git"
   org: "{{ .Values.gitops.production.owner | default .Values.gitops.owner }}"
   repo: "{{ .Values.gitops.production.repo }}"
   description: "the git repository for the Production environment"

--- a/env/templates/staging-env.yaml
+++ b/env/templates/staging-env.yaml
@@ -13,5 +13,5 @@ spec:
   promotionStrategy: Auto
   source:
     ref: master
-    url: "{{ .Values.gitops.staging.server | default .Values.gitops.server }}/{{ .Values.gitops.staging.owner | default .Values.gitops.owner }}/{{ .Values.gitops.staging.repo }}.git"
+    url: "{{ .Values.gitops.staging.server | default .Values.gitops.server }}{{ .Values.gitops.gitUrlPathPrefix}}/{{ .Values.gitops.staging.owner | default .Values.gitops.owner }}/{{ .Values.gitops.staging.repo }}.git"
 {{- end }}
\ No newline at end of file

--- a/env/templates/staging-repo.yaml
+++ b/env/templates/staging-repo.yaml
@@ -7,9 +7,12 @@ metadata:
     jenkins.io/gitSync: "false"
 spec:
   provider: "{{ .Values.gitops.staging.server | default .Values.gitops.server }}"
-  providerName: '{{ .Values.gitops.gitKind | default "github" }}'
+  providerName: '{{ .Values.gitops.gitName | default .Values.gitops.gitKind | default "github" }}'
+  providerKind: '{{ .Values.gitops.gitKind | default "github" }}'
   org: "{{ .Values.gitops.staging.owner | default .Values.gitops.owner }}"
   repo: "{{ .Values.gitops.staging.repo }}"
+  url: "{{ .Values.gitops.staging.server | default .Values.gitops.server }}{{ .Values.gitops.gitUrlPathPrefix}}/{{ .Values.gitops.staging.owner | default .Values.gitops.owner }}/{{ .Values.gitops.staging.repo }}.git"
+  httpCloneURL: "{{ .Values.gitops.staging.server | default .Values.gitops.server }}{{ .Values.gitops.gitUrlPathPrefix}}/{{ .Values.gitops.staging.owner | default .Values.gitops.owner }}/{{ .Values.gitops.staging.repo }}.git"
   description: "the git repository for the Staging environment"
   scheduler:
     kind: Scheduler

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