Commit 621cbeaf authored by Kevin Di Lallo's avatar Kevin Di Lallo
Browse files

app-enablement support for all MEC Services

parent 050bcd77

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

+1 −1
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:

charts/meep-loc-serv/templates/deployment.yaml

+9 −4
Original line number Diff line number Diff line
@@ -51,10 +51,15 @@ spec: 
          {{- end}}

      terminationGracePeriodSeconds: 5

      initContainers:

        {{- if .Values.deployment.kubeDnsInitContainerEnabled }}

        - 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-loc-serv/values-template.yaml

+11 −6
Original line number Diff line number Diff line
@@ -6,12 +6,12 @@ deployment: 
  replicas: 1

  port: 80

  protocol: TCP

  dependency: kube-dns

  {{- if .IsMepService }}

  kubeDnsInitContainerEnabled: false

  {{- else }}

  kubeDnsInitContainerEnabled: true

  dependencies:

    system:

      {{- if not .IsMepService }}

      - kube-dns

      {{- end }}

    sandbox:



image:

  repository: meep-docker-registry:30001/meep-loc-serv
@@ -23,6 +23,11 @@ image: 
    {{- if .IsMepService }}

    MEEP_MEP_NAME: {{.MepName}}

    {{- end }}

    {{- if eq .AppEnablement "local" }}

    MEEP_APP_ENABLEMENT: {{.MepName}}-meep-app-enablement

    {{- else if eq .AppEnablement "global" }}

    MEEP_APP_ENABLEMENT: meep-app-enablement

    {{- end }}

    {{- range .Env}}

    {{.}}

    {{- end}}

charts/meep-rnis/templates/deployment.yaml

+10 −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,9 +51,15 @@ spec: 
          {{- end}}

      terminationGracePeriodSeconds: 5

      initContainers:

        {{- if .Values.deployment.kubeDnsInitContainerEnabled }}

        - 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-rnis/values-template.yaml

+11 −6
Original line number Diff line number Diff line
@@ -6,12 +6,12 @@ deployment: 
  replicas: 1

  port: 80

  protocol: TCP

  dependency: kube-dns

  {{- if .IsMepService }}

  kubeDnsInitContainerEnabled: false

  {{- else }}

  kubeDnsInitContainerEnabled: true

  dependencies:

    system:

      {{- if not .IsMepService }}

      - kube-dns

      {{- end }}

    sandbox:



image:

  repository: meep-docker-registry:30001/meep-rnis
@@ -25,6 +25,11 @@ image: 
    {{- if .IsMepService }}

    MEEP_MEP_NAME: {{.MepName}}

    {{- end }}

    {{- if eq .AppEnablement "local" }}

    MEEP_APP_ENABLEMENT: {{.MepName}}-meep-app-enablement

    {{- else if eq .AppEnablement "global" }}

    MEEP_APP_ENABLEMENT: meep-app-enablement

    {{- end }}

    {{- range .Env}}

    {{.}}

    {{- end}}