Commit 5a4f87dc authored by Kevin Di Lallo's avatar Kevin Di Lallo
Browse files

Merge branch 'develop' into lts

parents b539ae2a 6d4a31c3

charts/meep-app-enablement/templates/clusterrolebinding.yaml

+2 −2
Original line number Diff line number Diff line 
apiVersion: rbac.authorization.k8s.io/v1

kind: ClusterRoleBinding

metadata:

  name: "{{ .Release.Namespace }}:{{ .Values.serviceAccount }}"

  name: "{{ .Release.Namespace }}:{{ template "meep-app-enablement.fullname" . }}"

roleRef:

  apiGroup: rbac.authorization.k8s.io

  kind: ClusterRole

  name: cluster-admin

subjects:

- kind: ServiceAccount

  name: {{ .Values.serviceAccount }}

  name: {{ template "meep-app-enablement.fullname" . }}

  namespace: {{ .Release.Namespace }}

  
 No newline at end of file

charts/meep-app-enablement/templates/deployment.yaml

+11 −4
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ spec: 
          env:

            {{- range $key, $value := .Values.image.env }}

            - name: {{ $key }}

              value: {{ $value }}

              value: {{ $value | quote }}

            {{- end }}

          {{- if .Values.codecov.enabled}}

          volumeMounts:
@@ -51,8 +51,15 @@ spec: 
          {{- end}}

      terminationGracePeriodSeconds: 5

      initContainers:

        - name: init-{{ .Values.deployment.dependency }}

        {{- range $value := .Values.deployment.dependencies.system }}

        - name: init-system-{{ $value }}

          image: busybox:1.28

          imagePullPolicy: IfNotPresent

          command: ['sh', '-c', 'until nslookup {{ .Values.deployment.dependency }}.kube-system ; do echo waiting for {{ .Values.deployment.dependency }}; sleep 0.25; done;']

          command: ['sh', '-c', 'until nslookup {{ $value }}.kube-system ; do echo waiting for {{ $value }}; sleep 0.25; done;']

        {{- end}}

        {{- range $value := .Values.deployment.dependencies.sandbox }}

        - name: init-sandbox-{{ $value }}

          image: busybox:1.28

          imagePullPolicy: IfNotPresent

          command: ['sh', '-c', 'until nslookup {{ $value }} ; do echo waiting for {{ $value }}; sleep 0.25; done;']

        {{- end}}

charts/meep-app-enablement/templates/ingress.yaml

+2 −3
Original line number Diff line number Diff line 
{{- if .Values.ingress.enabled -}}

{{- $serviceName := include "meep-app-enablement.fullname" . -}}

{{- $serviceName := .Values.service.name -}}

{{- $servicePort := .Values.service.port -}}

{{- $path := .Values.ingress.path -}}

apiVersion: extensions/v1beta1

kind: Ingress

metadata:

  name: {{ template "meep-app-enablement.fullname" . }}

  name: {{ $serviceName }}

  labels:

    app: {{ template "meep-app-enablement.name" . }}

    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}

charts/meep-app-enablement/templates/service.yaml

+1 −1
Original line number Diff line number Diff line 
apiVersion: v1

kind: Service

metadata:

  name: {{ template "meep-app-enablement.fullname" . }}

  name: {{ .Values.service.name }}

  labels:

    app: {{ template "meep-app-enablement.name" . }}

    chart: {{ template "meep-app-enablement.chart" . }}

charts/meep-app-enablement/templates/serviceaccount.yaml

+1 −1
Original line number Diff line number Diff line 
apiVersion: v1

kind: ServiceAccount

metadata:

  name: {{ .Values.serviceAccount }}
 
  name: {{ template "meep-app-enablement.fullname" . }}