• R/O
  • HTTP
  • SSH
  • HTTPS

提交

標籤
無標籤

Frequently used words (click to add to your profile)

javac++androidlinuxc#windowsobjective-ccocoa誰得qtpythonphprubygameguibathyscaphec計画中(planning stage)翻訳omegatframeworktwitterdomtestvb.netdirectxゲームエンジンbtronarduinopreviewer

the default GitOps source repository for booting up Jenkins X


Commit MetaInfo

修訂c89d4c60385407bb199c4183beab5316958c30a0 (tree)
時間2019-07-12 19:18:51
作者James Strachan <james.strachan@gmai...>
CommiterGitHub

Log Message

Merge pull request #5 from jstrachan/changes

fixes for gitops + for prow or lighthouse

Change Summary

差異

--- /dev/null
+++ b/env/lighthouse/README.MD
@@ -0,0 +1,6 @@
1+# lighthouse
2+
3+|App Metadata||
4+|---|---|
5+| **Version** | 0.0.39 |
6+| **Chart Repository** | http://chartmuseum.jenkins-x.io |
--- /dev/null
+++ b/env/lighthouse/values.tmpl.yaml
@@ -0,0 +1,20 @@
1+{{- if eq .Requirements.webhook "lighthouse" }}
2+enabled: true
3+{{- else }}
4+enabled: false
5+{{- end }}
6+
7+hmacToken: "{{ .Parameters.prow.hmacToken }}"
8+
9+git:
10+ kind: github
11+ name: github
12+ server: ""
13+
14+service:
15+ name: hook
16+
17+replicaCount: 1
18+
19+image:
20+ repository: gcr.io/jenkinsxio/lighthouse
--- a/env/prow/values.tmpl.yaml
+++ b/env/prow/values.tmpl.yaml
@@ -1,3 +1,9 @@
1+{{- if eq .Requirements.webhook "prow" }}
2+enabled: true
3+{{- else }}
4+enabled: false
5+{{- end }}
6+
17 hmacToken: "{{ .Parameters.prow.hmacToken }}"
28 oauthToken: "{{ .Parameters.pipelineUser.github.token }}"
39 user: "{{ .Parameters.pipelineUser.github.username }}"
--- a/env/requirements.yaml
+++ b/env/requirements.yaml
@@ -3,10 +3,16 @@ dependencies:
33 name: tekton
44 repository: http://chartmuseum.jenkins-x.io
55 version: 0.0.39
6-- alias: prow
6+- condition: prow.enabled
7+ alias: prow
78 name: prow
89 repository: http://chartmuseum.jenkins-x.io
910 version: 0.0.849
11+- condition: lighthouse.enabled
12+ alias: lighthouse
13+ name: lighthouse
14+ repository: http://chartmuseum.jenkins-x.io
15+ version: 0.0.39
1016 - name: jenkins-x-platform
1117 repository: http://chartmuseum.jenkins-x.io
1218 version: 2.0.752
--- a/env/values.tmpl.yaml
+++ b/env/values.tmpl.yaml
@@ -13,10 +13,16 @@ gitops:
1313 owner: ""
1414
1515 dev:
16+ server: ""
17+{{- if .Requirements.gitops }}
1618 repo: "{{ .Environments.dev.repository }}"
1719 owner: "{{ .Environments.dev.owner }}"
18- server: ""
1920 envOrganisation: "{{ .Requirements.cluster.environmentGitOwner }}"
21+{{- else }}
22+ repo: ""
23+ owner: ""
24+ envOrganisation: ""
25+{{- end }}
2026 {{- if eq .Requirements.cluster.provider "gke" }}
2127 dockerRegistryOrg: "{{ .Requirements.cluster.project }}"
2228 {{- else }}
--- a/jx-requirements.yml
+++ b/jx-requirements.yml
@@ -4,6 +4,7 @@ cluster:
44 project: ""
55 provider: gke
66 zone: ""
7+gitops: false
78 environments:
89 - key: dev
910 - key: staging
@@ -27,3 +28,4 @@ storage:
2728 repository:
2829 enabled: false
2930 url: ""
31+webhook: prow
--- a/repositories/templates/default-group.yaml
+++ b/repositories/templates/default-group.yaml
@@ -7,7 +7,4 @@ spec:
77 apiVersion: jenkins.io/v1
88 kind: Scheduler
99 name: default-scheduler
10- repositories:
11- - apiVersion: jenkins.io/v1
12- kind: SourceRepository
13- name: jstrachan-nodey126
10+ repositories: []
--- a/repositories/templates/dev-repo.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
1-apiVersion: jenkins.io/v1
2-kind: SourceRepository
3-metadata:
4- name: jstrachan-nodey126
5-spec:
6- provider: https://github.com
7- providerName: github
8- org: jstrachan
9- repo: nodey126
\ No newline at end of file