Add support for regions.customValues for use in helm templates

This feature was introduced in onyxia-api in PR 298 ( InseeFrLab/onyxia-api#298). Values from backend (regions.json -> services.customValues) are available to use in helm templates as region.customValues
statisticsnorway · Dec 16, 2023 · 35748a8 · 35748a8
1 parent 46fb3b3
commit 35748a8
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 0 deletions.
diff --git a/web/src/core/adapters/onyxiaApi/default.ts b/web/src/core/adapters/onyxiaApi/default.ts
@@ -82,6 +82,7 @@ export function createOnyxiaApi(params: {
                         id: string;
                         services: {
                             allowedURIPattern: string;
+                            customValues?: object;
                             expose: {
                                 domain: string;
                                 ingressClassName: string;
@@ -319,6 +320,7 @@ export function createOnyxiaApi(params: {
                                 region.packageRepositoryInjection,
                             "certificateAuthorityInjection":
                                 region.certificateAuthorityInjection,
+                            "customValues": region.services.customValues,
                             "kubernetes": (() => {
                                 const { k8sPublicEndpoint } = region.services;
                                 return k8sPublicEndpoint?.URL === undefined

diff --git a/web/src/core/adapters/onyxiaApi/mock.ts b/web/src/core/adapters/onyxiaApi/mock.ts
@@ -33,6 +33,7 @@ export const onyxiaApi: OnyxiaApi = {
                         "ingress": true,
                         "route": undefined,
                         "istio": undefined,
+                        "customValues": undefined,
                         "initScriptUrl":
                             "https://InseeFrLab.github.io/onyxia/onyxia-init.sh",
                         "s3": undefined,

diff --git a/web/src/core/ports/OnyxiaApi/DeploymentRegion.ts b/web/src/core/ports/OnyxiaApi/DeploymentRegion.ts
@@ -7,6 +7,7 @@ export type DeploymentRegion = {
     ingressClassName: string | undefined;
     ingress: boolean | undefined;
     route: boolean | undefined;
+    customValues: object | undefined;
     istio:
         | {
               enabled: boolean;

diff --git a/web/src/core/ports/OnyxiaApi/XOnyxia.ts b/web/src/core/ports/OnyxiaApi/XOnyxia.ts
@@ -64,6 +64,7 @@ export type XOnyxiaContext = {
         defaultIpProtection: boolean | undefined;
         defaultNetworkPolicy: boolean | undefined;
         allowedURIPattern: string;
+        customValues: object | undefined;
         kafka:
             | {
                   url: string;

diff --git a/web/src/core/usecases/launcher/thunks.ts b/web/src/core/usecases/launcher/thunks.ts
@@ -278,6 +278,7 @@ export const thunks = {
                             "defaultNetworkPolicy": region.defaultNetworkPolicy,
                             "allowedURIPattern":
                                 region.allowedURIPatternForUserDefinedInitScript,
+                            "customValues": region.customValues,
                             "kafka": region.kafka,
                             "from": region.from,
                             "tolerations": region.tolerations,