Commit 8da3f493 authored by Ľuboslav Pivarč's avatar Ľuboslav Pivarč
Browse files

Merge branch 'dev' into 'beta'

Dev

See merge request !6
parents 5fcc34b4 e00da039
Pipeline #22665 passed with stages
in 15 minutes and 27 seconds
......@@ -37,14 +37,14 @@ public class KubernetesImpl implements CBioOnDemandService {
private V1beta1CronJob cronJob;
private IdentifierCRD identifier;
@Value("${namespace:cbio-on-demand}")
private final String NAMESPACE = "cbio-on-demand";
private final String NAMESPACE;
private final String APP_LABELS = "app=cbio, type=ondemand";
private final String DB_LABELS = "app=cbioDB, type=ondemand";
public KubernetesImpl(KubernetesCalls api, RoutingAAI routing) throws IOException {
public KubernetesImpl(KubernetesCalls api, RoutingAAI routing, @Value("${namespace:cbio-on-demand}")String namespace) throws IOException {
this.api = api;
this.routing = routing;
NAMESPACE = namespace;
cronJob = (V1beta1CronJob) Utils.getConfigurationFromYaml("deletecronjob.yml");
cbioService = (V1Service) Utils.getConfigurationFromYaml("cbio-service.yml");
cbioReplicaSet = (V1ReplicaSet) Utils.getConfigurationFromYaml("cbio-replicaset.yml");
......
......@@ -21,6 +21,7 @@ spec:
app: cbio-api
type: ondemand
spec:
serviceAccountName: cbio-api
imagePullSecrets:
- name: temporary
containers:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment