Merge branch 'testing'

nimbix · Dec 3, 2024 · b9b4b37 · b9b4b37
2 parents c2fd00a + 96c855e
commit b9b4b37
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 18 deletions.
diff --git a/templates/jarvice-api.yaml b/templates/jarvice-api.yaml
@@ -371,15 +371,15 @@ spec:
         {{- include "jarvice.rootCertVolumeMount" . | indent 8 }}
         resources:
 {{ toYaml .Values.jarvice_api.resources | indent 10 }}
-      - name: jarvice-billing-api
-        image: {{ include "jarvice.registry" . }}/{{ .Values.jarvice.JARVICE_SYSTEM_REPO_BASE }}/jarvice-billing-api:{{ default .Values.jarvice.JARVICE_IMAGES_TAG .Chart.Annotations.tag }}{{- include "jarvice.version" . }}
+      - name: jarvice-api-v1
+        image: {{ include "jarvice.registry" . }}/{{ .Values.jarvice.JARVICE_SYSTEM_REPO_BASE }}/jarvice-api-v1:{{ default .Values.jarvice.JARVICE_IMAGES_TAG .Chart.Annotations.tag }}{{- include "jarvice.version" . }}
 {{- if and (empty .Values.jarvice.JARVICE_IMAGES_VERSION) (empty .Chart.Annotations.tag) }}
         imagePullPolicy: Always
 {{- else }}
         imagePullPolicy: IfNotPresent
 {{- end }}
         ports:
-          - name: http-billing
+          - name: http-api-v1
             containerPort: 8000
         readinessProbe:
           exec:
@@ -394,7 +394,7 @@ spec:
           httpGet:
             scheme: HTTP
             port: http
-            path: {{ .Values.jarvice_api.billing.env.JARVICE_EXTERNAL_BILLING_PATH }}/live
+            path: {{ cat .Values.jarvice_api.ingressPath "/v1/live" | nospace | replace "//" "/" }}
           initialDelaySeconds: {{ .Values.jarvice_api.livenessProbe.initialDelaySeconds }}
           periodSeconds: {{ .Values.jarvice_api.livenessProbe.periodSeconds }}
           timeoutSeconds: {{ .Values.jarvice_api.livenessProbe.timeoutSeconds }}
@@ -439,14 +439,18 @@ spec:
 {{- else }}
             value: "http://jarvice-dal.{{ .Values.jarvice.JARVICE_SYSTEM_NAMESPACE }}:8080"
 {{- end }}
-          - name: JARVICE_EXTERNAL_BILLING_PATH
-            value: "{{ .Values.jarvice_api.billing.env.JARVICE_EXTERNAL_BILLING_PATH }}"
-          - name: JARVICE_EXTERNAL_BILLING_WORKERS
-            value: "{{ .Values.jarvice_api.billing.env.JARVICE_EXTERNAL_BILLING_WORKERS }}"
+          - name: JARVICE_API_PATH
+            value: "{{ .Values.jarvice_api.ingressPath }}"
+          - name: JARVICE_API_POOL_SIZE
+            value: "{{ .Values.jarvice_api.env.JARVICE_API_POOL_SIZE }}"
+          - name: JARVICE_API_TIMEOUT
+            value: "{{ .Values.jarvice_api.env.JARVICE_API_TIMEOUT }}"
+          - name: JARVICE_API_MAX_CNCR
+            value: "{{ .Values.jarvice_api.env.JARVICE_API_MAX_CNCR }}"
         volumeMounts:
         {{- include "jarvice.rootCertVolumeMount" . | indent 8 }}
         resources:
-{{ toYaml .Values.jarvice_api.billing.resources | indent 10 }}
+{{ toYaml .Values.jarvice_api.fastapi.resources | indent 10 }}
 ---
 apiVersion: v1
 kind: Service
@@ -465,7 +469,7 @@ spec:
   - protocol: TCP
     port: 8000
     targetPort: 8000
-    name: http-billing
+    name: http-api-v1
   selector:
     deployment: jarvice-api
 ---
@@ -514,7 +518,7 @@ spec:
   - protocol: TCP
     port: 8000
     targetPort: 8000
-    name: http-billing
+    name: http-api-v1
   selector:
     deployment: jarvice-api
 ---
@@ -592,9 +596,9 @@ spec:
           service:
             name: jarvice-api
             port:
-              name: http-billing
+              name: http-api-v1
         pathType: Prefix
-        path: {{ .Values.jarvice_api.billing.env.JARVICE_EXTERNAL_BILLING_PATH }}
+        path: {{ cat .Values.jarvice_api.ingressPath "/v1" | nospace | replace "//" "/" }}
 {{- if ne "-" .Values.jarvice_api.ingressHost }}
     host: '{{- .Values.jarvice_api.ingressHost -}}'
 {{- if or (not (empty .Values.jarvice.ingress.tls.cluster_issuer.name)) (not (empty .Values.jarvice.ingress.tls.issuer.name)) (and (not (empty .Values.jarvice.ingress.tls.crt)) (not (empty .Values.jarvice.ingress.tls.key))) }}

diff --git a/values.yaml b/values.yaml
@@ -1059,10 +1059,7 @@ jarvice_api: # N/A if jarvice.JARVICE_CLUSTER_TYPE: "downstream"
     JARVICE_API_TIMEOUT: 1000
     JARVICE_API_MAX_CNCR: 16
     JARVICE_API_KEYCLOAK_REALM_PUBLIC_KEY: # Keycloak realm public RSA signing key
-  billing:
-    env:
-      JARVICE_EXTERNAL_BILLING_PATH: "/v1/billing"
-      JARVICE_EXTERNAL_BILLING_WORKERS: 2
+  fastapi:
     resources:
       limits:
         cpu: 1
@@ -1545,7 +1542,7 @@ keycloakx:
       subPath: jarvice_realm.json
   dbchecker:
     enabled: true
-    image: 
+    image:
       repository: us-docker.pkg.dev/jarvice/images/busybox
       tag: latest
       pullPolicy: IfNotPresent