Update v1.5 content

roles/openshift_examples/files/examples/v1.5/db-templates/redis-ephemeral-template.json

@@ -21,6 +21,16 @@
   },
   "objects": [
     {
+      "kind": "Secret",
+      "apiVersion": "v1",
+      "metadata": {
+        "name": "${DATABASE_SERVICE_NAME}"
+      },
+      "stringData" : {
+        "database-password" : "${REDIS_PASSWORD}"
+      }
+    },
+    {
       "kind": "Service",
       "apiVersion": "v1",
       "metadata": {
@@ -117,7 +127,12 @@
                 "env": [
                   {
                     "name": "REDIS_PASSWORD",
-                    "value": "${REDIS_PASSWORD}"
+                    "valueFrom": {
+                      "secretKeyRef" : {
+                        "name" : "${DATABASE_SERVICE_NAME}",
+                        "key" : "database-password"
+                      }
+                    }
                   }
                 ],
                 "resources": {

roles/openshift_examples/files/examples/v1.5/db-templates/redis-persistent-template.json

@@ -21,6 +21,16 @@
   },
   "objects": [
     {
+      "kind": "Secret",
+      "apiVersion": "v1",
+      "metadata": {
+        "name": "${DATABASE_SERVICE_NAME}"
+      },
+      "stringData" : {
+        "database-password" : "${REDIS_PASSWORD}"
+      }
+    },
+    {
       "kind": "Service",
       "apiVersion": "v1",
       "metadata": {
@@ -134,7 +144,12 @@
                 "env": [
                   {
                     "name": "REDIS_PASSWORD",
-                    "value": "${REDIS_PASSWORD}"
+                    "valueFrom": {
+                      "secretKeyRef" : {
+                        "name" : "${DATABASE_SERVICE_NAME}",
+                        "key" : "database-password"
+                      }
+                    }
                   }
                 ],
                 "resources": {

roles/openshift_examples/files/examples/v1.5/quickstart-templates/jenkins-ephemeral-template.json

@@ -110,6 +110,10 @@
                     "value": "true"
                   },
                   {
+                    "name": "OPENSHIFT_JENKINS_JVM_ARCH",
+                    "value": "${JVM_ARCH}"
+                  },
+                  {
                     "name": "KUBERNETES_MASTER",
                     "value": "https://kubernetes.default:443"
                   },
@@ -255,6 +259,12 @@
       "value": "true"
     },
     {
+      "name": "JVM_ARCH",
+      "displayName": "Jenkins JVM Architecture",
+      "description": "Whether Jenkins runs with a 32 bit (i386) or 64 bit (x86_64) JVM.",
+      "value": "i386"
+    },
+    {
       "name": "MEMORY_LIMIT",
       "displayName": "Memory Limit",
       "description": "Maximum amount of memory the container can use.",

roles/openshift_examples/files/examples/v1.5/quickstart-templates/jenkins-persistent-template.json

@@ -127,6 +127,10 @@
                     "value": "true"
                   },
                   {
+                    "name": "OPENSHIFT_JENKINS_JVM_ARCH",
+                    "value": "${JVM_ARCH}"
+                  },
+                  {
                     "name": "KUBERNETES_MASTER",
                     "value": "https://kubernetes.default:443"
                   },
@@ -272,6 +276,12 @@
       "value": "true"
     },
     {
+      "name": "JVM_ARCH",
+      "displayName": "Jenkins JVM Architecture",
+      "description": "Whether Jenkins runs with a 32 bit (i386) or 64 bit (x86_64) JVM.",
+      "value": "i386"
+    },
+    {
       "name": "MEMORY_LIMIT",
       "displayName": "Memory Limit",
       "description": "Maximum amount of memory the container can use.",

roles/openshift_hosted_templates/files/v1.5/enterprise/logging-deployer.yaml

@@ -81,6 +81,7 @@ items:
     metadata:
       name: logging-deployer-edit-role
     roleRef:
+      kind: ClusterRole
       name: edit
     subjects:
     - kind: ServiceAccount
@@ -91,6 +92,7 @@ items:
     metadata:
       name: logging-deployer-dsadmin-role
     roleRef:
+      kind: ClusterRole
       name: daemonset-admin
     subjects:
     - kind: ServiceAccount
@@ -101,6 +103,7 @@ items:
     metadata:
       name: logging-elasticsearch-view-role
     roleRef:
+      kind: ClusterRole
       name: view
     subjects:
     - kind: ServiceAccount
@@ -217,11 +220,11 @@ items:
     name: MODE
     value: "install"
   -
-    description: 'Specify prefix for logging components; e.g. for "registry.access.redhat.com/openshift3/logging-deployer:3.4.0", set prefix "registry.access.redhat.com/openshift3/"'
+    description: 'Specify prefix for logging components; e.g. for "registry.access.redhat.com/openshift3/logging-deployer:3.3.0", set prefix "registry.access.redhat.com/openshift3/"'
     name: IMAGE_PREFIX
     value: "registry.access.redhat.com/openshift3/"
   -
-    description: 'Specify version for logging components; e.g. for "registry.access.redhat.com/openshift3/logging-deployer:3.4.0", set version "3.4.0"'
+    description: 'Specify version for logging components; e.g. for "registry.access.redhat.com/openshift3/logging-deployer:3.3.0", set version "3.3.0"'
     name: IMAGE_VERSION
     value: "3.4.0"
   -

roles/openshift_hosted_templates/files/v1.5/enterprise/metrics-deployer.yaml

@@ -105,7 +105,7 @@ parameters:
 -
   description: 'Specify version for metrics components; e.g. for "openshift/origin-metrics-deployer:latest", set version "latest"'
   name: IMAGE_VERSION
-  value: "3.4.0"
+  value: "v3.5"
 -
   description: "Internal URL for the master, for authentication retrieval"
   name: MASTER_URL

roles/openshift_hosted_templates/files/v1.5/origin/logging-deployer.yaml

@@ -81,7 +81,6 @@ items:
     metadata:
       name: logging-deployer-edit-role
     roleRef:
-      kind: ClusterRole
       name: edit
     subjects:
     - kind: ServiceAccount
@@ -92,7 +91,6 @@ items:
     metadata:
       name: logging-deployer-dsadmin-role
     roleRef:
-      kind: ClusterRole
       name: daemonset-admin
     subjects:
     - kind: ServiceAccount
@@ -103,7 +101,6 @@ items:
     metadata:
       name: logging-elasticsearch-view-role
     roleRef:
-      kind: ClusterRole
       name: view
     subjects:
     - kind: ServiceAccount