Some minor chart improvements (#187)

Signed-off-by: Sergio Castaño Arteaga <[email protected]>

Author: tegioz

charts/ocg/templates/server_deployment.yaml

@@ -28,7 +28,9 @@ spec:
         - {{- include "chart.checkDbIsReadyInitContainer" . | nindent 10 }}
         {{- if .Release.IsInstall }}
         - name: check-dbmigrator-run
-          image: "bitnami/kubectl:{{ template "chart.KubernetesVersion" . }}"
+          {{ $kubeVersion := include "chart.KubernetesVersion" . }}
+          {{ $kubectlImageVersion := ternary "1.33" $kubeVersion (semverCompare ">=1.34.0-0" (printf "%s.0" $kubeVersion)) }}
+          image: "docker.io/bitnamilegacy/kubectl:{{ $kubectlImageVersion }}"
           imagePullPolicy: IfNotPresent
           command: ['kubectl', 'wait', '--namespace={{ .Release.Namespace }}', '--for=condition=complete', 'job/{{ include "chart.resourceNamePrefix" . }}dbmigrator-install', '--timeout=60s']
         {{- end }}

charts/ocg/templates/server_ingress.yaml

@@ -15,7 +15,7 @@ spec:
     service:
       name: {{ include "chart.resourceNamePrefix" . }}server
       port:
-        number: {{ .Values.server.service.port }}
+        number: {{ .Values.server.ingress.backendServicePort }}
   {{- with .Values.server.ingress.rules }}
   rules:
     {{- toYaml . | nindent 4 }}

charts/ocg/templates/server_service.yaml

@@ -5,13 +5,15 @@ metadata:
   labels:
     app.kubernetes.io/component: server
     {{- include "chart.labels" . | nindent 4 }}
+  {{- with .Values.server.service.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
 spec:
+  allocateLoadBalancerNodePorts: {{ .Values.server.service.allocateLoadBalancerNodePorts }}
   type: {{ .Values.server.service.type }}
   ports:
-    - port: {{ .Values.server.service.port }}
-      targetPort: http
-      protocol: TCP
-      name: http
+    {{- toYaml .Values.server.service.ports | nindent 4 }}
   selector:
     app.kubernetes.io/component: server
     {{- include "chart.selectorLabels" . | nindent 4 }}

charts/ocg/values.yaml

@@ -120,13 +120,20 @@ server:
     enabled: true
     annotations:
       kubernetes.io/ingress.class: nginx
+    backendServicePort: 80
     rules: []
     tls: []
 
   # Service configuration
   service:
+    allocateLoadBalancerNodePorts: true
+    annotations: {}
+    ports:
+      - name: http
+        port: 80
+        protocol: TCP
+        targetPort: 9000
     type: NodePort
-    port: 80
 
   # Deployment configuration
   deploy:
@@ -144,7 +151,7 @@ postgresql:
     password: postgres
     database: ocg
   image:
-    repository: bitnami/postgresql
+    repository: docker.io/bitnamilegacy/postgresql
     tag: 17.2.0-debian-12-r3
   postgresqlDataDir: /data/pgdata
   primary: