From 38f0e9ee65dc1fc00016f050d7f4ed158f833758 Mon Sep 17 00:00:00 2001 From: Steven Fitzpatrick Date: Thu, 3 Jun 2021 03:21:48 +0000 Subject: [PATCH] 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 --- manifests/function/elasticsearch/helmrelease.yaml | 3 +-- manifests/function/grafana/helmrelease.yaml | 4 +--- manifests/function/kibana/helmrelease.yaml | 3 +-- manifests/function/kibana/replacements/versions.yaml | 2 +- manifests/function/kube-prometheus-stack/helmrelease.yaml | 2 +- manifests/function/logging-operator/helmrelease-logging.yaml | 2 +- manifests/function/logging-operator/helmrelease-operator.yaml | 2 +- manifests/function/minio/helmrelease.yaml | 3 +-- .../prometheus-elasticsearch-exporter/helmrelease.yaml | 2 +- manifests/function/thanos-operator/helmrelease.yaml | 3 +-- manifests/site/test-site/target/workload/kustomization.yaml | 2 +- 11 files changed, 11 insertions(+), 17 deletions(-) diff --git a/manifests/function/elasticsearch/helmrelease.yaml b/manifests/function/elasticsearch/helmrelease.yaml index 4ca967efc..4c294558b 100644 --- a/manifests/function/elasticsearch/helmrelease.yaml +++ b/manifests/function/elasticsearch/helmrelease.yaml @@ -10,7 +10,6 @@ spec: sourceRef: kind: HelmRepository name: elasticsearch - interval: 1m - wait: false + interval: 1m timeout: 5m values: {} diff --git a/manifests/function/grafana/helmrelease.yaml b/manifests/function/grafana/helmrelease.yaml index acc5328bd..3765549ba 100644 --- a/manifests/function/grafana/helmrelease.yaml +++ b/manifests/function/grafana/helmrelease.yaml @@ -7,12 +7,10 @@ spec: interval: 5m chart: spec: - chart: grafana sourceRef: kind: HelmRepository name: grafana - version: 6.1.0 - interval: 1m + interval: 1m timeout: 5m # Reference values at # https://github.com/grafana/helm-charts/blob/main/charts/grafana/values.yaml diff --git a/manifests/function/kibana/helmrelease.yaml b/manifests/function/kibana/helmrelease.yaml index da36c8e69..ca5254555 100644 --- a/manifests/function/kibana/helmrelease.yaml +++ b/manifests/function/kibana/helmrelease.yaml @@ -10,7 +10,6 @@ spec: sourceRef: kind: HelmRepository name: kibana - interval: 1m - wait: false + interval: 1m timeout: 5m values: {} diff --git a/manifests/function/kibana/replacements/versions.yaml b/manifests/function/kibana/replacements/versions.yaml index 46d360d95..d66091dce 100644 --- a/manifests/function/kibana/replacements/versions.yaml +++ b/manifests/function/kibana/replacements/versions.yaml @@ -36,7 +36,7 @@ replacements: objref: kind: HelmRelease name: kibana - fieldrefs: ["{.spec.chart.version}"] + fieldrefs: ["{.spec.chart.spec.version}"] - source: objref: kind: VersionsCatalogue diff --git a/manifests/function/kube-prometheus-stack/helmrelease.yaml b/manifests/function/kube-prometheus-stack/helmrelease.yaml index faccc1e20..ca9be204c 100644 --- a/manifests/function/kube-prometheus-stack/helmrelease.yaml +++ b/manifests/function/kube-prometheus-stack/helmrelease.yaml @@ -10,7 +10,7 @@ spec: sourceRef: kind: HelmRepository name: prometheus-community - interval: 1m + interval: 1m timeout: 5m # Reference values at # https://github.com/prometheus-community/helm-charts/blob/main/charts/kube-prometheus-stack/values.yaml diff --git a/manifests/function/logging-operator/helmrelease-logging.yaml b/manifests/function/logging-operator/helmrelease-logging.yaml index db45b2d97..40ed891c0 100644 --- a/manifests/function/logging-operator/helmrelease-logging.yaml +++ b/manifests/function/logging-operator/helmrelease-logging.yaml @@ -10,7 +10,7 @@ spec: sourceRef: kind: HelmRepository name: banzaicloud - interval: 1m + interval: 1m timeout: 5m # Reference values at # https://github.com/banzaicloud/logging-operator/blob/master/charts/logging-operator-logging/values.yaml diff --git a/manifests/function/logging-operator/helmrelease-operator.yaml b/manifests/function/logging-operator/helmrelease-operator.yaml index f183e491d..67ddaed0b 100644 --- a/manifests/function/logging-operator/helmrelease-operator.yaml +++ b/manifests/function/logging-operator/helmrelease-operator.yaml @@ -10,7 +10,7 @@ spec: sourceRef: kind: HelmRepository name: banzaicloud - interval: 1m + interval: 1m timeout: 5m # Reference values at # https://github.com/banzaicloud/logging-operator/blob/master/charts/logging-operator/values.yaml diff --git a/manifests/function/minio/helmrelease.yaml b/manifests/function/minio/helmrelease.yaml index f2a1e07e8..9ee9ea492 100644 --- a/manifests/function/minio/helmrelease.yaml +++ b/manifests/function/minio/helmrelease.yaml @@ -10,8 +10,7 @@ spec: sourceRef: kind: HelmRepository name: minio - interval: 1m - wait: false + interval: 1m timeout: 5m # Reference values at # https://github.com/minio/charts/blob/master/minio/values.yaml diff --git a/manifests/function/prometheus-elasticsearch-exporter/helmrelease.yaml b/manifests/function/prometheus-elasticsearch-exporter/helmrelease.yaml index ec50b677b..070f063e5 100644 --- a/manifests/function/prometheus-elasticsearch-exporter/helmrelease.yaml +++ b/manifests/function/prometheus-elasticsearch-exporter/helmrelease.yaml @@ -10,7 +10,7 @@ spec: sourceRef: kind: HelmRepository name: prometheus-elasticsearch-exporter - interval: 1m + interval: 1m timeout: 5m # Reference values at # https://github.com/prometheus-community/helm-charts/blob/main/charts/prometheus-elasticsearch-exporter/values.yaml diff --git a/manifests/function/thanos-operator/helmrelease.yaml b/manifests/function/thanos-operator/helmrelease.yaml index bd1aa566c..1ad9cec2c 100644 --- a/manifests/function/thanos-operator/helmrelease.yaml +++ b/manifests/function/thanos-operator/helmrelease.yaml @@ -10,8 +10,7 @@ spec: sourceRef: kind: HelmRepository name: thanos - interval: 1m - wait: false + interval: 1m timeout: 5m # Reference values at # https://github.com/banzaicloud/thanos-operator/blob/master/charts/thanos-operator/values.yaml diff --git a/manifests/site/test-site/target/workload/kustomization.yaml b/manifests/site/test-site/target/workload/kustomization.yaml index e839e7b4f..7117db2f5 100644 --- a/manifests/site/test-site/target/workload/kustomization.yaml +++ b/manifests/site/test-site/target/workload/kustomization.yaml @@ -2,5 +2,5 @@ resources: - ../../../../type/airship-core/target/workload - ../catalogues transformers: - - ../../../../function/ingress/replacements - ./replacements + - ../../../../type/airship-core/target/workload/replacements