Remove prometheus operator from Kubespray (#2658)
Kubespray should not install any helm charts. This is a task that a user should do on his/her own through ansible or another tool. It opens the door to wrapping installation of any helm chart.pull/2662/head
parent
e95ba800ea
commit
49e3665d96
|
@ -162,15 +162,9 @@ dashboard_enabled: true
|
||||||
# Monitoring apps for k8s
|
# Monitoring apps for k8s
|
||||||
efk_enabled: false
|
efk_enabled: false
|
||||||
|
|
||||||
# Helm deployment. Needs for Prometheus Operator, k8s metrics.
|
# Helm deployment
|
||||||
helm_enabled: false
|
helm_enabled: false
|
||||||
|
|
||||||
# Prometheus Operator. Needs for k8s metrics. Installed Helm is required.
|
|
||||||
prometheus_operator_enabled: false
|
|
||||||
|
|
||||||
# K8s cluster metrics. Installed Helm and Prometheus Operator are required.
|
|
||||||
k8s_metrics_enabled: false
|
|
||||||
|
|
||||||
# Istio deployment
|
# Istio deployment
|
||||||
istio_enabled: false
|
istio_enabled: false
|
||||||
|
|
||||||
|
|
|
@ -27,12 +27,6 @@ dependencies:
|
||||||
- apps
|
- apps
|
||||||
- registry
|
- registry
|
||||||
|
|
||||||
- role: kubernetes-apps/metrics
|
|
||||||
when: prometheus_operator_enabled
|
|
||||||
tags:
|
|
||||||
- apps
|
|
||||||
- metrics
|
|
||||||
|
|
||||||
# istio role should be last because it takes a long time to initialize and
|
# istio role should be last because it takes a long time to initialize and
|
||||||
# will cause timeouts trying to start other addons.
|
# will cause timeouts trying to start other addons.
|
||||||
- role: kubernetes-apps/istio
|
- role: kubernetes-apps/istio
|
||||||
|
|
|
@ -1,9 +0,0 @@
|
||||||
---
|
|
||||||
# Prometheus Operator. Needs for k8s metrics. Installed Helm is required.
|
|
||||||
prometheus_operator_enabled: false
|
|
||||||
|
|
||||||
# K8s cluster metrics. Installed Helm and Prometheus Operators are required.
|
|
||||||
k8s_metrics_enabled: false
|
|
||||||
|
|
||||||
# Separate namespace for monitoring/metrics
|
|
||||||
monitoring_namespace: "monitoring"
|
|
|
@ -1,32 +0,0 @@
|
||||||
---
|
|
||||||
- name: Metrics | Make sure Helm is installed
|
|
||||||
command: "{{ bin_dir }}/helm version"
|
|
||||||
register: helm_ready_result
|
|
||||||
until: helm_ready_result|succeeded
|
|
||||||
retries: 4
|
|
||||||
delay: 5
|
|
||||||
when:
|
|
||||||
- prometheus_operator_enabled
|
|
||||||
- inventory_hostname == groups['kube-master'][0]
|
|
||||||
|
|
||||||
- name: Metrics | Add coreos repo
|
|
||||||
command: "{{ bin_dir }}/helm repo add coreos https://s3-eu-west-1.amazonaws.com/coreos-charts/stable/"
|
|
||||||
when:
|
|
||||||
- prometheus_operator_enabled
|
|
||||||
- inventory_hostname == groups['kube-master'][0]
|
|
||||||
run_once: true
|
|
||||||
|
|
||||||
- name: Metrics | Install Prometheus Operator
|
|
||||||
command: "{{ bin_dir }}/helm upgrade --install prometheus-operator coreos/prometheus-operator --namespace {{ monitoring_namespace }}"
|
|
||||||
when:
|
|
||||||
- prometheus_operator_enabled
|
|
||||||
- inventory_hostname == groups['kube-master'][0]
|
|
||||||
run_once: true
|
|
||||||
|
|
||||||
- name: Metrics | Install K8s cluster metrics
|
|
||||||
command: "{{ bin_dir }}/helm upgrade --install kube-prometheus coreos/kube-prometheus --namespace {{ monitoring_namespace }}"
|
|
||||||
when:
|
|
||||||
- prometheus_operator_enabled
|
|
||||||
- k8s_metrics_enabled
|
|
||||||
- inventory_hostname == groups['kube-master'][0]
|
|
||||||
run_once: true
|
|
|
@ -16,7 +16,5 @@ deploy_netchecker: true
|
||||||
kubedns_min_replicas: 1
|
kubedns_min_replicas: 1
|
||||||
cloud_provider: gce
|
cloud_provider: gce
|
||||||
kube_encrypt_secret_data: true
|
kube_encrypt_secret_data: true
|
||||||
prometheus_operator_enabled: true
|
|
||||||
k8s_metrics_enabled: true
|
|
||||||
ingress_nginx_enabled: true
|
ingress_nginx_enabled: true
|
||||||
cert_manager_enabled: true
|
cert_manager_enabled: true
|
||||||
|
|
Loading…
Reference in New Issue