Fix multi-instance configuration

vshn · Oct 18, 2022 · c2f7bf3 · c2f7bf3
1 parent 5234bf2
commit c2f7bf3
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/component/class/defaults.yml b/component/class/defaults.yml
@@ -13,7 +13,7 @@ parameters:
       collector:
         registry: 'ghcr.io'
         repository: 'vshn/exoscale-metrics-collector'
-        tag: 'v0.2.2'
+        tag: 'v0.2.3'
     # Times in UTC! Don't run job around midnight as exoscale API may return incomplete data
     # default: Every day at minute 10 past hour 10, 16 and 20.
     schedule: '10 10,16,20 * * *'
diff --git a/component/component/app.jsonnet b/component/component/app.jsonnet
@@ -1,11 +1,11 @@
 local kap = import 'lib/kapitan.libjsonnet';
 local inv = kap.inventory();
-local params = inv.parameters.exoscale_metrics_collector;
 local paramsACR = inv.parameters.appuio_cloud_reporting;
 local argocd = import 'lib/argocd.libjsonnet';
 
-local app = argocd.App('exoscale-metrics-collector', paramsACR.namespace);
+local instance = inv.parameters._instance;
+local app = argocd.App(instance, paramsACR.namespace);
 
 {
-  'exoscale-metrics-collector': app,
+  [instance]: app,
 }
diff --git a/...pg-2/apps/exoscale-metrics-collector.yaml → ...pg-2/apps/collector-cloudscale-lpg-2.yaml b/...pg-2/apps/exoscale-metrics-collector.yaml → ...pg-2/apps/collector-cloudscale-lpg-2.yaml
diff --git a/...ector-cloudscale-lpg-2/collector-cloudscale-lpg-2/collector-cloudscale-lpg-2/cronjob.yaml b/...ector-cloudscale-lpg-2/collector-cloudscale-lpg-2/collector-cloudscale-lpg-2/cronjob.yaml
@@ -34,7 +34,7 @@ spec:
               envFrom:
                 - secretRef:
                     name: credentials-collector-cloudscale-lpg-2
-              image: ghcr.io/vshn/exoscale-metrics-collector:v0.2.2
+              image: ghcr.io/vshn/exoscale-metrics-collector:v0.2.3
               name: exoscale-metrics-collector-backfill
               resources: {}
           restartPolicy: OnFailure

diff --git a/...cale-metrics-collector/exoscale-metrics-collector/exoscale-metrics-collector/cronjob.yaml b/...cale-metrics-collector/exoscale-metrics-collector/exoscale-metrics-collector/cronjob.yaml
@@ -34,7 +34,7 @@ spec:
               envFrom:
                 - secretRef:
                     name: credentials-exoscale-metrics-collector
-              image: ghcr.io/vshn/exoscale-metrics-collector:v0.2.2
+              image: ghcr.io/vshn/exoscale-metrics-collector:v0.2.3
               name: exoscale-metrics-collector-backfill
               resources: {}
           restartPolicy: OnFailure