Commit 39428167 authored by Martin Schurz's avatar Martin Schurz
Browse files

fix: update all test cases 



Signed-off-by: default avatarMartin Schurz <Martin.Schurz@telekom.de>
parent 76a81d4a

assets/auto-deploy-app/templates/db-initialize-job.yaml

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ spec: 
    spec:

      restartPolicy: Never

      imagePullSecrets:

{{- toYaml .Values.image.secrets | nindent 10 }}

      {{- toYaml .Values.image.secrets | nindent 8 }}

      containers:

      - name: {{ .Chart.Name }}

        image: {{ template "imagename" . }}

assets/auto-deploy-app/templates/db-migrate-hook.yaml

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ spec: 
    spec:

      restartPolicy: Never

      imagePullSecrets:

{{- toYaml .Values.image.secrets | nindent 10 }}

      {{- toYaml .Values.image.secrets | nindent 8 }}

      containers:

      - name: {{ .Chart.Name }}

        image: {{ template "imagename" . }}

assets/auto-deploy-app/templates/deployment.yaml

+15 −7
Original line number Diff line number Diff line
@@ -4,8 +4,12 @@ kind: Deployment 
metadata:

  name: {{ template "trackableappname" . }}

  annotations:

    {{ if .Values.gitlab.app }}app.gitlab.com/app: {{ .Values.gitlab.app | quote }}{{ end }}

    {{ if .Values.gitlab.env }}app.gitlab.com/env: {{ .Values.gitlab.env | quote }}{{ end }}

    {{- if .Values.gitlab.app }}

    app.gitlab.com/app: {{ .Values.gitlab.app | quote }}

    {{- end }}

    {{- if .Values.gitlab.env }}

    app.gitlab.com/env: {{ .Values.gitlab.env | quote }}

    {{- end }}

  labels:

    track: "{{ .Values.application.track }}"

    tier: "{{ .Values.application.tier }}"
@@ -26,8 +30,12 @@ spec: 
    metadata:

      annotations:

        checksum/application-secrets: "{{ .Values.application.secretChecksum }}"

        {{ if .Values.gitlab.app }}app.gitlab.com/app: {{ .Values.gitlab.app | quote }}{{ end }}

        {{ if .Values.gitlab.env }}app.gitlab.com/env: {{ .Values.gitlab.env | quote }}{{ end }}

        {{- if .Values.gitlab.app }}

        app.gitlab.com/app: {{ .Values.gitlab.app | quote }}

        {{- end }}

        {{- if .Values.gitlab.env }}

        app.gitlab.com/env: {{ .Values.gitlab.env | quote }}

        {{- end }}

{{- if .Values.podAnnotations }}

{{- toYaml .Values.podAnnotations | nindent 8 }}

{{- end }}
@@ -40,7 +48,7 @@ spec: 
      serviceAccountName: {{ .Values.serviceAccount.name | default .Values.serviceAccountName | quote }}

{{- end }}

      imagePullSecrets:

{{- toYaml .Values.image.secrets | nindent 10 }}

{{- toYaml .Values.image.secrets | nindent 8 }}

{{- if .Values.nodeSelector }}

      nodeSelector:

{{- toYaml .Values.nodeSelector | nindent 8 }}
@@ -82,7 +90,7 @@ spec: 
{{- range $volume := .Values.persistence.volumes }}

        - name: {{ $volume.name | quote }}

          persistentVolumeClaim:

            {{ $args := dict "context" $context "name" $volume.name }}

            {{- $args := dict "context" $context "name" $volume.name }}

            claimName: {{ template "pvcName" $args }}

{{- end }}

{{- end }}
@@ -250,7 +258,7 @@ spec: 
{{- toYaml .Values.containerSecurityContext | nindent 10 }}

{{- end }}

        resources:

{{- toYaml .Values.resources | nindent 12 }}

{{- toYaml .Values.resources | nindent 10 }}

{{- if or (.Values.persistence.enabled) (.Values.extraVolumeMounts) }}

        volumeMounts:

{{- if .Values.persistence.enabled }}

assets/auto-deploy-app/templates/ingress.yaml

+2 −2
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
apiVersion: networking.k8s.io/v1

{{- else if .Capabilities.APIVersions.Has "networking.k8s.io/v1beta1/Ingress" }}

apiVersion: networking.k8s.io/v1beta1

{{ else }}

{{- else }}

apiVersion: extensions/v1beta1

{{- end }}

kind: Ingress
@@ -14,7 +14,7 @@ metadata: 
  annotations:

{{ include "ingress.annotations" . | indent 4 }}

spec:

{{/* We don't set a default value because old ingress controllers may not provide an IngressClass, causing deployments to fail */}}

{{- /* We don't set a default value because old ingress controllers may not provide an IngressClass, causing deployments to fail */}}

{{- if and .Values.ingress.className (.Capabilities.APIVersions.Has "networking.k8s.io/v1/Ingress") }}

  ingressClassName: {{ .Values.ingress.className | quote }}

{{- end }}

assets/auto-deploy-app/templates/pvc.yaml

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
kind: PersistentVolumeClaim

apiVersion: v1

metadata:

  {{ $args := dict "context" $context "name" $volume.name }}

  {{- $args := dict "context" $context "name" $volume.name }}

  name: {{ template "pvcName" $args }}

  labels:

    track: "{{ $.Values.application.track }}"