UNCLASSIFIED - NO CUI

Skip to content
Snippets Groups Projects
Commit de059264 authored by Samuel Sarnowski's avatar Samuel Sarnowski Committed by Andrew Shoell
Browse files

Resolve "Istio injection for namespaces should be optional for all charts"

parent 9cdd8497
No related branches found
No related tags found
1 merge request!4880Resolve "Istio injection for namespaces should be optional for all charts"
Hide whitespace changes
Inline Side-by-side
Showing
with 165 additions and 44 deletions
chart/templates/metrics-server/namespace.yaml
+ 1
− 1
View file @ de059264
......@@ -9,6 +9,6 @@ metadata:
app.kubernetes.io/name: metrics-server
app.kubernetes.io/component: "cluster-utilities"
{{- include "commonLabels" . | nindent 4}}
istio-injection: {{ dig "istio" "injection" "enabled" .Values.addons.metricsServer }}
istio-injection: {{ ternary "enabled" "disabled" (and .Values.istio.enabled (eq (dig "istio" "injection" "enabled" .Values.addons.metricsServer) "enabled")) }}
name: metrics-server
{{- end }}
chart/templates/minio-operator/namespace.yaml
+ 1
− 1
View file @ de059264
......@@ -4,7 +4,7 @@ kind: Namespace
metadata:
name: minio-operator
labels:
istio-injection: enabled
istio-injection: {{ ternary "enabled" "disabled" (and .Values.istio.enabled (eq (dig "istio" "injection" "enabled" .Values.addons.minioOperator) "enabled")) }}
app.kubernetes.io/name: minioOperator
app.kubernetes.io/component: "application-utilities"
{{- include "commonLabels" . | nindent 4}}
......
chart/templates/minio/namespace.yaml
+ 1
− 1
View file @ de059264
......@@ -4,7 +4,7 @@ kind: Namespace
metadata:
name: minio
labels:
istio-injection: enabled
istio-injection: {{ ternary "enabled" "disabled" (and .Values.istio.enabled (eq (dig "istio" "injection" "enabled" .Values.addons.minio) "enabled")) }}
app.kubernetes.io/name: minio
app.kubernetes.io/component: "application-utilities"
{{- include "commonLabels" . | nindent 4}}
......
chart/templates/monitoring/namespace.yaml
+ 1
− 1
View file @ de059264
......@@ -7,5 +7,5 @@ metadata:
app.kubernetes.io/name: monitoring
app.kubernetes.io/component: "core"
{{- include "commonLabels" . | nindent 4}}
istio-injection: {{ dig "istio" "injection" "enabled" .Values.monitoring }}
istio-injection: {{ ternary "enabled" "disabled" (and .Values.istio.enabled (eq (dig "istio" "injection" "enabled" .Values.monitoring) "enabled")) }}
{{- end }}
chart/templates/neuvector/namespace.yaml
+ 1
− 3
View file @ de059264
......@@ -7,7 +7,5 @@ metadata:
app.kubernetes.io/name: neuvector
app.kubernetes.io/component: "sandbox"
{{- include "commonLabels" . | nindent 4}}
{{- if .Values.istio.enabled }}
istio-injection: {{ dig "istio" "injection" "enabled" .Values.neuvector }}
{{- end }}
istio-injection: {{ ternary "enabled" "disabled" (and .Values.istio.enabled (eq (dig "istio" "injection" "enabled" .Values.neuvector) "enabled")) }}
{{- end }}
\ No newline at end of file
chart/templates/nexus-repository-manager/namespace.yaml
+ 1
− 3
View file @ de059264
......@@ -6,9 +6,7 @@ kind: Namespace
metadata:
name: nexus-repository-manager
labels:
{{- if .Values.istio.enabled }}
istio-injection: {{ dig "istio" "injection" "enabled" $nexusValues }}
{{- end }}
istio-injection: {{ ternary "enabled" "disabled" (and .Values.istio.enabled (eq (dig "istio" "injection" "enabled" $nexusValues) "enabled")) }}
app.kubernetes.io/name: "nexus-repository-manager"
app.kubernetes.io/component: "developer-tools"
{{- include "commonLabels" . | nindent 4}}
......
chart/templates/promtail/namespace.yaml
+ 1
− 1
View file @ de059264
......@@ -7,5 +7,5 @@ metadata:
app.kubernetes.io/name: promtail
app.kubernetes.io/component: "core"
{{- include "commonLabels" . | nindent 4}}
istio-injection: enabled
istio-injection: {{ ternary "enabled" "disabled" (and .Values.istio.enabled (eq (dig "istio" "injection" "enabled" .Values.promtail) "enabled")) }}
{{- end }}
chart/templates/sonarqube/namespace.yaml
+ 1
− 1
View file @ de059264
......@@ -7,5 +7,5 @@ metadata:
app.kubernetes.io/name: sonarqube
app.kubernetes.io/component: "developer-tools"
{{- include "commonLabels" . | nindent 4}}
istio-injection: {{ dig "istio" "injection" "enabled" .Values.addons.sonarqube }}
istio-injection: {{ ternary "enabled" "disabled" (and .Values.istio.enabled (eq (dig "istio" "injection" "enabled" .Values.addons.sonarqube) "enabled")) }}
{{- end }}
chart/templates/tempo/namespace.yaml
+ 1
− 1
View file @ de059264
......@@ -7,5 +7,5 @@ metadata:
app.kubernetes.io/name: tempo
app.kubernetes.io/component: "core"
{{- include "commonLabels" . | nindent 4}}
istio-injection: enabled
istio-injection: {{ ternary "enabled" "disabled" (and .Values.istio.enabled (eq (dig "istio" "injection" "enabled" .Values.tempo) "enabled")) }}
{{- end }}
chart/templates/thanos/namespace.yaml
+ 1
− 3
View file @ de059264
......@@ -5,9 +5,7 @@ kind: Namespace
metadata:
name: {{ $pkg }}
labels:
{{- if .Values.istio.enabled }}
istio-injection: enabled
{{- end }}
istio-injection: {{ ternary "enabled" "disabled" (and .Values.istio.enabled (eq (dig "istio" "injection" "enabled" (get .Values.addons $pkg)) "enabled")) }}
app.kubernetes.io/name: {{ $pkg }}
app.kubernetes.io/component: "core"
{{- include "commonLabels" . | nindent 4}}
......
chart/templates/twistlock/namespace.yaml
+ 1
− 1
View file @ de059264
......@@ -7,5 +7,5 @@ metadata:
app.kubernetes.io/name: twistlock
app.kubernetes.io/component: "security"
{{- include "commonLabels" . | nindent 4}}
istio-injection: enabled
istio-injection: {{ ternary "enabled" "disabled" (and .Values.istio.enabled (eq (dig "istio" "injection" "enabled" .Values.twistlock) "enabled")) }}
{{- end }}
\ No newline at end of file
chart/templates/vault/namespace.yaml
+ 1
− 1
View file @ de059264
......@@ -7,5 +7,5 @@ metadata:
app.kubernetes.io/name: vault
app.kubernetes.io/component: "security-tools"
{{- include "commonLabels" . | nindent 4}}
istio-injection: enabled
istio-injection: {{ ternary "enabled" "disabled" (and .Values.istio.enabled (eq (dig "istio" "injection" "enabled" .Values.addons.vault) "enabled")) }}
{{- end }}
chart/templates/velero/namespace.yaml
+ 1
− 3
View file @ de059264
......@@ -7,7 +7,5 @@ metadata:
app.kubernetes.io/name: velero
app.kubernetes.io/component: "cluster-utilities"
{{- include "commonLabels" . | nindent 4 }}
{{- if .Values.istio.enabled }}
istio-injection: enabled
{{- end }}
istio-injection: {{ ternary "enabled" "disabled" (and .Values.istio.enabled (eq (dig "istio" "injection" "enabled" .Values.addons.velero) "enabled")) }}
{{- end }}
chart/values.schema.json
+ 152
− 23
View file @ de059264
......@@ -296,6 +296,9 @@
"flux": true,
"values": true,
"postRenderers": true,
"istio": {
"$ref": "#/$defs/istio"
},
"sso": {
"$ref": "#/$defs/sso"
},
......@@ -323,6 +326,9 @@
"flux": true,
"values": true,
"postRenderers": true,
"istio": {
"$ref": "#/$defs/istio"
},
"sso": {
"$ref": "#/$defs/sso"
},
......@@ -345,7 +351,10 @@
"helmRepo": true,
"flux": true,
"values": true,
"postRenderers": true
"postRenderers": true,
"istio": {
"$ref": "#/$defs/istio"
}
},
"allOf": [
{
......@@ -413,7 +422,10 @@
"helmRepo": true,
"flux": true,
"values": true,
"postRenderers": true
"postRenderers": true,
"istio": {
"$ref": "#/$defs/istio"
}
},
"allOf": [
{
......@@ -435,6 +447,9 @@
"flux": true,
"values": true,
"postRenderers": true,
"istio": {
"$ref": "#/$defs/istio"
},
"sso": {
"$ref": "#/$defs/sso"
},
......@@ -474,7 +489,10 @@
"helmRepo": true,
"flux": true,
"values": true,
"postRenderers": true
"postRenderers": true,
"istio": {
"$ref": "#/$defs/istio"
}
},
"allOf": [
{
......@@ -491,7 +509,10 @@
"helmRepo": true,
"flux": true,
"values": true,
"postRenderers": true
"postRenderers": true,
"istio": {
"$ref": "#/$defs/istio"
}
},
"allOf": [
{
......@@ -508,7 +529,10 @@
"helmRepo": true,
"flux": true,
"values": true,
"postRenderers": true
"postRenderers": true,
"istio": {
"$ref": "#/$defs/istio"
}
},
"allOf": [
{
......@@ -538,6 +562,9 @@
"flux": true,
"values": true,
"postRenderers": true,
"istio": {
"$ref": "#/$defs/istio"
},
"strategy": {
"type": "string",
"enum": [
......@@ -656,6 +683,9 @@
"flux": true,
"values": true,
"postRenderers": true,
"istio": {
"$ref": "#/$defs/istio"
},
"sso": {
"$ref": "#/$defs/sso"
},
......@@ -888,6 +918,9 @@
"flux": true,
"values": true,
"postRenderers": true,
"istio": {
"$ref": "#/$defs/istio"
},
"sso": {
"type": "object",
"required": [
......@@ -940,63 +973,108 @@
{
"$ref": "#/$defs/basePackage"
}
]
],
"properties": {
"istio": {
"$ref": "#/$defs/istio"
}
}
},
"authservice": {
"allOf": [
{
"$ref": "#/$defs/basePackage"
}
]
],
"properties": {
"istio": {
"$ref": "#/$defs/istio"
}
}
},
"minioOperator": {
"allOf": [
{
"$ref": "#/$defs/basePackage"
}
]
],
"properties": {
"istio": {
"$ref": "#/$defs/istio"
}
}
},
"minio": {
"allOf": [
{
"$ref": "#/$defs/basePackage"
}
]
],
"properties": {
"istio": {
"$ref": "#/$defs/istio"
}
}
},
"gitlab": {
"allOf": [
{
"$ref": "#/$defs/basePackage"
}
]
],
"properties": {
"istio": {
"$ref": "#/$defs/istio"
}
}
},
"gitlabRunner": {
"allOf": [
{
"$ref": "#/$defs/basePackage"
}
]
],
"properties": {
"istio": {
"$ref": "#/$defs/istio"
}
}
},
"nexusRepositoryManager": {
"allOf": [
{
"$ref": "#/$defs/basePackage"
}
]
],
"properties": {
"istio": {
"$ref": "#/$defs/istio"
}
}
},
"sonarqube": {
"allOf": [
{
"$ref": "#/$defs/basePackage"
}
]
],
"properties": {
"istio": {
"$ref": "#/$defs/istio"
}
}
},
"fortify": {
"allOf": [
{
"$ref": "#/$defs/basePackage"
}
]
],
"properties": {
"istio": {
"$ref": "#/$defs/istio"
}
}
},
"haproxy": {
"type": "object",
......@@ -1014,6 +1092,9 @@
},
"values": {
"$ref": "#/$defs/values"
},
"istio": {
"$ref": "#/$defs/istio"
}
}
},
......@@ -1022,42 +1103,72 @@
{
"$ref": "#/$defs/basePackage"
}
]
],
"properties": {
"istio": {
"$ref": "#/$defs/istio"
}
}
},
"mattermostOperator": {
"allOf": [
{
"$ref": "#/$defs/basePackage"
}
]
],
"properties": {
"istio": {
"$ref": "#/$defs/istio"
}
}
},
"mattermost": {
"allOf": [
{
"$ref": "#/$defs/basePackage"
}
]
],
"properties": {
"istio": {
"$ref": "#/$defs/istio"
}
}
},
"velero": {
"allOf": [
{
"$ref": "#/$defs/basePackage"
}
]
],
"properties": {
"istio": {
"$ref": "#/$defs/istio"
}
}
},
"keycloak": {
"allOf": [
{
"$ref": "#/$defs/basePackage"
}
]
],
"properties": {
"istio": {
"$ref": "#/$defs/istio"
}
}
},
"vault": {
"allOf": [
{
"$ref": "#/$defs/basePackage"
}
]
],
"properties": {
"istio": {
"$ref": "#/$defs/istio"
}
}
},
"metricsServer": {
"type": "object",
......@@ -1087,6 +1198,9 @@
},
"values": {
"$ref": "#/$defs/values"
},
"istio": {
"$ref": "#/$defs/istio"
}
}
},
......@@ -1095,21 +1209,36 @@
{
"$ref": "#/$defs/basePackage"
}
]
],
"properties": {
"istio": {
"$ref": "#/$defs/istio"
}
}
},
"holocron": {
"allOf": [
{
"$ref": "#/$defs/basePackage"
}
]
],
"properties": {
"istio": {
"$ref": "#/$defs/istio"
}
}
},
"thanos": {
"allOf": [
{
"$ref": "#/$defs/basePackage"
}
]
],
"properties": {
"istio": {
"$ref": "#/$defs/istio"
}
}
}
}
},
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

UNCLASSIFIED - NO CUI