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
This commit is contained in:
Steven Fitzpatrick 2021-07-07 07:41:13 +00:00 committed by Andrii Ostapenko
parent 0b1d661c6d
commit 6a8e9ee2a0
7 changed files with 61 additions and 18 deletions

View File

@ -47,3 +47,13 @@ replacements:
kind: HelmRelease kind: HelmRelease
name: grafana name: grafana
fieldrefs: ["{.spec.values.image}"] 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}"]

View File

@ -62,6 +62,16 @@ replacements:
kind: HelmRelease kind: HelmRelease
name: kube-prometheus-stack name: kube-prometheus-stack
fieldrefs: ["{.spec.values.alertmanager.alertmanagerSpec.image}"] 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: - source:
objref: objref:
kind: VersionsCatalogue kind: VersionsCatalogue
@ -71,7 +81,7 @@ replacements:
objref: objref:
kind: HelmRelease kind: HelmRelease
name: kube-prometheus-stack name: kube-prometheus-stack
fieldrefs: ["{.spec.values.prometheusOperator.prometheusSpec.image}"] fieldrefs: ["{.spec.values.prometheus.prometheusSpec.image}"]
- source: - source:
objref: objref:
kind: VersionsCatalogue kind: VersionsCatalogue
@ -82,6 +92,16 @@ replacements:
kind: HelmRelease kind: HelmRelease
name: kube-prometheus-stack name: kube-prometheus-stack
fieldrefs: ["{.spec.values.prometheusOperator.prometheusConfigReloaderImage}"] 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: - source:
objref: objref:
kind: VersionsCatalogue kind: VersionsCatalogue

View File

@ -47,7 +47,7 @@ spec:
version: 7.11.2 version: 7.11.2
kube_prometheus_stack: kube_prometheus_stack:
chart: kube-prometheus-stack chart: kube-prometheus-stack
version: 16.0.1 version: 16.12.1
logging_operator: logging_operator:
chart: logging-operator chart: logging-operator
version: 3.10.0 version: 3.10.0
@ -62,7 +62,7 @@ spec:
version: 4.4.0 version: 4.4.0
thanos_operator: thanos_operator:
chart: thanos-operator chart: thanos-operator
version: 0.2.1 version: 0.3.0
ingress-nginx: ingress-nginx:
chart: ingress-nginx chart: ingress-nginx
version: 3.5.1 version: 3.5.1
@ -96,7 +96,7 @@ spec:
image: quay.io/prometheus/prometheus image: quay.io/prometheus/prometheus
thanos: thanos:
thanos: thanos:
image: quay.io/thanos/thanos:v0.19.0 image: quay.io/thanos/thanos:v0.19.0-rc.0
sip: sip:
sip: sip:
kube-rbac-proxy: kube-rbac-proxy:
@ -176,7 +176,10 @@ spec:
grafana: grafana:
grafana: grafana:
repository: grafana/grafana repository: grafana/grafana
tag: 7.5.5 tag: 8.0.3
curl:
repository: curlimages/curl
tag: 7.73.0
kibana: kibana:
kibana: kibana:
repository: docker.elastic.co/kibana/kibana repository: docker.elastic.co/kibana/kibana
@ -187,16 +190,22 @@ spec:
tag: v1.5.2 tag: v1.5.2
alertmanager: alertmanager:
repository: quay.io/prometheus/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: prometheus:
repository: quay.io/prometheus/prometheus repository: quay.io/prometheus/prometheus
tag: v2.27.1 tag: v2.27.1
prometheus_config_reloader: prometheus_config_reloader:
repository: quay.io/prometheus-operator/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: prometheus_operator:
repository: quay.io/prometheus-operator/prometheus-operator repository: quay.io/prometheus-operator/prometheus-operator
tag: v0.46.0 tag: v0.48.1
logging_operator: logging_operator:
logging_operator: logging_operator:
repository: ghcr.io/banzaicloud/logging-operator repository: ghcr.io/banzaicloud/logging-operator
@ -204,13 +213,13 @@ spec:
logging_operator_logging: logging_operator_logging:
config_reloader: config_reloader:
repository: jimmidyson/configmap-reload repository: jimmidyson/configmap-reload
tag: v0.5.0 tag: v0.4.0
fluentbit: fluentbit:
repository: fluent/fluent-bit repository: fluent/fluent-bit
tag: 1.7.9 tag: 1.7.4
fluentd: fluentd:
repository: ghcr.io/banzaicloud/fluentd repository: ghcr.io/banzaicloud/fluentd
tag: v1.11.5-alpine-24 tag: v1.11.5-alpine-21
volume_mod: volume_mod:
repository: busybox repository: busybox
tag: latest tag: latest
@ -225,10 +234,14 @@ spec:
prometheus_elasticsearch_exporter: prometheus_elasticsearch_exporter:
repository: justwatch/elasticsearch_exporter repository: justwatch/elasticsearch_exporter
tag: 1.1.0 tag: 1.1.0
prometheus_node_exporter:
prometheus_node_exporter:
repository: quay.io/prometheus/node-exporter
tag: v1.1.2
thanos: thanos:
thanos-operator: thanos-operator:
repository: banzaicloud/thanos-operator repository: banzaicloud/thanos-operator
tag: 0.2.0 tag: 0.3.0
ingress-nginx: ingress-nginx:
controller: controller:
repository: k8s.gcr.io/ingress-nginx/controller repository: k8s.gcr.io/ingress-nginx/controller

View File

@ -15,7 +15,7 @@ spec:
cpu: "8000m" cpu: "8000m"
memory: "32Gi" memory: "32Gi"
volumeClaimTemplate: volumeClaimTemplate:
resouces: resources:
requests: requests:
storage: 20Ti storage: 20Ti
storageclass: block-storage-sc storageClassName: block-storage-sc

View File

@ -15,9 +15,9 @@ spec:
cpu: "8000m" cpu: "8000m"
memory: "24Gi" memory: "24Gi"
volumeClaimTemplate: volumeClaimTemplate:
resouces: resources:
requests: requests:
storage: 10Gi storage: 10Gi
storageclass: block-storage-sc storageClassName: block-storage-sc
service: service:
type: NodePort type: NodePort

View File

@ -1,6 +1,6 @@
resources: resources:
- ../../../../function/workload-config - ../../../../function/workload-config
- ../../../../function/lma-configs - ../../../../function/lma-configs/logging/
patches: patches:
- path: patches/cluster-flow.yaml - path: patches/cluster-flow.yaml

View File

@ -21,7 +21,7 @@ replacements:
objref: objref:
kind: VariableCatalogue kind: VariableCatalogue
name: subcluster-networking name: subcluster-networking
fieldref: "{.spec.lma.exposed_services[?(.name == 'elasticsearch-ingest')].nodePort}" fieldref: "{.spec.lma.exposed_services[?(@.name == 'elasticsearch-ingest')].nodePort}"
target: target:
objref: objref:
kind: ClusterOutput kind: ClusterOutput