beta

.gitlab-ci.yml

@@ -36,7 +36,7 @@ stages:
 .docker-build-dry:
   script: &docker-build-dry
     - docker build --pull ./cbioondemandK8S
-    
+
 #ALL
 API Pipeline for MR:
   stage: build
@@ -49,6 +49,7 @@ API Pipeline for MR:
     - dev
     - beta
 
+
 #PRODUCTION
 API docker image build:
   <<: *docker-build

cbioondemandK8S/src/main/resources/cbio-replicaset.yml

@@ -34,13 +34,24 @@ spec:
           operator: Equal
           value: cbio
       affinity:
+        podAntiAffinity:
+          preferredDuringSchedulingIgnoredDuringExecution:
+            - weight: 50
+              podAffinityTerm:
+                topologyKey: kubernetes.io/hostname
+                labelSelector:
+                  matchExpressions:
+                    - key: app
+                      operator: In
+                      values:
+                        - cbio
         nodeAffinity:
           requiredDuringSchedulingIgnoredDuringExecution:
             nodeSelectorTerms:
-              - matchExpressions: 
+              - matchExpressions:
                 - key: edirex
                   operator: In
-                  values: 
+                  values:
                   - cbio
       initContainers:
         - name: wait-for-db
@@ -53,7 +64,7 @@ spec:
         - name: dataloding
       containers:
         - name: cbio
-          image: registry.gitlab.ics.muni.cz:443/europdx/k8s/cbio-on-demand/data-loading:master-app-97fb8c1069486ec071efbca7809303c5c5203b46 
+          image: registry.gitlab.ics.muni.cz:443/europdx/k8s/cbio-on-demand/data-loading:master-app-b72064c4cfaaa4c307183ea0b85349fe55d85574
           ports:
             - name: http
               containerPort: 8080
@@ -83,4 +94,4 @@ spec:
           resources:
             requests:
               memory: "1400Mi"
-              cpu: "1000m"
\ No newline at end of file
+              cpu: "1000m"

cbioondemandK8S/src/main/resources/cbiodb-replicaset.yml

@@ -42,6 +42,17 @@ spec:
                   operator: In
                   values: 
                   - cbio
+        podAntiAffinity:
+          preferredDuringSchedulingIgnoredDuringExecution:
+            - weight: 50
+              podAffinityTerm:
+                topologyKey: kubernetes.io/hostname
+                labelSelector:
+                  matchExpressions:
+                    - key: app
+                      operator: In
+                      values:
+                        - cbioDB
       containers:
         - name: cbio
           image: lpivo/cbiodb:v1