Merge pull request #2802 from sdodson/image-stream-sync

Sync latest image stream and templates

roles/openshift_examples/files/examples/v1.4/image-streams/dotnet_imagestreams.json

@@ -12,14 +12,18 @@
             "kind": "ImageStream",
             "apiVersion": "v1",
             "metadata": {
-                "name": "dotnet"
+                "name": "dotnet",
+                "annotations": {
+                    "openshift.io/display-name": ".NET Core"
+                }
             },
             "spec": {
                 "tags": [
                     {
                         "name": "latest",
                         "annotations": {
-                          "description": "Build and run .NET Core 1.0 applications",
+                          "openshift.io/display-name": ".NET Core (Latest)",
+                          "description": "Build and run .NET Core applications on RHEL 7. For more information about using this builder image, including OpenShift considerations, see https://github.com/redhat-developer/s2i-dotnetcore/tree/master/1.0/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version of .NET Core available on OpenShift, including major versions updates.",
                           "iconClass": "icon-dotnet",
                           "tags": "builder,.net,dotnet,dotnetcore",
                           "supports":"dotnet",
@@ -34,7 +38,8 @@
                     {
                         "name": "1.0",
                         "annotations": {
-                            "description": "Build and run .NET Core 1.0 applications",
+                            "openshift.io/display-name": ".NET Core 1.0",
+                            "description": "Build and run .NET Core 1.0 applications on RHEL 7. For more information about using this builder image, including OpenShift considerations, see https://github.com/redhat-developer/s2i-dotnetcore/tree/master/1.0/README.md.",
                             "iconClass": "icon-dotnet",
                             "tags": "builder,.net,dotnet,dotnetcore,rh-dotnetcore10",
                             "supports":"dotnet:1.0,dotnet",

roles/openshift_hosted_templates/files/v1.4/enterprise/logging-deployer.yaml

@@ -66,6 +66,15 @@ items:
       - watch
       - delete
       - update
+  - apiVersion: v1
+    kind: ClusterRole
+    metadata:
+      name: rolebinding-reader
+    rules:
+    - resources:
+      - clusterrolebindings
+      verbs:
+      - get
   -
     apiVersion: v1
     kind: RoleBinding
@@ -88,6 +97,17 @@ items:
     subjects:
     - kind: ServiceAccount
       name: logging-deployer
+  -
+    apiVersion: v1
+    kind: RoleBinding
+    metadata:
+      name: logging-elasticsearch-view-role
+    roleRef:
+      kind: ClusterRole
+      name: view
+    subjects:
+    - kind: ServiceAccount
+      name: aggregated-logging-elasticsearch
 -
   apiVersion: "v1"
   kind: "Template"

roles/openshift_hosted_templates/files/v1.4/enterprise/metrics-deployer.yaml

@@ -86,6 +86,8 @@ objects:
           value: ${HEAPSTER_NODE_ID}
         - name: METRIC_RESOLUTION
           value: ${METRIC_RESOLUTION}
+        - name: STARTUP_TIMEOUT
+          value: ${STARTUP_TIMEOUT}
     dnsPolicy: ClusterFirst
     restartPolicy: Never
     serviceAccount: metrics-deployer
@@ -160,3 +162,7 @@ parameters:
   description: "How often metrics should be gathered. Defaults value of '15s' for 15 seconds"
   name: METRIC_RESOLUTION
   value: "15s"
+-
+  description: "How long in seconds we should wait until Hawkular Metrics and Heapster starts up before attempting a restart"
+  name: STARTUP_TIMEOUT
+  value: "500"

roles/openshift_hosted_templates/files/v1.4/origin/metrics-deployer.yaml

@@ -86,6 +86,8 @@ objects:
           value: ${HEAPSTER_NODE_ID}
         - name: METRIC_RESOLUTION
           value: ${METRIC_RESOLUTION}
+        - name: STARTUP_TIMEOUT
+          value: ${STARTUP_TIMEOUT}
     dnsPolicy: ClusterFirst
     restartPolicy: Never
     serviceAccount: metrics-deployer
@@ -160,3 +162,7 @@ parameters:
   description: "How often metrics should be gathered. Defaults value of '15s' for 15 seconds"
   name: METRIC_RESOLUTION
   value: "15s"
+-
+  description: "How long in seconds we should wait until Hawkular Metrics and Heapster starts up before attempting a restart"
+  name: STARTUP_TIMEOUT
+  value: "500"