• R/O
  • HTTP
  • SSH
  • HTTPS

提交

标签
No Tags

Frequently used words (click to add to your profile)

javaandroidc++linuxc#objective-ccocoa誰得qtrubypythongamewindowsbathyscaphephpguic翻訳omegattwitterframeworktestbtronarduinovb.net計画中(planning stage)directxpreviewerゲームエンジンdom

the default GitOps source repository for booting up Jenkins X


Commit MetaInfo

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

Log Message

Fix: new vault name location

更改概述

差异

--- a/bdd/bdd.sh
+++ b/bdd/bdd.sh
@@ -11,7 +11,7 @@ DST_PATH=$2
1111
1212 export GH_USERNAME="jenkins-x-bot-test"
1313 export GH_EMAIL="jenkins-x@googlegroups.com"
14-export GH_OWNER="cb-kubecd"
14+export GH_OWNER="jenkins-x-bot-test"
1515
1616 # fix broken `BUILD_NUMBER` env var
1717 export BUILD_NUMBER="$BUILD_ID"
--- a/jenkins-x-bdd-local.yml
+++ b/jenkins-x-bdd-local.yml
@@ -30,7 +30,7 @@ pipelineConfig:
3030 name: test-jenkins-user
3131 key: password
3232 agent:
33- image: gcr.io/jenkinsxio/builder-go-maven
33+ image: gcr.io/jenkinsxio/builder-go-maven:0.1.773
3434 stages:
3535 - name: ci
3636 options:
--- a/jenkins-x-bdd-vault.yml
+++ b/jenkins-x-bdd-vault.yml
@@ -34,7 +34,7 @@ pipelineConfig:
3434 name: test-jenkins-user
3535 key: password
3636 agent:
37- image: gcr.io/jenkinsxio/builder-go-maven
37+ image: gcr.io/jenkinsxio/builder-go-maven:0.1.773
3838 stages:
3939 - name: ci
4040 options:
--- a/systems/vault/vault-ing.tmpl.yaml
+++ b/systems/vault/vault-ing.tmpl.yaml
@@ -4,14 +4,14 @@ metadata:
44 annotations:
55 kubernetes.io/ingress.class: nginx
66 helm.sh/hook: pre-install,pre-upgrade
7- name: {{ .Requirements.cluster.vaultName }}
7+ name: {{ .Requirements.vault.name }}
88 spec:
99 rules:
1010 - host: vault{{ .Requirements.ingress.namespaceSubDomain | default ".jx." }}{{ .Requirements.ingress.domain }}
1111 http:
1212 paths:
1313 - backend:
14- serviceName: {{ .Requirements.cluster.vaultName }}
14+ serviceName: {{ .Requirements.vault.name }}
1515 servicePort: 8200
1616 {{- if .Requirements.ingress.tls.enabled }}
1717 tls: