From d3334dd37a2528bb165b789ac48d02c3bfd2682c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=BDuboslav=20Pivar=C4=8D?= <456130@mail.muni.cz>
Date: Tue, 6 Aug 2019 12:07:46 +0000
Subject: [PATCH] Revert "add init container"
This reverts commit e1bff1a6c855ba57f73a7941451ce54d704b1f03
---
.../edirex/cbioondemandK8S/service/KubernetesImpl.java | 10 ----------
cbioondemandK8S/src/main/resources/cbio-replicaset.yml | 7 -------
2 files changed, 17 deletions(-)
diff --git a/cbioondemandK8S/src/main/java/cz/muni/ics/edirex/cbioondemandK8S/service/KubernetesImpl.java b/cbioondemandK8S/src/main/java/cz/muni/ics/edirex/cbioondemandK8S/service/KubernetesImpl.java
index aff49c5..fd96a1f 100644
--- a/cbioondemandK8S/src/main/java/cz/muni/ics/edirex/cbioondemandK8S/service/KubernetesImpl.java
+++ b/cbioondemandK8S/src/main/java/cz/muni/ics/edirex/cbioondemandK8S/service/KubernetesImpl.java
@@ -212,7 +212,6 @@ public class KubernetesImpl implements CBioOnDemandService {
V1ReplicaSet replicaSet = Utils.deepCopy(cbioReplicaSet, V1ReplicaSet.class);
addLabelsAndSelectors(replicaSet, userID, id);
addDbHost(replicaSet, Host);
- addDbHostToInit(replicaSet, Host);
addMoveAndID(replicaSet, move, samplesId);
addUrl(replicaSet, url);
V1ReplicaSet result = api.createReplicaSet(replicaSet, NAMESPACE);
@@ -281,15 +280,6 @@ public class KubernetesImpl implements CBioOnDemandService {
.setValue(Host);
}
- private void addDbHostToInit(V1ReplicaSet replicaSet, String Host){
- replicaSet.getSpec()
- .getTemplate()
- .getSpec()
- .getInitContainers().get(0)
- .getEnv().get(0)
- .setValue(Host);
- }
-
private void addUrl(V1ReplicaSet replicaSet, String url) {
replicaSet.getSpec()
.getTemplate()
diff --git a/cbioondemandK8S/src/main/resources/cbio-replicaset.yml b/cbioondemandK8S/src/main/resources/cbio-replicaset.yml
index 825185a..9489faa 100644
--- a/cbioondemandK8S/src/main/resources/cbio-replicaset.yml
+++ b/cbioondemandK8S/src/main/resources/cbio-replicaset.yml
@@ -28,13 +28,6 @@ spec:
# generated by API unique for user
#instance: "1"
spec:
- initContainers:
- - name: waitForDb
- image: lpivo/wait_for_db
- env:
- - name: DBHOST
- # generated by API from service name
- value: cbio-on-demand-dbpjvrw
imagePullSecrets:
- name: dataloding
containers:
--
GitLab