Merge pull request #21 from projectsyn/feat/upstream-chart

Update component to use latest upstream chart
projectsyn · Jul 5, 2022 · 1e462e9 · 1e462e9
2 parents cd17a49 + 3a4010b
commit 1e462e9
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/class/defaults.yml b/class/defaults.yml
@@ -2,7 +2,9 @@ parameters:
   metrics_server:
     namespace: syn-metrics-server
     charts:
-      metrics-server: '2.12.0'
+      metrics-server:
+        source: https://kubernetes-sigs.github.io/metrics-server
+        version: '3.8.2'
     images:
       metrics_server:
         image: k8s.gcr.io/metrics-server/metrics-server

diff --git a/class/metrics-server.yml b/class/metrics-server.yml
@@ -2,10 +2,10 @@ parameters:
   kapitan:
     dependencies:
       - type: helm
-        source: https://charts.appuio.ch
+        source: ${metrics_server:charts:metrics-server:source}
         chart_name: metrics-server
-        version: ${metrics_server:charts:metrics-server}
-        output_path: dependencies/metrics-server/helmcharts/metrics-server
+        version: ${metrics_server:charts:metrics-server:version}
+        output_path: dependencies/metrics-server/helmcharts/metrics-server/${metrics_server:charts:metrics-server:version}/
     compile:
       - input_paths:
           - metrics-server/component/app.jsonnet
@@ -18,7 +18,7 @@ parameters:
       - output_path: metrics-server/01_helmchart
         input_type: helm
         input_paths:
-          - metrics-server/helmcharts/metrics-server
+          - metrics-server/helmcharts/metrics-server/${metrics_server:charts:metrics-server:version}
         helm_values:
           image:
             repository: ${metrics_server:images:metrics_server:image}