From 6a8e9ee2a04da9421ddc1cd4593ab2c1cf351461 Mon Sep 17 00:00:00 2001 From: Steven Fitzpatrick Date: Wed, 7 Jul 2021 07:41:13 +0000 Subject: [PATCH] Add some and fix other LMA Versions Replacements This change adds version replacements for images: - kube-state-metrics - node-exporter - curl - Fixes the replacement transformer for prometheus image - Include only logging CRs in workload-config-target - Fixes a typo in Elasticsearch's storageClassName Relates-To: #150 Change-Id: I0110749bb28ca486127b64b516153ce4a25226ae --- .../grafana/replacements/versions.yaml | 10 ++++++ .../replacements/versions.yaml | 22 +++++++++++- .../versions-treasuremap.yaml | 35 +++++++++++++------ .../services/patches/elasticsearch-data.yaml | 4 +-- .../patches/elasticsearch-ingest.yaml | 4 +-- .../target/workload-config/kustomization.yaml | 2 +- .../lma-elasticsearch-output.yaml | 2 +- 7 files changed, 61 insertions(+), 18 deletions(-) diff --git a/manifests/function/grafana/replacements/versions.yaml b/manifests/function/grafana/replacements/versions.yaml index d82c11ccd..21adb0751 100644 --- a/manifests/function/grafana/replacements/versions.yaml +++ b/manifests/function/grafana/replacements/versions.yaml @@ -47,3 +47,13 @@ replacements: kind: HelmRelease name: grafana fieldrefs: ["{.spec.values.image}"] +- source: + objref: + kind: VersionsCatalogue + name: versions-treasuremap + fieldref: "{.spec.image_components.grafana.curl}" + target: + objref: + kind: HelmRelease + name: grafana + fieldrefs: ["{.spec.values.downloadDashboardsImage}"] \ No newline at end of file diff --git a/manifests/function/kube-prometheus-stack/replacements/versions.yaml b/manifests/function/kube-prometheus-stack/replacements/versions.yaml index 2a4ffe2ad..d300d3de2 100644 --- a/manifests/function/kube-prometheus-stack/replacements/versions.yaml +++ b/manifests/function/kube-prometheus-stack/replacements/versions.yaml @@ -62,6 +62,16 @@ replacements: kind: HelmRelease name: kube-prometheus-stack fieldrefs: ["{.spec.values.alertmanager.alertmanagerSpec.image}"] +- source: + objref: + kind: VersionsCatalogue + name: versions-treasuremap + fieldref: "{.spec.image_components.kube_prometheus_stack.kube_state_metrics}" + target: + objref: + kind: HelmRelease + name: kube-prometheus-stack + fieldrefs: ["{.spec.values.kube-state-metrics.image}"] - source: objref: kind: VersionsCatalogue @@ -71,7 +81,7 @@ replacements: objref: kind: HelmRelease name: kube-prometheus-stack - fieldrefs: ["{.spec.values.prometheusOperator.prometheusSpec.image}"] + fieldrefs: ["{.spec.values.prometheus.prometheusSpec.image}"] - source: objref: kind: VersionsCatalogue @@ -82,6 +92,16 @@ replacements: kind: HelmRelease name: kube-prometheus-stack fieldrefs: ["{.spec.values.prometheusOperator.prometheusConfigReloaderImage}"] +- source: + objref: + kind: VersionsCatalogue + name: versions-treasuremap + fieldref: "{.spec.image_components.kube_prometheus_stack.prometheus_node_exporter}" + target: + objref: + kind: HelmRelease + name: kube-prometheus-stack + fieldrefs: ["{.spec.values.prometheus-node-exporter.image}"] - source: objref: kind: VersionsCatalogue diff --git a/manifests/function/treasuremap-base-catalogues/versions-treasuremap.yaml b/manifests/function/treasuremap-base-catalogues/versions-treasuremap.yaml index e9ad90d76..c701678fa 100644 --- a/manifests/function/treasuremap-base-catalogues/versions-treasuremap.yaml +++ b/manifests/function/treasuremap-base-catalogues/versions-treasuremap.yaml @@ -47,7 +47,7 @@ spec: version: 7.11.2 kube_prometheus_stack: chart: kube-prometheus-stack - version: 16.0.1 + version: 16.12.1 logging_operator: chart: logging-operator version: 3.10.0 @@ -62,7 +62,7 @@ spec: version: 4.4.0 thanos_operator: chart: thanos-operator - version: 0.2.1 + version: 0.3.0 ingress-nginx: chart: ingress-nginx version: 3.5.1 @@ -96,7 +96,7 @@ spec: image: quay.io/prometheus/prometheus thanos: thanos: - image: quay.io/thanos/thanos:v0.19.0 + image: quay.io/thanos/thanos:v0.19.0-rc.0 sip: sip: kube-rbac-proxy: @@ -176,7 +176,10 @@ spec: grafana: grafana: repository: grafana/grafana - tag: 7.5.5 + tag: 8.0.3 + curl: + repository: curlimages/curl + tag: 7.73.0 kibana: kibana: repository: docker.elastic.co/kibana/kibana @@ -187,16 +190,22 @@ spec: tag: v1.5.2 alertmanager: repository: quay.io/prometheus/alertmanager - tag: v0.21.0 + tag: v0.22.2 + kube_state_metrics: + repository: k8s.gcr.io/kube-state-metrics/kube-state-metrics + tag: v2.0.0 prometheus: repository: quay.io/prometheus/prometheus tag: v2.27.1 prometheus_config_reloader: repository: quay.io/prometheus-operator/prometheus-config-reloader - tag: v0.46.0 + tag: v0.48.1 + prometheus_node_exporter: + repository: quay.io/prometheus/node-exporter + tag: v1.1.2 prometheus_operator: repository: quay.io/prometheus-operator/prometheus-operator - tag: v0.46.0 + tag: v0.48.1 logging_operator: logging_operator: repository: ghcr.io/banzaicloud/logging-operator @@ -204,13 +213,13 @@ spec: logging_operator_logging: config_reloader: repository: jimmidyson/configmap-reload - tag: v0.5.0 + tag: v0.4.0 fluentbit: repository: fluent/fluent-bit - tag: 1.7.9 + tag: 1.7.4 fluentd: repository: ghcr.io/banzaicloud/fluentd - tag: v1.11.5-alpine-24 + tag: v1.11.5-alpine-21 volume_mod: repository: busybox tag: latest @@ -225,10 +234,14 @@ spec: prometheus_elasticsearch_exporter: repository: justwatch/elasticsearch_exporter tag: 1.1.0 + prometheus_node_exporter: + prometheus_node_exporter: + repository: quay.io/prometheus/node-exporter + tag: v1.1.2 thanos: thanos-operator: repository: banzaicloud/thanos-operator - tag: 0.2.0 + tag: 0.3.0 ingress-nginx: controller: repository: k8s.gcr.io/ingress-nginx/controller diff --git a/manifests/type/multi-tenant/sub-clusters/lma/workload/services/patches/elasticsearch-data.yaml b/manifests/type/multi-tenant/sub-clusters/lma/workload/services/patches/elasticsearch-data.yaml index 42501956a..35da0c96b 100644 --- a/manifests/type/multi-tenant/sub-clusters/lma/workload/services/patches/elasticsearch-data.yaml +++ b/manifests/type/multi-tenant/sub-clusters/lma/workload/services/patches/elasticsearch-data.yaml @@ -15,7 +15,7 @@ spec: cpu: "8000m" memory: "32Gi" volumeClaimTemplate: - resouces: + resources: requests: storage: 20Ti - storageclass: block-storage-sc + storageClassName: block-storage-sc diff --git a/manifests/type/multi-tenant/sub-clusters/lma/workload/services/patches/elasticsearch-ingest.yaml b/manifests/type/multi-tenant/sub-clusters/lma/workload/services/patches/elasticsearch-ingest.yaml index e1aa0a565..8c79c3cc7 100644 --- a/manifests/type/multi-tenant/sub-clusters/lma/workload/services/patches/elasticsearch-ingest.yaml +++ b/manifests/type/multi-tenant/sub-clusters/lma/workload/services/patches/elasticsearch-ingest.yaml @@ -15,9 +15,9 @@ spec: cpu: "8000m" memory: "24Gi" volumeClaimTemplate: - resouces: + resources: requests: storage: 10Gi - storageclass: block-storage-sc + storageClassName: block-storage-sc service: type: NodePort diff --git a/manifests/type/multi-tenant/target/workload-config/kustomization.yaml b/manifests/type/multi-tenant/target/workload-config/kustomization.yaml index 05bc2330e..0ec765478 100644 --- a/manifests/type/multi-tenant/target/workload-config/kustomization.yaml +++ b/manifests/type/multi-tenant/target/workload-config/kustomization.yaml @@ -1,6 +1,6 @@ resources: - ../../../../function/workload-config - - ../../../../function/lma-configs + - ../../../../function/lma-configs/logging/ patches: - path: patches/cluster-flow.yaml diff --git a/manifests/type/multi-tenant/target/workload-config/replacements/lma-elasticsearch-output.yaml b/manifests/type/multi-tenant/target/workload-config/replacements/lma-elasticsearch-output.yaml index 481477023..0ea32bbe7 100644 --- a/manifests/type/multi-tenant/target/workload-config/replacements/lma-elasticsearch-output.yaml +++ b/manifests/type/multi-tenant/target/workload-config/replacements/lma-elasticsearch-output.yaml @@ -21,7 +21,7 @@ replacements: objref: kind: VariableCatalogue name: subcluster-networking - fieldref: "{.spec.lma.exposed_services[?(.name == 'elasticsearch-ingest')].nodePort}" + fieldref: "{.spec.lma.exposed_services[?(@.name == 'elasticsearch-ingest')].nodePort}" target: objref: kind: ClusterOutput