diff options
10 files changed, 3 insertions, 2049 deletions
| diff --git a/roles/openshift_hosted_templates/files/v1.4/enterprise/logging-deployer.yaml b/roles/openshift_hosted_templates/files/v1.4/enterprise/logging-deployer.yaml index c67058696..5abb2ef83 100644 --- a/roles/openshift_hosted_templates/files/v1.4/enterprise/logging-deployer.yaml +++ b/roles/openshift_hosted_templates/files/v1.4/enterprise/logging-deployer.yaml @@ -223,7 +223,7 @@ items:    -      description: 'Specify version for logging components; e.g. for "registry.access.redhat.com/openshift3/logging-deployer:3.4.0", set version "3.4.0"'      name: IMAGE_VERSION -    value: "3.4.0" +    value: "v3.4"    -      description: "(Deprecated) Specify the name of an existing pull secret to be used for pulling component images from an authenticated registry."      name: IMAGE_PULL_SECRET diff --git a/roles/openshift_hosted_templates/files/v1.4/enterprise/metrics-deployer.yaml b/roles/openshift_hosted_templates/files/v1.4/enterprise/metrics-deployer.yaml index 6ead122c5..1d319eab8 100644 --- a/roles/openshift_hosted_templates/files/v1.4/enterprise/metrics-deployer.yaml +++ b/roles/openshift_hosted_templates/files/v1.4/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.4"  -    description: "Internal URL for the master, for authentication retrieval"    name: MASTER_URL @@ -118,7 +118,7 @@ parameters:    description: "Can be set to: 'preflight' to perform validation before a deployment; 'deploy' to perform an initial deployment; 'refresh' to delete and redeploy all components but to keep persisted data and routes; 'redeploy' to delete and redeploy everything (losing all data in the process); 'validate' to re-run validations after a deployment"    name: MODE    value: "deploy" --  +-    description: "Set to true to continue even if the deployer runs into an error."    name: CONTINUE_ON_ERROR    value: "false" 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 deleted file mode 100644 index fdfc285ca..000000000 --- a/roles/openshift_hosted_templates/files/v1.5/enterprise/logging-deployer.yaml +++ /dev/null @@ -1,345 +0,0 @@ -apiVersion: "v1" -kind: "List" -items: -- -  apiVersion: "v1" -  kind: "Template" -  metadata: -    name: logging-deployer-account-template -    annotations: -      description: "Template for creating the deployer account and roles needed for the aggregated logging deployer. Create as cluster-admin." -      tags: "infrastructure" -  objects: -  - -    apiVersion: v1 -    kind: ServiceAccount -    name: logging-deployer -    metadata: -      name: logging-deployer -      labels: -        logging-infra: deployer -        provider: openshift -        component: deployer -  - -    apiVersion: v1 -    kind: ServiceAccount -    metadata: -      name: aggregated-logging-kibana -  - -    apiVersion: v1 -    kind: ServiceAccount -    metadata: -      name: aggregated-logging-elasticsearch -  - -    apiVersion: v1 -    kind: ServiceAccount -    metadata: -      name: aggregated-logging-fluentd -  - -    apiVersion: v1 -    kind: ServiceAccount -    metadata: -      name: aggregated-logging-curator -  - apiVersion: v1 -    kind: ClusterRole -    metadata: -      name: oauth-editor -    rules: -    - resources: -      - oauthclients -      verbs: -      - create -      - delete -  - apiVersion: v1 -    kind: ClusterRole -    metadata: -      name: daemonset-admin -    rules: -    - resources: -      - daemonsets -      apiGroups: -      - extensions -      verbs: -      - create -      - get -      - list -      - watch -      - delete -      - update -  - apiVersion: v1 -    kind: ClusterRole -    metadata: -      name: rolebinding-reader -    rules: -    - resources: -      - clusterrolebindings -      verbs: -      - get -  - -    apiVersion: v1 -    kind: RoleBinding -    metadata: -      name: logging-deployer-edit-role -    roleRef: -      kind: ClusterRole -      name: edit -    subjects: -    - kind: ServiceAccount -      name: logging-deployer -  - -    apiVersion: v1 -    kind: RoleBinding -    metadata: -      name: logging-deployer-dsadmin-role -    roleRef: -      kind: ClusterRole -      name: daemonset-admin -    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" -  metadata: -    name: logging-deployer-template -    annotations: -      description: "Template for running the aggregated logging deployer in a pod. Requires empowered 'logging-deployer' service account." -      tags: "infrastructure" -  labels: -    logging-infra: deployer -    provider: openshift -  objects: -  - -    apiVersion: v1 -    kind: Pod -    metadata: -      generateName: logging-deployer- -    spec: -      containers: -      - image: ${IMAGE_PREFIX}logging-deployer:${IMAGE_VERSION} -        imagePullPolicy: Always -        name: deployer -        volumeMounts: -        - name: empty -          mountPath: /etc/deploy -        env: -          - name: PROJECT -            valueFrom: -              fieldRef: -                fieldPath: metadata.namespace -          - name: IMAGE_PREFIX -            value: ${IMAGE_PREFIX} -          - name: IMAGE_VERSION -            value: ${IMAGE_VERSION} -          - name: IMAGE_PULL_SECRET -            value: ${IMAGE_PULL_SECRET} -          - name: INSECURE_REGISTRY -            value: ${INSECURE_REGISTRY} -          - name: ENABLE_OPS_CLUSTER -            value: ${ENABLE_OPS_CLUSTER} -          - name: KIBANA_HOSTNAME -            value: ${KIBANA_HOSTNAME} -          - name: KIBANA_OPS_HOSTNAME -            value: ${KIBANA_OPS_HOSTNAME} -          - name: PUBLIC_MASTER_URL -            value: ${PUBLIC_MASTER_URL} -          - name: MASTER_URL -            value: ${MASTER_URL} -          - name: ES_INSTANCE_RAM -            value: ${ES_INSTANCE_RAM} -          - name: ES_PVC_SIZE -            value: ${ES_PVC_SIZE} -          - name: ES_PVC_PREFIX -            value: ${ES_PVC_PREFIX} -          - name: ES_PVC_DYNAMIC -            value: ${ES_PVC_DYNAMIC} -          - name: ES_CLUSTER_SIZE -            value: ${ES_CLUSTER_SIZE} -          - name: ES_NODE_QUORUM -            value: ${ES_NODE_QUORUM} -          - name: ES_RECOVER_AFTER_NODES -            value: ${ES_RECOVER_AFTER_NODES} -          - name: ES_RECOVER_EXPECTED_NODES -            value: ${ES_RECOVER_EXPECTED_NODES} -          - name: ES_RECOVER_AFTER_TIME -            value: ${ES_RECOVER_AFTER_TIME} -          - name: ES_OPS_INSTANCE_RAM -            value: ${ES_OPS_INSTANCE_RAM} -          - name: ES_OPS_PVC_SIZE -            value: ${ES_OPS_PVC_SIZE} -          - name: ES_OPS_PVC_PREFIX -            value: ${ES_OPS_PVC_PREFIX} -          - name: ES_OPS_PVC_DYNAMIC -            value: ${ES_OPS_PVC_DYNAMIC} -          - name: ES_OPS_CLUSTER_SIZE -            value: ${ES_OPS_CLUSTER_SIZE} -          - name: ES_OPS_NODE_QUORUM -            value: ${ES_OPS_NODE_QUORUM} -          - name: ES_OPS_RECOVER_AFTER_NODES -            value: ${ES_OPS_RECOVER_AFTER_NODES} -          - name: ES_OPS_RECOVER_EXPECTED_NODES -            value: ${ES_OPS_RECOVER_EXPECTED_NODES} -          - name: ES_OPS_RECOVER_AFTER_TIME -            value: ${ES_OPS_RECOVER_AFTER_TIME} -          - name: FLUENTD_NODESELECTOR -            value: ${FLUENTD_NODESELECTOR} -          - name: ES_NODESELECTOR -            value: ${ES_NODESELECTOR} -          - name: ES_OPS_NODESELECTOR -            value: ${ES_OPS_NODESELECTOR} -          - name: KIBANA_NODESELECTOR -            value: ${KIBANA_NODESELECTOR} -          - name: KIBANA_OPS_NODESELECTOR -            value: ${KIBANA_OPS_NODESELECTOR} -          - name: CURATOR_NODESELECTOR -            value: ${CURATOR_NODESELECTOR} -          - name: CURATOR_OPS_NODESELECTOR -            value: ${CURATOR_OPS_NODESELECTOR} -          - name: MODE -            value: ${MODE} -      dnsPolicy: ClusterFirst -      restartPolicy: Never -      serviceAccount: logging-deployer -      volumes: -      - name: empty -        emptyDir: {} -  parameters: -  - -    description: "The mode that the deployer runs in." -    name: MODE -    value: "install" -  - -    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.3.0", set version "3.3.0"' -    name: IMAGE_VERSION -    value: "3.4.0" -  - -    description: "(Deprecated) Specify the name of an existing pull secret to be used for pulling component images from an authenticated registry." -    name: IMAGE_PULL_SECRET -  - -    description: "(Deprecated) Allow the registry for logging component images to be non-secure (not secured with a certificate signed by a known CA)" -    name: INSECURE_REGISTRY -    value: "false" -  - -    description: "(Deprecated) If true, set up to use a second ES cluster for ops logs." -    name: ENABLE_OPS_CLUSTER -    value: "false" -  - -    description: "(Deprecated) External hostname where clients will reach kibana" -    name: KIBANA_HOSTNAME -    value: "kibana.example.com" -  - -    description: "(Deprecated) External hostname at which admins will visit the ops Kibana." -    name: KIBANA_OPS_HOSTNAME -    value: kibana-ops.example.com -  - -    description: "(Deprecated) External URL for the master, for OAuth purposes" -    name: PUBLIC_MASTER_URL -    value: "https://localhost:8443" -  - -    description: "(Deprecated) Internal URL for the master, for authentication retrieval" -    name: MASTER_URL -    value: "https://kubernetes.default.svc.cluster.local" -  - -    description: "(Deprecated) How many instances of ElasticSearch to deploy." -    name: ES_CLUSTER_SIZE -    value: "1" -  - -    description: "(Deprecated) Amount of RAM to reserve per ElasticSearch instance." -    name: ES_INSTANCE_RAM -    value: "8G" -  - -    description: "(Deprecated) Size of the PersistentVolumeClaim to create per ElasticSearch instance, e.g. 100G. If empty, no PVCs will be created and emptyDir volumes are used instead." -    name: ES_PVC_SIZE -  - -    description: "(Deprecated) Prefix for the names of PersistentVolumeClaims to be created; a number will be appended per instance. If they don't already exist, they will be created with size ES_PVC_SIZE." -    name: ES_PVC_PREFIX -    value: "logging-es-" -  - -    description: '(Deprecated) Set to "true" to request dynamic provisioning (if enabled for your cluster) of a PersistentVolume for the ES PVC. ' -    name: ES_PVC_DYNAMIC -  - -    description: "(Deprecated) Number of nodes required to elect a master (ES minimum_master_nodes). By default, derived from ES_CLUSTER_SIZE / 2 + 1." -    name: ES_NODE_QUORUM -  - -    description: "(Deprecated) Number of nodes required to be present before the cluster will recover from a full restart. By default, one fewer than ES_CLUSTER_SIZE." -    name: ES_RECOVER_AFTER_NODES -  - -    description: "(Deprecated) Number of nodes desired to be present before the cluster will recover from a full restart. By default, ES_CLUSTER_SIZE." -    name: ES_RECOVER_EXPECTED_NODES -  - -    description: "(Deprecated) Timeout for *expected* nodes to be present when cluster is recovering from a full restart." -    name: ES_RECOVER_AFTER_TIME -    value: "5m" -  - -    description: "(Deprecated) How many ops instances of ElasticSearch to deploy. By default, ES_CLUSTER_SIZE." -    name: ES_OPS_CLUSTER_SIZE -  - -    description: "(Deprecated) Amount of RAM to reserve per ops ElasticSearch instance." -    name: ES_OPS_INSTANCE_RAM -    value: "8G" -  - -    description: "(Deprecated) Size of the PersistentVolumeClaim to create per ElasticSearch ops instance, e.g. 100G. If empty, no PVCs will be created and emptyDir volumes are used instead." -    name: ES_OPS_PVC_SIZE -  - -    description: "(Deprecated) Prefix for the names of PersistentVolumeClaims to be created; a number will be appended per instance. If they don't already exist, they will be created with size ES_OPS_PVC_SIZE." -    name: ES_OPS_PVC_PREFIX -    value: "logging-es-ops-" -  - -    description: '(Deprecated) Set to "true" to request dynamic provisioning (if enabled for your cluster) of a PersistentVolume for the ES ops PVC. ' -    name: ES_OPS_PVC_DYNAMIC -  - -    description: "(Deprecated) Number of ops nodes required to elect a master (ES minimum_master_nodes). By default, derived from ES_CLUSTER_SIZE / 2 + 1." -    name: ES_OPS_NODE_QUORUM -  - -    description: "(Deprecated) Number of ops nodes required to be present before the cluster will recover from a full restart. By default, one fewer than ES_OPS_CLUSTER_SIZE." -    name: ES_OPS_RECOVER_AFTER_NODES -  - -    description: "(Deprecated) Number of ops nodes desired to be present before the cluster will recover from a full restart. By default, ES_OPS_CLUSTER_SIZE." -    name: ES_OPS_RECOVER_EXPECTED_NODES -  - -    description: "(Deprecated) Timeout for *expected* ops nodes to be present when cluster is recovering from a full restart." -    name: ES_OPS_RECOVER_AFTER_TIME -    value: "5m" -  - -    description: "(Deprecated) The nodeSelector used for the Fluentd DaemonSet." -    name: FLUENTD_NODESELECTOR -    value: "logging-infra-fluentd=true" -  - -    description: "(Deprecated) Node selector Elasticsearch cluster (label=value)." -    name: ES_NODESELECTOR -    value: "" -  - -    description: "(Deprecated) Node selector Elasticsearch operations cluster (label=value)." -    name: ES_OPS_NODESELECTOR -    value: "" -  - -    description: "(Deprecated) Node selector Kibana cluster (label=value)." -    name: KIBANA_NODESELECTOR -    value: "" -  - -    description: "(Deprecated) Node selector Kibana operations cluster (label=value)." -    name: KIBANA_OPS_NODESELECTOR -    value: "" -  - -    description: "(Deprecated) Node selector Curator (label=value)." -    name: CURATOR_NODESELECTOR -    value: "" -  - -    description: "(Deprecated) Node selector operations Curator (label=value)." -    name: CURATOR_OPS_NODESELECTOR -    value: "" 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 deleted file mode 100644 index c4ab794ae..000000000 --- a/roles/openshift_hosted_templates/files/v1.5/enterprise/metrics-deployer.yaml +++ /dev/null @@ -1,168 +0,0 @@ -#!/bin/bash -# -# Copyright 2014-2015 Red Hat, Inc. and/or its affiliates -# and other contributors as indicated by the @author tags. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -#    http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -apiVersion: "v1" -kind: "Template" -metadata: -  name: metrics-deployer-template -  annotations: -    description: "Template for deploying the required Metrics integration. Requires cluster-admin 'metrics-deployer' service account and 'metrics-deployer' secret." -    tags: "infrastructure" -labels: -  metrics-infra: deployer -  provider: openshift -  component: deployer -objects: -- -  apiVersion: v1 -  kind: Pod -  metadata: -    generateName: metrics-deployer- -  spec: -    securityContext: {} -    containers: -    - image: ${IMAGE_PREFIX}metrics-deployer:${IMAGE_VERSION} -      name: deployer -      securityContext: {} -      volumeMounts: -      - name: secret -        mountPath: /secret -        readOnly: true -      - name: empty -        mountPath: /etc/deploy -      env: -        - name: PROJECT -          valueFrom: -            fieldRef: -              fieldPath: metadata.namespace -        - name: POD_NAME -          valueFrom: -            fieldRef: -              fieldPath: metadata.name -        - name: IMAGE_PREFIX -          value: ${IMAGE_PREFIX} -        - name: IMAGE_VERSION -          value: ${IMAGE_VERSION} -        - name: MASTER_URL -          value: ${MASTER_URL} -        - name: MODE -          value: ${MODE} -        - name: CONTINUE_ON_ERROR -          value: ${CONTINUE_ON_ERROR} -        - name: REDEPLOY -          value: ${REDEPLOY} -        - name: IGNORE_PREFLIGHT -          value: ${IGNORE_PREFLIGHT} -        - name: USE_PERSISTENT_STORAGE -          value: ${USE_PERSISTENT_STORAGE} -        - name: DYNAMICALLY_PROVISION_STORAGE -          value: ${DYNAMICALLY_PROVISION_STORAGE} -        - name: HAWKULAR_METRICS_HOSTNAME -          value: ${HAWKULAR_METRICS_HOSTNAME} -        - name: CASSANDRA_NODES -          value: ${CASSANDRA_NODES} -        - name: CASSANDRA_PV_SIZE -          value: ${CASSANDRA_PV_SIZE} -        - name: METRIC_DURATION -          value: ${METRIC_DURATION} -        - name: USER_WRITE_ACCESS -          value: ${USER_WRITE_ACCESS} -        - name: HEAPSTER_NODE_ID -          value: ${HEAPSTER_NODE_ID} -        - name: METRIC_RESOLUTION -          value: ${METRIC_RESOLUTION} -        - name: STARTUP_TIMEOUT -          value: ${STARTUP_TIMEOUT} -    dnsPolicy: ClusterFirst -    restartPolicy: Never -    serviceAccount: metrics-deployer -    volumes: -    - name: empty -      emptyDir: {} -    - name: secret -      secret: -        secretName: metrics-deployer -parameters: -- -  description: 'Specify prefix for metrics components; e.g. for "openshift/origin-metrics-deployer:latest", set prefix "openshift/origin-"' -  name: IMAGE_PREFIX -  value: "registry.access.redhat.com/openshift3/" -- -  description: 'Specify version for metrics components; e.g. for "openshift/origin-metrics-deployer:latest", set version "latest"' -  name: IMAGE_VERSION -  value: "v3.5" -- -  description: "Internal URL for the master, for authentication retrieval" -  name: MASTER_URL -  value: "https://kubernetes.default.svc:443" -- -  description: "External hostname where clients will reach Hawkular Metrics" -  name: HAWKULAR_METRICS_HOSTNAME -  required: true -- -  description: "Can be set to: 'preflight' to perform validation before a deployment; 'deploy' to perform an initial deployment; 'refresh' to delete and redeploy all components but to keep persisted data and routes; 'redeploy' to delete and redeploy everything (losing all data in the process); 'validate' to re-run validations after a deployment" -  name: MODE -  value: "deploy" --  -  description: "Set to true to continue even if the deployer runs into an error." -  name: CONTINUE_ON_ERROR -  value: "false" -- -  description: "(Deprecated) Turns 'deploy' mode into 'redeploy' mode, deleting and redeploying everything (losing all data in the process)" -  name: REDEPLOY -  value: "false" -- -  description: "If preflight validation is blocking deployment and you're sure you don't care about it, this will ignore the results and proceed to deploy." -  name: IGNORE_PREFLIGHT -  value: "false" -- -  description: "Set to true for persistent storage, set to false to use non persistent storage" -  name: USE_PERSISTENT_STORAGE -  value: "true" -- -  description: "Set to true to dynamically provision storage, set to false to use use pre-created persistent volumes" -  name: DYNAMICALLY_PROVISION_STORAGE -  value: "false" -- -  description: "The number of Cassandra Nodes to deploy for the initial cluster" -  name: CASSANDRA_NODES -  value: "1" -- -  description: "The persistent volume size for each of the Cassandra nodes" -  name: CASSANDRA_PV_SIZE -  value: "10Gi" -- -  description: "How many days metrics should be stored for." -  name: METRIC_DURATION -  value: "7" -- -  description: "If a user accounts should be allowed to write metrics." -  name: USER_WRITE_ACCESS -  value: "false" -- -  description: "The identifier used when generating metric ids in Hawkular" -  name: HEAPSTER_NODE_ID -  value: "nodename" -- -  description: "How often metrics should be gathered. Defaults value of '30s' for 30 seconds" -  name: METRIC_RESOLUTION -  value: "30s" -- -  description: "How long in seconds we should wait until Hawkular Metrics and Heapster starts up before attempting a restart" -  name: STARTUP_TIMEOUT -  value: "500" 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 deleted file mode 100644 index 5b5503500..000000000 --- a/roles/openshift_hosted_templates/files/v1.5/origin/logging-deployer.yaml +++ /dev/null @@ -1,342 +0,0 @@ -apiVersion: "v1" -kind: "List" -items: -- -  apiVersion: "v1" -  kind: "Template" -  metadata: -    name: logging-deployer-account-template -    annotations: -      description: "Template for creating the deployer account and roles needed for the aggregated logging deployer. Create as cluster-admin." -      tags: "infrastructure" -  objects: -  - -    apiVersion: v1 -    kind: ServiceAccount -    name: logging-deployer -    metadata: -      name: logging-deployer -      labels: -        logging-infra: deployer -        provider: openshift -        component: deployer -  - -    apiVersion: v1 -    kind: ServiceAccount -    metadata: -      name: aggregated-logging-kibana -  - -    apiVersion: v1 -    kind: ServiceAccount -    metadata: -      name: aggregated-logging-elasticsearch -  - -    apiVersion: v1 -    kind: ServiceAccount -    metadata: -      name: aggregated-logging-fluentd -  - -    apiVersion: v1 -    kind: ServiceAccount -    metadata: -      name: aggregated-logging-curator -  - apiVersion: v1 -    kind: ClusterRole -    metadata: -      name: oauth-editor -    rules: -    - resources: -      - oauthclients -      verbs: -      - create -      - delete -  - apiVersion: v1 -    kind: ClusterRole -    metadata: -      name: daemonset-admin -    rules: -    - resources: -      - daemonsets -      apiGroups: -      - extensions -      verbs: -      - create -      - get -      - list -      - watch -      - delete -      - update -  - apiVersion: v1 -    kind: ClusterRole -    metadata: -      name: rolebinding-reader -    rules: -    - resources: -      - clusterrolebindings -      verbs: -      - get -  - -    apiVersion: v1 -    kind: RoleBinding -    metadata: -      name: logging-deployer-edit-role -    roleRef: -      name: edit -    subjects: -    - kind: ServiceAccount -      name: logging-deployer -  - -    apiVersion: v1 -    kind: RoleBinding -    metadata: -      name: logging-deployer-dsadmin-role -    roleRef: -      name: daemonset-admin -    subjects: -    - kind: ServiceAccount -      name: logging-deployer -  - -    apiVersion: v1 -    kind: RoleBinding -    metadata: -      name: logging-elasticsearch-view-role -    roleRef: -      name: view -    subjects: -    - kind: ServiceAccount -      name: aggregated-logging-elasticsearch -- -  apiVersion: "v1" -  kind: "Template" -  metadata: -    name: logging-deployer-template -    annotations: -      description: "Template for running the aggregated logging deployer in a pod. Requires empowered 'logging-deployer' service account." -      tags: "infrastructure" -  labels: -    logging-infra: deployer -    provider: openshift -  objects: -  - -    apiVersion: v1 -    kind: Pod -    metadata: -      generateName: logging-deployer- -    spec: -      containers: -      - image: ${IMAGE_PREFIX}logging-deployment:${IMAGE_VERSION} -        imagePullPolicy: Always -        name: deployer -        volumeMounts: -        - name: empty -          mountPath: /etc/deploy -        env: -          - name: PROJECT -            valueFrom: -              fieldRef: -                fieldPath: metadata.namespace -          - name: IMAGE_PREFIX -            value: ${IMAGE_PREFIX} -          - name: IMAGE_VERSION -            value: ${IMAGE_VERSION} -          - name: IMAGE_PULL_SECRET -            value: ${IMAGE_PULL_SECRET} -          - name: INSECURE_REGISTRY -            value: ${INSECURE_REGISTRY} -          - name: ENABLE_OPS_CLUSTER -            value: ${ENABLE_OPS_CLUSTER} -          - name: KIBANA_HOSTNAME -            value: ${KIBANA_HOSTNAME} -          - name: KIBANA_OPS_HOSTNAME -            value: ${KIBANA_OPS_HOSTNAME} -          - name: PUBLIC_MASTER_URL -            value: ${PUBLIC_MASTER_URL} -          - name: MASTER_URL -            value: ${MASTER_URL} -          - name: ES_INSTANCE_RAM -            value: ${ES_INSTANCE_RAM} -          - name: ES_PVC_SIZE -            value: ${ES_PVC_SIZE} -          - name: ES_PVC_PREFIX -            value: ${ES_PVC_PREFIX} -          - name: ES_PVC_DYNAMIC -            value: ${ES_PVC_DYNAMIC} -          - name: ES_CLUSTER_SIZE -            value: ${ES_CLUSTER_SIZE} -          - name: ES_NODE_QUORUM -            value: ${ES_NODE_QUORUM} -          - name: ES_RECOVER_AFTER_NODES -            value: ${ES_RECOVER_AFTER_NODES} -          - name: ES_RECOVER_EXPECTED_NODES -            value: ${ES_RECOVER_EXPECTED_NODES} -          - name: ES_RECOVER_AFTER_TIME -            value: ${ES_RECOVER_AFTER_TIME} -          - name: ES_OPS_INSTANCE_RAM -            value: ${ES_OPS_INSTANCE_RAM} -          - name: ES_OPS_PVC_SIZE -            value: ${ES_OPS_PVC_SIZE} -          - name: ES_OPS_PVC_PREFIX -            value: ${ES_OPS_PVC_PREFIX} -          - name: ES_OPS_PVC_DYNAMIC -            value: ${ES_OPS_PVC_DYNAMIC} -          - name: ES_OPS_CLUSTER_SIZE -            value: ${ES_OPS_CLUSTER_SIZE} -          - name: ES_OPS_NODE_QUORUM -            value: ${ES_OPS_NODE_QUORUM} -          - name: ES_OPS_RECOVER_AFTER_NODES -            value: ${ES_OPS_RECOVER_AFTER_NODES} -          - name: ES_OPS_RECOVER_EXPECTED_NODES -            value: ${ES_OPS_RECOVER_EXPECTED_NODES} -          - name: ES_OPS_RECOVER_AFTER_TIME -            value: ${ES_OPS_RECOVER_AFTER_TIME} -          - name: FLUENTD_NODESELECTOR -            value: ${FLUENTD_NODESELECTOR} -          - name: ES_NODESELECTOR -            value: ${ES_NODESELECTOR} -          - name: ES_OPS_NODESELECTOR -            value: ${ES_OPS_NODESELECTOR} -          - name: KIBANA_NODESELECTOR -            value: ${KIBANA_NODESELECTOR} -          - name: KIBANA_OPS_NODESELECTOR -            value: ${KIBANA_OPS_NODESELECTOR} -          - name: CURATOR_NODESELECTOR -            value: ${CURATOR_NODESELECTOR} -          - name: CURATOR_OPS_NODESELECTOR -            value: ${CURATOR_OPS_NODESELECTOR} -          - name: MODE -            value: ${MODE} -      dnsPolicy: ClusterFirst -      restartPolicy: Never -      serviceAccount: logging-deployer -      volumes: -      - name: empty -        emptyDir: {} -  parameters: -  - -    description: "The mode that the deployer runs in." -    name: MODE -    value: "install" -  - -    description: 'Specify prefix for logging components; e.g. for "openshift/origin-logging-deployer:v1.1", set prefix "openshift/origin-"' -    name: IMAGE_PREFIX -    value: "docker.io/openshift/origin-" -  - -    description: 'Specify version for logging components; e.g. for "openshift/origin-logging-deployer:v1.1", set version "v1.1"' -    name: IMAGE_VERSION -    value: "latest" -  - -    description: "(Deprecated) Specify the name of an existing pull secret to be used for pulling component images from an authenticated registry." -    name: IMAGE_PULL_SECRET -  - -    description: "(Deprecated) Allow the registry for logging component images to be non-secure (not secured with a certificate signed by a known CA)" -    name: INSECURE_REGISTRY -    value: "false" -  - -    description: "(Deprecated) If true, set up to use a second ES cluster for ops logs." -    name: ENABLE_OPS_CLUSTER -    value: "false" -  - -    description: "(Deprecated) External hostname where clients will reach kibana" -    name: KIBANA_HOSTNAME -    value: "kibana.example.com" -  - -    description: "(Deprecated) External hostname at which admins will visit the ops Kibana." -    name: KIBANA_OPS_HOSTNAME -    value: kibana-ops.example.com -  - -    description: "(Deprecated) External URL for the master, for OAuth purposes" -    name: PUBLIC_MASTER_URL -    value: "https://localhost:8443" -  - -    description: "(Deprecated) Internal URL for the master, for authentication retrieval" -    name: MASTER_URL -    value: "https://kubernetes.default.svc.cluster.local" -  - -    description: "(Deprecated) How many instances of ElasticSearch to deploy." -    name: ES_CLUSTER_SIZE -    value: "1" -  - -    description: "(Deprecated) Amount of RAM to reserve per ElasticSearch instance." -    name: ES_INSTANCE_RAM -    value: "8G" -  - -    description: "(Deprecated) Size of the PersistentVolumeClaim to create per ElasticSearch instance, e.g. 100G. If empty, no PVCs will be created and emptyDir volumes are used instead." -    name: ES_PVC_SIZE -  - -    description: "(Deprecated) Prefix for the names of PersistentVolumeClaims to be created; a number will be appended per instance. If they don't already exist, they will be created with size ES_PVC_SIZE." -    name: ES_PVC_PREFIX -    value: "logging-es-" -  - -    description: '(Deprecated) Set to "true" to request dynamic provisioning (if enabled for your cluster) of a PersistentVolume for the ES PVC. ' -    name: ES_PVC_DYNAMIC -  - -    description: "(Deprecated) Number of nodes required to elect a master (ES minimum_master_nodes). By default, derived from ES_CLUSTER_SIZE / 2 + 1." -    name: ES_NODE_QUORUM -  - -    description: "(Deprecated) Number of nodes required to be present before the cluster will recover from a full restart. By default, one fewer than ES_CLUSTER_SIZE." -    name: ES_RECOVER_AFTER_NODES -  - -    description: "(Deprecated) Number of nodes desired to be present before the cluster will recover from a full restart. By default, ES_CLUSTER_SIZE." -    name: ES_RECOVER_EXPECTED_NODES -  - -    description: "(Deprecated) Timeout for *expected* nodes to be present when cluster is recovering from a full restart." -    name: ES_RECOVER_AFTER_TIME -    value: "5m" -  - -    description: "(Deprecated) How many ops instances of ElasticSearch to deploy. By default, ES_CLUSTER_SIZE." -    name: ES_OPS_CLUSTER_SIZE -  - -    description: "(Deprecated) Amount of RAM to reserve per ops ElasticSearch instance." -    name: ES_OPS_INSTANCE_RAM -    value: "8G" -  - -    description: "(Deprecated) Size of the PersistentVolumeClaim to create per ElasticSearch ops instance, e.g. 100G. If empty, no PVCs will be created and emptyDir volumes are used instead." -    name: ES_OPS_PVC_SIZE -  - -    description: "(Deprecated) Prefix for the names of PersistentVolumeClaims to be created; a number will be appended per instance. If they don't already exist, they will be created with size ES_OPS_PVC_SIZE." -    name: ES_OPS_PVC_PREFIX -    value: "logging-es-ops-" -  - -    description: '(Deprecated) Set to "true" to request dynamic provisioning (if enabled for your cluster) of a PersistentVolume for the ES ops PVC. ' -    name: ES_OPS_PVC_DYNAMIC -  - -    description: "(Deprecated) Number of ops nodes required to elect a master (ES minimum_master_nodes). By default, derived from ES_CLUSTER_SIZE / 2 + 1." -    name: ES_OPS_NODE_QUORUM -  - -    description: "(Deprecated) Number of ops nodes required to be present before the cluster will recover from a full restart. By default, one fewer than ES_OPS_CLUSTER_SIZE." -    name: ES_OPS_RECOVER_AFTER_NODES -  - -    description: "(Deprecated) Number of ops nodes desired to be present before the cluster will recover from a full restart. By default, ES_OPS_CLUSTER_SIZE." -    name: ES_OPS_RECOVER_EXPECTED_NODES -  - -    description: "(Deprecated) Timeout for *expected* ops nodes to be present when cluster is recovering from a full restart." -    name: ES_OPS_RECOVER_AFTER_TIME -    value: "5m" -  - -    description: "(Deprecated) The nodeSelector used for the Fluentd DaemonSet." -    name: FLUENTD_NODESELECTOR -    value: "logging-infra-fluentd=true" -  - -    description: "(Deprecated) Node selector Elasticsearch cluster (label=value)." -    name: ES_NODESELECTOR -    value: "" -  - -    description: "(Deprecated) Node selector Elasticsearch operations cluster (label=value)." -    name: ES_OPS_NODESELECTOR -    value: "" -  - -    description: "(Deprecated) Node selector Kibana cluster (label=value)." -    name: KIBANA_NODESELECTOR -    value: "" -  - -    description: "(Deprecated) Node selector Kibana operations cluster (label=value)." -    name: KIBANA_OPS_NODESELECTOR -    value: "" -  - -    description: "(Deprecated) Node selector Curator (label=value)." -    name: CURATOR_NODESELECTOR -    value: "" -  - -    description: "(Deprecated) Node selector operations Curator (label=value)." -    name: CURATOR_OPS_NODESELECTOR -    value: "" diff --git a/roles/openshift_hosted_templates/files/v1.5/origin/metrics-deployer.yaml b/roles/openshift_hosted_templates/files/v1.5/origin/metrics-deployer.yaml deleted file mode 100644 index d191c0439..000000000 --- a/roles/openshift_hosted_templates/files/v1.5/origin/metrics-deployer.yaml +++ /dev/null @@ -1,168 +0,0 @@ -#!/bin/bash -# -# Copyright 2014-2015 Red Hat, Inc. and/or its affiliates -# and other contributors as indicated by the @author tags. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -#    http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -apiVersion: "v1" -kind: "Template" -metadata: -  name: metrics-deployer-template -  annotations: -    description: "Template for deploying the required Metrics integration. Requires cluster-admin 'metrics-deployer' service account and 'metrics-deployer' secret." -    tags: "infrastructure" -labels: -  metrics-infra: deployer -  provider: openshift -  component: deployer -objects: -- -  apiVersion: v1 -  kind: Pod -  metadata: -    generateName: metrics-deployer- -  spec: -    securityContext: {} -    containers: -    - image: ${IMAGE_PREFIX}metrics-deployer:${IMAGE_VERSION} -      name: deployer -      securityContext: {} -      volumeMounts: -      - name: secret -        mountPath: /secret -        readOnly: true -      - name: empty -        mountPath: /etc/deploy -      env: -        - name: PROJECT -          valueFrom: -            fieldRef: -              fieldPath: metadata.namespace -        - name: POD_NAME -          valueFrom: -            fieldRef: -              fieldPath: metadata.name -        - name: IMAGE_PREFIX -          value: ${IMAGE_PREFIX} -        - name: IMAGE_VERSION -          value: ${IMAGE_VERSION} -        - name: MASTER_URL -          value: ${MASTER_URL} -        - name: MODE -          value: ${MODE} -        - name: CONTINUE_ON_ERROR -          value: ${CONTINUE_ON_ERROR} -        - name: REDEPLOY -          value: ${REDEPLOY} -        - name: IGNORE_PREFLIGHT -          value: ${IGNORE_PREFLIGHT} -        - name: USE_PERSISTENT_STORAGE -          value: ${USE_PERSISTENT_STORAGE} -        - name: DYNAMICALLY_PROVISION_STORAGE -          value: ${DYNAMICALLY_PROVISION_STORAGE} -        - name: HAWKULAR_METRICS_HOSTNAME -          value: ${HAWKULAR_METRICS_HOSTNAME} -        - name: CASSANDRA_NODES -          value: ${CASSANDRA_NODES} -        - name: CASSANDRA_PV_SIZE -          value: ${CASSANDRA_PV_SIZE} -        - name: METRIC_DURATION -          value: ${METRIC_DURATION} -        - name: USER_WRITE_ACCESS -          value: ${USER_WRITE_ACCESS} -        - name: HEAPSTER_NODE_ID -          value: ${HEAPSTER_NODE_ID} -        - name: METRIC_RESOLUTION -          value: ${METRIC_RESOLUTION} -        - name: STARTUP_TIMEOUT -          value: ${STARTUP_TIMEOUT} -    dnsPolicy: ClusterFirst -    restartPolicy: Never -    serviceAccount: metrics-deployer -    volumes: -    - name: empty -      emptyDir: {} -    - name: secret -      secret: -        secretName: metrics-deployer -parameters: -- -  description: 'Specify prefix for metrics components; e.g. for "openshift/origin-metrics-deployer:latest", set prefix "openshift/origin-"' -  name: IMAGE_PREFIX -  value: "openshift/origin-" -- -  description: 'Specify version for metrics components; e.g. for "openshift/origin-metrics-deployer:latest", set version "latest"' -  name: IMAGE_VERSION -  value: "latest" -- -  description: "Internal URL for the master, for authentication retrieval" -  name: MASTER_URL -  value: "https://kubernetes.default.svc:443" -- -  description: "External hostname where clients will reach Hawkular Metrics" -  name: HAWKULAR_METRICS_HOSTNAME -  required: true -- -  description: "Can be set to: 'preflight' to perform validation before a deployment; 'deploy' to perform an initial deployment; 'refresh' to delete and redeploy all components but to keep persisted data and routes; 'redeploy' to delete and redeploy everything (losing all data in the process); 'validate' to re-run validations after a deployment" -  name: MODE -  value: "deploy" --  -  description: "Set to true to continue even if the deployer runs into an error." -  name: CONTINUE_ON_ERROR -  value: "false" -- -  description: "(Deprecated) Turns 'deploy' mode into 'redeploy' mode, deleting and redeploying everything (losing all data in the process)" -  name: REDEPLOY -  value: "false" -- -  description: "If preflight validation is blocking deployment and you're sure you don't care about it, this will ignore the results and proceed to deploy." -  name: IGNORE_PREFLIGHT -  value: "false" -- -  description: "Set to true for persistent storage, set to false to use non persistent storage" -  name: USE_PERSISTENT_STORAGE -  value: "true" -- -  description: "Set to true to dynamically provision storage, set to false to use use pre-created persistent volumes" -  name: DYNAMICALLY_PROVISION_STORAGE -  value: "false" -- -  description: "The number of Cassandra Nodes to deploy for the initial cluster" -  name: CASSANDRA_NODES -  value: "1" -- -  description: "The persistent volume size for each of the Cassandra nodes" -  name: CASSANDRA_PV_SIZE -  value: "10Gi" -- -  description: "How many days metrics should be stored for." -  name: METRIC_DURATION -  value: "7" -- -  description: "If a user accounts should be allowed to write metrics." -  name: USER_WRITE_ACCESS -  value: "false" -- -  description: "The identifier used when generating metric ids in Hawkular" -  name: HEAPSTER_NODE_ID -  value: "nodename" -- -  description: "How often metrics should be gathered. Defaults value of '30s' for 30 seconds" -  name: METRIC_RESOLUTION -  value: "30s" -- -  description: "How long in seconds we should wait until Hawkular Metrics and Heapster starts up before attempting a restart" -  name: STARTUP_TIMEOUT -  value: "500" diff --git a/roles/openshift_hosted_templates/files/v1.6/enterprise/logging-deployer.yaml b/roles/openshift_hosted_templates/files/v1.6/enterprise/logging-deployer.yaml deleted file mode 100644 index fdfc285ca..000000000 --- a/roles/openshift_hosted_templates/files/v1.6/enterprise/logging-deployer.yaml +++ /dev/null @@ -1,345 +0,0 @@ -apiVersion: "v1" -kind: "List" -items: -- -  apiVersion: "v1" -  kind: "Template" -  metadata: -    name: logging-deployer-account-template -    annotations: -      description: "Template for creating the deployer account and roles needed for the aggregated logging deployer. Create as cluster-admin." -      tags: "infrastructure" -  objects: -  - -    apiVersion: v1 -    kind: ServiceAccount -    name: logging-deployer -    metadata: -      name: logging-deployer -      labels: -        logging-infra: deployer -        provider: openshift -        component: deployer -  - -    apiVersion: v1 -    kind: ServiceAccount -    metadata: -      name: aggregated-logging-kibana -  - -    apiVersion: v1 -    kind: ServiceAccount -    metadata: -      name: aggregated-logging-elasticsearch -  - -    apiVersion: v1 -    kind: ServiceAccount -    metadata: -      name: aggregated-logging-fluentd -  - -    apiVersion: v1 -    kind: ServiceAccount -    metadata: -      name: aggregated-logging-curator -  - apiVersion: v1 -    kind: ClusterRole -    metadata: -      name: oauth-editor -    rules: -    - resources: -      - oauthclients -      verbs: -      - create -      - delete -  - apiVersion: v1 -    kind: ClusterRole -    metadata: -      name: daemonset-admin -    rules: -    - resources: -      - daemonsets -      apiGroups: -      - extensions -      verbs: -      - create -      - get -      - list -      - watch -      - delete -      - update -  - apiVersion: v1 -    kind: ClusterRole -    metadata: -      name: rolebinding-reader -    rules: -    - resources: -      - clusterrolebindings -      verbs: -      - get -  - -    apiVersion: v1 -    kind: RoleBinding -    metadata: -      name: logging-deployer-edit-role -    roleRef: -      kind: ClusterRole -      name: edit -    subjects: -    - kind: ServiceAccount -      name: logging-deployer -  - -    apiVersion: v1 -    kind: RoleBinding -    metadata: -      name: logging-deployer-dsadmin-role -    roleRef: -      kind: ClusterRole -      name: daemonset-admin -    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" -  metadata: -    name: logging-deployer-template -    annotations: -      description: "Template for running the aggregated logging deployer in a pod. Requires empowered 'logging-deployer' service account." -      tags: "infrastructure" -  labels: -    logging-infra: deployer -    provider: openshift -  objects: -  - -    apiVersion: v1 -    kind: Pod -    metadata: -      generateName: logging-deployer- -    spec: -      containers: -      - image: ${IMAGE_PREFIX}logging-deployer:${IMAGE_VERSION} -        imagePullPolicy: Always -        name: deployer -        volumeMounts: -        - name: empty -          mountPath: /etc/deploy -        env: -          - name: PROJECT -            valueFrom: -              fieldRef: -                fieldPath: metadata.namespace -          - name: IMAGE_PREFIX -            value: ${IMAGE_PREFIX} -          - name: IMAGE_VERSION -            value: ${IMAGE_VERSION} -          - name: IMAGE_PULL_SECRET -            value: ${IMAGE_PULL_SECRET} -          - name: INSECURE_REGISTRY -            value: ${INSECURE_REGISTRY} -          - name: ENABLE_OPS_CLUSTER -            value: ${ENABLE_OPS_CLUSTER} -          - name: KIBANA_HOSTNAME -            value: ${KIBANA_HOSTNAME} -          - name: KIBANA_OPS_HOSTNAME -            value: ${KIBANA_OPS_HOSTNAME} -          - name: PUBLIC_MASTER_URL -            value: ${PUBLIC_MASTER_URL} -          - name: MASTER_URL -            value: ${MASTER_URL} -          - name: ES_INSTANCE_RAM -            value: ${ES_INSTANCE_RAM} -          - name: ES_PVC_SIZE -            value: ${ES_PVC_SIZE} -          - name: ES_PVC_PREFIX -            value: ${ES_PVC_PREFIX} -          - name: ES_PVC_DYNAMIC -            value: ${ES_PVC_DYNAMIC} -          - name: ES_CLUSTER_SIZE -            value: ${ES_CLUSTER_SIZE} -          - name: ES_NODE_QUORUM -            value: ${ES_NODE_QUORUM} -          - name: ES_RECOVER_AFTER_NODES -            value: ${ES_RECOVER_AFTER_NODES} -          - name: ES_RECOVER_EXPECTED_NODES -            value: ${ES_RECOVER_EXPECTED_NODES} -          - name: ES_RECOVER_AFTER_TIME -            value: ${ES_RECOVER_AFTER_TIME} -          - name: ES_OPS_INSTANCE_RAM -            value: ${ES_OPS_INSTANCE_RAM} -          - name: ES_OPS_PVC_SIZE -            value: ${ES_OPS_PVC_SIZE} -          - name: ES_OPS_PVC_PREFIX -            value: ${ES_OPS_PVC_PREFIX} -          - name: ES_OPS_PVC_DYNAMIC -            value: ${ES_OPS_PVC_DYNAMIC} -          - name: ES_OPS_CLUSTER_SIZE -            value: ${ES_OPS_CLUSTER_SIZE} -          - name: ES_OPS_NODE_QUORUM -            value: ${ES_OPS_NODE_QUORUM} -          - name: ES_OPS_RECOVER_AFTER_NODES -            value: ${ES_OPS_RECOVER_AFTER_NODES} -          - name: ES_OPS_RECOVER_EXPECTED_NODES -            value: ${ES_OPS_RECOVER_EXPECTED_NODES} -          - name: ES_OPS_RECOVER_AFTER_TIME -            value: ${ES_OPS_RECOVER_AFTER_TIME} -          - name: FLUENTD_NODESELECTOR -            value: ${FLUENTD_NODESELECTOR} -          - name: ES_NODESELECTOR -            value: ${ES_NODESELECTOR} -          - name: ES_OPS_NODESELECTOR -            value: ${ES_OPS_NODESELECTOR} -          - name: KIBANA_NODESELECTOR -            value: ${KIBANA_NODESELECTOR} -          - name: KIBANA_OPS_NODESELECTOR -            value: ${KIBANA_OPS_NODESELECTOR} -          - name: CURATOR_NODESELECTOR -            value: ${CURATOR_NODESELECTOR} -          - name: CURATOR_OPS_NODESELECTOR -            value: ${CURATOR_OPS_NODESELECTOR} -          - name: MODE -            value: ${MODE} -      dnsPolicy: ClusterFirst -      restartPolicy: Never -      serviceAccount: logging-deployer -      volumes: -      - name: empty -        emptyDir: {} -  parameters: -  - -    description: "The mode that the deployer runs in." -    name: MODE -    value: "install" -  - -    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.3.0", set version "3.3.0"' -    name: IMAGE_VERSION -    value: "3.4.0" -  - -    description: "(Deprecated) Specify the name of an existing pull secret to be used for pulling component images from an authenticated registry." -    name: IMAGE_PULL_SECRET -  - -    description: "(Deprecated) Allow the registry for logging component images to be non-secure (not secured with a certificate signed by a known CA)" -    name: INSECURE_REGISTRY -    value: "false" -  - -    description: "(Deprecated) If true, set up to use a second ES cluster for ops logs." -    name: ENABLE_OPS_CLUSTER -    value: "false" -  - -    description: "(Deprecated) External hostname where clients will reach kibana" -    name: KIBANA_HOSTNAME -    value: "kibana.example.com" -  - -    description: "(Deprecated) External hostname at which admins will visit the ops Kibana." -    name: KIBANA_OPS_HOSTNAME -    value: kibana-ops.example.com -  - -    description: "(Deprecated) External URL for the master, for OAuth purposes" -    name: PUBLIC_MASTER_URL -    value: "https://localhost:8443" -  - -    description: "(Deprecated) Internal URL for the master, for authentication retrieval" -    name: MASTER_URL -    value: "https://kubernetes.default.svc.cluster.local" -  - -    description: "(Deprecated) How many instances of ElasticSearch to deploy." -    name: ES_CLUSTER_SIZE -    value: "1" -  - -    description: "(Deprecated) Amount of RAM to reserve per ElasticSearch instance." -    name: ES_INSTANCE_RAM -    value: "8G" -  - -    description: "(Deprecated) Size of the PersistentVolumeClaim to create per ElasticSearch instance, e.g. 100G. If empty, no PVCs will be created and emptyDir volumes are used instead." -    name: ES_PVC_SIZE -  - -    description: "(Deprecated) Prefix for the names of PersistentVolumeClaims to be created; a number will be appended per instance. If they don't already exist, they will be created with size ES_PVC_SIZE." -    name: ES_PVC_PREFIX -    value: "logging-es-" -  - -    description: '(Deprecated) Set to "true" to request dynamic provisioning (if enabled for your cluster) of a PersistentVolume for the ES PVC. ' -    name: ES_PVC_DYNAMIC -  - -    description: "(Deprecated) Number of nodes required to elect a master (ES minimum_master_nodes). By default, derived from ES_CLUSTER_SIZE / 2 + 1." -    name: ES_NODE_QUORUM -  - -    description: "(Deprecated) Number of nodes required to be present before the cluster will recover from a full restart. By default, one fewer than ES_CLUSTER_SIZE." -    name: ES_RECOVER_AFTER_NODES -  - -    description: "(Deprecated) Number of nodes desired to be present before the cluster will recover from a full restart. By default, ES_CLUSTER_SIZE." -    name: ES_RECOVER_EXPECTED_NODES -  - -    description: "(Deprecated) Timeout for *expected* nodes to be present when cluster is recovering from a full restart." -    name: ES_RECOVER_AFTER_TIME -    value: "5m" -  - -    description: "(Deprecated) How many ops instances of ElasticSearch to deploy. By default, ES_CLUSTER_SIZE." -    name: ES_OPS_CLUSTER_SIZE -  - -    description: "(Deprecated) Amount of RAM to reserve per ops ElasticSearch instance." -    name: ES_OPS_INSTANCE_RAM -    value: "8G" -  - -    description: "(Deprecated) Size of the PersistentVolumeClaim to create per ElasticSearch ops instance, e.g. 100G. If empty, no PVCs will be created and emptyDir volumes are used instead." -    name: ES_OPS_PVC_SIZE -  - -    description: "(Deprecated) Prefix for the names of PersistentVolumeClaims to be created; a number will be appended per instance. If they don't already exist, they will be created with size ES_OPS_PVC_SIZE." -    name: ES_OPS_PVC_PREFIX -    value: "logging-es-ops-" -  - -    description: '(Deprecated) Set to "true" to request dynamic provisioning (if enabled for your cluster) of a PersistentVolume for the ES ops PVC. ' -    name: ES_OPS_PVC_DYNAMIC -  - -    description: "(Deprecated) Number of ops nodes required to elect a master (ES minimum_master_nodes). By default, derived from ES_CLUSTER_SIZE / 2 + 1." -    name: ES_OPS_NODE_QUORUM -  - -    description: "(Deprecated) Number of ops nodes required to be present before the cluster will recover from a full restart. By default, one fewer than ES_OPS_CLUSTER_SIZE." -    name: ES_OPS_RECOVER_AFTER_NODES -  - -    description: "(Deprecated) Number of ops nodes desired to be present before the cluster will recover from a full restart. By default, ES_OPS_CLUSTER_SIZE." -    name: ES_OPS_RECOVER_EXPECTED_NODES -  - -    description: "(Deprecated) Timeout for *expected* ops nodes to be present when cluster is recovering from a full restart." -    name: ES_OPS_RECOVER_AFTER_TIME -    value: "5m" -  - -    description: "(Deprecated) The nodeSelector used for the Fluentd DaemonSet." -    name: FLUENTD_NODESELECTOR -    value: "logging-infra-fluentd=true" -  - -    description: "(Deprecated) Node selector Elasticsearch cluster (label=value)." -    name: ES_NODESELECTOR -    value: "" -  - -    description: "(Deprecated) Node selector Elasticsearch operations cluster (label=value)." -    name: ES_OPS_NODESELECTOR -    value: "" -  - -    description: "(Deprecated) Node selector Kibana cluster (label=value)." -    name: KIBANA_NODESELECTOR -    value: "" -  - -    description: "(Deprecated) Node selector Kibana operations cluster (label=value)." -    name: KIBANA_OPS_NODESELECTOR -    value: "" -  - -    description: "(Deprecated) Node selector Curator (label=value)." -    name: CURATOR_NODESELECTOR -    value: "" -  - -    description: "(Deprecated) Node selector operations Curator (label=value)." -    name: CURATOR_OPS_NODESELECTOR -    value: "" diff --git a/roles/openshift_hosted_templates/files/v1.6/enterprise/metrics-deployer.yaml b/roles/openshift_hosted_templates/files/v1.6/enterprise/metrics-deployer.yaml deleted file mode 100644 index c4ab794ae..000000000 --- a/roles/openshift_hosted_templates/files/v1.6/enterprise/metrics-deployer.yaml +++ /dev/null @@ -1,168 +0,0 @@ -#!/bin/bash -# -# Copyright 2014-2015 Red Hat, Inc. and/or its affiliates -# and other contributors as indicated by the @author tags. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -#    http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -apiVersion: "v1" -kind: "Template" -metadata: -  name: metrics-deployer-template -  annotations: -    description: "Template for deploying the required Metrics integration. Requires cluster-admin 'metrics-deployer' service account and 'metrics-deployer' secret." -    tags: "infrastructure" -labels: -  metrics-infra: deployer -  provider: openshift -  component: deployer -objects: -- -  apiVersion: v1 -  kind: Pod -  metadata: -    generateName: metrics-deployer- -  spec: -    securityContext: {} -    containers: -    - image: ${IMAGE_PREFIX}metrics-deployer:${IMAGE_VERSION} -      name: deployer -      securityContext: {} -      volumeMounts: -      - name: secret -        mountPath: /secret -        readOnly: true -      - name: empty -        mountPath: /etc/deploy -      env: -        - name: PROJECT -          valueFrom: -            fieldRef: -              fieldPath: metadata.namespace -        - name: POD_NAME -          valueFrom: -            fieldRef: -              fieldPath: metadata.name -        - name: IMAGE_PREFIX -          value: ${IMAGE_PREFIX} -        - name: IMAGE_VERSION -          value: ${IMAGE_VERSION} -        - name: MASTER_URL -          value: ${MASTER_URL} -        - name: MODE -          value: ${MODE} -        - name: CONTINUE_ON_ERROR -          value: ${CONTINUE_ON_ERROR} -        - name: REDEPLOY -          value: ${REDEPLOY} -        - name: IGNORE_PREFLIGHT -          value: ${IGNORE_PREFLIGHT} -        - name: USE_PERSISTENT_STORAGE -          value: ${USE_PERSISTENT_STORAGE} -        - name: DYNAMICALLY_PROVISION_STORAGE -          value: ${DYNAMICALLY_PROVISION_STORAGE} -        - name: HAWKULAR_METRICS_HOSTNAME -          value: ${HAWKULAR_METRICS_HOSTNAME} -        - name: CASSANDRA_NODES -          value: ${CASSANDRA_NODES} -        - name: CASSANDRA_PV_SIZE -          value: ${CASSANDRA_PV_SIZE} -        - name: METRIC_DURATION -          value: ${METRIC_DURATION} -        - name: USER_WRITE_ACCESS -          value: ${USER_WRITE_ACCESS} -        - name: HEAPSTER_NODE_ID -          value: ${HEAPSTER_NODE_ID} -        - name: METRIC_RESOLUTION -          value: ${METRIC_RESOLUTION} -        - name: STARTUP_TIMEOUT -          value: ${STARTUP_TIMEOUT} -    dnsPolicy: ClusterFirst -    restartPolicy: Never -    serviceAccount: metrics-deployer -    volumes: -    - name: empty -      emptyDir: {} -    - name: secret -      secret: -        secretName: metrics-deployer -parameters: -- -  description: 'Specify prefix for metrics components; e.g. for "openshift/origin-metrics-deployer:latest", set prefix "openshift/origin-"' -  name: IMAGE_PREFIX -  value: "registry.access.redhat.com/openshift3/" -- -  description: 'Specify version for metrics components; e.g. for "openshift/origin-metrics-deployer:latest", set version "latest"' -  name: IMAGE_VERSION -  value: "v3.5" -- -  description: "Internal URL for the master, for authentication retrieval" -  name: MASTER_URL -  value: "https://kubernetes.default.svc:443" -- -  description: "External hostname where clients will reach Hawkular Metrics" -  name: HAWKULAR_METRICS_HOSTNAME -  required: true -- -  description: "Can be set to: 'preflight' to perform validation before a deployment; 'deploy' to perform an initial deployment; 'refresh' to delete and redeploy all components but to keep persisted data and routes; 'redeploy' to delete and redeploy everything (losing all data in the process); 'validate' to re-run validations after a deployment" -  name: MODE -  value: "deploy" --  -  description: "Set to true to continue even if the deployer runs into an error." -  name: CONTINUE_ON_ERROR -  value: "false" -- -  description: "(Deprecated) Turns 'deploy' mode into 'redeploy' mode, deleting and redeploying everything (losing all data in the process)" -  name: REDEPLOY -  value: "false" -- -  description: "If preflight validation is blocking deployment and you're sure you don't care about it, this will ignore the results and proceed to deploy." -  name: IGNORE_PREFLIGHT -  value: "false" -- -  description: "Set to true for persistent storage, set to false to use non persistent storage" -  name: USE_PERSISTENT_STORAGE -  value: "true" -- -  description: "Set to true to dynamically provision storage, set to false to use use pre-created persistent volumes" -  name: DYNAMICALLY_PROVISION_STORAGE -  value: "false" -- -  description: "The number of Cassandra Nodes to deploy for the initial cluster" -  name: CASSANDRA_NODES -  value: "1" -- -  description: "The persistent volume size for each of the Cassandra nodes" -  name: CASSANDRA_PV_SIZE -  value: "10Gi" -- -  description: "How many days metrics should be stored for." -  name: METRIC_DURATION -  value: "7" -- -  description: "If a user accounts should be allowed to write metrics." -  name: USER_WRITE_ACCESS -  value: "false" -- -  description: "The identifier used when generating metric ids in Hawkular" -  name: HEAPSTER_NODE_ID -  value: "nodename" -- -  description: "How often metrics should be gathered. Defaults value of '30s' for 30 seconds" -  name: METRIC_RESOLUTION -  value: "30s" -- -  description: "How long in seconds we should wait until Hawkular Metrics and Heapster starts up before attempting a restart" -  name: STARTUP_TIMEOUT -  value: "500" diff --git a/roles/openshift_hosted_templates/files/v1.6/origin/logging-deployer.yaml b/roles/openshift_hosted_templates/files/v1.6/origin/logging-deployer.yaml deleted file mode 100644 index 5b5503500..000000000 --- a/roles/openshift_hosted_templates/files/v1.6/origin/logging-deployer.yaml +++ /dev/null @@ -1,342 +0,0 @@ -apiVersion: "v1" -kind: "List" -items: -- -  apiVersion: "v1" -  kind: "Template" -  metadata: -    name: logging-deployer-account-template -    annotations: -      description: "Template for creating the deployer account and roles needed for the aggregated logging deployer. Create as cluster-admin." -      tags: "infrastructure" -  objects: -  - -    apiVersion: v1 -    kind: ServiceAccount -    name: logging-deployer -    metadata: -      name: logging-deployer -      labels: -        logging-infra: deployer -        provider: openshift -        component: deployer -  - -    apiVersion: v1 -    kind: ServiceAccount -    metadata: -      name: aggregated-logging-kibana -  - -    apiVersion: v1 -    kind: ServiceAccount -    metadata: -      name: aggregated-logging-elasticsearch -  - -    apiVersion: v1 -    kind: ServiceAccount -    metadata: -      name: aggregated-logging-fluentd -  - -    apiVersion: v1 -    kind: ServiceAccount -    metadata: -      name: aggregated-logging-curator -  - apiVersion: v1 -    kind: ClusterRole -    metadata: -      name: oauth-editor -    rules: -    - resources: -      - oauthclients -      verbs: -      - create -      - delete -  - apiVersion: v1 -    kind: ClusterRole -    metadata: -      name: daemonset-admin -    rules: -    - resources: -      - daemonsets -      apiGroups: -      - extensions -      verbs: -      - create -      - get -      - list -      - watch -      - delete -      - update -  - apiVersion: v1 -    kind: ClusterRole -    metadata: -      name: rolebinding-reader -    rules: -    - resources: -      - clusterrolebindings -      verbs: -      - get -  - -    apiVersion: v1 -    kind: RoleBinding -    metadata: -      name: logging-deployer-edit-role -    roleRef: -      name: edit -    subjects: -    - kind: ServiceAccount -      name: logging-deployer -  - -    apiVersion: v1 -    kind: RoleBinding -    metadata: -      name: logging-deployer-dsadmin-role -    roleRef: -      name: daemonset-admin -    subjects: -    - kind: ServiceAccount -      name: logging-deployer -  - -    apiVersion: v1 -    kind: RoleBinding -    metadata: -      name: logging-elasticsearch-view-role -    roleRef: -      name: view -    subjects: -    - kind: ServiceAccount -      name: aggregated-logging-elasticsearch -- -  apiVersion: "v1" -  kind: "Template" -  metadata: -    name: logging-deployer-template -    annotations: -      description: "Template for running the aggregated logging deployer in a pod. Requires empowered 'logging-deployer' service account." -      tags: "infrastructure" -  labels: -    logging-infra: deployer -    provider: openshift -  objects: -  - -    apiVersion: v1 -    kind: Pod -    metadata: -      generateName: logging-deployer- -    spec: -      containers: -      - image: ${IMAGE_PREFIX}logging-deployment:${IMAGE_VERSION} -        imagePullPolicy: Always -        name: deployer -        volumeMounts: -        - name: empty -          mountPath: /etc/deploy -        env: -          - name: PROJECT -            valueFrom: -              fieldRef: -                fieldPath: metadata.namespace -          - name: IMAGE_PREFIX -            value: ${IMAGE_PREFIX} -          - name: IMAGE_VERSION -            value: ${IMAGE_VERSION} -          - name: IMAGE_PULL_SECRET -            value: ${IMAGE_PULL_SECRET} -          - name: INSECURE_REGISTRY -            value: ${INSECURE_REGISTRY} -          - name: ENABLE_OPS_CLUSTER -            value: ${ENABLE_OPS_CLUSTER} -          - name: KIBANA_HOSTNAME -            value: ${KIBANA_HOSTNAME} -          - name: KIBANA_OPS_HOSTNAME -            value: ${KIBANA_OPS_HOSTNAME} -          - name: PUBLIC_MASTER_URL -            value: ${PUBLIC_MASTER_URL} -          - name: MASTER_URL -            value: ${MASTER_URL} -          - name: ES_INSTANCE_RAM -            value: ${ES_INSTANCE_RAM} -          - name: ES_PVC_SIZE -            value: ${ES_PVC_SIZE} -          - name: ES_PVC_PREFIX -            value: ${ES_PVC_PREFIX} -          - name: ES_PVC_DYNAMIC -            value: ${ES_PVC_DYNAMIC} -          - name: ES_CLUSTER_SIZE -            value: ${ES_CLUSTER_SIZE} -          - name: ES_NODE_QUORUM -            value: ${ES_NODE_QUORUM} -          - name: ES_RECOVER_AFTER_NODES -            value: ${ES_RECOVER_AFTER_NODES} -          - name: ES_RECOVER_EXPECTED_NODES -            value: ${ES_RECOVER_EXPECTED_NODES} -          - name: ES_RECOVER_AFTER_TIME -            value: ${ES_RECOVER_AFTER_TIME} -          - name: ES_OPS_INSTANCE_RAM -            value: ${ES_OPS_INSTANCE_RAM} -          - name: ES_OPS_PVC_SIZE -            value: ${ES_OPS_PVC_SIZE} -          - name: ES_OPS_PVC_PREFIX -            value: ${ES_OPS_PVC_PREFIX} -          - name: ES_OPS_PVC_DYNAMIC -            value: ${ES_OPS_PVC_DYNAMIC} -          - name: ES_OPS_CLUSTER_SIZE -            value: ${ES_OPS_CLUSTER_SIZE} -          - name: ES_OPS_NODE_QUORUM -            value: ${ES_OPS_NODE_QUORUM} -          - name: ES_OPS_RECOVER_AFTER_NODES -            value: ${ES_OPS_RECOVER_AFTER_NODES} -          - name: ES_OPS_RECOVER_EXPECTED_NODES -            value: ${ES_OPS_RECOVER_EXPECTED_NODES} -          - name: ES_OPS_RECOVER_AFTER_TIME -            value: ${ES_OPS_RECOVER_AFTER_TIME} -          - name: FLUENTD_NODESELECTOR -            value: ${FLUENTD_NODESELECTOR} -          - name: ES_NODESELECTOR -            value: ${ES_NODESELECTOR} -          - name: ES_OPS_NODESELECTOR -            value: ${ES_OPS_NODESELECTOR} -          - name: KIBANA_NODESELECTOR -            value: ${KIBANA_NODESELECTOR} -          - name: KIBANA_OPS_NODESELECTOR -            value: ${KIBANA_OPS_NODESELECTOR} -          - name: CURATOR_NODESELECTOR -            value: ${CURATOR_NODESELECTOR} -          - name: CURATOR_OPS_NODESELECTOR -            value: ${CURATOR_OPS_NODESELECTOR} -          - name: MODE -            value: ${MODE} -      dnsPolicy: ClusterFirst -      restartPolicy: Never -      serviceAccount: logging-deployer -      volumes: -      - name: empty -        emptyDir: {} -  parameters: -  - -    description: "The mode that the deployer runs in." -    name: MODE -    value: "install" -  - -    description: 'Specify prefix for logging components; e.g. for "openshift/origin-logging-deployer:v1.1", set prefix "openshift/origin-"' -    name: IMAGE_PREFIX -    value: "docker.io/openshift/origin-" -  - -    description: 'Specify version for logging components; e.g. for "openshift/origin-logging-deployer:v1.1", set version "v1.1"' -    name: IMAGE_VERSION -    value: "latest" -  - -    description: "(Deprecated) Specify the name of an existing pull secret to be used for pulling component images from an authenticated registry." -    name: IMAGE_PULL_SECRET -  - -    description: "(Deprecated) Allow the registry for logging component images to be non-secure (not secured with a certificate signed by a known CA)" -    name: INSECURE_REGISTRY -    value: "false" -  - -    description: "(Deprecated) If true, set up to use a second ES cluster for ops logs." -    name: ENABLE_OPS_CLUSTER -    value: "false" -  - -    description: "(Deprecated) External hostname where clients will reach kibana" -    name: KIBANA_HOSTNAME -    value: "kibana.example.com" -  - -    description: "(Deprecated) External hostname at which admins will visit the ops Kibana." -    name: KIBANA_OPS_HOSTNAME -    value: kibana-ops.example.com -  - -    description: "(Deprecated) External URL for the master, for OAuth purposes" -    name: PUBLIC_MASTER_URL -    value: "https://localhost:8443" -  - -    description: "(Deprecated) Internal URL for the master, for authentication retrieval" -    name: MASTER_URL -    value: "https://kubernetes.default.svc.cluster.local" -  - -    description: "(Deprecated) How many instances of ElasticSearch to deploy." -    name: ES_CLUSTER_SIZE -    value: "1" -  - -    description: "(Deprecated) Amount of RAM to reserve per ElasticSearch instance." -    name: ES_INSTANCE_RAM -    value: "8G" -  - -    description: "(Deprecated) Size of the PersistentVolumeClaim to create per ElasticSearch instance, e.g. 100G. If empty, no PVCs will be created and emptyDir volumes are used instead." -    name: ES_PVC_SIZE -  - -    description: "(Deprecated) Prefix for the names of PersistentVolumeClaims to be created; a number will be appended per instance. If they don't already exist, they will be created with size ES_PVC_SIZE." -    name: ES_PVC_PREFIX -    value: "logging-es-" -  - -    description: '(Deprecated) Set to "true" to request dynamic provisioning (if enabled for your cluster) of a PersistentVolume for the ES PVC. ' -    name: ES_PVC_DYNAMIC -  - -    description: "(Deprecated) Number of nodes required to elect a master (ES minimum_master_nodes). By default, derived from ES_CLUSTER_SIZE / 2 + 1." -    name: ES_NODE_QUORUM -  - -    description: "(Deprecated) Number of nodes required to be present before the cluster will recover from a full restart. By default, one fewer than ES_CLUSTER_SIZE." -    name: ES_RECOVER_AFTER_NODES -  - -    description: "(Deprecated) Number of nodes desired to be present before the cluster will recover from a full restart. By default, ES_CLUSTER_SIZE." -    name: ES_RECOVER_EXPECTED_NODES -  - -    description: "(Deprecated) Timeout for *expected* nodes to be present when cluster is recovering from a full restart." -    name: ES_RECOVER_AFTER_TIME -    value: "5m" -  - -    description: "(Deprecated) How many ops instances of ElasticSearch to deploy. By default, ES_CLUSTER_SIZE." -    name: ES_OPS_CLUSTER_SIZE -  - -    description: "(Deprecated) Amount of RAM to reserve per ops ElasticSearch instance." -    name: ES_OPS_INSTANCE_RAM -    value: "8G" -  - -    description: "(Deprecated) Size of the PersistentVolumeClaim to create per ElasticSearch ops instance, e.g. 100G. If empty, no PVCs will be created and emptyDir volumes are used instead." -    name: ES_OPS_PVC_SIZE -  - -    description: "(Deprecated) Prefix for the names of PersistentVolumeClaims to be created; a number will be appended per instance. If they don't already exist, they will be created with size ES_OPS_PVC_SIZE." -    name: ES_OPS_PVC_PREFIX -    value: "logging-es-ops-" -  - -    description: '(Deprecated) Set to "true" to request dynamic provisioning (if enabled for your cluster) of a PersistentVolume for the ES ops PVC. ' -    name: ES_OPS_PVC_DYNAMIC -  - -    description: "(Deprecated) Number of ops nodes required to elect a master (ES minimum_master_nodes). By default, derived from ES_CLUSTER_SIZE / 2 + 1." -    name: ES_OPS_NODE_QUORUM -  - -    description: "(Deprecated) Number of ops nodes required to be present before the cluster will recover from a full restart. By default, one fewer than ES_OPS_CLUSTER_SIZE." -    name: ES_OPS_RECOVER_AFTER_NODES -  - -    description: "(Deprecated) Number of ops nodes desired to be present before the cluster will recover from a full restart. By default, ES_OPS_CLUSTER_SIZE." -    name: ES_OPS_RECOVER_EXPECTED_NODES -  - -    description: "(Deprecated) Timeout for *expected* ops nodes to be present when cluster is recovering from a full restart." -    name: ES_OPS_RECOVER_AFTER_TIME -    value: "5m" -  - -    description: "(Deprecated) The nodeSelector used for the Fluentd DaemonSet." -    name: FLUENTD_NODESELECTOR -    value: "logging-infra-fluentd=true" -  - -    description: "(Deprecated) Node selector Elasticsearch cluster (label=value)." -    name: ES_NODESELECTOR -    value: "" -  - -    description: "(Deprecated) Node selector Elasticsearch operations cluster (label=value)." -    name: ES_OPS_NODESELECTOR -    value: "" -  - -    description: "(Deprecated) Node selector Kibana cluster (label=value)." -    name: KIBANA_NODESELECTOR -    value: "" -  - -    description: "(Deprecated) Node selector Kibana operations cluster (label=value)." -    name: KIBANA_OPS_NODESELECTOR -    value: "" -  - -    description: "(Deprecated) Node selector Curator (label=value)." -    name: CURATOR_NODESELECTOR -    value: "" -  - -    description: "(Deprecated) Node selector operations Curator (label=value)." -    name: CURATOR_OPS_NODESELECTOR -    value: "" diff --git a/roles/openshift_hosted_templates/files/v1.6/origin/metrics-deployer.yaml b/roles/openshift_hosted_templates/files/v1.6/origin/metrics-deployer.yaml deleted file mode 100644 index d191c0439..000000000 --- a/roles/openshift_hosted_templates/files/v1.6/origin/metrics-deployer.yaml +++ /dev/null @@ -1,168 +0,0 @@ -#!/bin/bash -# -# Copyright 2014-2015 Red Hat, Inc. and/or its affiliates -# and other contributors as indicated by the @author tags. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -#    http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -apiVersion: "v1" -kind: "Template" -metadata: -  name: metrics-deployer-template -  annotations: -    description: "Template for deploying the required Metrics integration. Requires cluster-admin 'metrics-deployer' service account and 'metrics-deployer' secret." -    tags: "infrastructure" -labels: -  metrics-infra: deployer -  provider: openshift -  component: deployer -objects: -- -  apiVersion: v1 -  kind: Pod -  metadata: -    generateName: metrics-deployer- -  spec: -    securityContext: {} -    containers: -    - image: ${IMAGE_PREFIX}metrics-deployer:${IMAGE_VERSION} -      name: deployer -      securityContext: {} -      volumeMounts: -      - name: secret -        mountPath: /secret -        readOnly: true -      - name: empty -        mountPath: /etc/deploy -      env: -        - name: PROJECT -          valueFrom: -            fieldRef: -              fieldPath: metadata.namespace -        - name: POD_NAME -          valueFrom: -            fieldRef: -              fieldPath: metadata.name -        - name: IMAGE_PREFIX -          value: ${IMAGE_PREFIX} -        - name: IMAGE_VERSION -          value: ${IMAGE_VERSION} -        - name: MASTER_URL -          value: ${MASTER_URL} -        - name: MODE -          value: ${MODE} -        - name: CONTINUE_ON_ERROR -          value: ${CONTINUE_ON_ERROR} -        - name: REDEPLOY -          value: ${REDEPLOY} -        - name: IGNORE_PREFLIGHT -          value: ${IGNORE_PREFLIGHT} -        - name: USE_PERSISTENT_STORAGE -          value: ${USE_PERSISTENT_STORAGE} -        - name: DYNAMICALLY_PROVISION_STORAGE -          value: ${DYNAMICALLY_PROVISION_STORAGE} -        - name: HAWKULAR_METRICS_HOSTNAME -          value: ${HAWKULAR_METRICS_HOSTNAME} -        - name: CASSANDRA_NODES -          value: ${CASSANDRA_NODES} -        - name: CASSANDRA_PV_SIZE -          value: ${CASSANDRA_PV_SIZE} -        - name: METRIC_DURATION -          value: ${METRIC_DURATION} -        - name: USER_WRITE_ACCESS -          value: ${USER_WRITE_ACCESS} -        - name: HEAPSTER_NODE_ID -          value: ${HEAPSTER_NODE_ID} -        - name: METRIC_RESOLUTION -          value: ${METRIC_RESOLUTION} -        - name: STARTUP_TIMEOUT -          value: ${STARTUP_TIMEOUT} -    dnsPolicy: ClusterFirst -    restartPolicy: Never -    serviceAccount: metrics-deployer -    volumes: -    - name: empty -      emptyDir: {} -    - name: secret -      secret: -        secretName: metrics-deployer -parameters: -- -  description: 'Specify prefix for metrics components; e.g. for "openshift/origin-metrics-deployer:latest", set prefix "openshift/origin-"' -  name: IMAGE_PREFIX -  value: "openshift/origin-" -- -  description: 'Specify version for metrics components; e.g. for "openshift/origin-metrics-deployer:latest", set version "latest"' -  name: IMAGE_VERSION -  value: "latest" -- -  description: "Internal URL for the master, for authentication retrieval" -  name: MASTER_URL -  value: "https://kubernetes.default.svc:443" -- -  description: "External hostname where clients will reach Hawkular Metrics" -  name: HAWKULAR_METRICS_HOSTNAME -  required: true -- -  description: "Can be set to: 'preflight' to perform validation before a deployment; 'deploy' to perform an initial deployment; 'refresh' to delete and redeploy all components but to keep persisted data and routes; 'redeploy' to delete and redeploy everything (losing all data in the process); 'validate' to re-run validations after a deployment" -  name: MODE -  value: "deploy" --  -  description: "Set to true to continue even if the deployer runs into an error." -  name: CONTINUE_ON_ERROR -  value: "false" -- -  description: "(Deprecated) Turns 'deploy' mode into 'redeploy' mode, deleting and redeploying everything (losing all data in the process)" -  name: REDEPLOY -  value: "false" -- -  description: "If preflight validation is blocking deployment and you're sure you don't care about it, this will ignore the results and proceed to deploy." -  name: IGNORE_PREFLIGHT -  value: "false" -- -  description: "Set to true for persistent storage, set to false to use non persistent storage" -  name: USE_PERSISTENT_STORAGE -  value: "true" -- -  description: "Set to true to dynamically provision storage, set to false to use use pre-created persistent volumes" -  name: DYNAMICALLY_PROVISION_STORAGE -  value: "false" -- -  description: "The number of Cassandra Nodes to deploy for the initial cluster" -  name: CASSANDRA_NODES -  value: "1" -- -  description: "The persistent volume size for each of the Cassandra nodes" -  name: CASSANDRA_PV_SIZE -  value: "10Gi" -- -  description: "How many days metrics should be stored for." -  name: METRIC_DURATION -  value: "7" -- -  description: "If a user accounts should be allowed to write metrics." -  name: USER_WRITE_ACCESS -  value: "false" -- -  description: "The identifier used when generating metric ids in Hawkular" -  name: HEAPSTER_NODE_ID -  value: "nodename" -- -  description: "How often metrics should be gathered. Defaults value of '30s' for 30 seconds" -  name: METRIC_RESOLUTION -  value: "30s" -- -  description: "How long in seconds we should wait until Hawkular Metrics and Heapster starts up before attempting a restart" -  name: STARTUP_TIMEOUT -  value: "500" | 
