Skip to content
Snippets Groups Projects
Commit e6da47b4 authored by Jan Zickermann's avatar Jan Zickermann
Browse files

Merge remote-tracking branch 'origin/OZG-4786-DeploymentIngress' into OZG-4786-DeploymentIngress

parents ce5454a8 eb6ea93f
Branches
Tags
No related merge requests found
{{/* Chart: Name + Version */}}
{{- define "app.chart" -}}
{{ printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
{{- end -}}
{{- define "app.baseDomain" -}}
{{- printf "%s.%s" (.Values.ozgcloud).bezeichner (.Values.ingress).baseUrl }}
......@@ -14,7 +10,7 @@ app.kubernetes.io/instance: administration
app.kubernetes.io/managed-by: {{ .Release.Service }}
app.kubernetes.io/name: {{ .Release.Name }}
app.kubernetes.io/namespace: {{ .Release.Namespace }}
helm.sh/chart: {{ include "app.chart" . }}
helm.sh/chart: {{ printf "%s-%s" .Chart.Name .Chart.Version }}
{{- end -}}
{{- define "app.matchLabels" }}
......
......@@ -22,7 +22,7 @@
apiVersion: v1
kind: ConfigMap
metadata:
name: bindings-type
name: administration-bindings-type
namespace: {{ .Release.Namespace }}
data:
type: |
......
......@@ -131,7 +131,7 @@ spec:
volumes:
- name: bindings
configMap:
name: bindings-type
name: administration-bindings-type
- name: mongodb-root-ca
secret:
secretName: {{ .Values.database.tls.secretName }}
......
......@@ -64,7 +64,7 @@ tests:
value: "bindings"
- equal:
path: spec.template.spec.volumes[0].configMap.name
value: "bindings-type"
value: "administration-bindings-type"
- equal:
path: spec.template.spec.volumes[1].name
value: "mongodb-root-ca"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment