From d854b8957426c63a56c0418066ad1430207b7e03 Mon Sep 17 00:00:00 2001 From: Devin Buhl Date: Tue, 3 Oct 2023 15:41:37 -0400 Subject: [PATCH] fix: bump kps and prom operator crd versions Signed-off-by: Devin Buhl --- .../addons/kube-prometheus-stack/app/helmrelease.yaml.j2 | 4 +--- .../ansible/inventory/group_vars/kubernetes/main.yaml.j2 | 8 ++++---- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/bootstrap/templates/addons/kube-prometheus-stack/app/helmrelease.yaml.j2 b/bootstrap/templates/addons/kube-prometheus-stack/app/helmrelease.yaml.j2 index 20890db2..12b32ca3 100644 --- a/bootstrap/templates/addons/kube-prometheus-stack/app/helmrelease.yaml.j2 +++ b/bootstrap/templates/addons/kube-prometheus-stack/app/helmrelease.yaml.j2 @@ -11,19 +11,17 @@ spec: chart: spec: chart: kube-prometheus-stack - version: 48.1.2 + version: 51.2.0 sourceRef: kind: HelmRepository name: prometheus-community namespace: flux-system maxHistory: 2 install: - crds: CreateReplace remediation: retries: 3 upgrade: cleanupOnFail: true - crds: CreateReplace remediation: retries: 3 uninstall: diff --git a/bootstrap/templates/ansible/inventory/group_vars/kubernetes/main.yaml.j2 b/bootstrap/templates/ansible/inventory/group_vars/kubernetes/main.yaml.j2 index b87bfaec..8861bce0 100644 --- a/bootstrap/templates/ansible/inventory/group_vars/kubernetes/main.yaml.j2 +++ b/bootstrap/templates/ansible/inventory/group_vars/kubernetes/main.yaml.j2 @@ -17,13 +17,13 @@ k3s_server_manifests_urls: - url: https://raw.githubusercontent.com/kube-vip/kube-vip/main/docs/manifests/rbac.yaml filename: kube-vip-rbac.yaml # Essential Prometheus Operator CRDs (the rest are installed with the kube-prometheus-stack helm release) - - url: https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.66.0/example/prometheus-operator-crd/monitoring.coreos.com_podmonitors.yaml + - url: https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.68.0/example/prometheus-operator-crd/monitoring.coreos.com_podmonitors.yaml filename: custom-prometheus-podmonitors.yaml - - url: https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.66.0/example/prometheus-operator-crd/monitoring.coreos.com_prometheusrules.yaml + - url: https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.68.0/example/prometheus-operator-crd/monitoring.coreos.com_prometheusrules.yaml filename: custom-prometheus-prometheusrules.yaml - - url: https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.66.0/example/prometheus-operator-crd/monitoring.coreos.com_scrapeconfigs.yaml + - url: https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.68.0/example/prometheus-operator-crd/monitoring.coreos.com_scrapeconfigs.yaml filename: custom-prometheus-scrapeconfigs.yaml - - url: https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.66.0/example/prometheus-operator-crd/monitoring.coreos.com_servicemonitors.yaml + - url: https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.68.0/example/prometheus-operator-crd/monitoring.coreos.com_servicemonitors.yaml filename: custom-prometheus-servicemonitors.yaml # /var/lib/rancher/k3s/server/manifests k3s_server_manifests_templates: