Commit d32444ee authored by Kevin Di Lallo's avatar Kevin Di Lallo
Browse files

removed unused nodeports + added mgm ingress

parent 0678ae42
Loading
Loading
Loading
Loading
+40 −0
Original line number Diff line number Diff line
{{- if .Values.ingress.enabled -}}
{{- $serviceName := include "meep-mg-manager.fullname" . -}}
{{- $servicePort := .Values.service.port -}}
{{- $path := .Values.ingress.path -}}
apiVersion: extensions/v1beta1
kind: Ingress
metadata:
  name: {{ template "meep-mg-manager.fullname" . }}
  labels:
    app: {{ template "meep-mg-manager.name" . }}
    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
    release: {{ .Release.Name }}
    heritage: {{ .Release.Service }}
{{- if .Values.ingress.labels }}
{{ toYaml .Values.ingress.labels | indent 4 }}
{{- end }}
  annotations:
    {{- range $key, $value := .Values.ingress.annotations }}
      {{ $key }}: {{ $value | quote }}
    {{- end }}
spec:
  rules:
    {{- range .Values.ingress.hosts }}
    - http:
        paths:
          {{- range $path := .paths }}
          - path: {{ $path }}
            backend:
              serviceName: {{ $serviceName }}
              servicePort: {{ $servicePort }}
          {{- end -}}
      {{- if .name }}
      host: {{ .name }}
      {{- end }}
    {{- end -}}
  {{- if .Values.ingress.tls }}
  tls:
{{ toYaml .Values.ingress.tls | indent 4 }}
  {{- end -}}
{{- end -}}
+4 −3
Original line number Diff line number Diff line
@@ -15,7 +15,8 @@ spec:
    app: {{ template "meep-mg-manager.name" . }}
    release: {{ .Release.Name }}
  ports:
    - port: {{ .Values.deployment.port }}
      targetPort: {{ .Values.service.targetPort }}
    - port: {{ .Values.service.port }}
      targetPort: {{ .Values.deployment.port }}
      {{- if .Values.service.nodePort }}
      nodePort: {{ .Values.service.nodePort }}
      {{- end }}
+27 −3
Original line number Diff line number Diff line
@@ -24,9 +24,33 @@ image:
  pullPolicy: Always

service:
  type: NodePort
  targetPort: 80
  nodePort: 30005
  type: ClusterIP
  # type: NodePort
  port: 80
  # nodePort: 30005

ingress:
  enabled: true

  # Used to create an Ingress record.
  hosts:
    - name: ''
      paths:
        - /mgm

  annotations:
    # kubernetes.io/ingress.class: nginx
    # kubernetes.io/tls-acme: "true"
    # nginx.ingress.kubernetes.io/rewrite-target: /$2
    # nginx.ingress.kubernetes.io/configuration-snippet: |
    #   rewrite ^/metrics(/|$)(.*)$ /$2 break;

  labels: {}
  tls:
    # Secrets must be manually created in the namespace.
    # - secretName: chart-example-tls
    #   hosts:
    #     - chart-example.local
    
codecov:
  enabled: false
+4 −3
Original line number Diff line number Diff line
@@ -15,7 +15,8 @@ spec:
    app: {{ template "meep-mon-engine.name" . }}
    release: {{ .Release.Name }}
  ports:
    - port: {{ .Values.deployment.port }}
      targetPort: {{ .Values.service.targetPort }}
    - port: {{ .Values.service.port }}
      targetPort: {{ .Values.deployment.port }}
      {{- if .Values.service.nodePort }}
      nodePort: {{ .Values.service.nodePort }}
      {{- end }}
 No newline at end of file
+4 −3
Original line number Diff line number Diff line
@@ -24,9 +24,10 @@ image:
  pullPolicy: Always

service:
  type: NodePort
  targetPort: 80
  nodePort: 30004
  type: ClusterIP
  # type: NodePort
  port: 80
  # nodePort: 30004

codecov:
  enabled: false
Loading