提交: 501f77211f21bbdfc181aebc82a58b6259c2e498 - jenkins-x-boot-config (git)

the default GitOps source repository for booting up Jenkins X

Commit MetaInfo

• 修訂: 501f77211f21bbdfc181aebc82a58b6259c2e498 (tree)
• 時間: 2019-09-17 06:13:18
• 作者: jenkins-x-bot <35031835+jenkins-x-bot@user...>
• Commiter: GitHub

Log Message

Merge pull request #65 from pmuir/5117

Fix: new vault name location

Change Summary

• modified: bdd/bdd.sh
• modified: bdd/boot-local/jx-requirements.yml
• modified: bdd/boot-vault/jx-requirements.yml
• modified: jenkins-x-bdd-local.yml
• modified: jenkins-x-bdd-vault.yml
• modified: systems/vault/vault-ing.tmpl.yaml

差異

--- a/bdd/bdd.sh
+++ b/bdd/bdd.sh
@@ -11,7 +11,7 @@ DST_PATH=$2
 
 export GH_USERNAME="jenkins-x-bot-test"
 export GH_EMAIL="[e-mail]"
-export GH_OWNER="cb-kubecd"
+export GH_OWNER="jenkins-x-bot-test"
 
 # fix broken `BUILD_NUMBER` env var
 export BUILD_NUMBER="$BUILD_ID"

--- a/bdd/boot-local/jx-requirements.yml
+++ b/bdd/boot-local/jx-requirements.yml
@@ -1,6 +1,6 @@
 cluster:
   clusterName: bdd-boot
-  environmentGitOwner: cb-kubecd
+  environmentGitOwner: jenkins-x-bot-test
   project: jenkins-x-bdd3
   provider: gke
   zone: europe-west1-c

--- a/bdd/boot-vault/jx-requirements.yml
+++ b/bdd/boot-vault/jx-requirements.yml
@@ -1,6 +1,6 @@
 cluster:
   clusterName: bdd-boot-v
-  environmentGitOwner: cb-kubecd
+  environmentGitOwner: jenkins-x-bot-test
   project: jenkins-x-bdd3
   provider: gke
   zone: europe-west1-c

--- a/jenkins-x-bdd-local.yml
+++ b/jenkins-x-bdd-local.yml
@@ -30,7 +30,7 @@ pipelineConfig:
                 name: test-jenkins-user 
                 key: password
         agent:
-          image: gcr.io/jenkinsxio/builder-go-maven
+          image: gcr.io/jenkinsxio/builder-go-maven:0.1.773
         stages:
           - name: ci
             options:

--- a/jenkins-x-bdd-vault.yml
+++ b/jenkins-x-bdd-vault.yml
@@ -34,7 +34,7 @@ pipelineConfig:
                 name: test-jenkins-user 
                 key: password
         agent:
-          image: gcr.io/jenkinsxio/builder-go-maven
+          image: gcr.io/jenkinsxio/builder-go-maven:0.1.773
         stages:
           - name: ci
             options:

--- a/systems/vault/vault-ing.tmpl.yaml
+++ b/systems/vault/vault-ing.tmpl.yaml
@@ -4,14 +4,14 @@ metadata:
   annotations:
     kubernetes.io/ingress.class: nginx
     helm.sh/hook: pre-install,pre-upgrade
-  name: {{ .Requirements.cluster.vaultName }}
+  name: {{ .Requirements.vault.name }}
 spec:
   rules:
   - host: vault{{ .Requirements.ingress.namespaceSubDomain | default ".jx." }}{{ .Requirements.ingress.domain }}
     http:
       paths:
       - backend:
-          serviceName: {{ .Requirements.cluster.vaultName }}
+          serviceName: {{ .Requirements.vault.name }}
           servicePort: 8200
 {{- if .Requirements.ingress.tls.enabled }}
   tls: