Merge branch 'master' into 1.0.x

kiegroup · Apr 1, 2019 · 217bddf · 217bddf
2 parents a306c5a + 6dde1e7
commit 217bddf
Show file tree

Hide file tree

Showing 11 changed files with 407 additions and 173 deletions.
diff --git a/config/common.yaml b/config/common.yaml
@@ -724,11 +724,6 @@ others:
         rules:
           - apiGroups:
               - ""
-            resources:
-              - "*"
-            verbs:
-              - "*"
-          - apiGroups:
               - app.kiegroup.org
               - apps.openshift.io
               - image.openshift.io

diff --git a/config/dbs/h2.yaml b/config/dbs/h2.yaml
@@ -13,10 +13,37 @@ servers:
             spec:
               containers:
                 - name: "[[.KieName]]"
+                  env:
+                    ## H2 driver settings BEGIN
+                    - name: DATASOURCES
+                      value: "RHPAM"
+                    - name: RHPAM_DATABASE
+                      value: "rhpam7"
+                    - name: RHPAM_JNDI
+                      value: "java:/jboss/datasources/rhpam"
+                    - name: RHPAM_JTA
+                      value: "true"
+                    - name: RHPAM_DRIVER
+                      value: "h2"
+                    - name: KIE_SERVER_PERSISTENCE_DIALECT
+                      value: "org.hibernate.dialect.H2Dialect"
+                    - name: RHPAM_USERNAME
+                      value: "rhpam"
+                    - name: RHPAM_PASSWORD
+                      value: "[[$.AdminPassword]]"
+                    - name: RHPAM_SERVICE_HOST
+                      value: "dummy_ignored"
+                    - name: RHPAM_SERVICE_PORT
+                      value: "12345"
+                    - name: KIE_SERVER_PERSISTENCE_DS
+                      value: "java:/jboss/datasources/rhpam"
+                    - name: RHPAM_XA_CONNECTION_PROPERTY_URL
+                      value: "jdbc:h2:/opt/eap/standalone/data/rhpam"
+                    ## H2 driver settings END
                   volumeMounts:
                     - name: "[[.KieName]]-h2-[[$.Constants.DatabaseVolumeSuffix]]"
                       mountPath: "/opt/eap/standalone/data"
-## [[ if ne .Database.Size "" ]]
+              ## [[ if ne .Database.Size "" ]]
               volumes:
                 ## H2 volume settings BEGIN
                 - name: "[[.KieName]]-h2-[[$.Constants.DatabaseVolumeSuffix]]"
@@ -37,8 +64,8 @@ servers:
           resources:
             requests:
               storage: "[[.Database.Size]]"
-      ## H2 persistent volume claim END
-## [[ else ]]
+              ## H2 persistent volume claim END
+              ## [[ else ]]
               volumes:
                 ## H2 volume settings BEGIN
                 - name: "[[.KieName]]-h2-[[$.Constants.DatabaseVolumeSuffix]]"

diff --git a/config/dbs/mysql.yaml b/config/dbs/mysql.yaml
@@ -9,6 +9,17 @@ servers:
         spec:
           template:
             spec:
+              initContainers:
+                - command:
+                    [
+                      "sh",
+                      "-c",
+                      "until nslookup [[.KieName]]-mysql && nc -vz [[.KieName]]-mysql 3306; do echo waiting for [[.KieName]]-mysql; sleep 2; done;",
+                    ]
+                  image: busybox
+                  imagePullPolicy: IfNotPresent
+                  name: "[[.KieName]]-mysql-init"
+                  terminationMessagePolicy: FallbackToLogsOnError
               containers:
                 - name: "[[.KieName]]"
                   env:

diff --git a/config/dbs/postgresql.yaml b/config/dbs/postgresql.yaml
@@ -9,6 +9,17 @@ servers:
         spec:
           template:
             spec:
+              initContainers:
+                - command:
+                    [
+                      "sh",
+                      "-c",
+                      "until nslookup [[.KieName]]-postgresql && nc -vz [[.KieName]]-postgresql 5432; do echo waiting for [[.KieName]]-postgresql; sleep 2; done;",
+                    ]
+                  image: busybox
+                  imagePullPolicy: IfNotPresent
+                  name: "[[.KieName]]-postgresql-init"
+                  terminationMessagePolicy: FallbackToLogsOnError
               containers:
                 - name: "[[.KieName]]"
                   env:

diff --git a/config/envs/rhdm-authoring-ha.yaml b/config/envs/rhdm-authoring-ha.yaml
@@ -290,7 +290,7 @@ others:
                 from:
                   kind: ImageStreamTag
                   namespace: "openshift"
-                  name: "amq-broker-72-scaledown-controller-openshift:0.4"
+                  name: "amq-broker-72-scaledown-controller-openshift:1.0"
               type: ImageChange
             - type: ConfigChange