Merge pull request #335 from msmagnanijr/RHPAM-2431-7.6.0

[RHPAM-2431] - Busybox dependency in Kieserver DeploymentConfig
kiegroup · Dec 19, 2019 · 57a7bb3 · 57a7bb3
2 parents 9bb3896 + dd6fa0d
commit 57a7bb3
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/config/7.6.0/dbs/mysql.yaml b/config/7.6.0/dbs/mysql.yaml
@@ -12,11 +12,12 @@ servers:
               initContainers:
                 - command:
                     [
-                      "sh",
+                      "/bin/bash",
                       "-c",
-                      "until nslookup [[.KieName]]-mysql && nc -vz [[.KieName]]-mysql 3306; do echo waiting for [[.KieName]]-mysql; sleep 2; done;",
+                      ">-
+                        replicas=$(oc get dc [[.KieName]]-mysql -o=jsonpath='{.status.availableReplicas}'); until '[' $replicas -gt 0 ']'; do echo waiting for [[.KieName]]-mysql; replicas=$(oc get dc [[.KieName]]-mysql -o=jsonpath='{.status.availableReplicas}'); sleep 2; done;",
                     ]
-                  image: busybox
+                  image: registry.redhat.io/openshift3/ose-cli:v3.11
                   imagePullPolicy: IfNotPresent
                   name: "[[.KieName]]-mysql-init"
                   terminationMessagePolicy: FallbackToLogsOnError

diff --git a/config/7.6.0/dbs/postgresql.yaml b/config/7.6.0/dbs/postgresql.yaml
@@ -12,11 +12,12 @@ servers:
               initContainers:
                 - command:
                     [
-                      "sh",
+                      "/bin/bash",
                       "-c",
-                      "until nslookup [[.KieName]]-postgresql && nc -vz [[.KieName]]-postgresql 5432; do echo waiting for [[.KieName]]-postgresql; sleep 2; done;",
+                      ">-
+                        replicas=$(oc get dc [[.KieName]]-postgresql -o=jsonpath='{.status.availableReplicas}'); until '[' $replicas -gt 0 ']'; do echo waiting for [[.KieName]]-postgresql; replicas=$(oc get dc [[.KieName]]-postgresql -o=jsonpath='{.status.availableReplicas}'); sleep 2; done;",
                     ]
-                  image: busybox
+                  image: registry.redhat.io/openshift3/ose-cli:v3.11
                   imagePullPolicy: IfNotPresent
                   name: "[[.KieName]]-postgresql-init"
                   terminationMessagePolicy: FallbackToLogsOnError