Merge branch 'dev' into 'beta'

Dev

See merge request !6

cbioondemandK8S/src/main/java/cz/muni/ics/edirex/cbioondemandK8S/service/KubernetesImpl.java

@@ -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");

k8s/deployment.yml

@@ -21,6 +21,7 @@ spec:
         app: cbio-api
         type: ondemand
     spec:
+      serviceAccountName: cbio-api
       imagePullSecrets:
         - name: temporary
       containers: