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 --- .../files/v1.5/enterprise/logging-deployer.yaml | 7 +++++-- .../files/v1.5/enterprise/metrics-deployer.yaml | 2 +- .../files/v1.5/origin/logging-deployer.yaml | 3 --- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'roles/openshift_hosted_templates') 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.1