switch to generated password for jenkins service

openshift · Aug 2, 2016 · 72acf08 · 72acf08
1 parent 074e084
commit 72acf08
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 7 deletions.
diff --git a/examples/jenkins/jenkins-ephemeral-template.json b/examples/jenkins/jenkins-ephemeral-template.json
@@ -10,6 +10,7 @@
       "tags": "instant-app,jenkins"
     }
   },
+  "message": "A Jenkins service has been created in your project.  The username/password are admin/${JENKINS_PASSWORD}.",
   "objects": [
     {
       "kind": "Route",
@@ -172,7 +173,8 @@
       "displayName": "Jenkins Password",
       "description": "Password for the Jenkins 'admin' user.",
       "generate": "expression",
-      "value": "password"
+      "from": "[a-zA-Z0-9]{16}",
+      "required": true
     },
     {
       "name": "MEMORY_LIMIT",

diff --git a/examples/jenkins/jenkins-persistent-template.json b/examples/jenkins/jenkins-persistent-template.json
@@ -10,6 +10,7 @@
       "tags": "instant-app,jenkins"
     }
   },
+  "message": "A Jenkins service has been created in your project.  The username/password are admin/${JENKINS_PASSWORD}.",
   "objects": [
     {
       "kind": "Route",
@@ -189,7 +190,8 @@
       "displayName": "Jenkins Password",
       "description": "Password for the Jenkins 'admin' user.",
       "generate": "expression",
-      "value": "password"
+      "from": "[a-zA-Z0-9]{16}",
+      "required": true
     },
     {
       "name": "MEMORY_LIMIT",

diff --git a/examples/jenkins/pipeline/README.md b/examples/jenkins/pipeline/README.md
@@ -40,6 +40,14 @@ jenkins template represented by jenkinstemplate.json by running these commands a
     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
@@ -48,7 +56,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.
 
-    The login/password are `admin/password`.
+    Login with the user name is `admin` and the password as determined above.
 
 6. Launch a new build
 

diff --git a/examples/jenkins/pipeline/jenkinstemplate.json b/examples/jenkins/pipeline/jenkinstemplate.json
@@ -10,6 +10,7 @@
       "tags": "instant-app,jenkins"
     }
   },
+  "message": "A Jenkins service has been created in your project.  The username/password are admin/${JENKINS_PASSWORD}.",
   "objects": [
     {
       "kind": "Route",
@@ -243,9 +244,10 @@
     {
       "name": "JENKINS_PASSWORD",
       "displayName": "Jenkins Password",
-      "description": "Password for the Jenkins user.",
+      "description": "Password for the Jenkins 'admin' user.",
       "generate": "expression",
-      "value": "password"
+      "from": "[a-zA-Z0-9]{16}",
+      "required": true
     }
   ],
   "labels": {

diff --git a/pkg/bootstrap/bindata.go b/pkg/bootstrap/bindata.go