Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
  • Loading branch information
garronej committed Jul 17, 2024
1 parent c366d38 commit ca0d26c
Show file tree
Hide file tree
Showing 6 changed files with 28 additions and 3 deletions.
4 changes: 4 additions & 0 deletions web/src/core/adapters/onyxiaApi/default/ApiTypes.ts
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,10 @@ export type ApiTypes = {
cacerts: string;
pathToCaBundle: string;
};
openshiftSCC?: {
scc: string;
enabled: boolean;
};
}[];
oidcConfiguration?: {
issuerURI: string;
Expand Down
9 changes: 8 additions & 1 deletion web/src/core/adapters/onyxiaApi/default/default.ts
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,14 @@ export function createOnyxiaApi(params: {
"certManagerClusterIssuer":
apiRegion.services.expose.certManager
?.certManagerClusterIssuer
}
},
"openshiftSCC":
apiRegion.openshiftSCC === undefined
? undefined
: {
"scc": apiRegion.openshiftSCC.scc,
"enabled": apiRegion.openshiftSCC.enabled
}
})
);

Expand Down
3 changes: 2 additions & 1 deletion web/src/core/adapters/onyxiaApi/mock.ts
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,8 @@ export const onyxiaApi: OnyxiaApi = {
"certManager": {
"useCertManager": false,
"certManagerClusterIssuer": undefined
}
},
"openshiftSCC": undefined
}
],
"oidcParams": undefined
Expand Down
6 changes: 6 additions & 0 deletions web/src/core/ports/OnyxiaApi/DeploymentRegion.ts
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,12 @@ export type DeploymentRegion = {
useCertManager: boolean;
certManagerClusterIssuer: string | undefined;
};
openshiftSCC:
| {
scc: string;
enabled: boolean;
}
| undefined;
};
export namespace DeploymentRegion {
/** https://github.com/InseeFrLab/onyxia-api/blob/main/docs/region-configuration.md#s3 */
Expand Down
6 changes: 6 additions & 0 deletions web/src/core/ports/OnyxiaApi/XOnyxia.ts
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,12 @@ export type XOnyxiaContext = {
gpu?: `${number}`;
}
| undefined;
openshiftSCC:
| {
scc: string;
enabled: boolean;
}
| undefined;
};
k8s: {
domain: string;
Expand Down
3 changes: 2 additions & 1 deletion web/src/core/usecases/launcher/thunks.ts
Original file line number Diff line number Diff line change
Expand Up @@ -568,7 +568,8 @@ const privateThunks = {
"startupProbe": region.startupProbe,
"sliders": region.sliders,
"resources": region.resources,
"customValues": region.customValues ?? {}
"customValues": region.customValues ?? {},
"openshiftSCC": region.openshiftSCC
},
"k8s": {
"domain": region.kubernetesClusterDomain,
Expand Down

0 comments on commit ca0d26c

Please sign in to comment.