SLABI-722 Proxy at ingress level (#19)

* Update chart version

* changelog

* Proxy at ingress level

* Make jira port configurable

Author: js-sub

charts/dependency-db/Chart.yaml

@@ -2,5 +2,10 @@ apiVersion: v2
 name: dependency-db
 description: Dependency-DB with frontend, API-Backend
 type: application
-version: 0.1.0
+version: 0.2.0
 appVersion: "0.1.0"
+
+annotations:
+  artifacthub.io/changes: |
+    - kind: "added"
+      description: "The ingress now proxies to API and Jira"

charts/dependency-db/templates/frontend_deployment.yaml

@@ -29,10 +29,6 @@ spec:
           image: "{{ .Values.frontend.image.repository }}:{{ .Values.frontend.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.frontend.image.pullPolicy }}
           env:
-            - name: DEPDB_API_ADDRESS
-              value: "http://{{ include "dependency-db.fullname.api" . }}"
-            - name: DEPDB_JIRA_ADDRESS
-              value: {{ .Values.jira.address }}"
             - name: DEPDB_EXTERNAL_HOSTNAME
               value: {{ join " " .Values.ingress.hosts | quote }}
           ports:

charts/dependency-db/templates/ingress.yaml

@@ -1,6 +1,8 @@
 {{- if .Values.ingress.enabled -}}
 {{- $fullName := include "dependency-db.fullname.frontend" . -}}
+{{- $apiServiceName := include "dependency-db.fullname.api" . -}}
 {{- $svcPort := .Values.service.port -}}
+{{- $jiraPort := .Values.jira.port -}}
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
@@ -37,5 +39,19 @@ spec:
                 name: {{ $fullName }}
                 port: 
                   number: {{ $svcPort }}
+          - path: /api/db/
+            pathType: Prefix
+            backend:
+              service:
+                name: {{ $apiServiceName }}
+                port:
+                  number: {{ $svcPort }}
+          - path: /api/jira/
+            pathType: Prefix
+            backend:
+              service:
+                name: {{ $apiServiceName }}-jira-service
+                port:
+                  number: {{ $jiraPort }}
     {{- end }}
   {{- end }}

charts/dependency-db/templates/jira_service.yaml

@@ -0,0 +1,11 @@
+{{- if .Values.ingress.enabled -}}
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ include "dependency-db.fullname.api" . }}-jira-service
+  labels:
+    {{- include "dependency-db-api.labels" . | nindent 4 }}
+spec:
+  type: ExternalName
+  externalName: {{ .Values.jira.hostname }}
+{{- end }}

charts/dependency-db/values.yaml

@@ -41,7 +41,8 @@ importerconfig:
     - secretRef: graph-db-pw-secret
 
 jira:
-  address: "https://jira.example.com"
+  hostname: "jira.example.com"
+  port: 443
 
 imagePullSecrets: []
 nameOverride: ""