Prepare chart for migration to OCI (#337)

* Prepare chart for migration to OCI

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

* Do not use feature added in PG 17

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

---------

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

Author: tegioz

charts/gitjobs/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 name: gitjobs
 description: GitJobs is an open source job board platform
 type: application
-version: 0.1.1-0
+version: 0.1.1-1
 appVersion: 0.1.0
 kubeVersion: ">= 1.19.0-0"
 keywords:
@@ -16,6 +16,6 @@ maintainers:
     email: [email protected]
 dependencies:
   - name: postgresql
-    version: 16.3.2
+    version: 18.0.15
     repository: https://charts.bitnami.com/bitnami
     condition: postgresql.enabled

charts/gitjobs/templates/_helpers.tpl

@@ -78,6 +78,7 @@ longest resource name ("db-migrator-install" = 19 chars).
 Provide an init container to verify the database is accessible
 */}}
 {{- define "chart.checkDbIsReadyInitContainer" -}}
+{{- $securityContext := default (dict) .Values.checkDbIsReadyInitContainer.securityContext }}
 name: check-db-ready
 {{ if .Values.postgresql.image.registry -}}
 image: {{ .Values.postgresql.image.registry }}/{{ .Values.postgresql.image.repository }}:{{ .Values.postgresql.image.tag }}
@@ -92,6 +93,11 @@ env:
     value: "{{ .Values.db.port }}"
   - name: PGUSER
     value: "{{ .Values.db.user }}"
+{{- if $securityContext }}
+securityContext:{{- toYaml $securityContext | nindent 2 }}
+{{- else }}
+securityContext: {}
+{{- end }}
 command: ['sh', '-c', 'until pg_isready; do echo waiting for database; sleep 2; done;']
 {{- end -}}
 

charts/gitjobs/templates/db_migrator_job.yaml

@@ -13,6 +13,10 @@ metadata:
 spec:
   template:
     spec:
+    {{- with .Values.dbmigrator.job.podSecurityContext }}
+      securityContext:
+        {{- toYaml . | nindent 8 }}
+    {{- end }}
     {{- with .Values.imagePullSecrets }}
       imagePullSecrets:
         {{- toYaml . | nindent 8 }}
@@ -24,6 +28,10 @@ spec:
         - name: dbmigrator
           image: {{ .Values.dbmigrator.job.image.repository }}:{{ .Values.imageTag | default (printf "v%s" .Chart.AppVersion) }}
           imagePullPolicy: {{ .Values.pullPolicy }}
+          {{- with .Values.dbmigrator.job.containerSecurityContext }}
+          securityContext:
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
           env:
             - name: TERN_CONF
               value: {{ .Values.configDir }}/tern.conf

charts/gitjobs/templates/server_deployment.yaml

@@ -17,6 +17,10 @@ spec:
         app.kubernetes.io/component: server
         {{- include "chart.selectorLabels" . | nindent 8 }}
     spec:
+    {{- with .Values.server.deploy.podSecurityContext }}
+      securityContext:
+        {{- toYaml . | nindent 8 }}
+    {{- end }}
     {{- with .Values.imagePullSecrets }}
       imagePullSecrets:
         {{- toYaml . | nindent 8 }}
@@ -32,12 +36,20 @@ spec:
           {{ $kubectlImageVersion := ternary "1.33" $kubeVersion (semverCompare ">=1.34.0-0" (printf "%s.0" $kubeVersion)) }}
           image: "docker.io/bitnamilegacy/kubectl:{{ $kubectlImageVersion }}"
           imagePullPolicy: IfNotPresent
+          {{- with .Values.checkDbIsReadyInitContainer.securityContext }}
+          securityContext:
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
           command: ['kubectl', 'wait', '--namespace={{ .Release.Namespace }}', '--for=condition=complete', 'job/{{ include "chart.resourceNamePrefix" . }}dbmigrator-install', '--timeout=60s']
         {{- end }}
       containers:
         - name: server
           image: {{ .Values.server.deploy.image.repository }}:{{ .Values.imageTag | default (printf "v%s" .Chart.AppVersion) }}
           imagePullPolicy: {{ .Values.pullPolicy }}
+          {{- with .Values.server.deploy.containerSecurityContext }}
+          securityContext:
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
           volumeMounts:
             - name: server-config
               mountPath: {{ .Values.configDir | quote }}
@@ -46,6 +58,10 @@ spec:
             - name: http
               containerPort: 9000
               protocol: TCP
+          {{- with .Values.server.deploy.readinessProbe }}
+          readinessProbe:
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
           resources:
             {{- toYaml .Values.server.deploy.resources | nindent 12 }}
           command: ['gitjobs-server', '-c', '{{ .Values.configDir }}/server.yml']

charts/gitjobs/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/gitjobs/templates/server_service.yaml

@@ -5,13 +5,18 @@ metadata:
   labels:
     app.kubernetes.io/component: server
     {{- include "chart.labels" . | nindent 4 }}
+  {{- with .Values.server.service.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
 spec:
-  type: {{ .Values.server.service.type }}
+  {{- $serviceType := default "ClusterIP" .Values.server.service.type }}
+  {{- if eq $serviceType "LoadBalancer" }}
+  allocateLoadBalancerNodePorts: {{ .Values.server.service.allocateLoadBalancerNodePorts }}
+  {{- end }}
+  type: {{ $serviceType }}
   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/gitjobs/templates/syncer_cronjob.yaml

@@ -15,6 +15,10 @@ spec:
     spec:
       template:
         spec:
+        {{- with .Values.syncer.cronjob.podSecurityContext }}
+          securityContext:
+            {{- toYaml . | nindent 12 }}
+        {{- end }}
         {{- with .Values.imagePullSecrets }}
           imagePullSecrets:
             {{- toYaml . | nindent 12 }}
@@ -26,6 +30,10 @@ spec:
             - name: syncer
               image: {{ .Values.syncer.cronjob.image.repository }}:{{ .Values.imageTag | default (printf "v%s" .Chart.AppVersion) }}
               imagePullPolicy: {{ .Values.pullPolicy }}
+              {{- with .Values.syncer.cronjob.containerSecurityContext }}
+              securityContext:
+                {{- toYaml . | nindent 16 }}
+              {{- end }}
               resources:
                 {{- toYaml .Values.syncer.cronjob.resources | nindent 16 }}
               volumeMounts:

charts/gitjobs/values.yaml

@@ -18,13 +18,17 @@ fullnameOverride: ""
 # Directory path where the configuration files should be mounted
 configDir: "/home/gitjobs/.config/gitjobs"
 
+# Check database readiness init container configuration
+checkDbIsReadyInitContainer:
+  securityContext: {}
+
 # Database configuration
 db:
   host: ""
   port: 5432
   dbname: gitjobs
-  user: postgres
-  password: postgres
+  user: gitjobs
+  password: gitjobs
 
 # Email configuration
 email:
@@ -51,9 +55,11 @@ log:
 # Database migrator configuration
 dbmigrator:
   job:
+    containerSecurityContext: {}
     image:
       # Database migrator image repository (without the tag)
       repository: gitjobs/dbmigrator
+    podSecurityContext: {}
 
 # Server configuration
 server:
@@ -138,41 +144,65 @@ 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:
-    replicaCount: 1
+    containerSecurityContext: {}
     image:
-      # Database migrator image repository (without the tag)
+      # Server image repository (without the tag)
       repository: gitjobs/server
+    podSecurityContext: {}
+    readinessProbe:
+      httpGet:
+        path: /health-check
+        port: 9000
+    replicaCount: 1
     resources: {}
 
 # Syncer configuration
 syncer:
   cronjob:
+    containerSecurityContext: {}
     image:
       # Syncer image repository (without the tag)
       repository: gitjobs/syncer
+    podSecurityContext: {}
     resources: {}
 
 # PostgreSQL configuration
 postgresql:
   enabled: true
   auth:
-    username: postgres
-    password: postgres
+    username: gitjobs
+    password: gitjobs
     database: gitjobs
+  global:
+    security:
+      allowInsecureImages: true
   image:
-    repository: bitnamilegacy/postgresql
-    tag: 17.2.0-debian-12-r3
-  postgresqlDataDir: /data/pgdata
+    registry: docker.io
+    repository: artifacthub/postgres
+    tag: latest
+  persistence:
+    mountPath: /data
   primary:
-    persistence:
-      mountPath: /data
+    extraVolumes:
+      - name: run
+        emptyDir: {}
+    extraVolumeMounts:
+      - name: run
+        mountPath: /var/run/postgresql

database/migrations/functions/jobboard/search_jobs.sql

@@ -166,10 +166,7 @@ begin
                     where project_id = any(
                         select project_id
                         from project p
-                        join json_table((p_filters->'projects'), '$[*]' columns (
-                            foundation text path '$.foundation',
-                            name text path '$.name'
-                        )) fp
+                        join jsonb_to_recordset(p_filters->'projects') as fp(foundation text, name text)
                         on p.foundation = fp.foundation and p.name = fp.name
                     )
                 )