(BAOBAB) Clean up nodejs api

api/Chart.yaml

@@ -1,4 +1,4 @@
-apiVersion: v1
+apiVersion: v2
 name: orakl-api
 description: A Helm chart for Kubernetes
 
@@ -15,10 +15,10 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.1.4
+version: 0.1.0
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "v0.1.0.20231214.0451.cb4bd3a"
+appVersion: "v0.0.1.20240215.1237.1c4d022"

api/templates/deployment.yaml

@@ -3,26 +3,31 @@ kind: Deployment
 metadata:
   name: api
   labels:
-    {{- include "orakl-api.labels.api" . | nindent 4 }}
+    app: {{ .Values.deployment.name }}
+    app.kubernetes.io/name: {{ .Values.deployment.name }}
+    app.kubernetes.io/instance: {{ .Values.deployment.name }}
 spec:
   replicas: {{ .Values.api.replicas }}
   selector:
     matchLabels:
-      {{- include "orakl-api.selectorLabels.api" . | nindent 6 }}
+      app: {{ .Values.deployment.name }}
+      app.kubernetes.io/name: {{ .Values.deployment.name }}
+      app.kubernetes.io/instance: {{ .Values.deployment.name }}
   template:
     metadata:
       {{- with .Values.global.podAnnotations }}
       annotations:
         {{- toYaml . | nindent 8 }}
       {{- end }}
       labels:
-        {{- include "orakl-api.selectorLabels.api" . | nindent 8 }}
+        app: {{ .Values.deployment.name }}
+        app.kubernetes.io/name: {{ .Values.deployment.name }}
+        app.kubernetes.io/instance: {{ .Values.deployment.name }}
     spec:
       {{- with .Values.global.image.imagePullSecrets }}
       imagePullSecrets:
         {{- toYaml . | nindent 8 }}
       {{- end }}
-      serviceAccountName: {{ .Values.api.serviceAccount.name }}
       securityContext:
         {{- toYaml .Values.api.podSecurityContext | nindent 8 }}
       {{- if .Values.global.affinity.enabled }}
@@ -43,34 +48,6 @@ spec:
             {{- toYaml .Values.api.containerSecurityContext | nindent 12 }}
           image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.global.image.pullPolicy }}
-          {{- if .Values.global.secretManager.enabled }}
-          env:
-            - name: DATABASE_URL
-              valueFrom:
-                secretKeyRef:
-                  name: orakl-api-secrets
-                  key: DATABASE_URL
-            - name: ENCRYPT_PASSWORD
-              valueFrom:
-                secretKeyRef:
-                  name: orakl-api-secrets
-                  key: ENCRYPT_PASSWORD
-            - name: APP_PORT
-              valueFrom:
-                secretKeyRef:
-                  name: orakl-api-secrets
-                  key: APP_PORT
-            - name: REDIS_HOST
-              valueFrom:
-                secretKeyRef:
-                  name: orakl-api-secrets
-                  key: REDIS_HOST
-            - name: REDIS_PORT
-              valueFrom:
-                secretKeyRef:
-                  name: orakl-api-secrets
-                  key: REDIS_PORT
-          {{ else }}
           env:
             - name: DATABASE_URL
               valueFrom:
@@ -94,9 +71,6 @@ spec:
                 secretKeyRef:
                   name: api-secrets
                   key: REDIS_PORT
-          {{ end }}
-          command: ["yarn"]
-          args: ["start:prod"]
           ports:
           - name: http
             containerPort: 3030

api/templates/service.yaml

@@ -5,8 +5,8 @@ metadata:
 spec:
   type: ClusterIP
   ports:
-  - port: 3030
-    targetPort: http
-    protocol: TCP
+    - port: 3030
+      targetPort: http
+      protocol: TCP
   selector:
-    {{- include "orakl-api.selectorLabels.api" . | nindent 6 }}
+    app: {{ .Values.deployment.name }}

api/values.yaml

@@ -4,16 +4,11 @@ global:
   image:
     repository: public.ecr.aws/bisonai/orakl-api
     pullPolicy: IfNotPresent
-    tag: "v0.1.0.20231214.0451.cb4bd3a"
+    tag: "v0.0.1.20240215.1237.1c4d022"
     imagePullPolicy: IfNotPresent
     # -- If defined, uses a Secret to pull an image from a private Docker registry or repository
     imagePullSecrets: []
 
-  secretManager:
-    enabled: false
-    secretId:
-    versionId:
-
   affinity:
     enabled: false
     key: kubernetes.io/hostname
@@ -42,16 +37,6 @@ global:
 api:
   enabled: true
   replicas: 1
-  serviceAccount:
-    # -- Create a service account for the application controller
-    create: true
-    # -- Service account name
-    name: orakl-api
-    # -- Annotations applied to created service account
-    annotations: {}
-    # -- Automount API credentials for the Service Account
-    automountServiceAccountToken: true
-
   podSecurityContext: {}
 
   containerSecurityContext: {}
@@ -67,3 +52,7 @@ api:
 nodeSelector: {}
 tolerations: []
 dotenv: {}
+
+deployment:
+  name: orakl-api
+  replicas: 1

bisontry-health-checker/Chart.yaml

@@ -2,4 +2,4 @@ apiVersion: v2
 name: bisontry-health-checker
 description: Bisontry Health Checker service.
 version: 0.1.0
-appVersion: v0.1.0.20240131.0543.c3d8172
+appVersion: v0.1.0.20240216.0351.30594bb

bisontry-health-checker/values.yaml

@@ -1,6 +1,6 @@
 image:
   repository: asia-southeast1-docker.pkg.dev/bisontry/bisontry/bisontry-health-checker
-  tag: v0.1.0.20240131.0543.c3d8172
+  tag: v0.1.0.20240216.0351.30594bb
 
 deployment:
   name: bisontry-health-checker