From 945812d9849305649d52a24936b3288a44a5cdad Mon Sep 17 00:00:00 2001 From: Scott Dodson Date: Fri, 31 Mar 2017 14:33:30 -0400 Subject: Update v1.5 content --- .../v1.5/db-templates/redis-ephemeral-template.json | 17 ++++++++++++++++- .../v1.5/db-templates/redis-persistent-template.json | 17 ++++++++++++++++- .../jenkins-ephemeral-template.json | 10 ++++++++++ .../jenkins-persistent-template.json | 10 ++++++++++ .../files/v1.5/enterprise/logging-deployer.yaml | 7 +++++-- .../files/v1.5/enterprise/metrics-deployer.yaml | 2 +- .../files/v1.5/origin/logging-deployer.yaml | 3 --- 7 files changed, 58 insertions(+), 8 deletions(-) (limited to 'roles') 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 @@ -20,6 +20,16 @@ "template": "redis-ephemeral-template" }, "objects": [ + { + "kind": "Secret", + "apiVersion": "v1", + "metadata": { + "name": "${DATABASE_SERVICE_NAME}" + }, + "stringData" : { + "database-password" : "${REDIS_PASSWORD}" + } + }, { "kind": "Service", "apiVersion": "v1", @@ -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 @@ -20,6 +20,16 @@ "template": "redis-persistent-template" }, "objects": [ + { + "kind": "Secret", + "apiVersion": "v1", + "metadata": { + "name": "${DATABASE_SERVICE_NAME}" + }, + "stringData" : { + "database-password" : "${REDIS_PASSWORD}" + } + }, { "kind": "Service", "apiVersion": "v1", @@ -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 @@ -109,6 +109,10 @@ "name": "OPENSHIFT_ENABLE_REDIRECT_PROMPT", "value": "true" }, + { + "name": "OPENSHIFT_JENKINS_JVM_ARCH", + "value": "${JVM_ARCH}" + }, { "name": "KUBERNETES_MASTER", "value": "https://kubernetes.default:443" @@ -254,6 +258,12 @@ "description": "Whether to enable OAuth OpenShift integration. If false, the static account 'admin' will be initialized with the password 'password'.", "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", 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 @@ -126,6 +126,10 @@ "name": "OPENSHIFT_ENABLE_REDIRECT_PROMPT", "value": "true" }, + { + "name": "OPENSHIFT_JENKINS_JVM_ARCH", + "value": "${JVM_ARCH}" + }, { "name": "KUBERNETES_MASTER", "value": "https://kubernetes.default:443" @@ -271,6 +275,12 @@ "description": "Whether to enable OAuth OpenShift integration. If false, the static account 'admin' will be initialized with the password 'password'.", "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", diff --git a/roles/openshift_hosted_templates/files/v1.5/enterprise/logging-deployer.yaml b/roles/openshift_hosted_templates/files/v1.5/enterprise/logging-deployer.yaml index c67058696..fdfc285ca 100644 --- a/roles/openshift_hosted_templates/files/v1.5/enterprise/logging-deployer.yaml +++ b/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" - diff --git a/roles/openshift_hosted_templates/files/v1.5/enterprise/metrics-deployer.yaml b/roles/openshift_hosted_templates/files/v1.5/enterprise/metrics-deployer.yaml index 6ead122c5..c4ab794ae 100644 --- a/roles/openshift_hosted_templates/files/v1.5/enterprise/metrics-deployer.yaml +++ b/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 diff --git a/roles/openshift_hosted_templates/files/v1.5/origin/logging-deployer.yaml b/roles/openshift_hosted_templates/files/v1.5/origin/logging-deployer.yaml index bc8c79ca1..5b5503500 100644 --- a/roles/openshift_hosted_templates/files/v1.5/origin/logging-deployer.yaml +++ b/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 -- cgit v1.2.3