UNCLASSIFIED - NO CUI

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

Merge branch '2209-fixing-monitoring-ns-hardening-consistency' into 'master'

attempting to harden velero

Closes #2035

See merge request !4877
parents 794dddae ad661a82
No related branches found
No related tags found
1 merge request!4877attempting to harden velero
Pipeline #3552745 passed
......@@ -6,8 +6,13 @@
istio:
enabled: {{ .Values.istio.enabled }}
# hardened:
# enabled: {{ or (dig "istio" "hardened" "enabled" false .Values.addons.velero.values) (dig "hardened" "enabled" false .Values.istio.values) }}
hardened:
enabled: {{ or
(dig "istio" "hardened" "enabled" false .Values.addons.velero.values)
(dig "hardened" "enabled" false .Values.istio.values)
}}
domain: {{ .Values.domain }}
{{- if .Values.istio.enabled }}
podAnnotations:
......
......@@ -1742,11 +1742,11 @@ addons:
git:
repo: https://repo1.dso.mil/big-bang/product/packages/velero.git
path: "./chart"
tag: "6.7.0-bb.7"
tag: "6.7.0-bb.8"
helmRepo:
repoName: "registry1"
chartName: "velero"
tag: "6.7.0-bb.7"
tag: "6.7.0-bb.8"
# -- Flux reconciliation overrides specifically for the Velero Package
flux: {}
......
......@@ -2205,23 +2205,29 @@ addons:
docker_host: "containers.dev.bigbang.mil"
velero:
istio:
hardened:
enabled: true
customServiceEntries:
- name: "cypress-service-entries-velero"
enabled: true
spec:
hosts:
- 'registry.npmjs.org'
- 'download.cypress.io'
- 'cdn.cypress.io'
- 'repo1.dso.mil'
enabled: false
plugins:
- aws
values:
istio:
hardened:
customServiceEntries:
- name: "cypress-service-entries-velero"
enabled: true
spec:
hosts:
- 'registry.npmjs.org'
- 'download.cypress.io'
- 'cdn.cypress.io'
- 'repo1.dso.mil'
exportTo:
- "."
location: MESH_EXTERNAL
ports:
- number: 443
protocol: TLS
name: https
resolution: DNS
serviceAccount:
server:
name: velero
......
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