Add logging-operator versions and replacements

This change adds the logging-operator and logging-operator-logging
charts, repo, and image versions to the versions catalogue so they can
be overridden downstream.

Signed-off-by: Drew Walters <andrew.walters@att.com>
Change-Id: I0e3166378a330a498bdc8a53286cf0e9c95e9b1b
changes/09/782609/2
Drew Walters 2 years ago
parent 048f1b8d28
commit b85aea7dba
  1. 1
      manifests/composite/lma-infra/replacements/kustomization.yaml
  2. 2
      manifests/function/logging-operator/helmrelease-logging.yaml
  3. 2
      manifests/function/logging-operator/helmrelease-operator.yaml
  4. 1
      manifests/function/logging-operator/helmrepository.yaml
  5. 2
      manifests/function/logging-operator/replacements/kustomization.yaml
  6. 118
      manifests/function/logging-operator/replacements/versions.yaml
  7. 25
      manifests/function/treasuremap-base-catalogues/versions-treasuremap.yaml

@ -1,2 +1,3 @@
resources:
- ../../../function/kube-prometheus-stack/replacements
- ../../../function/logging-operator/replacements

@ -7,11 +7,9 @@ spec:
interval: 5m
chart:
spec:
chart: logging-operator-logging
sourceRef:
kind: HelmRepository
name: banzaicloud
version: 3.8.3
interval: 1m
timeout: 5m
# Reference values at

@ -7,11 +7,9 @@ spec:
interval: 5m
chart:
spec:
chart: logging-operator
sourceRef:
kind: HelmRepository
name: banzaicloud
version: 3.8.3
interval: 1m
timeout: 5m
# Reference values at

@ -3,5 +3,4 @@ kind: HelmRepository
metadata:
name: banzaicloud
spec:
url: https://kubernetes-charts.banzaicloud.com
interval: 10m

@ -0,0 +1,118 @@
apiVersion: airshipit.org/v1alpha1
kind: ReplacementTransformer
metadata:
name: logging-operator-versions-replacements
annotations:
config.kubernetes.io/function: |-
container:
image: quay.io/airshipit/replacement-transformer:latest
replacements:
# Helm Repo (logging-operator and logging-operator-logging charts)
- source:
objref:
kind: VersionsCatalogue
name: versions-treasuremap
fieldref: "{.spec.helm_repositories.logging_operator}"
target:
objref:
kind: HelmRepository
name: banzaicloud
fieldrefs: ["{.spec}"]
# Logging-operator Chart
- source:
objref:
kind: VersionsCatalogue
name: versions-treasuremap
fieldref: "{.spec.charts.logging_operator.chart}"
target:
objref:
kind: HelmRelease
name: logging-operator
fieldrefs: ["{.spec.chart.spec.chart}"]
- source:
objref:
kind: VersionsCatalogue
name: versions-treasuremap
fieldref: "{.spec.charts.logging_operator.version}"
target:
objref:
kind: HelmRelease
name: logging-operator
fieldrefs: ["{.spec.chart.version}"]
# Logging-operator-logging Chart
- source:
objref:
kind: VersionsCatalogue
name: versions-treasuremap
fieldref: "{.spec.charts.logging_operator_logging.chart}"
target:
objref:
kind: HelmRelease
name: logging-operator-logging
fieldrefs: ["{.spec.chart.spec.chart}"]
- source:
objref:
kind: VersionsCatalogue
name: versions-treasuremap
fieldref: "{.spec.charts.logging_operator_logging.version}"
target:
objref:
kind: HelmRelease
name: logging-operator-logging
fieldrefs: ["{.spec.chart.version}"]
# Logging-operator Chart Image
- source:
objref:
kind: VersionsCatalogue
name: versions-treasuremap
fieldref: "{.spec.images.logging_operator}"
target:
objref:
kind: HelmRelease
name: logging-operator
fieldrefs: ["{.spec.values.image}"]
# Logging-operator-logging Chart Images
- source:
objref:
kind: VersionsCatalogue
name: versions-treasuremap
fieldref: "{.spec.images.logging_operator_logging.config_reloader}"
target:
objref:
kind: HelmRelease
name: logging-operator-logging
fieldrefs: ["{.spec.values.fluentd.configReloaderImage}"]
- source:
objref:
kind: VersionsCatalogue
name: versions-treasuremap
fieldref: "{.spec.images.logging_operator_logging.fluentbit}"
target:
objref:
kind: HelmRelease
name: logging-operator-logging
fieldrefs: ["{.spec.values.fluentbit.image}"]
- source:
objref:
kind: VersionsCatalogue
name: versions-treasuremap
fieldref: "{.spec.images.logging_operator_logging.fluentd}"
target:
objref:
kind: HelmRelease
name: logging-operator-logging
fieldrefs: ["{.spec.values.fluentd.image}"]
- source:
objref:
kind: VersionsCatalogue
name: versions-treasuremap
fieldref: "{.spec.images.logging_operator_logging.volume_mod}"
target:
objref:
kind: HelmRelease
name: logging-operator-logging
fieldrefs: ["{.spec.values.fluentd.volumeModImage}"]

@ -10,6 +10,9 @@ spec:
url: https://grafana.github.io/helm-charts
kube_prometheus_stack:
url: https://prometheus-community.github.io/helm-charts
# NOTE: logging-operator and logging-operator-logging charts share this repository
logging_operator:
url: https://kubernetes-charts.banzaicloud.com
charts:
grafana:
@ -18,6 +21,12 @@ spec:
kube_prometheus_stack:
chart: kube-prometheus-stack
version: 12.8.0
logging_operator:
chart: logging-operator
version: 3.8.3
logging_operator_logging:
chart: logging-operator-logging
version: 3.8.3
images:
grafana:
@ -49,6 +58,22 @@ spec:
thanos:
image: quay.io/thanos/thanos:v0.17.2
version: v0.17.2
logging_operator:
repository: ghcr.io/banzaicloud/logging-operator
tag: 3.9.1
logging_operator_logging:
config_reloader:
repository: jimmidyson/configmap-reload
tag: v0.2.2
fluentbit:
repository: fluent/fluent-bit
tag: 1.6.10
fluentd:
repository: ghcr.io/banzaicloud/fluentd
tag: v1.11.5-alpine-9
volume_mod:
repository: busybox
tag: latest
sip:
kube-rbac-proxy: gcr.io/kubebuilder/kube-rbac-proxy:v0.5.0
manager: quay.io/airshipit/sip:51e7ff85d617c0e94fa98920fdbacce3ad9e6bc0

Loading…
Cancel
Save