Merge "Fix up validation errors from LMA functions"

manifests/function/elasticsearch/helmrelease.yaml

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

manifests/function/grafana/helmrelease.yaml

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

manifests/function/kibana/helmrelease.yaml

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

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

manifests/function/minio/helmrelease.yaml

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

manifests/function/thanos-operator/helmrelease.yaml

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

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