Fix up validation errors from LMA functions

I'm splitting these changes from [0] for clarity.

This change fixes various indentation errors/ key placements in LMA
functions.

Also fixes a validation error in the test-site's workload
replacements

[0] https://review.opendev.org/c/airship/treasuremap/+/793106

Change-Id: I9f252cf067e30de6e961edaa412ab87a902918de
This commit is contained in:
Steven Fitzpatrick 2021-06-03 03:21:48 +00:00
parent 49f02e6be4
commit 38f0e9ee65
11 changed files with 11 additions and 17 deletions

View File

@ -10,7 +10,6 @@ spec:
sourceRef: sourceRef:
kind: HelmRepository kind: HelmRepository
name: elasticsearch name: elasticsearch
interval: 1m interval: 1m
wait: false
timeout: 5m timeout: 5m
values: {} values: {}

View File

@ -7,12 +7,10 @@ spec:
interval: 5m interval: 5m
chart: chart:
spec: spec:
chart: grafana
sourceRef: sourceRef:
kind: HelmRepository kind: HelmRepository
name: grafana name: grafana
version: 6.1.0 interval: 1m
interval: 1m
timeout: 5m timeout: 5m
# Reference values at # Reference values at
# https://github.com/grafana/helm-charts/blob/main/charts/grafana/values.yaml # https://github.com/grafana/helm-charts/blob/main/charts/grafana/values.yaml

View File

@ -10,7 +10,6 @@ spec:
sourceRef: sourceRef:
kind: HelmRepository kind: HelmRepository
name: kibana name: kibana
interval: 1m interval: 1m
wait: false
timeout: 5m timeout: 5m
values: {} values: {}

View File

@ -36,7 +36,7 @@ replacements:
objref: objref:
kind: HelmRelease kind: HelmRelease
name: kibana name: kibana
fieldrefs: ["{.spec.chart.version}"] fieldrefs: ["{.spec.chart.spec.version}"]
- source: - source:
objref: objref:
kind: VersionsCatalogue kind: VersionsCatalogue

View File

@ -10,7 +10,7 @@ spec:
sourceRef: sourceRef:
kind: HelmRepository kind: HelmRepository
name: prometheus-community name: prometheus-community
interval: 1m interval: 1m
timeout: 5m timeout: 5m
# Reference values at # Reference values at
# https://github.com/prometheus-community/helm-charts/blob/main/charts/kube-prometheus-stack/values.yaml # https://github.com/prometheus-community/helm-charts/blob/main/charts/kube-prometheus-stack/values.yaml

View File

@ -10,7 +10,7 @@ spec:
sourceRef: sourceRef:
kind: HelmRepository kind: HelmRepository
name: banzaicloud name: banzaicloud
interval: 1m interval: 1m
timeout: 5m timeout: 5m
# Reference values at # Reference values at
# https://github.com/banzaicloud/logging-operator/blob/master/charts/logging-operator-logging/values.yaml # https://github.com/banzaicloud/logging-operator/blob/master/charts/logging-operator-logging/values.yaml

View File

@ -10,7 +10,7 @@ spec:
sourceRef: sourceRef:
kind: HelmRepository kind: HelmRepository
name: banzaicloud name: banzaicloud
interval: 1m interval: 1m
timeout: 5m timeout: 5m
# Reference values at # Reference values at
# https://github.com/banzaicloud/logging-operator/blob/master/charts/logging-operator/values.yaml # https://github.com/banzaicloud/logging-operator/blob/master/charts/logging-operator/values.yaml

View File

@ -10,8 +10,7 @@ spec:
sourceRef: sourceRef:
kind: HelmRepository kind: HelmRepository
name: minio name: minio
interval: 1m interval: 1m
wait: false
timeout: 5m timeout: 5m
# Reference values at # Reference values at
# https://github.com/minio/charts/blob/master/minio/values.yaml # https://github.com/minio/charts/blob/master/minio/values.yaml

View File

@ -10,7 +10,7 @@ spec:
sourceRef: sourceRef:
kind: HelmRepository kind: HelmRepository
name: prometheus-elasticsearch-exporter name: prometheus-elasticsearch-exporter
interval: 1m interval: 1m
timeout: 5m timeout: 5m
# Reference values at # Reference values at
# https://github.com/prometheus-community/helm-charts/blob/main/charts/prometheus-elasticsearch-exporter/values.yaml # https://github.com/prometheus-community/helm-charts/blob/main/charts/prometheus-elasticsearch-exporter/values.yaml

View File

@ -10,8 +10,7 @@ spec:
sourceRef: sourceRef:
kind: HelmRepository kind: HelmRepository
name: thanos name: thanos
interval: 1m interval: 1m
wait: false
timeout: 5m timeout: 5m
# Reference values at # Reference values at
# https://github.com/banzaicloud/thanos-operator/blob/master/charts/thanos-operator/values.yaml # https://github.com/banzaicloud/thanos-operator/blob/master/charts/thanos-operator/values.yaml

View File

@ -2,5 +2,5 @@ resources:
- ../../../../type/airship-core/target/workload - ../../../../type/airship-core/target/workload
- ../catalogues - ../catalogues
transformers: transformers:
- ../../../../function/ingress/replacements
- ./replacements - ./replacements
- ../../../../type/airship-core/target/workload/replacements