Merge pull request #2213 from detiber/remove_old_metrics_role

remove outdated openshift_cluster_metrics role

13 files changed, 0 insertions, 274 deletions

diff --git a/inventory/byo/hosts.aep.example b/inventory/byo/hosts.aep.example
index e038b39d5..79add680a 100644
--- a/inventory/byo/hosts.aep.example
+++ b/inventory/byo/hosts.aep.example
@@ -44,9 +44,6 @@ openshift_release=v3.2
 # Install the openshift examples
 #openshift_install_examples=true
 
-# Enable cluster metrics
-#use_cluster_metrics=true
-
 # Configure logoutURL in the master config for console customization
 # See: https://docs.openshift.org/latest/install_config/web_console_customization.html#changing-the-logout-url
 #openshift_master_logout_url=http://example.com
diff --git a/inventory/byo/hosts.origin.example b/inventory/byo/hosts.origin.example
index 5bfb451c5..dfe616519 100644
--- a/inventory/byo/hosts.origin.example
+++ b/inventory/byo/hosts.origin.example
@@ -45,9 +45,6 @@ openshift_release=v1.2
 # Install the openshift examples
 #openshift_install_examples=true
 
-# Enable cluster metrics
-#use_cluster_metrics=true
-
 # Configure logoutURL in the master config for console customization
 # See: https://docs.openshift.org/latest/install_config/web_console_customization.html#changing-the-logout-url
 #openshift_master_logout_url=http://example.com
diff --git a/inventory/byo/hosts.ose.example b/inventory/byo/hosts.ose.example
index 96a9db30d..9bce9b1e3 100644
--- a/inventory/byo/hosts.ose.example
+++ b/inventory/byo/hosts.ose.example
@@ -44,9 +44,6 @@ openshift_release=v3.2
 # Install the openshift examples
 #openshift_install_examples=true
 
-# Enable cluster metrics
-#use_cluster_metrics=true
-
 # Configure logoutURL in the master config for console customization
 # See: https://docs.openshift.org/latest/install_config/web_console_customization.html#changing-the-logout-url
 #openshift_master_logout_url=http://example.com
diff --git a/playbooks/common/openshift-cluster/additional_config.yml b/playbooks/common/openshift-cluster/additional_config.yml
index a34322754..e9fb3de96 100644
--- a/playbooks/common/openshift-cluster/additional_config.yml
+++ b/playbooks/common/openshift-cluster/additional_config.yml
@@ -19,8 +19,6 @@
   - role: openshift_examples
     registry_url: "{{ openshift.master.registry_url }}"
     when: openshift.common.install_examples | bool
-  - role: openshift_cluster_metrics
-    when: openshift.common.use_cluster_metrics | bool
   - role: openshift_manageiq
     when: openshift.common.use_manageiq | bool
   - role: cockpit
diff --git a/roles/openshift_cluster_metrics/README.md b/roles/openshift_cluster_metrics/README.md
deleted file mode 100644
index 9fdfab8e3..000000000
--- a/roles/openshift_cluster_metrics/README.md
+++ /dev/null
@@ -1,36 +0,0 @@
-#openshift_cluster_metrics
-
-This role configures Cluster wide metrics. It does setting up three services:
-* Metrics are stored in InfluxDB for querying.
-* Heapster reads all nodes and pods from the master, then connects to eachs node's kubelet to retrieve pod metrics.
-* Grafan allows users to create dashboards of metrics from InfluxDB
-
-## Requirements
-
-Running OpenShift cluster
-
-## Role Variables
-
-```
-# Enable cluster metrics
-use_cluster_metrics=true
-```
-
-## Dependencies
-
-None
-
-## Example Playbook
-
-TODO
-
-## Security Note
-Opening up the read-only port exposes information about the running pods (such as namespace, pod name, labels, etc.) to unauthenticated clients. The requirement to open up this read-only port will be fixed in future versions.
-
-##License
-
-Apache License, Version 2.0
-
-## Author Information
-
-Diego Castro (diego.castro@getupcloud.com)
diff --git a/roles/openshift_cluster_metrics/files/cluster-metrics/grafana.yaml b/roles/openshift_cluster_metrics/files/cluster-metrics/grafana.yaml
deleted file mode 100644
index bff422efc..000000000
--- a/roles/openshift_cluster_metrics/files/cluster-metrics/grafana.yaml
+++ /dev/null
@@ -1,53 +0,0 @@
-apiVersion: "v1"
-kind: "List"
-items:
-  -
-    apiVersion: "v1"
-    kind: "Service"
-    metadata:
-      labels:
-        provider: "fabric8"
-        component: "grafana"
-      name: "grafana"
-    spec:
-      ports:
-        -
-          port: 80
-          targetPort: "http"
-      selector:
-        provider: "fabric8"
-        component: "grafana"
-  -
-    apiVersion: "v1"
-    kind: "ReplicationController"
-    metadata:
-      labels:
-        provider: "fabric8"
-        component: "grafana"
-      name: "grafana"
-    spec:
-      replicas: 1
-      selector:
-        provider: "fabric8"
-        component: "grafana"
-      template:
-        metadata:
-          labels:
-            provider: "fabric8"
-            component: "grafana"
-        spec:
-          containers:
-            -
-              env:
-                -
-                  name: "INFLUXDB_SERVICE_NAME"
-                  value: "INFLUXDB_MONITORING"
-                -
-                  name: "GRAFANA_DEFAULT_DASHBOARD"
-                  value: "/dashboard/file/kubernetes.json"
-              image: "fabric8/grafana:1.9.1_2"
-              name: "grafana"
-              ports:
-                -
-                  containerPort: 3000
-                  name: "http"
\ No newline at end of file
diff --git a/roles/openshift_cluster_metrics/files/cluster-metrics/heapster-serviceaccount.yaml b/roles/openshift_cluster_metrics/files/cluster-metrics/heapster-serviceaccount.yaml
deleted file mode 100644
index 1de2ad699..000000000
--- a/roles/openshift_cluster_metrics/files/cluster-metrics/heapster-serviceaccount.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: heapster
\ No newline at end of file
diff --git a/roles/openshift_cluster_metrics/files/cluster-metrics/heapster.yaml b/roles/openshift_cluster_metrics/files/cluster-metrics/heapster.yaml
deleted file mode 100644
index 83e314074..000000000
--- a/roles/openshift_cluster_metrics/files/cluster-metrics/heapster.yaml
+++ /dev/null
@@ -1,30 +0,0 @@
-apiVersion: "v1"
-kind: "List"
-items:
-  -
-    apiVersion: "v1"
-    kind: "ReplicationController"
-    metadata:
-      labels:
-        provider: "fabric8"
-        component: "heapster"
-      name: "heapster"
-    spec:
-      replicas: 1
-      selector:
-        provider: "fabric8"
-        component: "heapster"
-      template:
-        metadata:
-          labels:
-            provider: "fabric8"
-            component: "heapster"
-        spec:
-          containers:
-            -
-              args:
-                - "-source=kubernetes:https://kubernetes.default.svc.cluster.local?auth=&insecure=true&useServiceAccount=true"
-                - "-sink=influxdb:http://influxdb-monitoring.default.svc.cluster.local:8086"
-              image: "kubernetes/heapster:V0.14.2"
-              name: "heapster"
-          serviceAccount: "heapster"
\ No newline at end of file
diff --git a/roles/openshift_cluster_metrics/files/cluster-metrics/influxdb.yaml b/roles/openshift_cluster_metrics/files/cluster-metrics/influxdb.yaml
deleted file mode 100644
index 6f67c3d7c..000000000
--- a/roles/openshift_cluster_metrics/files/cluster-metrics/influxdb.yaml
+++ /dev/null
@@ -1,67 +0,0 @@
-apiVersion: "v1"
-kind: "List"
-items:
-  -
-    apiVersion: "v1"
-    kind: "Service"
-    metadata:
-      labels:
-        provider: "fabric8"
-        component: "influxdb-monitoring"
-      name: "influxdb-monitoring"
-    spec:
-      ports:
-        -
-          port: 8086
-          targetPort: "http"
-      selector:
-        provider: "fabric8"
-        component: "influxdb-monitoring"
-  -
-    apiVersion: "v1"
-    kind: "ReplicationController"
-    metadata:
-      labels:
-        provider: "fabric8"
-        component: "influxdb-monitoring"
-      name: "influxdb-monitoring"
-    spec:
-      replicas: 1
-      selector:
-        provider: "fabric8"
-        component: "influxdb-monitoring"
-      template:
-        metadata:
-          labels:
-            provider: "fabric8"
-            component: "influxdb-monitoring"
-        spec:
-          containers:
-            -
-              env:
-                -
-                  name: "PRE_CREATE_DB"
-                  value: "k8s;grafana"
-              image: "fabric8/influxdb:0.8.8"
-              name: "influxdb"
-              ports:
-                -
-                  containerPort: 8090
-                  name: "raft"
-                -
-                  containerPort: 8099
-                  name: "protobuf"
-                -
-                  containerPort: 8083
-                  name: "admin"
-                -
-                  containerPort: 8086
-                  name: "http"
-              volumeMounts:
-                -
-                  mountPath: "/data"
-                  name: "influxdb-data"
-          volumes:
-            -
-              emptyDir:
-              name: "influxdb-data"
\ No newline at end of file
diff --git a/roles/openshift_cluster_metrics/tasks/main.yml b/roles/openshift_cluster_metrics/tasks/main.yml
deleted file mode 100644
index 1fc8a074a..000000000
--- a/roles/openshift_cluster_metrics/tasks/main.yml
+++ /dev/null
@@ -1,49 +0,0 @@
----
-
-- name: Install cluster metrics templates
-  copy:
-    src: cluster-metrics
-    dest: /etc/origin/
-
-- name: Create InfluxDB Services
-  command: >
-    {{ openshift.common.client_binary }} create -f
-    /etc/origin/cluster-metrics/influxdb.yaml
-  register: oex_influxdb_services
-  failed_when: "'already exists' not in oex_influxdb_services.stderr and oex_influxdb_services.rc != 0"
-  changed_when: false
-
-- name: Create Heapster Service Account
-  command: >
-    {{ openshift.common.client_binary }} create -f
-    /etc/origin/cluster-metrics/heapster-serviceaccount.yaml
-  register: oex_heapster_serviceaccount
-  failed_when: "'already exists' not in oex_heapster_serviceaccount.stderr and oex_heapster_serviceaccount.rc != 0"
-  changed_when: false
-
-- name: Add cluster-reader role to Heapster
-  command: >
-    {{ openshift.common.admin_binary }} policy
-    add-cluster-role-to-user
-    cluster-reader
-    system:serviceaccount:default:heapster
-  register: oex_cluster_header_role
-  failed_when: "'already exists' not in oex_cluster_header_role.stderr and oex_cluster_header_role.rc != 0"
-  changed_when: false
-
-- name: Create Heapster Services
-  command: >
-    {{ openshift.common.client_binary }} create -f
-    /etc/origin/cluster-metrics/heapster.yaml
-  register: oex_heapster_services
-  failed_when: "'already exists' not in oex_heapster_services.stderr and oex_heapster_services.rc != 0"
-  changed_when: false
-
-- name: Create Grafana Services
-  command: >
-    {{ openshift.common.client_binary }} create -f
-    /etc/origin/cluster-metrics/grafana.yaml
-  register: oex_grafana_services
-  failed_when: "'already exists' not in oex_grafana_services.stderr and oex_grafana_services.rc != 0"
-  changed_when: false
-
diff --git a/roles/openshift_facts/library/openshift_facts.py b/roles/openshift_facts/library/openshift_facts.py
index 54bdbc775..659f4eba6 100755
--- a/roles/openshift_facts/library/openshift_facts.py
+++ b/roles/openshift_facts/library/openshift_facts.py
@@ -480,23 +480,6 @@ def set_selectors(facts):
 
     return facts
 
-def set_metrics_facts_if_unset(facts):
-    """ Set cluster metrics facts if not already present in facts dict
-            dict: the facts dict updated with the generated cluster metrics facts if
-            missing
-        Args:
-            facts (dict): existing facts
-        Returns:
-            dict: the facts dict updated with the generated cluster metrics
-            facts if they were not already present
-
-    """
-    if 'common' in facts:
-        if 'use_cluster_metrics' not in facts['common']:
-            use_cluster_metrics = False
-            facts['common']['use_cluster_metrics'] = use_cluster_metrics
-    return facts
-
 def set_dnsmasq_facts_if_unset(facts):
     """ Set dnsmasq facts if not already present in facts
     Args:
@@ -1674,7 +1657,6 @@ class OpenShiftFacts(object):
         facts = set_nuage_facts_if_unset(facts)
         facts = set_node_schedulability(facts)
         facts = set_selectors(facts)
-        facts = set_metrics_facts_if_unset(facts)
         facts = set_identity_providers_if_unset(facts)
         facts = set_sdn_facts_if_unset(facts, self.system_facts)
         facts = set_deployment_facts_if_unset(facts)
diff --git a/roles/openshift_node/templates/node.yaml.v1.j2 b/roles/openshift_node/templates/node.yaml.v1.j2
index 9ba1a01dd..a37770c4a 100644
--- a/roles/openshift_node/templates/node.yaml.v1.j2
+++ b/roles/openshift_node/templates/node.yaml.v1.j2
@@ -34,7 +34,6 @@ servingInfo:
   clientCA: ca.crt
   keyFile: server.key
 volumeDirectory: {{ openshift.common.data_dir }}/openshift.local.volumes
-{% include 'partials/kubeletArguments.j2' %}
 proxyArguments:
   proxy-mode:
      - {{ openshift.node.proxy_mode }}
diff --git a/roles/openshift_node/templates/partials/kubeletArguments.j2 b/roles/openshift_node/templates/partials/kubeletArguments.j2
deleted file mode 100644
index 6c3bd04c5..000000000
--- a/roles/openshift_node/templates/partials/kubeletArguments.j2
+++ /dev/null
@@ -1,5 +0,0 @@
-{% if openshift.common.use_cluster_metrics | bool %}
-kubeletArguments:
-  "read-only-port":
-    - "10255"
-{% endif %}
\ No newline at end of file