the default GitOps source repository for booting up Jenkins X
修訂 | 04af89b480881e588815c9f492e92e5eac37da48 (tree) |
---|---|
時間 | 2019-09-04 20:56:52 |
作者 | Pete Muir <pmuir@blee...> |
Commiter | Pete Muir |
fix: use namespace from jx-requirements
fixes jenkins-x/jx#5034
@@ -16,7 +16,7 @@ pipelineConfig: | ||
16 | 16 | - name: GOPROXY |
17 | 17 | value: http://jenkins-x-athens-proxy:80 |
18 | 18 | agent: |
19 | - image: gcr.io/jenkinsxio/builder-go-maven:0.1.686 | |
19 | + image: gcr.io/jenkinsxio/builder-go-maven:0.1.714 | |
20 | 20 | stages: |
21 | 21 | - name: ci |
22 | 22 | steps: |
@@ -16,7 +16,7 @@ pipelineConfig: | ||
16 | 16 | - name: GOPROXY |
17 | 17 | value: http://jenkins-x-athens-proxy:80 |
18 | 18 | agent: |
19 | - image: gcr.io/jenkinsxio/builder-go-maven:0.1.686 | |
19 | + image: gcr.io/jenkinsxio/builder-go-maven:0.1.714 | |
20 | 20 | stages: |
21 | 21 | - name: ci |
22 | 22 | steps: |
@@ -4,10 +4,7 @@ pipelineConfig: | ||
4 | 4 | release: |
5 | 5 | pipeline: |
6 | 6 | agent: |
7 | - image: gcr.io/jenkinsxio/builder-go:0.1.686 | |
8 | - environment: | |
9 | - - name: DEPLOY_NAMESPACE | |
10 | - value: jx | |
7 | + image: gcr.io/jenkinsxio/builder-go:0.1.714 | |
11 | 8 | stages: |
12 | 9 | - name: release |
13 | 10 | steps: |
@@ -25,10 +22,7 @@ pipelineConfig: | ||
25 | 22 | - name: install-nginx |
26 | 23 | dir: /workspace/source/systems/jxing |
27 | 24 | command: jx |
28 | - args: ['step','helm','apply', '--boot', '--remote', '--no-vault', '--name', 'jxing'] | |
29 | - env: | |
30 | - - name: DEPLOY_NAMESPACE | |
31 | - value: kube-system | |
25 | + args: ['step','helm','apply', '--boot', '--remote', '--no-vault', '--name', 'jxing', '--namespace', 'kube-system'] | |
32 | 26 | - name: create-install-values |
33 | 27 | dir: /workspace/source/env |
34 | 28 | command: jx |
@@ -41,16 +35,10 @@ pipelineConfig: | ||
41 | 35 | dir: /workspace/source |
42 | 36 | command: kubectl |
43 | 37 | args: ['apply', '--wait', '--validate=true', '-f', 'https://raw.githubusercontent.com/jetstack/cert-manager/release-0.8/deploy/manifests/00-crds.yaml'] |
44 | - env: | |
45 | - - name: DEPLOY_NAMESPACE | |
46 | - value: cert-manager | |
47 | 38 | - name: install-cert-manager |
48 | 39 | dir: /workspace/source/systems/cm |
49 | 40 | command: jx |
50 | - args: ['step','helm','apply', '--boot', '--remote', '--no-vault', '--name', 'jx'] | |
51 | - env: | |
52 | - - name: DEPLOY_NAMESPACE | |
53 | - value: cert-manager | |
41 | + args: ['step','helm','apply', '--boot', '--remote', '--no-vault', '--name', 'jx', '--namespace', 'cert-manager'] | |
54 | 42 | - name: install-acme-issuer-and-certificate |
55 | 43 | dir: /workspace/source/systems/acme |
56 | 44 | command: jx |
@@ -99,7 +87,7 @@ pipelineConfig: | ||
99 | 87 | pullRequest: |
100 | 88 | pipeline: |
101 | 89 | agent: |
102 | - image: gcr.io/jenkinsxio/builder-go:0.1.686 | |
90 | + image: gcr.io/jenkinsxio/builder-go:0.1.714 | |
103 | 91 | stages: |
104 | 92 | - name: pr |
105 | 93 | steps: |
@@ -107,4 +95,3 @@ pipelineConfig: | ||
107 | 95 | dir: /workspace/source/env |
108 | 96 | command: make |
109 | 97 | args: ['build'] |
110 | - |