Dnes v noci mezi 02.10 - 02.15h proběhne aktualizace GitLabu na verzi 14.5.

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

Merge branch 'revert-e1bff1a6' into 'master'

Revert "add init container"

See merge request !3
parents e1bff1a6 d3334dd3
Pipeline #21738 passed with stages
in 11 minutes and 19 seconds
...@@ -212,7 +212,6 @@ public class KubernetesImpl implements CBioOnDemandService { ...@@ -212,7 +212,6 @@ public class KubernetesImpl implements CBioOnDemandService {
V1ReplicaSet replicaSet = Utils.deepCopy(cbioReplicaSet, V1ReplicaSet.class); V1ReplicaSet replicaSet = Utils.deepCopy(cbioReplicaSet, V1ReplicaSet.class);
addLabelsAndSelectors(replicaSet, userID, id); addLabelsAndSelectors(replicaSet, userID, id);
addDbHost(replicaSet, Host); addDbHost(replicaSet, Host);
addDbHostToInit(replicaSet, Host);
addMoveAndID(replicaSet, move, samplesId); addMoveAndID(replicaSet, move, samplesId);
addUrl(replicaSet, url); addUrl(replicaSet, url);
V1ReplicaSet result = api.createReplicaSet(replicaSet, NAMESPACE); V1ReplicaSet result = api.createReplicaSet(replicaSet, NAMESPACE);
...@@ -281,15 +280,6 @@ public class KubernetesImpl implements CBioOnDemandService { ...@@ -281,15 +280,6 @@ public class KubernetesImpl implements CBioOnDemandService {
.setValue(Host); .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) { private void addUrl(V1ReplicaSet replicaSet, String url) {
replicaSet.getSpec() replicaSet.getSpec()
.getTemplate() .getTemplate()
......
...@@ -28,13 +28,6 @@ spec: ...@@ -28,13 +28,6 @@ spec:
# generated by API unique for user # generated by API unique for user
#instance: "1" #instance: "1"
spec: spec:
initContainers:
- name: waitForDb
image: lpivo/wait_for_db
env:
- name: DBHOST
# generated by API from service name
value: cbio-on-demand-dbpjvrw
imagePullSecrets: imagePullSecrets:
- name: dataloding - name: dataloding
containers: 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