From 223266d5dd5f917130648a963f2224d5824c373b Mon Sep 17 00:00:00 2001 From: Moritz Graf Date: Thu, 3 Sep 2020 22:03:24 +0200 Subject: [PATCH] Current state --- bootstrap/README.md | 3 +++ k8s/monitoring/prometheus-operator.secret.yml | 2 ++ 2 files changed, 5 insertions(+) diff --git a/bootstrap/README.md b/bootstrap/README.md index 47c7967..5709cdd 100644 --- a/bootstrap/README.md +++ b/bootstrap/README.md @@ -71,6 +71,8 @@ cd kubespray ansible-playbook -i inventory/prod/inventory.ini -e kube_version=v1.17.7 -e upgrade_cluster_setup=true cluster.yml # or just the newest version ansible-playbook -i inventory/prod/inventory.ini -e upgrade_cluster_setup=true cluster.yml +# upgrade to specific calico version (did not trigger/ failed) +ansible-playbook -i inventory/prod/inventory.ini -e upgrade_cluster_setup=true -e calico_version=v3.15.2 cluster.yml --tags=network ``` History: @@ -93,3 +95,4 @@ This runs everything and is kind of idempotent: ```sh ansible-playbook -i inventory/prod/inventory.ini cluster.yml ``` + diff --git a/k8s/monitoring/prometheus-operator.secret.yml b/k8s/monitoring/prometheus-operator.secret.yml index fb1f800..132c8c3 100644 --- a/k8s/monitoring/prometheus-operator.secret.yml +++ b/k8s/monitoring/prometheus-operator.secret.yml @@ -13,6 +13,8 @@ prometheus: kubernetes.io/ingress.class: "nginx" nginx.ingress.kubernetes.io/force-ssl-redirect: "true" cert-manager.io/cluster-issuer: "letsencrypt-prod" + prometheusSpec: + scrapeInterval: "300s" alertmanager: enabled: false grafana: