提交: 677f3c983396046c594998f94db79ef0fd241b07 - jenkins-x-boot-config (git)

the default GitOps source repository for booting up Jenkins X

Commit MetaInfo

• 修订版: 677f3c983396046c594998f94db79ef0fd241b07 (tree)
• 时间: 2019-09-16 23:41:40
• 作者: Pete Muir <pmuir@blee...>
• Commiter: Pete Muir

Log Message

Fix: new vault name location

更改概述

• modified: bdd/bdd.sh
• 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/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: