UNCLASSIFIED - NO CUI

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

Merge branch 'update-gitlab-tag-7.11.0-bb.1' into 'master'

gitlab update to 7.11.0-bb.1

Closes big-bang/product/packages/gitlab#250

See merge request !4269
parents 9ea29ce5 36bfeb63
No related branches found
No related tags found
1 merge request!4269gitlab update to 7.11.0-bb.1
Pipeline #3234205 passed
......@@ -25,6 +25,11 @@ istio:
gateways:
- istio-system/{{ default "public" .Values.addons.gitlab.ingress.gateway }}
# Used for istio SSO serviceEntry
sso:
enabled: {{ .Values.addons.gitlab.sso.enabled }}
host: {{ include "sso.host" . }}
monitoring:
enabled: {{ .Values.monitoring.enabled }}
......
......@@ -1183,11 +1183,11 @@ addons:
git:
repo: https://repo1.dso.mil/big-bang/product/packages/gitlab.git
path: "./chart"
tag: "7.11.0-bb.0"
tag: "7.11.0-bb.1"
helmRepo:
repoName: "registry1"
chartName: "gitlab"
tag: "7.11.0-bb.0"
tag: "7.11.0-bb.1"
# -- Flux reconciliation overrides specifically for the Gitlab Package
flux: {}
......
......@@ -1443,6 +1443,31 @@ addons:
flux:
timeout: 30m
values:
istio:
enabled: true
hardened:
enabled: true
customServiceEntries:
- name: "cypress-service-entries-gitlab"
enabled: true
spec:
hosts:
- 'registry.npmjs.org'
- 'download.cypress.io'
- 'cdn.cypress.io'
- 'gitlab.dev.bigbang.mil'
- "registry.dev.bigbang.mil"
- 'keycloak.dev.bigbang.mil'
- 'repo1.dso.mil'
- "index.docker.io"
- "auth.docker.io"
- "production.cloudflare.docker.com"
location: MESH_EXTERNAL
ports:
- number: 443
protocol: TLS
name: https
resolution: DNS
global:
rails:
bootstrap:
......
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