diff options
author | OpenShift Bot <eparis+openshiftbot@redhat.com> | 2017-03-31 16:57:07 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-03-31 16:57:07 -0500 |
commit | d1bf5e0a5270dac11d6cd5aa9d4723a12221ae8b (patch) | |
tree | 8a5677558578d83edd2fc2def96263265add3a18 /roles/openshift_examples/files/examples/v1.5 | |
parent | 577b4f46ebf8db9b3e5601367cc7bc7cd73bce28 (diff) | |
parent | 945812d9849305649d52a24936b3288a44a5cdad (diff) | |
download | openshift-d1bf5e0a5270dac11d6cd5aa9d4723a12221ae8b.tar.gz openshift-d1bf5e0a5270dac11d6cd5aa9d4723a12221ae8b.tar.bz2 openshift-d1bf5e0a5270dac11d6cd5aa9d4723a12221ae8b.tar.xz openshift-d1bf5e0a5270dac11d6cd5aa9d4723a12221ae8b.zip |
Merge pull request #3823 from sdodson/image-stream-sync
Merged by openshift-bot
Diffstat (limited to 'roles/openshift_examples/files/examples/v1.5')
4 files changed, 52 insertions, 2 deletions
diff --git a/roles/openshift_examples/files/examples/v1.5/db-templates/redis-ephemeral-template.json b/roles/openshift_examples/files/examples/v1.5/db-templates/redis-ephemeral-template.json index 82a09a3ec..e9af50937 100644 --- a/roles/openshift_examples/files/examples/v1.5/db-templates/redis-ephemeral-template.json +++ b/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": { diff --git a/roles/openshift_examples/files/examples/v1.5/db-templates/redis-persistent-template.json b/roles/openshift_examples/files/examples/v1.5/db-templates/redis-persistent-template.json index 1d5f59188..aa27578a9 100644 --- a/roles/openshift_examples/files/examples/v1.5/db-templates/redis-persistent-template.json +++ b/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": { diff --git a/roles/openshift_examples/files/examples/v1.5/quickstart-templates/jenkins-ephemeral-template.json b/roles/openshift_examples/files/examples/v1.5/quickstart-templates/jenkins-ephemeral-template.json index b0aef3cfc..264e4b2de 100644 --- a/roles/openshift_examples/files/examples/v1.5/quickstart-templates/jenkins-ephemeral-template.json +++ b/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.", diff --git a/roles/openshift_examples/files/examples/v1.5/quickstart-templates/jenkins-persistent-template.json b/roles/openshift_examples/files/examples/v1.5/quickstart-templates/jenkins-persistent-template.json index a542de219..b47bdf353 100644 --- a/roles/openshift_examples/files/examples/v1.5/quickstart-templates/jenkins-persistent-template.json +++ b/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.", |