UNCLASSIFIED - NO CUI

Skip to content
Snippets Groups Projects
Commit cd5ba44e authored by Michael Martin's avatar Michael Martin
Browse files

Merge remote-tracking branch 'origin/master' into

943-research-and-document-best-way-for-utilizing-vault-secrets-within-bigbang

Conflicts:
	chart/values.yaml
parents 11d77533 310f9aa7
No related branches found
No related tags found
2 merge requests!1386Master,!1155Resolve "Research and Document best way for utilizing Vault secrets within BigBang"
Pipeline #606433 failed
......@@ -110,7 +110,7 @@ networkPolicies:
nodeCidr: ""
# -- Global ImagePullPolicy value for all packages
# Permitted values are: None, Always, IfNotPresent
# Permitted values are: None, Always, IfNotPresent
imagePullPolicy: IfNotPresent
......@@ -253,7 +253,7 @@ kiali:
git:
repo: https://repo1.dso.mil/platform-one/big-bang/apps/core/kiali.git
path: "./chart"
tag: "1.42.0-bb.0"
tag: "1.44.0-bb.0"
# -- Flux reconciliation overrides specifically for the Kiali Package
flux: {}
......@@ -415,7 +415,7 @@ fluentbit:
git:
repo: https://repo1.dso.mil/platform-one/big-bang/apps/core/fluentbit.git
path: "./chart"
tag: "0.19.3-bb.0"
tag: "0.19.9-bb.0"
# -- Flux reconciliation overrides specifically for the Fluent-Bit Package
flux: {}
......
......@@ -290,7 +290,7 @@ monitoring:
enabled: true
sso:
enabled: false
prometheus:
prometheus:
client_id: platform1_a8604cc9-f5e9-4656-802d-d05624370245_bb8-prometheus
alertmanager:
client_id: platform1_a8604cc9-f5e9-4656-802d-d05624370245_bb8-alertmanager
......@@ -327,7 +327,7 @@ monitoring:
revision: 1
datasource: Prometheus
downloadDashboards:
resources:
resources:
limits:
cpu: 20m
memory: 20Mi
......@@ -1065,10 +1065,23 @@ addons:
values:
server:
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:
enabled: true
cypress:
artifacts: true
artifacts: true
envs:
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