1
0

3 Commits

Author SHA1 Message Date
Sido Haakma
f9089f5ee0 Merge branch 'feature/vault' of P129679/molgenis-ops-docker-helm into master 2018-08-20 12:18:27 +02:00
Fleur Kelpin
6e4a3faa46 doc (jenkins) Fix chart README 2018-08-19 23:09:56 +02:00
Fleur Kelpin
8f7dfe9ec0 fix (jenkins) Fix skip verify value in vault secret 2018-08-19 23:07:11 +02:00
3 changed files with 19 additions and 18 deletions

View File

@@ -56,29 +56,29 @@ There is one additional group of configuration items specific for this chart, so
New vault token to be used by the pods to retrieve their tokens from the vault. New vault token to be used by the pods to retrieve their tokens from the vault.
| Parameter | Description | Default | | Parameter | Description | Default |
| ----------------------------------|--------------------------------------------|-----------------------------------------------| | ---------------------------------- | ------------------------------------------ | ---------------------------------------------- |
| `PipelineSecrets.Vault.Replace` | Replace the molgenis-pipeline-vault secret |`true` | | `PipelineSecrets.Vault.Replace` | Replace the molgenis-pipeline-vault secret | `true` |
| `PipelineSecrets.Vault.Token` | Token to log into the hashicorp vault |`xxxx` | | `PipelineSecrets.Vault.Token` | Token to log into the hashicorp vault | `xxxx` |
| `PipelineSecrets.Vault.Addr` | Address of the vault |`https:vault-operator.vault-operator.svc:8200` | | `PipelineSecrets.Vault.Addr` | Address of the vault | `https:vault-operator.vault-operator.svc:8200` |
| `PipelineSecrets.Vault.skipVerify`| Skip verification of the https connection |`1` | | `PipelineSecrets.Vault.SkipVerify` | Skip verification of the https connection | `1` |
* Env * Env
Environment variables stored in molgenis-pipeline-env secret, to be added as environment variables Environment variables stored in molgenis-pipeline-env secret, to be added as environment variables
in the slave pods. in the slave pods.
| Parameter | Description | Default | | Parameter | Description | Default |
| -------------------------------------- | ----------------------------------------- | --------------- | | --------------------------------------- | ----------------------------------------- | --------------- |
| `PipelineSecrets.Env.Replace` | Replace molgenis-pipeline-env secret | `true` | | `PipelineSecrets.Env.Replace` | Replace molgenis-pipeline-env secret | `true` |
| `PipelineSecrets.Env.PGPPassphrase` | passphrase for the pgp signing key | `literal:xxxx` | | `PipelineSecrets.Env.PGPPassphrase` | passphrase for the pgp signing key | `literal:xxxx` |
| `PipelineSecrets.Env.CodecovToken` | token for codecov.io | `xxxx` | | `PipelineSecrets.Env.CodecovToken` | token for codecov.io | `xxxx` |
| `PipelineSecrets.Env.GitHubToken` | token for GH molgenis-jenkins user | `xxxx` | | `PipelineSecrets.Env.GitHubToken` | token for GH molgenis-jenkins user | `xxxx` |
| `PipelineSecrets.Env.NexusPassword` | token for molgenis-jenkins user in NEXUS | `xxxx` | | `PipelineSecrets.Env.NexusPassword` | token for molgenis-jenkins user in NEXUS | `xxxx` |
| `PipelineSecrets.Env.DockerHubPassword`| token for molgenis user in hub.docker.com | `xxxx` | | `PipelineSecrets.Env.DockerHubPassword` | token for molgenis user in hub.docker.com | `xxxx` |
| `PipelineSecrets.Env.SonarToken` | token for sonarcloud.io | `xxxx` | | `PipelineSecrets.Env.SonarToken` | token for sonarcloud.io | `xxxx` |
| `PipelineSecrets.Env.NpmToken` | token for npmjs.org | `xxxx` | | `PipelineSecrets.Env.NpmToken` | token for npmjs.org | `xxxx` |
| `PipelineSecrets.Env.SauceAccessKey` | token for saucelabs.com | `xxxx` | | `PipelineSecrets.Env.SauceAccessKey` | token for saucelabs.com | `xxxx` |
* File * File

View File

@@ -12,5 +12,5 @@ type: Opaque
data: data:
token: {{ .Values.PipelineSecrets.Vault.Token | b64enc | quote }} token: {{ .Values.PipelineSecrets.Vault.Token | b64enc | quote }}
addr: {{ .Values.PipelineSecrets.Vault.Addr | b64enc | quote }} addr: {{ .Values.PipelineSecrets.Vault.Addr | b64enc | quote }}
skipVerify: {{ .Values.PipelineSecrets.Vault.Addr | b64enc | quote }} skipVerify: {{ .Values.PipelineSecrets.Vault.SkipVerify | b64enc | quote }}
{{- end }} {{- end }}

View File

@@ -545,6 +545,7 @@ PipelineSecrets:
Replace: true Replace: true
Token: xxxx Token: xxxx
Addr: "https://vault-operator.vault-operator.svc:8200" Addr: "https://vault-operator.vault-operator.svc:8200"
SkipVerify: 1
Env: Env:
# Set to false to keep existing secret # Set to false to keep existing secret
Replace: true Replace: true