UNCLASSIFIED - NO CUI
Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
bigbang
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
External wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Model registry
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Big Bang
bigbang
Commits
e1feeda4
Commit
e1feeda4
authored
3 years ago
by
kevin.wilder
Committed by
Micah Nagel
3 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Gitlab istio injection for jobs
parent
2c596630
No related branches found
Branches containing commit
No related tags found
Tags containing commit
2 merge requests
!1386
Master
,
!1068
Gitlab istio injection for jobs
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
chart/templates/gitlab/values.yaml
+3
-13
3 additions, 13 deletions
chart/templates/gitlab/values.yaml
chart/values.yaml
+3
-3
3 additions, 3 deletions
chart/values.yaml
with
6 additions
and
16 deletions
chart/templates/gitlab/values.yaml
+
3
−
13
View file @
e1feeda4
...
...
@@ -12,6 +12,7 @@ openshift: {{ .Values.openshift }}
istio
:
enabled
:
{{
.Values.istio.enabled
}}
injection
:
{{
dig "istio" "injection" "enabled" .Values.addons.gitlab
}}
gitlab
:
gateways
:
-
istio-system/{{ default "public" .Values.addons.gitlab.ingress.gateway }}
...
...
@@ -46,12 +47,6 @@ registry:
{{
- end
}}
{{
- end
}}
{{
- if .Values.istio.enabled
}}
shared-secrets
:
annotations
:
sidecar.istio.io/inject
:
"
false"
{{
- end
}}
gitlab
:
{{
- if .Values.addons.gitlab.objectStorage.endpoint
}}
task-runner
:
...
...
@@ -75,18 +70,13 @@ gitlab:
annotations
:
iam.amazonaws.com/role
:
{{
.Values.addons.gitlab.objectStorage.iamProfile
}}
{{
- end
}}
{{
- if .Values.istio.enabled
}}
migrations
:
annotations
:
sidecar.istio.io/inject
:
"
false"
{{
- end
}}
global
:
# added to help with Gitlab sub-chart configuration
istio
:
enabled
:
{{
.Values.istio.enabled
}}
injection
:
{{
dig "istio" "injection" "enabled" .Values.addons.gitlab
}}
hosts
:
domain
:
{{
$domainName
}}
...
...
This diff is collapsed.
Click to expand it.
chart/values.yaml
+
3
−
3
View file @
e1feeda4
...
...
@@ -591,7 +591,7 @@ addons:
postRenderers
:
[]
gitlab
:
# -- Toggle deployment of Gitlab
# -- Toggle deployment of Gitlab
enabled
:
false
hostnames
:
...
...
@@ -602,7 +602,7 @@ addons:
git
:
repo
:
https://repo1.dso.mil/platform-one/big-bang/apps/developer-tools/gitlab.git
path
:
"
./chart"
tag
:
"
5.3.1-bb.
5
"
tag
:
"
5.3.1-bb.
9
"
# -- Flux reconciliation overrides specifically for the Gitlab Package
flux
:
{}
...
...
@@ -683,7 +683,7 @@ addons:
git
:
repo
:
https://repo1.dso.mil/platform-one/big-bang/apps/developer-tools/gitlab-runner.git
path
:
"
./chart"
tag
:
"
0.33.1-bb.
4
"
tag
:
"
0.33.1-bb.
5
"
# -- Flux reconciliation overrides specifically for the Gitlab Runner Package
flux
:
{}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment