Commit 2ad8d8a0 authored by Simon Pastor's avatar Simon Pastor
Browse files

integration ingress and poa subtype

parent 26948005
Loading
Loading
Loading
Loading
+3 −0
Original line number Diff line number Diff line
@@ -41,6 +41,9 @@ spec:
          ports:
            - containerPort: {{ .Values.deployment.port }}
              protocol: {{ .Values.deployment.protocol }}
          env:
            - name: MEEP_RNIS_ROOT_URL
              value: {{ .Values.image.env.rooturl }}
          {{- if .Values.codecov.enabled}}
          volumeMounts:
          - name: codecov-storage
+40 −0
Original line number Diff line number Diff line
{{- if .Values.ingress.enabled -}}
{{- $serviceName := include "meep-rnis.fullname" . -}}
{{- $servicePort := .Values.service.port -}}
{{- $path := .Values.ingress.path -}}
apiVersion: extensions/v1beta1
kind: Ingress
metadata:
  name: {{ template "meep-rnis.fullname" . }}
  labels:
    app: {{ template "meep-rnis.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 −2
Original line number Diff line number Diff line
@@ -15,7 +15,9 @@ spec:
    app: {{ template "meep-rnis.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
@@ -14,11 +14,35 @@ image:
  repository: meep-rnis
  tag: latest
  pullPolicy: Always
  env:
    rooturl: "http://www.example.com"

service:
  type: NodePort
  targetPort: 80
  nodePort: 30017
  type: ClusterIP
  port: 80

ingress:
  enabled: true

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

  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 ^/rni(/|$)(.*)$ /$2 break;

  labels: {}
  tls:
    # Secrets must be manually created in the namespace.
    # - secretName: chart-example-tls
    #   hosts:
    #     - chart-example.local

codecov:
  enabled: false
+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ To see how to make this your own, look here:
[README](https://github.com/swagger-api/swagger-codegen/blob/master/README.md)

- API version: 0.0.1
- Build date: 2020-03-27T08:32:58.115-04:00
- Build date: 2020-04-10T12:09:13.328-04:00


### Running the server
Loading