@@ -5,12 +5,12 @@

     "name": "jenkins-ephemeral",

     "creationTimestamp": null,

     "annotations": {

-      "description": "Jenkins service, without persistent storage.\nThe username is 'admin' and the tutorial at https://github.com/openshift/origin/blob/master/examples/jenkins/README.md contains more information about using this template.\nWARNING: Any data stored will be lost upon pod destruction. Only use this template for testing",

+      "description": "Jenkins service, without persistent storage.\nWARNING: Any data stored will be lost upon pod destruction. Only use this template for testing",

       "iconClass": "icon-jenkins",

       "tags": "instant-app,jenkins"

     }

   },

-  "message": "A Jenkins service has been created in your project.  The username/password are admin/${JENKINS_PASSWORD}.",

+  "message": "A Jenkins service has been created in your project.  The username/password are admin/${JENKINS_PASSWORD}.  The tutorial at https://github.com/openshift/origin/blob/master/examples/jenkins/README.md contains more information about using this template.",

   "objects": [

     {

       "kind": "Route",

@@ -26,6 +26,7 @@

         },

         "tls": {

           "termination": "edge",

+          "insecureEdgeTerminationPolicy": "Redirect",

           "certificate": "-----BEGIN CERTIFICATE-----\nMIIDIjCCAgqgAwIBAgIBATANBgkqhkiG9w0BAQUFADCBoTELMAkGA1UEBhMCVVMx\nCzAJBgNVBAgMAlNDMRUwEwYDVQQHDAxEZWZhdWx0IENpdHkxHDAaBgNVBAoME0Rl\nZmF1bHQgQ29tcGFueSBMdGQxEDAOBgNVBAsMB1Rlc3QgQ0ExGjAYBgNVBAMMEXd3\ndy5leGFtcGxlY2EuY29tMSIwIAYJKoZIhvcNAQkBFhNleGFtcGxlQGV4YW1wbGUu\nY29tMB4XDTE1MDExMjE0MTk0MVoXDTE2MDExMjE0MTk0MVowfDEYMBYGA1UEAwwP\nd3d3LmV4YW1wbGUuY29tMQswCQYDVQQIDAJTQzELMAkGA1UEBhMCVVMxIjAgBgkq\nhkiG9w0BCQEWE2V4YW1wbGVAZXhhbXBsZS5jb20xEDAOBgNVBAoMB0V4YW1wbGUx\nEDAOBgNVBAsMB0V4YW1wbGUwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAMrv\ngu6ZTTefNN7jjiZbS/xvQjyXjYMN7oVXv76jbX8gjMOmg9m0xoVZZFAE4XyQDuCm\n47VRx5Qrf/YLXmB2VtCFvB0AhXr5zSeWzPwaAPrjA4ebG+LUo24ziS8KqNxrFs1M\nmNrQUgZyQC6XIe1JHXc9t+JlL5UZyZQC1IfaJulDAgMBAAGjDTALMAkGA1UdEwQC\nMAAwDQYJKoZIhvcNAQEFBQADggEBAFCi7ZlkMnESvzlZCvv82Pq6S46AAOTPXdFd\nTMvrh12E1sdVALF1P1oYFJzG1EiZ5ezOx88fEDTW+Lxb9anw5/KJzwtWcfsupf1m\nV7J0D3qKzw5C1wjzYHh9/Pz7B1D0KthQRATQCfNf8s6bbFLaw/dmiIUhHLtIH5Qc\nyfrejTZbOSP77z8NOWir+BWWgIDDB2//3AkDIQvT20vmkZRhkqSdT7et4NmXOX/j\njhPti4b2Fie0LeuvgaOdKjCpQQNrYthZHXeVlOLRhMTSk3qUczenkKTOhvP7IS9q\n+Dzv5hqgSfvMG392KWh5f8xXfJNs4W5KLbZyl901MeReiLrPH3w=\n-----END CERTIFICATE-----",

           "key": "-----BEGIN PRIVATE KEY-----\nMIICeAIBADANBgkqhkiG9w0BAQEFAASCAmIwggJeAgEAAoGBAMrvgu6ZTTefNN7j\njiZbS/xvQjyXjYMN7oVXv76jbX8gjMOmg9m0xoVZZFAE4XyQDuCm47VRx5Qrf/YL\nXmB2VtCFvB0AhXr5zSeWzPwaAPrjA4ebG+LUo24ziS8KqNxrFs1MmNrQUgZyQC6X\nIe1JHXc9t+JlL5UZyZQC1IfaJulDAgMBAAECgYEAnxOjEj/vrLNLMZE1Q9H7PZVF\nWdP/JQVNvQ7tCpZ3ZdjxHwkvf//aQnuxS5yX2Rnf37BS/TZu+TIkK4373CfHomSx\nUTAn2FsLmOJljupgGcoeLx5K5nu7B7rY5L1NHvdpxZ4YjeISrRtEPvRakllENU5y\ngJE8c2eQOx08ZSRE4TkCQQD7dws2/FldqwdjJucYijsJVuUdoTqxP8gWL6bB251q\nelP2/a6W2elqOcWId28560jG9ZS3cuKvnmu/4LG88vZFAkEAzphrH3673oTsHN+d\nuBd5uyrlnGjWjuiMKv2TPITZcWBjB8nJDSvLneHF59MYwejNNEof2tRjgFSdImFH\nmi995wJBAMtPjW6wiqRz0i41VuT9ZgwACJBzOdvzQJfHgSD9qgFb1CU/J/hpSRIM\nkYvrXK9MbvQFvG6x4VuyT1W8mpe1LK0CQAo8VPpffhFdRpF7psXLK/XQ/0VLkG3O\nKburipLyBg/u9ZkaL0Ley5zL5dFBjTV2Qkx367Ic2b0u9AYTCcgi2DsCQQD3zZ7B\nv7BOm7MkylKokY2MduFFXU0Bxg6pfZ7q3rvg8gqhUFbaMStPRYg6myiDiW/JfLhF\nTcFT4touIo7oriFJ\n-----END PRIVATE KEY-----",

           "caCertificate": "-----BEGIN CERTIFICATE-----\nMIIEFzCCAv+gAwIBAgIJALK1iUpF2VQLMA0GCSqGSIb3DQEBBQUAMIGhMQswCQYD\nVQQGEwJVUzELMAkGA1UECAwCU0MxFTATBgNVBAcMDERlZmF1bHQgQ2l0eTEcMBoG\nA1UECgwTRGVmYXVsdCBDb21wYW55IEx0ZDEQMA4GA1UECwwHVGVzdCBDQTEaMBgG\nA1UEAwwRd3d3LmV4YW1wbGVjYS5jb20xIjAgBgkqhkiG9w0BCQEWE2V4YW1wbGVA\nZXhhbXBsZS5jb20wHhcNMTUwMTEyMTQxNTAxWhcNMjUwMTA5MTQxNTAxWjCBoTEL\nMAkGA1UEBhMCVVMxCzAJBgNVBAgMAlNDMRUwEwYDVQQHDAxEZWZhdWx0IENpdHkx\nHDAaBgNVBAoME0RlZmF1bHQgQ29tcGFueSBMdGQxEDAOBgNVBAsMB1Rlc3QgQ0Ex\nGjAYBgNVBAMMEXd3dy5leGFtcGxlY2EuY29tMSIwIAYJKoZIhvcNAQkBFhNleGFt\ncGxlQGV4YW1wbGUuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA\nw2rK1J2NMtQj0KDug7g7HRKl5jbf0QMkMKyTU1fBtZ0cCzvsF4CqV11LK4BSVWaK\nrzkaXe99IVJnH8KdOlDl5Dh/+cJ3xdkClSyeUT4zgb6CCBqg78ePp+nN11JKuJlV\nIG1qdJpB1J5O/kCLsGcTf7RS74MtqMFo96446Zvt7YaBhWPz6gDaO/TUzfrNcGLA\nEfHVXkvVWqb3gqXUztZyVex/gtP9FXQ7gxTvJml7UkmT0VAFjtZnCqmFxpLZFZ15\n+qP9O7Q2MpsGUO/4vDAuYrKBeg1ZdPSi8gwqUP2qWsGd9MIWRv3thI2903BczDc7\nr8WaIbm37vYZAS9G56E4+wIDAQABo1AwTjAdBgNVHQ4EFgQUugLrSJshOBk5TSsU\nANs4+SmJUGwwHwYDVR0jBBgwFoAUugLrSJshOBk5TSsUANs4+SmJUGwwDAYDVR0T\nBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAaMJ33zAMV4korHo5aPfayV3uHoYZ\n1ChzP3eSsF+FjoscpoNSKs91ZXZF6LquzoNezbfiihK4PYqgwVD2+O0/Ty7UjN4S\nqzFKVR4OS/6lCJ8YncxoFpTntbvjgojf1DEataKFUN196PAANc3yz8cWHF4uvjPv\nWkgFqbIjb+7D1YgglNyovXkRDlRZl0LD1OQ0ZWhd4Ge1qx8mmmanoBeYZ9+DgpFC\nj9tQAbS867yeOryNe7sEOIpXAAqK/DTu0hB6+ySsDfMo4piXCc2aA/eI2DCuw08e\nw17Dz9WnupZjVdwTKzDhFgJZMLDqn37HQnT6EemLFqbcR0VPEnfyhDtZIQ==\n-----END CERTIFICATE-----"

@@ -75,6 +76,7 @@

             }

           },

           "spec": {

+            "serviceAccountName": "${JENKINS_SERVICE_NAME}",

             "containers": [

               {

                 "name": "jenkins",

@@ -89,7 +91,7 @@

                 },

                 "livenessProbe": {

                     "timeoutSeconds": 3,

-                    "initialDelaySeconds": 60,

+                    "initialDelaySeconds": 120,

                     "httpGet": {

                         "path": "/login",

                         "port": 8080

@@ -99,6 +101,18 @@

                   {

                     "name": "JENKINS_PASSWORD",

                     "value": "${JENKINS_PASSWORD}"

+                  },

+                  {

+                    "name": "KUBERNETES_MASTER",

+                    "value": "https://kubernetes.default:443"

+                  },

+                  {

+                    "name": "KUBERNETES_TRUST_CERTIFICATES",

+                    "value": "true"

+                  },

+                  {

+                    "name": "JNLP_SERVICE_NAME",

+                    "value": "${JNLP_SERVICE_NAME}"

                   }

                 ],

                 "resources": {

@@ -136,19 +150,42 @@

       }

     },

     {

+      "kind": "ServiceAccount",

+        "apiVersion": "v1",

+        "metadata": {

+            "name": "${JENKINS_SERVICE_NAME}"

+        }

+    },

+    {

+      "kind": "RoleBinding",

+      "apiVersion": "v1",

+      "metadata": {

+          "name": "${JENKINS_SERVICE_NAME}_edit"

+      },

+      "groupNames": null,

+      "subjects": [

+          {

+              "kind": "ServiceAccount",

+              "name": "${JENKINS_SERVICE_NAME}"

+          }

+      ],

+      "roleRef": {

+          "name": "edit"

+      }

+    },

+    {

       "kind": "Service",

       "apiVersion": "v1",

       "metadata": {

-        "name": "${JENKINS_SERVICE_NAME}",

-        "creationTimestamp": null

+        "name": "${JNLP_SERVICE_NAME}"

       },

       "spec": {

         "ports": [

           {

-            "name": "web",

+            "name": "agent",

             "protocol": "TCP",

-            "port": 8080,

-            "targetPort": 8080,

+            "port": 50000,

+            "targetPort": 50000,

             "nodePort": 0

           }

         ],

@@ -159,6 +196,35 @@

         "type": "ClusterIP",

         "sessionAffinity": "None"

       }

+    },

+    {

+       "kind": "Service",

+       "apiVersion": "v1",

+       "metadata": {

+         "name": "${JENKINS_SERVICE_NAME}",

+         "annotations": {

+           "service.alpha.openshift.io/dependencies": "[{\"name\": \"${JNLP_SERVICE_NAME}\", \"namespace\": \"\", \"kind\": \"Service\"}]",

+           "service.openshift.io/infrastructure": "true"

+         },

+         "creationTimestamp": null

+       },

+       "spec": {

+         "ports": [

+           {

+             "name": "web",

+             "protocol": "TCP",

+             "port": 80,

+             "targetPort": 8080,

+             "nodePort": 0

+           }

+         ],

+         "selector": {

+           "name": "${JENKINS_SERVICE_NAME}"

+         },

+         "portalIP": "",

+         "type": "ClusterIP",

+         "sessionAffinity": "None"

+       }

     }

   ],

   "parameters": [

@@ -169,6 +235,12 @@

       "value": "jenkins"

     },

     {

+      "name": "JNLP_SERVICE_NAME",

+      "displayName": "Jenkins JNLP Service Name",

+      "description": "The name of the service used for master/slave communication.",

+      "value": "jenkins-jnlp"

+    },

+    {

       "name": "JENKINS_PASSWORD",

       "displayName": "Jenkins Password",

       "description": "Password for the Jenkins 'admin' user.",

@@ -5,12 +5,12 @@

     "name": "jenkins-persistent",

     "creationTimestamp": null,

     "annotations": {

-      "description": "Jenkins service, with persistent storage.\nThe username is 'admin' and the tutorial at https://github.com/openshift/origin/blob/master/examples/jenkins/README.md contains more information about using this template.\nYou must have persistent volumes available in your cluster to use this template.",

+      "description": "Jenkins service, with persistent storage.\nYou must have persistent volumes available in your cluster to use this template.",

       "iconClass": "icon-jenkins",

       "tags": "instant-app,jenkins"

     }

   },

-  "message": "A Jenkins service has been created in your project.  The username/password are admin/${JENKINS_PASSWORD}.",

+  "message": "A Jenkins service has been created in your project.  The username/password are admin/${JENKINS_PASSWORD}.  The tutorial at https://github.com/openshift/origin/blob/master/examples/jenkins/README.md contains more information about using this template.",

   "objects": [

     {

       "kind": "Route",

@@ -26,6 +26,7 @@

         },

         "tls": {

           "termination": "edge",

+          "insecureEdgeTerminationPolicy": "Redirect",

           "certificate": "-----BEGIN CERTIFICATE-----\nMIIDIjCCAgqgAwIBAgIBATANBgkqhkiG9w0BAQUFADCBoTELMAkGA1UEBhMCVVMx\nCzAJBgNVBAgMAlNDMRUwEwYDVQQHDAxEZWZhdWx0IENpdHkxHDAaBgNVBAoME0Rl\nZmF1bHQgQ29tcGFueSBMdGQxEDAOBgNVBAsMB1Rlc3QgQ0ExGjAYBgNVBAMMEXd3\ndy5leGFtcGxlY2EuY29tMSIwIAYJKoZIhvcNAQkBFhNleGFtcGxlQGV4YW1wbGUu\nY29tMB4XDTE1MDExMjE0MTk0MVoXDTE2MDExMjE0MTk0MVowfDEYMBYGA1UEAwwP\nd3d3LmV4YW1wbGUuY29tMQswCQYDVQQIDAJTQzELMAkGA1UEBhMCVVMxIjAgBgkq\nhkiG9w0BCQEWE2V4YW1wbGVAZXhhbXBsZS5jb20xEDAOBgNVBAoMB0V4YW1wbGUx\nEDAOBgNVBAsMB0V4YW1wbGUwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAMrv\ngu6ZTTefNN7jjiZbS/xvQjyXjYMN7oVXv76jbX8gjMOmg9m0xoVZZFAE4XyQDuCm\n47VRx5Qrf/YLXmB2VtCFvB0AhXr5zSeWzPwaAPrjA4ebG+LUo24ziS8KqNxrFs1M\nmNrQUgZyQC6XIe1JHXc9t+JlL5UZyZQC1IfaJulDAgMBAAGjDTALMAkGA1UdEwQC\nMAAwDQYJKoZIhvcNAQEFBQADggEBAFCi7ZlkMnESvzlZCvv82Pq6S46AAOTPXdFd\nTMvrh12E1sdVALF1P1oYFJzG1EiZ5ezOx88fEDTW+Lxb9anw5/KJzwtWcfsupf1m\nV7J0D3qKzw5C1wjzYHh9/Pz7B1D0KthQRATQCfNf8s6bbFLaw/dmiIUhHLtIH5Qc\nyfrejTZbOSP77z8NOWir+BWWgIDDB2//3AkDIQvT20vmkZRhkqSdT7et4NmXOX/j\njhPti4b2Fie0LeuvgaOdKjCpQQNrYthZHXeVlOLRhMTSk3qUczenkKTOhvP7IS9q\n+Dzv5hqgSfvMG392KWh5f8xXfJNs4W5KLbZyl901MeReiLrPH3w=\n-----END CERTIFICATE-----",

           "key": "-----BEGIN PRIVATE KEY-----\nMIICeAIBADANBgkqhkiG9w0BAQEFAASCAmIwggJeAgEAAoGBAMrvgu6ZTTefNN7j\njiZbS/xvQjyXjYMN7oVXv76jbX8gjMOmg9m0xoVZZFAE4XyQDuCm47VRx5Qrf/YL\nXmB2VtCFvB0AhXr5zSeWzPwaAPrjA4ebG+LUo24ziS8KqNxrFs1MmNrQUgZyQC6X\nIe1JHXc9t+JlL5UZyZQC1IfaJulDAgMBAAECgYEAnxOjEj/vrLNLMZE1Q9H7PZVF\nWdP/JQVNvQ7tCpZ3ZdjxHwkvf//aQnuxS5yX2Rnf37BS/TZu+TIkK4373CfHomSx\nUTAn2FsLmOJljupgGcoeLx5K5nu7B7rY5L1NHvdpxZ4YjeISrRtEPvRakllENU5y\ngJE8c2eQOx08ZSRE4TkCQQD7dws2/FldqwdjJucYijsJVuUdoTqxP8gWL6bB251q\nelP2/a6W2elqOcWId28560jG9ZS3cuKvnmu/4LG88vZFAkEAzphrH3673oTsHN+d\nuBd5uyrlnGjWjuiMKv2TPITZcWBjB8nJDSvLneHF59MYwejNNEof2tRjgFSdImFH\nmi995wJBAMtPjW6wiqRz0i41VuT9ZgwACJBzOdvzQJfHgSD9qgFb1CU/J/hpSRIM\nkYvrXK9MbvQFvG6x4VuyT1W8mpe1LK0CQAo8VPpffhFdRpF7psXLK/XQ/0VLkG3O\nKburipLyBg/u9ZkaL0Ley5zL5dFBjTV2Qkx367Ic2b0u9AYTCcgi2DsCQQD3zZ7B\nv7BOm7MkylKokY2MduFFXU0Bxg6pfZ7q3rvg8gqhUFbaMStPRYg6myiDiW/JfLhF\nTcFT4touIo7oriFJ\n-----END PRIVATE KEY-----",

           "caCertificate": "-----BEGIN CERTIFICATE-----\nMIIEFzCCAv+gAwIBAgIJALK1iUpF2VQLMA0GCSqGSIb3DQEBBQUAMIGhMQswCQYD\nVQQGEwJVUzELMAkGA1UECAwCU0MxFTATBgNVBAcMDERlZmF1bHQgQ2l0eTEcMBoG\nA1UECgwTRGVmYXVsdCBDb21wYW55IEx0ZDEQMA4GA1UECwwHVGVzdCBDQTEaMBgG\nA1UEAwwRd3d3LmV4YW1wbGVjYS5jb20xIjAgBgkqhkiG9w0BCQEWE2V4YW1wbGVA\nZXhhbXBsZS5jb20wHhcNMTUwMTEyMTQxNTAxWhcNMjUwMTA5MTQxNTAxWjCBoTEL\nMAkGA1UEBhMCVVMxCzAJBgNVBAgMAlNDMRUwEwYDVQQHDAxEZWZhdWx0IENpdHkx\nHDAaBgNVBAoME0RlZmF1bHQgQ29tcGFueSBMdGQxEDAOBgNVBAsMB1Rlc3QgQ0Ex\nGjAYBgNVBAMMEXd3dy5leGFtcGxlY2EuY29tMSIwIAYJKoZIhvcNAQkBFhNleGFt\ncGxlQGV4YW1wbGUuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA\nw2rK1J2NMtQj0KDug7g7HRKl5jbf0QMkMKyTU1fBtZ0cCzvsF4CqV11LK4BSVWaK\nrzkaXe99IVJnH8KdOlDl5Dh/+cJ3xdkClSyeUT4zgb6CCBqg78ePp+nN11JKuJlV\nIG1qdJpB1J5O/kCLsGcTf7RS74MtqMFo96446Zvt7YaBhWPz6gDaO/TUzfrNcGLA\nEfHVXkvVWqb3gqXUztZyVex/gtP9FXQ7gxTvJml7UkmT0VAFjtZnCqmFxpLZFZ15\n+qP9O7Q2MpsGUO/4vDAuYrKBeg1ZdPSi8gwqUP2qWsGd9MIWRv3thI2903BczDc7\nr8WaIbm37vYZAS9G56E4+wIDAQABo1AwTjAdBgNVHQ4EFgQUugLrSJshOBk5TSsU\nANs4+SmJUGwwHwYDVR0jBBgwFoAUugLrSJshOBk5TSsUANs4+SmJUGwwDAYDVR0T\nBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAaMJ33zAMV4korHo5aPfayV3uHoYZ\n1ChzP3eSsF+FjoscpoNSKs91ZXZF6LquzoNezbfiihK4PYqgwVD2+O0/Ty7UjN4S\nqzFKVR4OS/6lCJ8YncxoFpTntbvjgojf1DEataKFUN196PAANc3yz8cWHF4uvjPv\nWkgFqbIjb+7D1YgglNyovXkRDlRZl0LD1OQ0ZWhd4Ge1qx8mmmanoBeYZ9+DgpFC\nj9tQAbS867yeOryNe7sEOIpXAAqK/DTu0hB6+ySsDfMo4piXCc2aA/eI2DCuw08e\nw17Dz9WnupZjVdwTKzDhFgJZMLDqn37HQnT6EemLFqbcR0VPEnfyhDtZIQ==\n-----END CERTIFICATE-----"

@@ -92,6 +93,7 @@

             }

           },

           "spec": {

+            "serviceAccountName": "${JENKINS_SERVICE_NAME}",

             "containers": [

               {

                 "name": "jenkins",

@@ -106,7 +108,7 @@

                 },

                 "livenessProbe": {

                     "timeoutSeconds": 3,

-                    "initialDelaySeconds": 60,

+                    "initialDelaySeconds": 120,

                     "httpGet": {

                         "path": "/login",

                         "port": 8080

@@ -116,6 +118,18 @@

                   {

                     "name": "JENKINS_PASSWORD",

                     "value": "${JENKINS_PASSWORD}"

+                  },

+                  {

+                    "name": "KUBERNETES_MASTER",

+                    "value": "https://kubernetes.default:443"

+                  },

+                  {

+                    "name": "KUBERNETES_TRUST_CERTIFICATES",

+                    "value": "true"

+                  },

+                  {

+                    "name": "JNLP_SERVICE_NAME",

+                    "value": "${JNLP_SERVICE_NAME}"

                   }

                 ],

                 "resources": {

@@ -153,19 +167,42 @@

       }

     },

     {

+      "kind": "ServiceAccount",

+        "apiVersion": "v1",

+        "metadata": {

+            "name": "${JENKINS_SERVICE_NAME}"

+        }

+    },

+    {

+      "kind": "RoleBinding",

+      "apiVersion": "v1",

+      "metadata": {

+          "name": "${JENKINS_SERVICE_NAME}_edit"

+      },

+      "groupNames": null,

+      "subjects": [

+          {

+              "kind": "ServiceAccount",

+              "name": "${JENKINS_SERVICE_NAME}"

+          }

+      ],

+      "roleRef": {

+          "name": "edit"

+      }

+    },

+    {

       "kind": "Service",

       "apiVersion": "v1",

       "metadata": {

-        "name": "${JENKINS_SERVICE_NAME}",

-        "creationTimestamp": null

+        "name": "${JNLP_SERVICE_NAME}"

       },

       "spec": {

         "ports": [

           {

-            "name": "web",

+            "name": "agent",

             "protocol": "TCP",

-            "port": 8080,

-            "targetPort": 8080,

+            "port": 50000,

+            "targetPort": 50000,

             "nodePort": 0

           }

         ],

@@ -176,6 +213,35 @@

         "type": "ClusterIP",

         "sessionAffinity": "None"

       }

+    },

+    {

+       "kind": "Service",

+       "apiVersion": "v1",

+       "metadata": {

+         "name": "${JENKINS_SERVICE_NAME}",

+         "annotations": {

+           "service.alpha.openshift.io/dependencies": "[{\"name\": \"${JNLP_SERVICE_NAME}\", \"namespace\": \"\", \"kind\": \"Service\"}]",

+           "service.openshift.io/infrastructure": "true"

+         },

+         "creationTimestamp": null

+       },

+       "spec": {

+         "ports": [

+           {

+             "name": "web",

+             "protocol": "TCP",

+             "port": 80,

+             "targetPort": 8080,

+             "nodePort": 0

+           }

+         ],

+         "selector": {

+           "name": "${JENKINS_SERVICE_NAME}"

+         },

+         "portalIP": "",

+         "type": "ClusterIP",

+         "sessionAffinity": "None"

+       }

     }

   ],

   "parameters": [

@@ -186,6 +252,12 @@

       "value": "jenkins"

     },

     {

+      "name": "JNLP_SERVICE_NAME",

+      "displayName": "Jenkins JNLP Service Name",

+      "description": "The name of the service used for master/slave communication.",

+      "value": "jenkins-jnlp"

+    },

+    {

       "name": "JENKINS_PASSWORD",

       "displayName": "Jenkins Password",

       "description": "Password for the Jenkins 'admin' user.",

@@ -15,7 +15,11 @@ To walk through the example:

 jenkins template represented by jenkinstemplate.json by running these commands as a cluster admin:

         $ oc create -f https://raw.githubusercontent.com/openshift/origin/master/examples/image-streams/image-streams-centos7.json -n openshift

-        $ oc create -f https://raw.githubusercontent.com/openshift/origin/master/examples/jenkins/pipeline/jenkinstemplate.json -n openshift

+        $ oc create -f https://raw.githubusercontent.com/openshift/origin/master/examples/jenkins/jenkins-ephemeral-template.json -n openshift

+

+    Note: If you have persistent volumes available in your cluster and prefer to use persistent storage (recommended) for your Jenkins server, register the jenkins-persistent-template.json file as well:

+

+        $ oc create -f https://raw.githubusercontent.com/openshift/origin/master/examples/jenkins/jenkins-persistent-template.json -n openshift

 2. Login as a normal user (any username is fine)

@@ -25,29 +29,37 @@ jenkins template represented by jenkinstemplate.json by running these commands a

         $ oc new-project pipelineproject

-4. Run this command to instantiate the template which will create a pipeline buildconfig and some other resources in your project:

+4. Run this command to instantiate a Jenkins server and service account in your project:

+

+    If your have persistent volumes available in your cluster:

+

+        $ oc new-app jenkins-persistent

+

+    Otherwise:

+

+        $ oc new-app jenkins-ephemeral

+

+    Make a note of the Jenkins password reported by new-app.

-        If you used cluster up:

+    Note: eventually this will be done automatically when you create a pipeline buildconfig.

+

+5. Run this command to instantiate the template which will create a pipeline buildconfig and some other resources in your project:

+

+    If you used cluster up:

+    

         $ oc new-app jenkins-pipeline-example

-        Otherwise:

+    Otherwise:

+    

         $ oc new-app -f https://raw.githubusercontent.com/openshift/origin/master/examples/jenkins/pipeline/samplepipeline.json

     At this point if you run `oc get pods` you should see a jenkins pod, or at least a jenkins-deploy pod. (along with other items in your project)  This pod was created as a result of the new pipeline buildconfig being defined by the sample-pipeline template.

-5. View/Manage Jenkins (optional)

+6. View/Manage Jenkins (optional)

     You should not need to access the jenkins console for anything, but if you want to configure settings or watch the execution,

     here are the steps to do so:

-    First you must determine the jenkins password which was randomly generated for you:

-

-        $ oc env dc/jenkins --list | grep JENKINS_PASSWORD

-

-    The value will appear as:

-

-        JENKINS_PASSWORD=faUXMOFUhRYXO2Gx

-

     If you have a router running (`oc cluster up` provides one), run:

         $ oc get route

@@ -56,7 +68,7 @@ jenkins template represented by jenkinstemplate.json by running these commands a

     If you do not have a router, you can access jenkins directly via the service ip.  Determine the jenkins service ip ("oc get svc") and go to it in your browser on port 80.  Do not confuse it with the jenkins-jnlp service.

-    Login with the user name is `admin` and the password as determined above.

+    Login with the user name is `admin` and the password as recorded earlier.

 6. Launch a new build

deleted file mode 100644

@@ -1,256 +0,0 @@

-{

-  "kind": "Template",

-  "apiVersion": "v1",

-  "metadata": {

-    "name": "jenkins",

-    "creationTimestamp": null,

-    "annotations": {

-      "description": "Jenkins service, without persistent storage. WARNING: Any data stored will be lost upon pod destruction. Only use this template for testing",

-      "iconClass": "icon-jenkins",

-      "tags": "instant-app,jenkins"

-    }

-  },

-  "message": "A Jenkins service has been created in your project.  The username/password are admin/${JENKINS_PASSWORD}.",

-  "objects": [

-    {

-      "kind": "Route",

-      "apiVersion": "v1",

-      "metadata": {

-        "name": "jenkins",

-        "creationTimestamp": null

-      },

-      "spec": {

-        "to": {

-          "kind": "Service",

-          "name": "${JENKINS_SERVICE_NAME}"

-        },

-        "tls": {

-          "termination": "edge",

-          "insecureEdgeTerminationPolicy": "Redirect",

-          "certificate": "-----BEGIN CERTIFICATE-----\nMIIDIjCCAgqgAwIBAgIBATANBgkqhkiG9w0BAQUFADCBoTELMAkGA1UEBhMCVVMx\nCzAJBgNVBAgMAlNDMRUwEwYDVQQHDAxEZWZhdWx0IENpdHkxHDAaBgNVBAoME0Rl\nZmF1bHQgQ29tcGFueSBMdGQxEDAOBgNVBAsMB1Rlc3QgQ0ExGjAYBgNVBAMMEXd3\ndy5leGFtcGxlY2EuY29tMSIwIAYJKoZIhvcNAQkBFhNleGFtcGxlQGV4YW1wbGUu\nY29tMB4XDTE1MDExMjE0MTk0MVoXDTE2MDExMjE0MTk0MVowfDEYMBYGA1UEAwwP\nd3d3LmV4YW1wbGUuY29tMQswCQYDVQQIDAJTQzELMAkGA1UEBhMCVVMxIjAgBgkq\nhkiG9w0BCQEWE2V4YW1wbGVAZXhhbXBsZS5jb20xEDAOBgNVBAoMB0V4YW1wbGUx\nEDAOBgNVBAsMB0V4YW1wbGUwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAMrv\ngu6ZTTefNN7jjiZbS/xvQjyXjYMN7oVXv76jbX8gjMOmg9m0xoVZZFAE4XyQDuCm\n47VRx5Qrf/YLXmB2VtCFvB0AhXr5zSeWzPwaAPrjA4ebG+LUo24ziS8KqNxrFs1M\nmNrQUgZyQC6XIe1JHXc9t+JlL5UZyZQC1IfaJulDAgMBAAGjDTALMAkGA1UdEwQC\nMAAwDQYJKoZIhvcNAQEFBQADggEBAFCi7ZlkMnESvzlZCvv82Pq6S46AAOTPXdFd\nTMvrh12E1sdVALF1P1oYFJzG1EiZ5ezOx88fEDTW+Lxb9anw5/KJzwtWcfsupf1m\nV7J0D3qKzw5C1wjzYHh9/Pz7B1D0KthQRATQCfNf8s6bbFLaw/dmiIUhHLtIH5Qc\nyfrejTZbOSP77z8NOWir+BWWgIDDB2//3AkDIQvT20vmkZRhkqSdT7et4NmXOX/j\njhPti4b2Fie0LeuvgaOdKjCpQQNrYthZHXeVlOLRhMTSk3qUczenkKTOhvP7IS9q\n+Dzv5hqgSfvMG392KWh5f8xXfJNs4W5KLbZyl901MeReiLrPH3w=\n-----END CERTIFICATE-----",

-          "key": "-----BEGIN PRIVATE KEY-----\nMIICeAIBADANBgkqhkiG9w0BAQEFAASCAmIwggJeAgEAAoGBAMrvgu6ZTTefNN7j\njiZbS/xvQjyXjYMN7oVXv76jbX8gjMOmg9m0xoVZZFAE4XyQDuCm47VRx5Qrf/YL\nXmB2VtCFvB0AhXr5zSeWzPwaAPrjA4ebG+LUo24ziS8KqNxrFs1MmNrQUgZyQC6X\nIe1JHXc9t+JlL5UZyZQC1IfaJulDAgMBAAECgYEAnxOjEj/vrLNLMZE1Q9H7PZVF\nWdP/JQVNvQ7tCpZ3ZdjxHwkvf//aQnuxS5yX2Rnf37BS/TZu+TIkK4373CfHomSx\nUTAn2FsLmOJljupgGcoeLx5K5nu7B7rY5L1NHvdpxZ4YjeISrRtEPvRakllENU5y\ngJE8c2eQOx08ZSRE4TkCQQD7dws2/FldqwdjJucYijsJVuUdoTqxP8gWL6bB251q\nelP2/a6W2elqOcWId28560jG9ZS3cuKvnmu/4LG88vZFAkEAzphrH3673oTsHN+d\nuBd5uyrlnGjWjuiMKv2TPITZcWBjB8nJDSvLneHF59MYwejNNEof2tRjgFSdImFH\nmi995wJBAMtPjW6wiqRz0i41VuT9ZgwACJBzOdvzQJfHgSD9qgFb1CU/J/hpSRIM\nkYvrXK9MbvQFvG6x4VuyT1W8mpe1LK0CQAo8VPpffhFdRpF7psXLK/XQ/0VLkG3O\nKburipLyBg/u9ZkaL0Ley5zL5dFBjTV2Qkx367Ic2b0u9AYTCcgi2DsCQQD3zZ7B\nv7BOm7MkylKokY2MduFFXU0Bxg6pfZ7q3rvg8gqhUFbaMStPRYg6myiDiW/JfLhF\nTcFT4touIo7oriFJ\n-----END PRIVATE KEY-----",

-          "caCertificate": "-----BEGIN CERTIFICATE-----\nMIIEFzCCAv+gAwIBAgIJALK1iUpF2VQLMA0GCSqGSIb3DQEBBQUAMIGhMQswCQYD\nVQQGEwJVUzELMAkGA1UECAwCU0MxFTATBgNVBAcMDERlZmF1bHQgQ2l0eTEcMBoG\nA1UECgwTRGVmYXVsdCBDb21wYW55IEx0ZDEQMA4GA1UECwwHVGVzdCBDQTEaMBgG\nA1UEAwwRd3d3LmV4YW1wbGVjYS5jb20xIjAgBgkqhkiG9w0BCQEWE2V4YW1wbGVA\nZXhhbXBsZS5jb20wHhcNMTUwMTEyMTQxNTAxWhcNMjUwMTA5MTQxNTAxWjCBoTEL\nMAkGA1UEBhMCVVMxCzAJBgNVBAgMAlNDMRUwEwYDVQQHDAxEZWZhdWx0IENpdHkx\nHDAaBgNVBAoME0RlZmF1bHQgQ29tcGFueSBMdGQxEDAOBgNVBAsMB1Rlc3QgQ0Ex\nGjAYBgNVBAMMEXd3dy5leGFtcGxlY2EuY29tMSIwIAYJKoZIhvcNAQkBFhNleGFt\ncGxlQGV4YW1wbGUuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA\nw2rK1J2NMtQj0KDug7g7HRKl5jbf0QMkMKyTU1fBtZ0cCzvsF4CqV11LK4BSVWaK\nrzkaXe99IVJnH8KdOlDl5Dh/+cJ3xdkClSyeUT4zgb6CCBqg78ePp+nN11JKuJlV\nIG1qdJpB1J5O/kCLsGcTf7RS74MtqMFo96446Zvt7YaBhWPz6gDaO/TUzfrNcGLA\nEfHVXkvVWqb3gqXUztZyVex/gtP9FXQ7gxTvJml7UkmT0VAFjtZnCqmFxpLZFZ15\n+qP9O7Q2MpsGUO/4vDAuYrKBeg1ZdPSi8gwqUP2qWsGd9MIWRv3thI2903BczDc7\nr8WaIbm37vYZAS9G56E4+wIDAQABo1AwTjAdBgNVHQ4EFgQUugLrSJshOBk5TSsU\nANs4+SmJUGwwHwYDVR0jBBgwFoAUugLrSJshOBk5TSsUANs4+SmJUGwwDAYDVR0T\nBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAaMJ33zAMV4korHo5aPfayV3uHoYZ\n1ChzP3eSsF+FjoscpoNSKs91ZXZF6LquzoNezbfiihK4PYqgwVD2+O0/Ty7UjN4S\nqzFKVR4OS/6lCJ8YncxoFpTntbvjgojf1DEataKFUN196PAANc3yz8cWHF4uvjPv\nWkgFqbIjb+7D1YgglNyovXkRDlRZl0LD1OQ0ZWhd4Ge1qx8mmmanoBeYZ9+DgpFC\nj9tQAbS867yeOryNe7sEOIpXAAqK/DTu0hB6+ySsDfMo4piXCc2aA/eI2DCuw08e\nw17Dz9WnupZjVdwTKzDhFgJZMLDqn37HQnT6EemLFqbcR0VPEnfyhDtZIQ==\n-----END CERTIFICATE-----"

-        }

-      }

-    },

-    {

-      "kind": "DeploymentConfig",

-      "apiVersion": "v1",

-      "metadata": {

-        "name": "${JENKINS_SERVICE_NAME}",

-        "creationTimestamp": null

-      },

-      "spec": {

-        "strategy": {

-          "type": "Recreate"

-        },

-        "triggers": [

-          {

-            "type": "ImageChange",

-            "imageChangeParams": {

-              "automatic": true,

-              "containerNames": [

-                "jenkins"

-              ],

-              "from": {

-                "kind": "ImageStreamTag",

-                "name": "jenkins:1",

-                "namespace": "openshift"

-              }

-            }

-          },

-          {

-            "type": "ConfigChange"

-          }

-        ],

-        "replicas": 1,

-        "selector": {

-          "name": "${JENKINS_SERVICE_NAME}"

-        },

-        "template": {

-          "metadata": {

-            "creationTimestamp": null,

-            "labels": {

-              "name": "${JENKINS_SERVICE_NAME}"

-            }

-          },

-          "spec": {

-            "serviceAccountName": "${JENKINS_SERVICE_NAME}",

-            "containers": [

-              {

-                "name": "jenkins",

-                "image": " ",

-                "readinessProbe": {

-                  "timeoutSeconds": 3,

-                  "initialDelaySeconds": 3,

-                  "httpGet": {

-                    "path": "/login",

-                    "port": 8080

-                  }

-                },

-                "livenessProbe": {

-                    "timeoutSeconds": 3,

-                    "initialDelaySeconds": 120,

-                    "httpGet": {

-                        "path": "/login",

-                        "port": 8080

-                    }

-                },

-                "env": [

-                  {

-                    "name": "JENKINS_PASSWORD",

-                    "value": "${JENKINS_PASSWORD}"

-                  },

-                  {

-                    "name": "KUBERNETES_MASTER",

-                    "value": "https://kubernetes.default:443"

-                  },

-                  {

-                    "name": "KUBERNETES_TRUST_CERTIFICATES",

-                    "value": "true"

-                  }

-                ],

-                "resources": {

-                  "limits": {

-                    "memory": "${MEMORY_LIMIT}"

-                  }

-                },

-                "volumeMounts": [

-                  {

-                    "name": "${JENKINS_SERVICE_NAME}-data",

-                    "mountPath": "/var/lib/jenkins"

-                  }

-                ],

-                "terminationMessagePath": "/dev/termination-log",

-                "imagePullPolicy": "IfNotPresent",

-                "capabilities": {},

-                "securityContext": {

-                  "capabilities": {},

-                  "privileged": false

-                }

-              }

-            ],

-            "volumes": [

-              {

-                "name": "${JENKINS_SERVICE_NAME}-data",

-                "emptyDir": {

-                  "medium": ""

-                }

-              }

-            ],

-            "restartPolicy": "Always",

-            "dnsPolicy": "ClusterFirst"

-          }

-        }

-      }

-    },

-    {

-      "kind": "ServiceAccount",

-        "apiVersion": "v1",

-        "metadata": {

-            "name": "${JENKINS_SERVICE_NAME}"

-        }

-    },

-    {

-      "kind": "RoleBinding",

-      "apiVersion": "v1",

-      "metadata": {

-          "name": "${JENKINS_SERVICE_NAME}_edit"

-      },

-      "groupNames": null,

-      "subjects": [

-          {

-              "kind": "ServiceAccount",

-              "name": "${JENKINS_SERVICE_NAME}"

-          }

-      ],

-      "roleRef": {

-          "name": "edit"

-      }

-    },

-    {

-      "kind": "Service",

-      "apiVersion": "v1",

-      "metadata": {

-        "name": "jenkins-jnlp"

-      },

-      "spec": {

-        "ports": [

-          {

-            "name": "agent",

-            "protocol": "TCP",

-            "port": 50000,

-            "targetPort": 50000,

-            "nodePort": 0

-          }

-        ],

-        "selector": {

-          "name": "${JENKINS_SERVICE_NAME}"

-        },

-        "portalIP": "",

-        "type": "ClusterIP",

-        "sessionAffinity": "None"

-      }

-    },

-    {

-       "kind": "Service",

-       "apiVersion": "v1",

-       "metadata": {

-         "name": "${JENKINS_SERVICE_NAME}",

-         "annotations": {

-           "service.alpha.openshift.io/dependencies": "[{\"name\": \"jenkins-jnlp\", \"namespace\": \"\", \"kind\": \"Service\"}]",

-           "service.openshift.io/infrastructure": "true"

-         },

-         "creationTimestamp": null

-       },

-       "spec": {

-         "ports": [

-           {

-             "name": "web",

-             "protocol": "TCP",

-             "port": 80,

-             "targetPort": 8080,

-             "nodePort": 0

-           }

-         ],

-         "selector": {

-           "name": "${JENKINS_SERVICE_NAME}"

-         },

-         "portalIP": "",

-         "type": "ClusterIP",

-         "sessionAffinity": "None"

-       }

-    }

-  ],

-  "parameters": [

-    {

-      "name": "MEMORY_LIMIT",

-      "displayName": "Memory Limit",

-      "description": "Maximum amount of memory the container can use.",

-      "value": "512Mi"

-    },

-    {

-      "name": "NAMESPACE",

-      "displayName": "Namespace",

-      "description": "The OpenShift Namespace where the ImageStream resides.",

-      "value": "openshift"

-    },

-    {

-      "name": "JENKINS_SERVICE_NAME",

-      "displayName": "Jenkins Service Name",

-      "description": "The name of the OpenShift Service exposed for the Jenkins container.",

-      "value": "jenkins"

-    },

-    {

-      "name": "JENKINS_PASSWORD",

-      "displayName": "Jenkins Password",

-      "description": "Password for the Jenkins 'admin' user.",

-      "generate": "expression",

-      "from": "[a-zA-Z0-9]{16}",

-      "required": true

-    }

-  ],

-  "labels": {

-    "template": "jenkins-pipeline-template"

-  }

-}

@@ -10,6 +10,7 @@

       "tags": "instant-app,ruby,mysql,jenkins"

     }

   },

+  "message": "The Jenkins server is not currently automatically instantiated for you.  Please instantiate one of the Jenkins templates to create a Jenkins server for managing your pipeline build configurations.",

   "objects": [

     {

       "kind": "BuildConfig",

@@ -12,13 +12,21 @@ if [[ -z "$( which go-bindata )" ]]; then

 fi

 pushd "${OS_ROOT}" > /dev/null

-  "$(os::util::find-go-binary go-bindata)" -nocompress -nometadata -prefix "bootstrap" -pkg "bootstrap" \

-                                   -o "${OUTPUT_PARENT}/pkg/bootstrap/bindata.go" -ignore "README.md" -ignore ".*\.go$" \

-                                   ${EXAMPLES}/image-streams/... \

-                                   ${EXAMPLES}/db-templates/... \

-                                   ${EXAMPLES}/jenkins/pipeline/... \

-                                   ${EXAMPLES}/quickstarts/... \

-                                   pkg/image/admission/imagepolicy/api/v1/...

+"$(os::util::find-go-binary go-bindata)" \

+    -nocompress \

+    -nometadata \

+    -prefix "bootstrap" \

+    -pkg "bootstrap" \

+    -o "${OUTPUT_PARENT}/pkg/bootstrap/bindata.go" \

+    -ignore "README.md" \

+    -ignore ".*\.go$" \

+    -ignore application-template.json \

+    ${EXAMPLES}/image-streams/... \

+    ${EXAMPLES}/db-templates/... \

+    ${EXAMPLES}/jenkins \

+    ${EXAMPLES}/jenkins/pipeline \

+    ${EXAMPLES}/quickstarts/... \

+    pkg/image/admission/imagepolicy/api/v1/...

 popd > /dev/null

 ret=$?; ENDTIME=$(date +%s); echo "$0 took $(($ENDTIME - $STARTTIME)) seconds"; exit "$ret"

@@ -10,7 +10,8 @@

 // examples/db-templates/mysql-persistent-template.json

 // examples/db-templates/postgresql-ephemeral-template.json

 // examples/db-templates/postgresql-persistent-template.json

-// examples/jenkins/pipeline/jenkinstemplate.json

+// examples/jenkins/jenkins-ephemeral-template.json

+// examples/jenkins/jenkins-persistent-template.json

 // examples/jenkins/pipeline/samplepipeline.json

 // examples/quickstarts/cakephp-mysql.json

 // examples/quickstarts/dancer-mysql.json

@@ -3151,25 +3152,25 @@ func examplesDbTemplatesPostgresqlPersistentTemplateJson() (*asset, error) {

 	return a, nil

 }

-var _examplesJenkinsPipelineJenkinstemplateJson = []byte(`{

+var _examplesJenkinsJenkinsEphemeralTemplateJson = []byte(`{

   "kind": "Template",

   "apiVersion": "v1",

   "metadata": {

-    "name": "jenkins",

+    "name": "jenkins-ephemeral",

     "creationTimestamp": null,

     "annotations": {

-      "description": "Jenkins service, without persistent storage. WARNING: Any data stored will be lost upon pod destruction. Only use this template for testing",

+      "description": "Jenkins service, without persistent storage.\nWARNING: Any data stored will be lost upon pod destruction. Only use this template for testing",

       "iconClass": "icon-jenkins",

       "tags": "instant-app,jenkins"

     }

   },

-  "message": "A Jenkins service has been created in your project.  The username/password are admin/${JENKINS_PASSWORD}.",

+  "message": "A Jenkins service has been created in your project.  The username/password are admin/${JENKINS_PASSWORD}.  The tutorial at https://github.com/openshift/origin/blob/master/examples/jenkins/README.md contains more information about using this template.",

   "objects": [

     {

       "kind": "Route",

       "apiVersion": "v1",

       "metadata": {

-        "name": "jenkins",

+        "name": "${JENKINS_SERVICE_NAME}",

         "creationTimestamp": null

       },

       "spec": {

@@ -3207,9 +3208,10 @@ var _examplesJenkinsPipelineJenkinstemplateJson = []byte(`{

               ],

               "from": {

                 "kind": "ImageStreamTag",

-                "name": "jenkins:1",

-                "namespace": "openshift"

-              }

+                "name": "${JENKINS_IMAGE_STREAM_TAG}",

+                "namespace": "${NAMESPACE}"

+              },

+              "lastTriggeredImage": ""

             }

           },

           {

@@ -3261,6 +3263,10 @@ var _examplesJenkinsPipelineJenkinstemplateJson = []byte(`{

                   {

                     "name": "KUBERNETES_TRUST_CERTIFICATES",

                     "value": "true"

+                  },

+                  {

+                    "name": "JNLP_SERVICE_NAME",

+                    "value": "${JNLP_SERVICE_NAME}"

                   }

                 ],

                 "resources": {

@@ -3325,7 +3331,7 @@ var _examplesJenkinsPipelineJenkinstemplateJson = []byte(`{

       "kind": "Service",

       "apiVersion": "v1",

       "metadata": {

-        "name": "jenkins-jnlp"

+        "name": "${JNLP_SERVICE_NAME}"

       },

       "spec": {

         "ports": [

@@ -3351,7 +3357,7 @@ var _examplesJenkinsPipelineJenkinstemplateJson = []byte(`{

        "metadata": {

          "name": "${JENKINS_SERVICE_NAME}",

          "annotations": {

-           "service.alpha.openshift.io/dependencies": "[{\"name\": \"jenkins-jnlp\", \"namespace\": \"\", \"kind\": \"Service\"}]",

+           "service.alpha.openshift.io/dependencies": "[{\"name\": \"${JNLP_SERVICE_NAME}\", \"namespace\": \"\", \"kind\": \"Service\"}]",

            "service.openshift.io/infrastructure": "true"

          },

          "creationTimestamp": null

@@ -3377,6 +3383,26 @@ var _examplesJenkinsPipelineJenkinstemplateJson = []byte(`{

   ],

   "parameters": [

     {

+      "name": "JENKINS_SERVICE_NAME",

+      "displayName": "Jenkins Service Name",

+      "description": "The name of the OpenShift Service exposed for the Jenkins container.",

+      "value": "jenkins"

+    },

+    {

+      "name": "JNLP_SERVICE_NAME",

+      "displayName": "Jenkins JNLP Service Name",

+      "description": "The name of the service used for master/slave communication.",

+      "value": "jenkins-jnlp"

+    },

+    {

+      "name": "JENKINS_PASSWORD",

+      "displayName": "Jenkins Password",

+      "description": "Password for the Jenkins 'admin' user.",

+      "generate": "expression",

+      "from": "[a-zA-Z0-9]{16}",

+      "required": true

+    },

+    {

       "name": "MEMORY_LIMIT",

       "displayName": "Memory Limit",

       "description": "Maximum amount of memory the container can use.",

@@ -3384,42 +3410,348 @@ var _examplesJenkinsPipelineJenkinstemplateJson = []byte(`{

     },

     {

       "name": "NAMESPACE",

-      "displayName": "Namespace",

-      "description": "The OpenShift Namespace where the ImageStream resides.",

+      "displayName": "Jenkins ImageStream Namespace",

+      "description": "The OpenShift Namespace where the Jenkins ImageStream resides.",

       "value": "openshift"

     },

     {

+      "name": "JENKINS_IMAGE_STREAM_TAG",

+      "displayName": "Jenkins ImageStreamTag",

+      "description": "Name of the ImageStreamTag to be used for the Jenkins image.",

+      "value": "jenkins:latest"

+    }

+  ],

+  "labels": {

+    "template": "jenkins-ephemeral-template"

+  }

+}

+`)

+

+func examplesJenkinsJenkinsEphemeralTemplateJsonBytes() ([]byte, error) {

+	return _examplesJenkinsJenkinsEphemeralTemplateJson, nil

+}

+

+func examplesJenkinsJenkinsEphemeralTemplateJson() (*asset, error) {

+	bytes, err := examplesJenkinsJenkinsEphemeralTemplateJsonBytes()

+	if err != nil {

+		return nil, err

+	}

+

+	info := bindataFileInfo{name: "examples/jenkins/jenkins-ephemeral-template.json", size: 0, mode: os.FileMode(0), modTime: time.Unix(0, 0)}

+	a := &asset{bytes: bytes, info:  info}

+	return a, nil

+}

+

+var _examplesJenkinsJenkinsPersistentTemplateJson = []byte(`{

+  "kind": "Template",

+  "apiVersion": "v1",

+  "metadata": {

+    "name": "jenkins-persistent",

+    "creationTimestamp": null,

+    "annotations": {

+      "description": "Jenkins service, with persistent storage.\nYou must have persistent volumes available in your cluster to use this template.",

+      "iconClass": "icon-jenkins",

+      "tags": "instant-app,jenkins"

+    }

+  },

+  "message": "A Jenkins service has been created in your project.  The username/password are admin/${JENKINS_PASSWORD}.  The tutorial at https://github.com/openshift/origin/blob/master/examples/jenkins/README.md contains more information about using this template.",

+  "objects": [

+    {

+      "kind": "Route",

+      "apiVersion": "v1",

+      "metadata": {

+        "name": "${JENKINS_SERVICE_NAME}",

+        "creationTimestamp": null

+      },

+      "spec": {

+        "to": {

+          "kind": "Service",

+          "name": "${JENKINS_SERVICE_NAME}"

+        },

+        "tls": {

+          "termination": "edge",

+          "insecureEdgeTerminationPolicy": "Redirect",

+          "certificate": "-----BEGIN CERTIFICATE-----\nMIIDIjCCAgqgAwIBAgIBATANBgkqhkiG9w0BAQUFADCBoTELMAkGA1UEBhMCVVMx\nCzAJBgNVBAgMAlNDMRUwEwYDVQQHDAxEZWZhdWx0IENpdHkxHDAaBgNVBAoME0Rl\nZmF1bHQgQ29tcGFueSBMdGQxEDAOBgNVBAsMB1Rlc3QgQ0ExGjAYBgNVBAMMEXd3\ndy5leGFtcGxlY2EuY29tMSIwIAYJKoZIhvcNAQkBFhNleGFtcGxlQGV4YW1wbGUu\nY29tMB4XDTE1MDExMjE0MTk0MVoXDTE2MDExMjE0MTk0MVowfDEYMBYGA1UEAwwP\nd3d3LmV4YW1wbGUuY29tMQswCQYDVQQIDAJTQzELMAkGA1UEBhMCVVMxIjAgBgkq\nhkiG9w0BCQEWE2V4YW1wbGVAZXhhbXBsZS5jb20xEDAOBgNVBAoMB0V4YW1wbGUx\nEDAOBgNVBAsMB0V4YW1wbGUwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAMrv\ngu6ZTTefNN7jjiZbS/xvQjyXjYMN7oVXv76jbX8gjMOmg9m0xoVZZFAE4XyQDuCm\n47VRx5Qrf/YLXmB2VtCFvB0AhXr5zSeWzPwaAPrjA4ebG+LUo24ziS8KqNxrFs1M\nmNrQUgZyQC6XIe1JHXc9t+JlL5UZyZQC1IfaJulDAgMBAAGjDTALMAkGA1UdEwQC\nMAAwDQYJKoZIhvcNAQEFBQADggEBAFCi7ZlkMnESvzlZCvv82Pq6S46AAOTPXdFd\nTMvrh12E1sdVALF1P1oYFJzG1EiZ5ezOx88fEDTW+Lxb9anw5/KJzwtWcfsupf1m\nV7J0D3qKzw5C1wjzYHh9/Pz7B1D0KthQRATQCfNf8s6bbFLaw/dmiIUhHLtIH5Qc\nyfrejTZbOSP77z8NOWir+BWWgIDDB2//3AkDIQvT20vmkZRhkqSdT7et4NmXOX/j\njhPti4b2Fie0LeuvgaOdKjCpQQNrYthZHXeVlOLRhMTSk3qUczenkKTOhvP7IS9q\n+Dzv5hqgSfvMG392KWh5f8xXfJNs4W5KLbZyl901MeReiLrPH3w=\n-----END CERTIFICATE-----",

+          "key": "-----BEGIN PRIVATE KEY-----\nMIICeAIBADANBgkqhkiG9w0BAQEFAASCAmIwggJeAgEAAoGBAMrvgu6ZTTefNN7j\njiZbS/xvQjyXjYMN7oVXv76jbX8gjMOmg9m0xoVZZFAE4XyQDuCm47VRx5Qrf/YL\nXmB2VtCFvB0AhXr5zSeWzPwaAPrjA4ebG+LUo24ziS8KqNxrFs1MmNrQUgZyQC6X\nIe1JHXc9t+JlL5UZyZQC1IfaJulDAgMBAAECgYEAnxOjEj/vrLNLMZE1Q9H7PZVF\nWdP/JQVNvQ7tCpZ3ZdjxHwkvf//aQnuxS5yX2Rnf37BS/TZu+TIkK4373CfHomSx\nUTAn2FsLmOJljupgGcoeLx5K5nu7B7rY5L1NHvdpxZ4YjeISrRtEPvRakllENU5y\ngJE8c2eQOx08ZSRE4TkCQQD7dws2/FldqwdjJucYijsJVuUdoTqxP8gWL6bB251q\nelP2/a6W2elqOcWId28560jG9ZS3cuKvnmu/4LG88vZFAkEAzphrH3673oTsHN+d\nuBd5uyrlnGjWjuiMKv2TPITZcWBjB8nJDSvLneHF59MYwejNNEof2tRjgFSdImFH\nmi995wJBAMtPjW6wiqRz0i41VuT9ZgwACJBzOdvzQJfHgSD9qgFb1CU/J/hpSRIM\nkYvrXK9MbvQFvG6x4VuyT1W8mpe1LK0CQAo8VPpffhFdRpF7psXLK/XQ/0VLkG3O\nKburipLyBg/u9ZkaL0Ley5zL5dFBjTV2Qkx367Ic2b0u9AYTCcgi2DsCQQD3zZ7B\nv7BOm7MkylKokY2MduFFXU0Bxg6pfZ7q3rvg8gqhUFbaMStPRYg6myiDiW/JfLhF\nTcFT4touIo7oriFJ\n-----END PRIVATE KEY-----",

+          "caCertificate": "-----BEGIN CERTIFICATE-----\nMIIEFzCCAv+gAwIBAgIJALK1iUpF2VQLMA0GCSqGSIb3DQEBBQUAMIGhMQswCQYD\nVQQGEwJVUzELMAkGA1UECAwCU0MxFTATBgNVBAcMDERlZmF1bHQgQ2l0eTEcMBoG\nA1UECgwTRGVmYXVsdCBDb21wYW55IEx0ZDEQMA4GA1UECwwHVGVzdCBDQTEaMBgG\nA1UEAwwRd3d3LmV4YW1wbGVjYS5jb20xIjAgBgkqhkiG9w0BCQEWE2V4YW1wbGVA\nZXhhbXBsZS5jb20wHhcNMTUwMTEyMTQxNTAxWhcNMjUwMTA5MTQxNTAxWjCBoTEL\nMAkGA1UEBhMCVVMxCzAJBgNVBAgMAlNDMRUwEwYDVQQHDAxEZWZhdWx0IENpdHkx\nHDAaBgNVBAoME0RlZmF1bHQgQ29tcGFueSBMdGQxEDAOBgNVBAsMB1Rlc3QgQ0Ex\nGjAYBgNVBAMMEXd3dy5leGFtcGxlY2EuY29tMSIwIAYJKoZIhvcNAQkBFhNleGFt\ncGxlQGV4YW1wbGUuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA\nw2rK1J2NMtQj0KDug7g7HRKl5jbf0QMkMKyTU1fBtZ0cCzvsF4CqV11LK4BSVWaK\nrzkaXe99IVJnH8KdOlDl5Dh/+cJ3xdkClSyeUT4zgb6CCBqg78ePp+nN11JKuJlV\nIG1qdJpB1J5O/kCLsGcTf7RS74MtqMFo96446Zvt7YaBhWPz6gDaO/TUzfrNcGLA\nEfHVXkvVWqb3gqXUztZyVex/gtP9FXQ7gxTvJml7UkmT0VAFjtZnCqmFxpLZFZ15\n+qP9O7Q2MpsGUO/4vDAuYrKBeg1ZdPSi8gwqUP2qWsGd9MIWRv3thI2903BczDc7\nr8WaIbm37vYZAS9G56E4+wIDAQABo1AwTjAdBgNVHQ4EFgQUugLrSJshOBk5TSsU\nANs4+SmJUGwwHwYDVR0jBBgwFoAUugLrSJshOBk5TSsUANs4+SmJUGwwDAYDVR0T\nBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAaMJ33zAMV4korHo5aPfayV3uHoYZ\n1ChzP3eSsF+FjoscpoNSKs91ZXZF6LquzoNezbfiihK4PYqgwVD2+O0/Ty7UjN4S\nqzFKVR4OS/6lCJ8YncxoFpTntbvjgojf1DEataKFUN196PAANc3yz8cWHF4uvjPv\nWkgFqbIjb+7D1YgglNyovXkRDlRZl0LD1OQ0ZWhd4Ge1qx8mmmanoBeYZ9+DgpFC\nj9tQAbS867yeOryNe7sEOIpXAAqK/DTu0hB6+ySsDfMo4piXCc2aA/eI2DCuw08e\nw17Dz9WnupZjVdwTKzDhFgJZMLDqn37HQnT6EemLFqbcR0VPEnfyhDtZIQ==\n-----END CERTIFICATE-----"

+        }

+      }

+    },

+    {

+      "kind": "PersistentVolumeClaim",

+      "apiVersion": "v1",

+      "metadata": {

+        "name": "${JENKINS_SERVICE_NAME}"

+      },

+      "spec": {

+        "accessModes": [

+          "ReadWriteOnce"

+        ],

+        "resources": {

+          "requests": {

+            "storage": "${VOLUME_CAPACITY}"

+          }

+        }

+      }

+    },    

+    {