UNCLASSIFIED - NO CUI

Skip to content
Snippets Groups Projects
Commit 310f9aa7 authored by Ryan Garcia's avatar Ryan Garcia :dizzy:
Browse files

Merge branch 'update-vault-tag' into 'master'

SKIP UPGRADE: Update vault tag

Closes #947

See merge request platform-one/big-bang/bigbang!1158
parents 924c53a1 caadf40e
No related branches found
No related tags found
2 merge requests!1386Master,!1158SKIP UPGRADE: Update vault tag
Pipeline #606043 passed with warnings
...@@ -110,7 +110,7 @@ networkPolicies: ...@@ -110,7 +110,7 @@ networkPolicies:
nodeCidr: "" nodeCidr: ""
# -- Global ImagePullPolicy value for all packages # -- Global ImagePullPolicy value for all packages
# Permitted values are: None, Always, IfNotPresent # Permitted values are: None, Always, IfNotPresent
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
...@@ -1198,7 +1198,7 @@ addons: ...@@ -1198,7 +1198,7 @@ addons:
git: git:
repo: https://repo1.dso.mil/platform-one/big-bang/apps/sandbox/vault.git repo: https://repo1.dso.mil/platform-one/big-bang/apps/sandbox/vault.git
path: "./chart" path: "./chart"
tag: "0.16.1-bb.3" tag: "0.18.0-bb.0"
# -- Flux reconciliation overrides specifically for the Vault Package # -- Flux reconciliation overrides specifically for the Vault Package
flux: {} flux: {}
......
...@@ -290,7 +290,7 @@ monitoring: ...@@ -290,7 +290,7 @@ monitoring:
enabled: true enabled: true
sso: sso:
enabled: false enabled: false
prometheus: prometheus:
client_id: platform1_a8604cc9-f5e9-4656-802d-d05624370245_bb8-prometheus client_id: platform1_a8604cc9-f5e9-4656-802d-d05624370245_bb8-prometheus
alertmanager: alertmanager:
client_id: platform1_a8604cc9-f5e9-4656-802d-d05624370245_bb8-alertmanager client_id: platform1_a8604cc9-f5e9-4656-802d-d05624370245_bb8-alertmanager
...@@ -327,7 +327,7 @@ monitoring: ...@@ -327,7 +327,7 @@ monitoring:
revision: 1 revision: 1
datasource: Prometheus datasource: Prometheus
downloadDashboards: downloadDashboards:
resources: resources:
limits: limits:
cpu: 20m cpu: 20m
memory: 20Mi memory: 20Mi
...@@ -1065,10 +1065,23 @@ addons: ...@@ -1065,10 +1065,23 @@ addons:
values: values:
server: server:
dataStorage: dataStorage:
enabled: true enabled: true
injector:
affinity: |
podAntiAffinity:
preferredDuringSchedulingIgnoredDuringExecution:
- weight: 100
podAffinityTerm:
labelSelector:
matchLabels:
app.kubernetes.io/name: {{ template "vault.name" . }}-agent-injector
app.kubernetes.io/instance: "{{ .Release.Name }}"
component: webhook
topologyKey: kubernetes.io/hostname
bbtests: bbtests:
enabled: true enabled: true
cypress: cypress:
artifacts: true artifacts: true
envs: envs:
cypress_vault_url: "https://vault.bigbang.dev" cypress_vault_url: "https://vault.bigbang.dev"
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment