UNCLASSIFIED - NO CUI

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

Merge branch '2050-reenabling-hardening-argocd-gitlab-runner' into 'master'

Reenabling hardening gitlab/runner

Closes #2050

See merge request !4365
parents 895079a2 b8461efe
No related branches found
No related tags found
1 merge request!4365Reenabling hardening gitlab/runner
Pipeline #3303387 passed
......@@ -1479,10 +1479,16 @@ addons:
flux:
timeout: 30m
values:
upgradeCheck:
annotations:
sidecar.istio.io/inject: "true"
shared-secrets:
annotations:
sidecar.istio.io/inject: "true"
istio:
enabled: true
hardened:
enabled: false
enabled: true
customServiceEntries:
- name: "cypress-service-entries-gitlab"
enabled: true
......@@ -1545,6 +1551,9 @@ addons:
cpu: 10m
limits: {}
migrations:
# required annotation when istio.hardened.enabled = true
annotations:
sidecar.istio.io/inject: "true"
resources:
requests:
cpu: 10m
......@@ -1569,6 +1578,9 @@ addons:
cpu: 10m
limits: {}
minio:
# required annotation when istio.hardened.enabled = true
jobAnnotations:
sidecar.istio.io/inject: "true"
persistence:
size: 256Mi
resources:
......@@ -1600,7 +1612,7 @@ addons:
istio:
enabled: true
hardened:
enabled: false
enabled: true
customServiceEntries:
- name: "cypress-service-entries-gitlab-runner"
enabled: true
......
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