feat(helm-chart): improve ingress, labels and namespace setting (#45)

eclipse-tractusx · Feb 21, 2024 · 1789336 · 1789336
1 parent b4d0d79
commit 1789336
Show file tree

Hide file tree

Showing 13 changed files with 16 additions and 17 deletions.
diff --git a/charts/policy-hub/templates/configmap-postgres-init.yaml b/charts/policy-hub/templates/configmap-postgres-init.yaml
@@ -23,6 +23,8 @@ kind: ConfigMap
 metadata:
   name: {{ .Release.Name }}-phub-cm-postgres
   namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "phub.labels" . | nindent 4 }}
 data:
   02-init-db.sql: |
     CREATE SCHEMA hub;

diff --git a/charts/policy-hub/templates/deployment-hub.yaml b/charts/policy-hub/templates/deployment-hub.yaml
@@ -21,7 +21,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ include "phub.fullname" . }}
-  namespace: {{ .Values.namespace }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "phub.labels" . | nindent 4 }}
 spec:
@@ -37,7 +37,7 @@ spec:
         {{- include "phub.selectorLabels" . | nindent 8 }}
     spec:
       containers:
-      - name: {{ .Chart.Name }}
+      - name: {{ include "phub.fullname" . }}
         securityContext:
           allowPrivilegeEscalation: false
           capabilities:

diff --git a/charts/policy-hub/templates/ingress.yaml b/charts/policy-hub/templates/ingress.yaml
@@ -35,6 +35,7 @@ apiVersion: extensions/v1beta1
 kind: Ingress
 metadata:
   name: {{ $fullName }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "phub.labels" . | nindent 4 }}
   {{- with .Values.ingress.annotations }}
@@ -73,7 +74,7 @@ spec:
                   number: {{ $svcPort }}
               {{- else }}
               serviceName: {{ $fullName }}
-              servicePort: {{ .backend.port }}
+              servicePort: {{ $svcPort }}
               {{- end }}
           {{- end }}
     {{- end }}

diff --git a/charts/policy-hub/templates/job-policy-hub-migrations.yaml b/charts/policy-hub/templates/job-policy-hub-migrations.yaml
@@ -21,6 +21,9 @@ apiVersion: batch/v1
 kind: Job
 metadata:
   name: {{ include "phub.fullname" . }}-migrations
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "phub.labels" . | nindent 4 }}
   annotations:
     "batch.kubernetes.io/job-tracking": "true"
     "helm.sh/hook": post-install,post-upgrade

diff --git a/charts/policy-hub/templates/secret-external-db.yaml b/charts/policy-hub/templates/secret-external-db.yaml
@@ -23,6 +23,8 @@ kind: Secret
 metadata:
   name: {{ .Values.externalDatabase.existingSecret }}
   namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "portal.labels" . | nindent 4 }}
 type: Opaque
 # use lookup function to check if secret exists
 {{- $secret := (lookup "v1" "Secret" .Release.Namespace .Values.externalDatabase.existingSecret) }}

diff --git a/charts/policy-hub/templates/secret-postgres.yaml b/charts/policy-hub/templates/secret-postgres.yaml
@@ -24,6 +24,8 @@ kind: Secret
 metadata:
   name: {{ $secretName }}
   namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "phub.labels" . | nindent 4 }}
 type: Opaque
 # use lookup function to check if secret exists
 {{- $secret := (lookup "v1" "Secret" .Release.Namespace $secretName) }}

diff --git a/charts/policy-hub/templates/service-hub.yaml b/charts/policy-hub/templates/service-hub.yaml
@@ -21,7 +21,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ include "phub.fullname" . }}
-  namespace: {{ .Values.namespace }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "phub.labels" . | nindent 4 }}
 spec:

diff --git a/charts/policy-hub/values.yaml b/charts/policy-hub/values.yaml
@@ -24,7 +24,6 @@ ingress:
   # -- Policy Hub ingress parameters,
   # enable ingress record generation for policy-hub.
   enabled: false
-  name: "policy-hub"
   className: "nginx"
   annotations:
     nginx.ingress.kubernetes.io/use-regex: "true"
@@ -44,9 +43,9 @@ ingress:
       paths:
         - path: "/api/policy-hub"
           pathType: "Prefix"
-          backend:
-            port: 8080
+
 dotnetEnvironment: "Production"
+
 dbConnection:
   schema: "hub"
   sslMode: "Disable"

diff --git a/consortia/environments/values-beta.yaml b/consortia/environments/values-beta.yaml
@@ -37,8 +37,6 @@ ingress:
       paths:
         - path: "/api/policy-hub"
           pathType: "Prefix"
-          backend:
-            port: 8080
 
 policyhub:
   swaggerEnabled: true

diff --git a/consortia/environments/values-dev.yaml b/consortia/environments/values-dev.yaml
@@ -37,8 +37,6 @@ ingress:
       paths:
         - path: "/api/policy-hub"
           pathType: "Prefix"
-          backend:
-            port: 8080
 
 keycloak:
   central:

diff --git a/consortia/environments/values-int.yaml b/consortia/environments/values-int.yaml
@@ -37,8 +37,6 @@ ingress:
       paths:
         - path: "/api/policy-hub"
           pathType: "Prefix"
-          backend:
-            port: 8080
 
 keycloak:
   central:

diff --git a/consortia/environments/values-pen.yaml b/consortia/environments/values-pen.yaml
@@ -37,8 +37,6 @@ ingress:
       paths:
         - path: "/api/policy-hub"
           pathType: "Prefix"
-          backend:
-            port: 8080
 
 policyhub:
   swaggerEnabled: true

diff --git a/consortia/environments/values-rc.yaml b/consortia/environments/values-rc.yaml
@@ -37,8 +37,6 @@ ingress:
       paths:
         - path: "/api/policy-hub"
           pathType: "Prefix"
-          backend:
-            port: 8080
 
 policyhub:
   image: "docker.io/tractusx/policy-hub-service:rc"