diff --git a/manifests/composite/lma-infra/replacements/kustomization.yaml b/manifests/composite/lma-infra/replacements/kustomization.yaml index 122ef10e1..41102d7e4 100644 --- a/manifests/composite/lma-infra/replacements/kustomization.yaml +++ b/manifests/composite/lma-infra/replacements/kustomization.yaml @@ -1,2 +1,3 @@ resources: - ../../../function/kube-prometheus-stack/replacements + - ../../../function/logging-operator/replacements diff --git a/manifests/function/logging-operator/helmrelease-logging.yaml b/manifests/function/logging-operator/helmrelease-logging.yaml index 5d78ef1bd..db45b2d97 100644 --- a/manifests/function/logging-operator/helmrelease-logging.yaml +++ b/manifests/function/logging-operator/helmrelease-logging.yaml @@ -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 diff --git a/manifests/function/logging-operator/helmrelease-operator.yaml b/manifests/function/logging-operator/helmrelease-operator.yaml index e51b33e4e..f183e491d 100644 --- a/manifests/function/logging-operator/helmrelease-operator.yaml +++ b/manifests/function/logging-operator/helmrelease-operator.yaml @@ -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 diff --git a/manifests/function/logging-operator/helmrepository.yaml b/manifests/function/logging-operator/helmrepository.yaml index 7a1eced55..019fd5fde 100644 --- a/manifests/function/logging-operator/helmrepository.yaml +++ b/manifests/function/logging-operator/helmrepository.yaml @@ -3,5 +3,4 @@ kind: HelmRepository metadata: name: banzaicloud spec: - url: https://kubernetes-charts.banzaicloud.com interval: 10m diff --git a/manifests/function/logging-operator/replacements/kustomization.yaml b/manifests/function/logging-operator/replacements/kustomization.yaml new file mode 100644 index 000000000..ee1becf0d --- /dev/null +++ b/manifests/function/logging-operator/replacements/kustomization.yaml @@ -0,0 +1,2 @@ +resources: + - versions.yaml diff --git a/manifests/function/logging-operator/replacements/versions.yaml b/manifests/function/logging-operator/replacements/versions.yaml new file mode 100644 index 000000000..bab55c5d3 --- /dev/null +++ b/manifests/function/logging-operator/replacements/versions.yaml @@ -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}"] diff --git a/manifests/function/treasuremap-base-catalogues/versions-treasuremap.yaml b/manifests/function/treasuremap-base-catalogues/versions-treasuremap.yaml index 2cb8bcf77..cec7f069a 100644 --- a/manifests/function/treasuremap-base-catalogues/versions-treasuremap.yaml +++ b/manifests/function/treasuremap-base-catalogues/versions-treasuremap.yaml @@ -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