Merge pull request #236 from tchughesiv/1.1.1merge

Merge 1.1.1 code from master
kiegroup · Jul 30, 2019 · 1e00848 · 1e00848
2 parents f1bab45 + a7807af
commit 1e00848
Show file tree

Hide file tree

Showing 38 changed files with 3,539 additions and 127 deletions.
diff --git a/config/common.yaml → config/7.4.0/common.yaml b/config/common.yaml → config/7.4.0/common.yaml
@@ -18,7 +18,7 @@ console:
               from:
                 kind: ImageStreamTag
                 namespace: openshift
-                name: "[[.Constants.Product]][[.Version]]-[[.Console.ImageName]]-openshift:[[.ImageTag]]"
+                name: "[[.Constants.Product]][[.Constants.Major]][[.Constants.Minor]]-[[.Console.ImageName]]-openshift:[[.ImageTag]]"
           - type: ConfigChange
         replicas: [[.Console.Replicas]]
         selector:
@@ -36,7 +36,7 @@ console:
             terminationGracePeriodSeconds: 60
             containers:
               - name: "[[.ApplicationName]]-[[.Console.Name]]"
-                image: "[[.Constants.Product]][[.Version]]-[[.Console.ImageName]]-openshift"
+                image: "[[.Constants.Product]][[.Constants.Major]][[.Constants.Minor]]-[[.Console.ImageName]]-openshift"
                 imagePullPolicy: Always
                 resources:
                   limits:
@@ -310,7 +310,7 @@ smartRouter:
               from:
                 kind: ImageStreamTag
                 namespace: "openshift"
-                name: "[[.Constants.Product]][[.Version]]-smartrouter-openshift:[[.ImageTag]]"
+                name: "[[.Constants.Product]][[.Constants.Major]][[.Constants.Minor]]-smartrouter-openshift:[[.ImageTag]]"
           - type: ConfigChange
         replicas: [[.SmartRouter.Replicas]]
         selector:
@@ -328,7 +328,7 @@ smartRouter:
             terminationGracePeriodSeconds: 60
             containers:
               - name: "[[.ApplicationName]]-smartrouter"
-                image: "[[.Constants.Product]][[.Version]]-smartrouter-openshift"
+                image: "[[.Constants.Product]][[.Constants.Major]][[.Constants.Minor]]-smartrouter-openshift"
                 imagePullPolicy: Always
                 resources:
                   limits:
@@ -476,7 +476,7 @@ servers:
               terminationGracePeriodSeconds: 90
               containers:
                 - name: "[[.KieName]]"
-                  image: "[[$.Constants.Product]][[$.Version]]-kieserver-openshift"
+                  image: "[[$.Constants.Product]][[$.Constants.Major]][[$.Constants.Minor]]-kieserver-openshift"
                   imagePullPolicy: Always
                   lifecycle:
                     postStart:

diff --git a/config/dbs/external.yaml → config/7.4.0/dbs/external.yaml b/config/dbs/external.yaml → config/7.4.0/dbs/external.yaml
diff --git a/config/dbs/h2.yaml → config/7.4.0/dbs/h2.yaml b/config/dbs/h2.yaml → config/7.4.0/dbs/h2.yaml
diff --git a/config/dbs/mysql.yaml → config/7.4.0/dbs/mysql.yaml b/config/dbs/mysql.yaml → config/7.4.0/dbs/mysql.yaml
diff --git a/config/dbs/postgresql.yaml → config/7.4.0/dbs/postgresql.yaml b/config/dbs/postgresql.yaml → config/7.4.0/dbs/postgresql.yaml
diff --git a/config/envs/rhdm-authoring-ha.yaml → config/7.4.0/envs/rhdm-authoring-ha.yaml b/config/envs/rhdm-authoring-ha.yaml → config/7.4.0/envs/rhdm-authoring-ha.yaml
diff --git a/config/envs/rhdm-authoring.yaml → config/7.4.0/envs/rhdm-authoring.yaml b/config/envs/rhdm-authoring.yaml → config/7.4.0/envs/rhdm-authoring.yaml
diff --git a/config/envs/rhdm-production-immutable.yaml → ...7.4.0/envs/rhdm-production-immutable.yaml b/config/envs/rhdm-production-immutable.yaml → ...7.4.0/envs/rhdm-production-immutable.yaml
diff --git a/config/7.4.0/envs/rhdm-trial.yaml b/config/7.4.0/envs/rhdm-trial.yaml
@@ -0,0 +1,113 @@
+console:
+  deploymentConfigs:
+    - metadata:
+        name: "[[.ApplicationName]]-[[.Console.Name]]"
+      spec:
+        template:
+          spec:
+            containers:
+              - name: "[[.ApplicationName]]-[[.Console.Name]]"
+                ports:
+                  - name: git-ssh
+                    containerPort: 8001
+                    protocol: TCP
+            volumes:
+              - name: "[[.ApplicationName]]-[[.Console.Name]]-pvol"
+                emptyDir: {}
+  persistentVolumeClaims:
+    - metadata:
+        name: "[[.ApplicationName]]-[[.Console.Name]]-claim"
+        annotations:
+          delete: "true"
+  services:
+    - metadata:
+        name: "[[.ApplicationName]]-[[.Console.Name]]"
+      spec:
+        ports:
+          - name: git-ssh
+            port: 8001
+            targetPort: 8001
+    - metadata:
+        name: "[[.ApplicationName]]-[[.Console.Name]]-ping"
+        annotations:
+          delete: "true"
+  routes:
+    - id: "[[.ApplicationName]]-[[.Console.Name]]-http"
+      metadata:
+        name: "[[.ApplicationName]]-[[.Console.Name]]-http"
+        labels:
+          app: "[[.ApplicationName]]"
+          application: "[[.ApplicationName]]"
+          service: "[[.ApplicationName]]-[[.Console.Name]]"
+        annotations:
+          description: Route for Business Central's http service.
+          haproxy.router.openshift.io/timeout: 60s
+      spec:
+        to:
+          name: "[[.ApplicationName]]-[[.Console.Name]]"
+        port:
+          targetPort: http
+## KIE Servers BEGIN
+servers:
+  ## RANGE BEGINS
+  #[[ range $index, $Map := .Servers ]]
+  - deploymentConfigs:
+      ## KIE server deployment config BEGIN
+      - metadata:
+          name: "[[.KieName]]"
+        spec:
+          template:
+            metadata:
+              name: "[[.KieName]]"
+            spec:
+              containers:
+                - name: "[[.KieName]]"
+                  env:
+                    - name: JGROUPS_PING_PROTOCOL
+                    - name: OPENSHIFT_DNS_PING_SERVICE_NAME
+                    - name: OPENSHIFT_DNS_PING_SERVICE_PORT
+                    - name: FILTERS
+                      value: "AC_ALLOW_ORIGIN,AC_ALLOW_METHODS,AC_ALLOW_HEADERS,AC_ALLOW_CREDENTIALS,AC_MAX_AGE"
+                    - name: AC_ALLOW_ORIGIN_FILTER_RESPONSE_HEADER_NAME
+                      value: "Access-Control-Allow-Origin"
+                    - name: AC_ALLOW_ORIGIN_FILTER_RESPONSE_HEADER_VALUE
+                      value: "*"
+                    - name: AC_ALLOW_METHODS_FILTER_RESPONSE_HEADER_NAME
+                      value: "Access-Control-Allow-Methods"
+                    - name: AC_ALLOW_METHODS_FILTER_RESPONSE_HEADER_VALUE
+                      value: "GET, POST, OPTIONS, PUT"
+                    - name: AC_ALLOW_HEADERS_FILTER_RESPONSE_HEADER_NAME
+                      value: "Access-Control-Allow-Headers"
+                    - name: AC_ALLOW_HEADERS_FILTER_RESPONSE_HEADER_VALUE
+                      value: "Accept, Authorization, Content-Type, X-Requested-With"
+                    - name: AC_ALLOW_CREDENTIALS_FILTER_RESPONSE_HEADER_NAME
+                      value: "Access-Control-Allow-Credentials"
+                    - name: AC_ALLOW_CREDENTIALS_FILTER_RESPONSE_HEADER_VALUE
+                      value: "true"
+                    - name: AC_MAX_AGE_FILTER_RESPONSE_HEADER_NAME
+                      value: "Access-Control-Max-Age"
+                    - name: AC_MAX_AGE_FILTER_RESPONSE_HEADER_VALUE
+                      value: "1"
+    ## KIE server deployment config END
+    ## KIE server route BEGIN
+    routes:
+      - id: "[[.KieName]]-http"
+        metadata:
+          name: "[[.KieName]]-http"
+          labels:
+            app: "[[$.ApplicationName]]"
+            application: "[[$.ApplicationName]]"
+            service: "[[.KieName]]"
+          annotations:
+            description: Route for KIE server's http service.
+            haproxy.router.openshift.io/balance: source
+            haproxy.router.openshift.io/timeout: 60s
+        spec:
+          to:
+            name: "[[.KieName]]"
+          port:
+            targetPort: http
+    ## KIE server route END
+#[[end]]
+## RANGE ends
+## KIE Servers END
diff --git a/config/envs/rhpam-authoring-ha.yaml → config/7.4.0/envs/rhpam-authoring-ha.yaml b/config/envs/rhpam-authoring-ha.yaml → config/7.4.0/envs/rhpam-authoring-ha.yaml
diff --git a/config/envs/rhpam-authoring.yaml → config/7.4.0/envs/rhpam-authoring.yaml b/config/envs/rhpam-authoring.yaml → config/7.4.0/envs/rhpam-authoring.yaml
diff --git a/config/envs/rhpam-production-immutable.yaml → ....4.0/envs/rhpam-production-immutable.yaml b/config/envs/rhpam-production-immutable.yaml → ....4.0/envs/rhpam-production-immutable.yaml
diff --git a/config/envs/rhpam-production.yaml → config/7.4.0/envs/rhpam-production.yaml b/config/envs/rhpam-production.yaml → config/7.4.0/envs/rhpam-production.yaml
diff --git a/config/7.4.0/envs/rhpam-trial.yaml b/config/7.4.0/envs/rhpam-trial.yaml
@@ -0,0 +1,113 @@
+console:
+  deploymentConfigs:
+    - metadata:
+        name: "[[.ApplicationName]]-[[.Console.Name]]"
+      spec:
+        template:
+          spec:
+            containers:
+              - name: "[[.ApplicationName]]-[[.Console.Name]]"
+                ports:
+                  - name: git-ssh
+                    containerPort: 8001
+                    protocol: TCP
+            volumes:
+              - name: "[[.ApplicationName]]-[[.Console.Name]]-pvol"
+                emptyDir: {}
+  persistentVolumeClaims:
+    - metadata:
+        name: "[[.ApplicationName]]-[[.Console.Name]]-claim"
+        annotations:
+          delete: "true"
+  services:
+    - metadata:
+        name: "[[.ApplicationName]]-[[.Console.Name]]"
+      spec:
+        ports:
+          - name: git-ssh
+            port: 8001
+            targetPort: 8001
+    - metadata:
+        name: "[[.ApplicationName]]-[[.Console.Name]]-ping"
+        annotations:
+          delete: "true"
+  routes:
+    - id: "[[.ApplicationName]]-[[.Console.Name]]-http"
+      metadata:
+        name: "[[.ApplicationName]]-[[.Console.Name]]-http"
+        labels:
+          app: "[[.ApplicationName]]"
+          application: "[[.ApplicationName]]"
+          service: "[[.ApplicationName]]-[[.Console.Name]]"
+        annotations:
+          description: Route for Business Central's http service.
+          haproxy.router.openshift.io/timeout: 60s
+      spec:
+        to:
+          name: "[[.ApplicationName]]-[[.Console.Name]]"
+        port:
+          targetPort: http
+## KIE Servers BEGIN
+servers:
+  ## RANGE BEGINS
+  #[[ range $index, $Map := .Servers ]]
+  - deploymentConfigs:
+      ## KIE server deployment config BEGIN
+      - metadata:
+          name: "[[.KieName]]"
+        spec:
+          template:
+            metadata:
+              name: "[[.KieName]]"
+            spec:
+              containers:
+                - name: "[[.KieName]]"
+                  env:
+                    - name: JGROUPS_PING_PROTOCOL
+                    - name: OPENSHIFT_DNS_PING_SERVICE_NAME
+                    - name: OPENSHIFT_DNS_PING_SERVICE_PORT
+                    - name: FILTERS
+                      value: "AC_ALLOW_ORIGIN,AC_ALLOW_METHODS,AC_ALLOW_HEADERS,AC_ALLOW_CREDENTIALS,AC_MAX_AGE"
+                    - name: AC_ALLOW_ORIGIN_FILTER_RESPONSE_HEADER_NAME
+                      value: "Access-Control-Allow-Origin"
+                    - name: AC_ALLOW_ORIGIN_FILTER_RESPONSE_HEADER_VALUE
+                      value: "*"
+                    - name: AC_ALLOW_METHODS_FILTER_RESPONSE_HEADER_NAME
+                      value: "Access-Control-Allow-Methods"
+                    - name: AC_ALLOW_METHODS_FILTER_RESPONSE_HEADER_VALUE
+                      value: "GET, POST, OPTIONS, PUT"
+                    - name: AC_ALLOW_HEADERS_FILTER_RESPONSE_HEADER_NAME
+                      value: "Access-Control-Allow-Headers"
+                    - name: AC_ALLOW_HEADERS_FILTER_RESPONSE_HEADER_VALUE
+                      value: "Accept, Authorization, Content-Type, X-Requested-With"
+                    - name: AC_ALLOW_CREDENTIALS_FILTER_RESPONSE_HEADER_NAME
+                      value: "Access-Control-Allow-Credentials"
+                    - name: AC_ALLOW_CREDENTIALS_FILTER_RESPONSE_HEADER_VALUE
+                      value: "true"
+                    - name: AC_MAX_AGE_FILTER_RESPONSE_HEADER_NAME
+                      value: "Access-Control-Max-Age"
+                    - name: AC_MAX_AGE_FILTER_RESPONSE_HEADER_VALUE
+                      value: "1"
+    ## KIE server deployment config END
+    ## KIE server route BEGIN
+    routes:
+      - id: "[[.KieName]]-http"
+        metadata:
+          name: "[[.KieName]]-http"
+          labels:
+            app: "[[$.ApplicationName]]"
+            application: "[[$.ApplicationName]]"
+            service: "[[.KieName]]"
+          annotations:
+            description: Route for KIE server's http service.
+            haproxy.router.openshift.io/balance: source
+            haproxy.router.openshift.io/timeout: 60s
+        spec:
+          to:
+            name: "[[.KieName]]"
+          port:
+            targetPort: http
+    ## KIE server route END
+#[[end]]
+## RANGE ends
+## KIE Servers END