Update component

vshn · Dec 5, 2023 · 1898198 · 1898198
1 parent 4fb4f61
commit 1898198
Show file tree

Hide file tree

Showing 53 changed files with 236 additions and 269 deletions.
diff --git a/component/Makefile.vars.mk b/component/Makefile.vars.mk
@@ -5,7 +5,7 @@ COMPONENT_SUBDIR ?= $(shell basename ${PWD})
 compiled_path   ?= compiled/$(COMPONENT_NAME)/$(COMPONENT_NAME)
 root_volume     ?= -v "$${PWD}/../:/$(COMPONENT_NAME)"
 compiled_volume ?= -v "$${PWD}/$(compiled_path):/$(COMPONENT_NAME)"
-commodore_args  ?= --search-paths . -n $(COMPONENT_NAME) --alias $(instance)
+commodore_args  ?= --search-paths . -n $(COMPONENT_NAME)
 
 ifneq "$(shell which docker 2>/dev/null)" ""
 	DOCKER_CMD    ?= $(shell which docker)

diff --git a/component/class/billing-collector-cloudservices.yml b/component/class/billing-collector-cloudservices.yml
@@ -10,4 +10,4 @@ parameters:
           - ${_base_directory}/component/main.jsonnet
         input_type: jsonnet
         output_type: yaml
-        output_path: ${_instance}
+        output_path: billing-collector-cloudservices/
diff --git a/component/class/defaults.yml b/component/class/defaults.yml
@@ -11,27 +11,27 @@ parameters:
       exoscale:
         credentials:
           stringData:
-            EXOSCALE_API_KEY: "?{vaultkv:${cluster:tenant}/${cluster:name}/billing-collector-cloudservices/${_instance}/exoscale-key}"
-            EXOSCALE_API_SECRET: "?{vaultkv:${cluster:tenant}/${cluster:name}/billing-collector-cloudservices/${_instance}/exoscale-secret}"
+            EXOSCALE_API_KEY: "?{vaultkv:${cluster:tenant}/${cluster:name}/billing-collector-cloudservices/exoscale-key}"
+            EXOSCALE_API_SECRET: "?{vaultkv:${cluster:tenant}/${cluster:name}/billing-collector-cloudservices/exoscale-secret}"
+            KUBERNETES_SERVER_URL: "?{vaultkv:${cluster:tenant}/${cluster:name}/billing-collector-cloudservices/cluster-server}"
+            KUBERNETES_SERVER_TOKEN: "?{vaultkv:${cluster:tenant}/${cluster:name}/billing-collector-cloudservices/cluster-token}"
       cloudscale:
         credentials:
           stringData:
-            CLOUDSCALE_API_TOKEN: "?{vaultkv:${cluster:tenant}/${cluster:name}/billing-collector-cloudservices/${_instance}/token}"
+            CLOUDSCALE_API_TOKEN: "?{vaultkv:${cluster:tenant}/${cluster:name}/billing-collector-cloudservices/cloudscale-token}"
+            KUBERNETES_SERVER_URL: "?{vaultkv:${cluster:tenant}/${cluster:name}/billing-collector-cloudservices/cluster-server}"
+            KUBERNETES_SERVER_TOKEN: "?{vaultkv:${cluster:tenant}/${cluster:name}/billing-collector-cloudservices/cluster-token}"
     images:
       collector:
         registry: 'ghcr.io'
         repository: 'vshn/billing-collector-cloudservices'
-        tag: change_exporter
+        tag: new-billing-cloud
 
     appuioManaged:
       enabled: false
-      tenant: ${cluster:tenant}
-      salesOrder: ""
-
-    appuioCloud:
-      enabled: true
-      promUrl: localhost:9090
+      salesOrder: "" #Update once the fact is available in Leutenant
 
+    promUrl: localhost:9090
     clusterId: ${cluster:name}
 
     odoo:

diff --git a/component/component/app.jsonnet b/component/component/app.jsonnet
@@ -1,9 +1,9 @@
 local kap = import 'lib/kapitan.libjsonnet';
 local inv = kap.inventory();
-local argocd = import 'lib/argocd.libjsonnet';
-local instance = inv.parameters._instance;
 local params = inv.parameters.billing_collector_cloudservices;
+local argocd = import 'lib/argocd.libjsonnet';
 
+local instance = 'billing-collector-cloudservices';
 local app = argocd.App(instance, params.namespace);
 
 {

diff --git a/component/component/main.jsonnet b/component/component/main.jsonnet
@@ -5,6 +5,7 @@ local kube = import 'lib/kube.libjsonnet';
 local com = import 'lib/commodore.libjsonnet';
 local collectorImage = '%(registry)s/%(repository)s:%(tag)s' % params.images.collector;
 local component_name = 'billing-collector-cloudservices';
+local appuioManaged = params.appuioManaged.enabled;
 
 local labels = {
   'app.kubernetes.io/name': component_name,
@@ -161,12 +162,13 @@ local config(name, extraConfig) = kube.ConfigMap(name) {
     ODOO_URL: std.toString(params.odoo.url),
     ODOO_OAUTH_TOKEN_URL: std.toString(params.odoo.tokenUrl),
     CLUSTER_ID: std.toString(params.clusterId),
-    APPUIO_MANAGED_SALES_ORDER: if params.appuioManaged.enabled then std.toString(params.appuioManaged.salesOrder) else '',
-    PROM_URL: if params.appuioCloud.enabled then std.toString(params.appuioCloud.promUrl) else '',
+    APPUIO_MANAGED_SALES_ORDER: if appuioManaged then std.toString(params.appuioManaged.salesOrder) else '',
+    PROM_URL: if !appuioManaged then std.toString(params.promUrl) else '',
   },
 } + extraConfig;
 
 ({
+
     local odoo = params.secrets.odoo,
     assert odoo.credentials != null : 'odoo.credentials must be set.',
     assert odoo.credentials.stringData != null : 'odoo.credentials.stringData must be set.',

diff --git a/component/tests/cloudscale-metrics-collector-cloud.yml b/component/tests/cloudscale-metrics-collector-cloud.yml
@@ -1,10 +1,7 @@
-applications:
-  - appuio-cloud-reporting
-
 parameters:
   billing_collector_cloudservices:
-    appuioCloud:
-      enabled: true
-      promUrl: localhost:9090
+    appuioManaged:
+      enabled: false
+    promUrl: localhost:9090
     cloudscale:
       enabled: true
diff --git a/component/tests/cloudscale-metrics-collector-managed.yml b/component/tests/cloudscale-metrics-collector-managed.yml
@@ -1,11 +1,7 @@
-applications:
-  - appuio-cloud-reporting
-
 parameters:
   billing_collector_cloudservices:
     appuioManaged:
       enabled: true
-      tenant: ${cluster:name}
       salesOrder: "12345"
     cloudscale:
       enabled: true
diff --git a/component/tests/exoscale-metrics-collector-cloud.yml b/component/tests/exoscale-metrics-collector-cloud.yml
@@ -1,8 +1,8 @@
 parameters:
   billing_collector_cloudservices:
-    appuioCloud:
-      enabled: true
-      promUrl: localhost:9090
+    appuioManaged:
+      enabled: false
+    promUrl: localhost:9090
     exoscale:
       enabled: true
       dbaas:

diff --git a/component/tests/exoscale-metrics-collector-managed.yml b/component/tests/exoscale-metrics-collector-managed.yml
@@ -1,8 +1,8 @@
 parameters:
   billing_collector_cloudservices:
+    namespace: appuio-cloud-reporting
     appuioManaged:
       enabled: true
-      tenant: ${cluster:name}
       salesOrder: "12345"
     exoscale:
       enabled: true

diff --git a/component/tests/fromenv.yml b/component/tests/fromenv.yml
@@ -1,17 +1,10 @@
-applications:
-  - metrics-collector as cloudscale
-  - metrics-collector as exoscale
 parameters:
   billing_collector_cloudservices:
-
     appuioManaged:
       enabled: true
-      tenant: ${cluster:name}
       salesOrder: "12345"
 
-    appuioCloud:
-      enabled: false
-      promUrl: localhost:9090
+    promUrl: localhost:9090
 
     clusterId: ${cluster:name}
 

diff --git a/...s/cloudscale-metrics-collector-cloud.yaml → ...apps/billing-collector-cloudservices.yaml b/...s/cloudscale-metrics-collector-cloud.yaml → ...apps/billing-collector-cloudservices.yaml
diff --git a/...ollector-cloud/cloudscaleClusterRole.yaml → ...-cloudservices/cloudscaleClusterRole.yaml b/...ollector-cloud/cloudscaleClusterRole.yaml → ...-cloudservices/cloudscaleClusterRole.yaml
diff --git a/...-collector-cloud/cloudscaleConfigMap.yaml → ...or-cloudservices/cloudscaleConfigMap.yaml b/...-collector-cloud/cloudscaleConfigMap.yaml → ...or-cloudservices/cloudscaleConfigMap.yaml
@@ -4,10 +4,10 @@ data:
   BILLING_HOUR: '6'
   CLUSTER_ID: c-green-test-1234
   COLLECT_INTERVAL: '23'
+  DAYS: '1'
   ODOO_OAUTH_TOKEN_URL: https://test.central.vshn.ch/api/v2/authentication/oauth2/token
   ODOO_URL: https://test.central.vshn.ch/api/v2/authentication/oauth2/token
   PROM_URL: localhost:9090
-  TENANT_ID: ''
 kind: ConfigMap
 metadata:
   name: cloudscale-env

diff --git a/...collector-managed/cloudscaleExporter.yaml → ...tor-cloudservices/cloudscaleExporter.yaml b/...collector-managed/cloudscaleExporter.yaml → ...tor-cloudservices/cloudscaleExporter.yaml
@@ -6,7 +6,6 @@ metadata:
     app.kubernetes.io/component: billing-collector-cloudservices
     app.kubernetes.io/managed-by: commodore
     app.kubernetes.io/name: billing-collector-cloudservices
-    app.kubernetes.io/part-of: appuio-cloud-reporting
     name: cloudscale
   name: cloudscale
   namespace: appuio-cloud-reporting
@@ -19,7 +18,6 @@ spec:
       app.kubernetes.io/component: billing-collector-cloudservices
       app.kubernetes.io/managed-by: commodore
       app.kubernetes.io/name: billing-collector-cloudservices
-      app.kubernetes.io/part-of: appuio-cloud-reporting
       name: cloudscale
   strategy:
     rollingUpdate:
@@ -33,7 +31,6 @@ spec:
         app.kubernetes.io/component: billing-collector-cloudservices
         app.kubernetes.io/managed-by: commodore
         app.kubernetes.io/name: billing-collector-cloudservices
-        app.kubernetes.io/part-of: appuio-cloud-reporting
         name: cloudscale
     spec:
       containers:

diff --git a/...ollector-cloud/cloudscaleRolebinding.yaml → ...-cloudservices/cloudscaleRolebinding.yaml b/...ollector-cloud/cloudscaleRolebinding.yaml → ...-cloudservices/cloudscaleRolebinding.yaml
diff --git a/...-collector-managed/cloudscaleSecrets.yaml → ...ctor-cloudservices/cloudscaleSecrets.yaml b/...-collector-managed/cloudscaleSecrets.yaml → ...ctor-cloudservices/cloudscaleSecrets.yaml
@@ -8,7 +8,9 @@ metadata:
   name: credentials-cloudscale
   namespace: appuio-cloud-reporting
 stringData:
-  CLOUDSCALE_API_TOKEN: t-silent-test-1234/c-green-test-1234/billing-collector-cloudservices/cloudscale-metrics-collector-managed/token
-  ODOO_OAUTH_CLIENT_ID: t-silent-test-1234/c-green-test-1234/billing-collector-cloudservices/cloudscale-metrics-collector-managed/odoo-oauth-client-id
-  ODOO_OAUTH_CLIENT_SECRET: t-silent-test-1234/c-green-test-1234/billing-collector-cloudservices/cloudscale-metrics-collector-managed/odoo-oauth-client-secret
+  CLOUDSCALE_API_TOKEN: t-silent-test-1234/c-green-test-1234/billing-collector-cloudservices/cloudscale-token
+  KUBERNETES_SERVER_TOKEN: t-silent-test-1234/c-green-test-1234/billing-collector-cloudservices/cluster-token
+  KUBERNETES_SERVER_URL: t-silent-test-1234/c-green-test-1234/billing-collector-cloudservices/cluster-server
+  ODOO_OAUTH_CLIENT_ID: t-silent-test-1234/c-green-test-1234/billing-collector-cloudservices/odoo-oauth-client-id
+  ODOO_OAUTH_CLIENT_SECRET: t-silent-test-1234/c-green-test-1234/billing-collector-cloudservices/odoo-oauth-client-secret
 type: Opaque
diff --git a/...ector-cloud/cloudscaleServiceAccount.yaml → ...oudservices/cloudscaleServiceAccount.yaml b/...ector-cloud/cloudscaleServiceAccount.yaml → ...oudservices/cloudscaleServiceAccount.yaml
diff --git a/...cloudscale-metrics-collector-managed.yaml → ...apps/billing-collector-cloudservices.yaml b/...cloudscale-metrics-collector-managed.yaml → ...apps/billing-collector-cloudservices.yaml
diff --git a/...lector-managed/cloudscaleClusterRole.yaml → ...-cloudservices/cloudscaleClusterRole.yaml b/...lector-managed/cloudscaleClusterRole.yaml → ...-cloudservices/cloudscaleClusterRole.yaml
diff --git a/...ollector-managed/cloudscaleConfigMap.yaml → ...or-cloudservices/cloudscaleConfigMap.yaml b/...ollector-managed/cloudscaleConfigMap.yaml → ...or-cloudservices/cloudscaleConfigMap.yaml
@@ -4,10 +4,10 @@ data:
   BILLING_HOUR: '6'
   CLUSTER_ID: c-green-test-1234
   COLLECT_INTERVAL: '23'
+  DAYS: '1'
   ODOO_OAUTH_TOKEN_URL: https://test.central.vshn.ch/api/v2/authentication/oauth2/token
   ODOO_URL: https://test.central.vshn.ch/api/v2/authentication/oauth2/token
-  PROM_URL: localhost:9090
-  TENANT_ID: c-green-test-1234
+  PROM_URL: ''
 kind: ConfigMap
 metadata:
   name: cloudscale-env

diff --git a/...s-collector-cloud/cloudscaleExporter.yaml → ...tor-cloudservices/cloudscaleExporter.yaml b/...s-collector-cloud/cloudscaleExporter.yaml → ...tor-cloudservices/cloudscaleExporter.yaml
@@ -6,7 +6,6 @@ metadata:
     app.kubernetes.io/component: billing-collector-cloudservices
     app.kubernetes.io/managed-by: commodore
     app.kubernetes.io/name: billing-collector-cloudservices
-    app.kubernetes.io/part-of: appuio-cloud-reporting
     name: cloudscale
   name: cloudscale
   namespace: appuio-cloud-reporting
@@ -19,7 +18,6 @@ spec:
       app.kubernetes.io/component: billing-collector-cloudservices
       app.kubernetes.io/managed-by: commodore
       app.kubernetes.io/name: billing-collector-cloudservices
-      app.kubernetes.io/part-of: appuio-cloud-reporting
       name: cloudscale
   strategy:
     rollingUpdate:
@@ -33,7 +31,6 @@ spec:
         app.kubernetes.io/component: billing-collector-cloudservices
         app.kubernetes.io/managed-by: commodore
         app.kubernetes.io/name: billing-collector-cloudservices
-        app.kubernetes.io/part-of: appuio-cloud-reporting
         name: cloudscale
     spec:
       containers:

diff --git a/...lector-managed/cloudscaleRolebinding.yaml → ...-cloudservices/cloudscaleRolebinding.yaml b/...lector-managed/cloudscaleRolebinding.yaml → ...-cloudservices/cloudscaleRolebinding.yaml
diff --git a/...cs-collector-cloud/cloudscaleSecrets.yaml → ...ctor-cloudservices/cloudscaleSecrets.yaml b/...cs-collector-cloud/cloudscaleSecrets.yaml → ...ctor-cloudservices/cloudscaleSecrets.yaml
@@ -8,7 +8,9 @@ metadata:
   name: credentials-cloudscale
   namespace: appuio-cloud-reporting
 stringData:
-  CLOUDSCALE_API_TOKEN: t-silent-test-1234/c-green-test-1234/billing-collector-cloudservices/cloudscale-metrics-collector-cloud/token
-  ODOO_OAUTH_CLIENT_ID: t-silent-test-1234/c-green-test-1234/billing-collector-cloudservices/cloudscale-metrics-collector-cloud/odoo-oauth-client-id
-  ODOO_OAUTH_CLIENT_SECRET: t-silent-test-1234/c-green-test-1234/billing-collector-cloudservices/cloudscale-metrics-collector-cloud/odoo-oauth-client-secret
+  CLOUDSCALE_API_TOKEN: t-silent-test-1234/c-green-test-1234/billing-collector-cloudservices/cloudscale-token
+  KUBERNETES_SERVER_TOKEN: t-silent-test-1234/c-green-test-1234/billing-collector-cloudservices/cluster-token
+  KUBERNETES_SERVER_URL: t-silent-test-1234/c-green-test-1234/billing-collector-cloudservices/cluster-server
+  ODOO_OAUTH_CLIENT_ID: t-silent-test-1234/c-green-test-1234/billing-collector-cloudservices/odoo-oauth-client-id
+  ODOO_OAUTH_CLIENT_SECRET: t-silent-test-1234/c-green-test-1234/billing-collector-cloudservices/odoo-oauth-client-secret
 type: Opaque
diff --git a/...tor-managed/cloudscaleServiceAccount.yaml → ...oudservices/cloudscaleServiceAccount.yaml b/...tor-managed/cloudscaleServiceAccount.yaml → ...oudservices/cloudscaleServiceAccount.yaml
diff --git a/...pps/exoscale-metrics-collector-cloud.yaml → ...apps/billing-collector-cloudservices.yaml b/...pps/exoscale-metrics-collector-cloud.yaml → ...apps/billing-collector-cloudservices.yaml
diff --git a/...-collector-cloud/exoDbaasClusterRole.yaml → ...or-cloudservices/exoDbaasClusterRole.yaml b/...-collector-cloud/exoDbaasClusterRole.yaml → ...or-cloudservices/exoDbaasClusterRole.yaml
diff --git a/...cs-collector-cloud/exoDbaasConfigMap.yaml → ...ctor-cloudservices/exoDbaasConfigMap.yaml b/...cs-collector-cloud/exoDbaasConfigMap.yaml → ...ctor-cloudservices/exoDbaasConfigMap.yaml
@@ -6,7 +6,6 @@ data:
   ODOO_OAUTH_TOKEN_URL: https://test.central.vshn.ch/api/v2/authentication/oauth2/token
   ODOO_URL: https://test.central.vshn.ch/api/v2/authentication/oauth2/token
   PROM_URL: localhost:9090
-  TENANT_ID: ''
 kind: ConfigMap
 metadata:
   name: exoscale-dbaas-env

diff --git a/...ics-collector-cloud/exoDbaasExporter.yaml → ...ector-cloudservices/exoDbaasExporter.yaml b/...ics-collector-cloud/exoDbaasExporter.yaml → ...ector-cloudservices/exoDbaasExporter.yaml
@@ -6,7 +6,6 @@ metadata:
     app.kubernetes.io/component: billing-collector-cloudservices
     app.kubernetes.io/managed-by: commodore
     app.kubernetes.io/name: billing-collector-cloudservices
-    app.kubernetes.io/part-of: appuio-cloud-reporting
     name: exoscale-dbaas
   name: exoscale-dbaas
   namespace: appuio-cloud-reporting
@@ -19,7 +18,6 @@ spec:
       app.kubernetes.io/component: billing-collector-cloudservices
       app.kubernetes.io/managed-by: commodore
       app.kubernetes.io/name: billing-collector-cloudservices
-      app.kubernetes.io/part-of: appuio-cloud-reporting
       name: exoscale-dbaas
   strategy:
     rollingUpdate:
@@ -33,7 +31,6 @@ spec:
         app.kubernetes.io/component: billing-collector-cloudservices
         app.kubernetes.io/managed-by: commodore
         app.kubernetes.io/name: billing-collector-cloudservices
-        app.kubernetes.io/part-of: appuio-cloud-reporting
         name: exoscale-dbaas
     spec:
       containers:

diff --git a/...-collector-cloud/exoDbaasRoleBinding.yaml → ...or-cloudservices/exoDbaasRoleBinding.yaml b/...-collector-cloud/exoDbaasRoleBinding.yaml → ...or-cloudservices/exoDbaasRoleBinding.yaml
diff --git a/...cs-collector-managed/exoDbaasSecrets.yaml → ...lector-cloudservices/exoDbaasSecrets.yaml b/...cs-collector-managed/exoDbaasSecrets.yaml → ...lector-cloudservices/exoDbaasSecrets.yaml
@@ -8,8 +8,10 @@ metadata:
   name: credentials-exoscale-dbaas
   namespace: appuio-cloud-reporting
 stringData:
-  EXOSCALE_API_KEY: t-silent-test-1234/c-green-test-1234/billing-collector-cloudservices/exoscale-metrics-collector-managed/exoscale-key
-  EXOSCALE_API_SECRET: t-silent-test-1234/c-green-test-1234/billing-collector-cloudservices/exoscale-metrics-collector-managed/exoscale-secret
-  ODOO_OAUTH_CLIENT_ID: t-silent-test-1234/c-green-test-1234/billing-collector-cloudservices/exoscale-metrics-collector-managed/odoo-oauth-client-id
-  ODOO_OAUTH_CLIENT_SECRET: t-silent-test-1234/c-green-test-1234/billing-collector-cloudservices/exoscale-metrics-collector-managed/odoo-oauth-client-secret
+  EXOSCALE_API_KEY: t-silent-test-1234/c-green-test-1234/billing-collector-cloudservices/exoscale-key
+  EXOSCALE_API_SECRET: t-silent-test-1234/c-green-test-1234/billing-collector-cloudservices/exoscale-secret
+  KUBERNETES_SERVER_TOKEN: t-silent-test-1234/c-green-test-1234/billing-collector-cloudservices/cluster-token
+  KUBERNETES_SERVER_URL: t-silent-test-1234/c-green-test-1234/billing-collector-cloudservices/cluster-server
+  ODOO_OAUTH_CLIENT_ID: t-silent-test-1234/c-green-test-1234/billing-collector-cloudservices/odoo-oauth-client-id
+  ODOO_OAUTH_CLIENT_SECRET: t-silent-test-1234/c-green-test-1234/billing-collector-cloudservices/odoo-oauth-client-secret
 type: Opaque
diff --git a/...llector-cloud/exoDbaasServiceAccount.yaml → ...cloudservices/exoDbaasServiceAccount.yaml b/...llector-cloud/exoDbaasServiceAccount.yaml → ...cloudservices/exoDbaasServiceAccount.yaml
diff --git a/...or-cloud/exoObjectStorageClusterRole.yaml → ...services/exoObjectStorageClusterRole.yaml b/...or-cloud/exoObjectStorageClusterRole.yaml → ...services/exoObjectStorageClusterRole.yaml
diff --git a/...ctor-cloud/exoObjectStorageConfigMap.yaml → ...udservices/exoObjectStorageConfigMap.yaml b/...ctor-cloud/exoObjectStorageConfigMap.yaml → ...udservices/exoObjectStorageConfigMap.yaml
@@ -7,7 +7,6 @@ data:
   ODOO_OAUTH_TOKEN_URL: https://test.central.vshn.ch/api/v2/authentication/oauth2/token
   ODOO_URL: https://test.central.vshn.ch/api/v2/authentication/oauth2/token
   PROM_URL: localhost:9090
-  TENANT_ID: ''
 kind: ConfigMap
 metadata:
   name: exoscale-objectstorage-env

diff --git a/...tor-managed/exoObjectStorageExporter.yaml → ...oudservices/exoObjectStorageExporter.yaml b/...tor-managed/exoObjectStorageExporter.yaml → ...oudservices/exoObjectStorageExporter.yaml
@@ -6,7 +6,6 @@ metadata:
     app.kubernetes.io/component: billing-collector-cloudservices
     app.kubernetes.io/managed-by: commodore
     app.kubernetes.io/name: billing-collector-cloudservices
-    app.kubernetes.io/part-of: appuio-cloud-reporting
     name: exoscale-objectstorage
   name: exoscale-objectstorage
   namespace: appuio-cloud-reporting
@@ -19,7 +18,6 @@ spec:
       app.kubernetes.io/component: billing-collector-cloudservices
       app.kubernetes.io/managed-by: commodore
       app.kubernetes.io/name: billing-collector-cloudservices
-      app.kubernetes.io/part-of: appuio-cloud-reporting
       name: exoscale-objectstorage
   strategy:
     rollingUpdate:
@@ -33,7 +31,6 @@ spec:
         app.kubernetes.io/component: billing-collector-cloudservices
         app.kubernetes.io/managed-by: commodore
         app.kubernetes.io/name: billing-collector-cloudservices
-        app.kubernetes.io/part-of: appuio-cloud-reporting
         name: exoscale-objectstorage
     spec:
       containers:

diff --git a/...or-cloud/exoObjectStorageRoleBinding.yaml → ...services/exoObjectStorageRoleBinding.yaml b/...or-cloud/exoObjectStorageRoleBinding.yaml → ...services/exoObjectStorageRoleBinding.yaml
diff --git a/...ctor-managed/exoObjectStorageSecrets.yaml → ...loudservices/exoObjectStorageSecrets.yaml b/...ctor-managed/exoObjectStorageSecrets.yaml → ...loudservices/exoObjectStorageSecrets.yaml
@@ -8,8 +8,10 @@ metadata:
   name: credentials-exoscale-objectstorage
   namespace: appuio-cloud-reporting
 stringData:
-  EXOSCALE_API_KEY: t-silent-test-1234/c-green-test-1234/billing-collector-cloudservices/exoscale-metrics-collector-managed/exoscale-key
-  EXOSCALE_API_SECRET: t-silent-test-1234/c-green-test-1234/billing-collector-cloudservices/exoscale-metrics-collector-managed/exoscale-secret
-  ODOO_OAUTH_CLIENT_ID: t-silent-test-1234/c-green-test-1234/billing-collector-cloudservices/exoscale-metrics-collector-managed/odoo-oauth-client-id
-  ODOO_OAUTH_CLIENT_SECRET: t-silent-test-1234/c-green-test-1234/billing-collector-cloudservices/exoscale-metrics-collector-managed/odoo-oauth-client-secret
+  EXOSCALE_API_KEY: t-silent-test-1234/c-green-test-1234/billing-collector-cloudservices/exoscale-key
+  EXOSCALE_API_SECRET: t-silent-test-1234/c-green-test-1234/billing-collector-cloudservices/exoscale-secret
+  KUBERNETES_SERVER_TOKEN: t-silent-test-1234/c-green-test-1234/billing-collector-cloudservices/cluster-token
+  KUBERNETES_SERVER_URL: t-silent-test-1234/c-green-test-1234/billing-collector-cloudservices/cluster-server
+  ODOO_OAUTH_CLIENT_ID: t-silent-test-1234/c-green-test-1234/billing-collector-cloudservices/odoo-oauth-client-id
+  ODOO_OAUTH_CLIENT_SECRET: t-silent-test-1234/c-green-test-1234/billing-collector-cloudservices/odoo-oauth-client-secret
 type: Opaque
diff --git a/...cloud/exoObjectStorageServiceAccount.yaml → ...vices/exoObjectStorageServiceAccount.yaml b/...cloud/exoObjectStorageServiceAccount.yaml → ...vices/exoObjectStorageServiceAccount.yaml
diff --git a/...s/exoscale-metrics-collector-managed.yaml → ...apps/billing-collector-cloudservices.yaml b/...s/exoscale-metrics-collector-managed.yaml → ...apps/billing-collector-cloudservices.yaml
diff --git a/...ollector-managed/exoDbaasClusterRole.yaml → ...or-cloudservices/exoDbaasClusterRole.yaml b/...ollector-managed/exoDbaasClusterRole.yaml → ...or-cloudservices/exoDbaasClusterRole.yaml
diff --git a/...-collector-managed/exoDbaasConfigMap.yaml → ...ctor-cloudservices/exoDbaasConfigMap.yaml b/...-collector-managed/exoDbaasConfigMap.yaml → ...ctor-cloudservices/exoDbaasConfigMap.yaml
@@ -5,8 +5,7 @@ data:
   COLLECT_INTERVAL: '1'
   ODOO_OAUTH_TOKEN_URL: https://test.central.vshn.ch/api/v2/authentication/oauth2/token
   ODOO_URL: https://test.central.vshn.ch/api/v2/authentication/oauth2/token
-  PROM_URL: localhost:9090
-  TENANT_ID: c-green-test-1234
+  PROM_URL: ''
 kind: ConfigMap
 metadata:
   name: exoscale-dbaas-env

diff --git a/...s-collector-managed/exoDbaasExporter.yaml → ...ector-cloudservices/exoDbaasExporter.yaml b/...s-collector-managed/exoDbaasExporter.yaml → ...ector-cloudservices/exoDbaasExporter.yaml
@@ -6,7 +6,6 @@ metadata:
     app.kubernetes.io/component: billing-collector-cloudservices
     app.kubernetes.io/managed-by: commodore
     app.kubernetes.io/name: billing-collector-cloudservices
-    app.kubernetes.io/part-of: appuio-cloud-reporting
     name: exoscale-dbaas
   name: exoscale-dbaas
   namespace: appuio-cloud-reporting
@@ -19,7 +18,6 @@ spec:
       app.kubernetes.io/component: billing-collector-cloudservices
       app.kubernetes.io/managed-by: commodore
       app.kubernetes.io/name: billing-collector-cloudservices
-      app.kubernetes.io/part-of: appuio-cloud-reporting
       name: exoscale-dbaas
   strategy:
     rollingUpdate:
@@ -33,7 +31,6 @@ spec:
         app.kubernetes.io/component: billing-collector-cloudservices
         app.kubernetes.io/managed-by: commodore
         app.kubernetes.io/name: billing-collector-cloudservices
-        app.kubernetes.io/part-of: appuio-cloud-reporting
         name: exoscale-dbaas
     spec:
       containers:

diff --git a/...ollector-managed/exoDbaasRoleBinding.yaml → ...or-cloudservices/exoDbaasRoleBinding.yaml b/...ollector-managed/exoDbaasRoleBinding.yaml → ...or-cloudservices/exoDbaasRoleBinding.yaml
diff --git a/...rics-collector-cloud/exoDbaasSecrets.yaml → ...lector-cloudservices/exoDbaasSecrets.yaml b/...rics-collector-cloud/exoDbaasSecrets.yaml → ...lector-cloudservices/exoDbaasSecrets.yaml
@@ -8,8 +8,10 @@ metadata:
   name: credentials-exoscale-dbaas
   namespace: appuio-cloud-reporting
 stringData:
-  EXOSCALE_API_KEY: t-silent-test-1234/c-green-test-1234/billing-collector-cloudservices/exoscale-metrics-collector-cloud/exoscale-key
-  EXOSCALE_API_SECRET: t-silent-test-1234/c-green-test-1234/billing-collector-cloudservices/exoscale-metrics-collector-cloud/exoscale-secret
-  ODOO_OAUTH_CLIENT_ID: t-silent-test-1234/c-green-test-1234/billing-collector-cloudservices/exoscale-metrics-collector-cloud/odoo-oauth-client-id
-  ODOO_OAUTH_CLIENT_SECRET: t-silent-test-1234/c-green-test-1234/billing-collector-cloudservices/exoscale-metrics-collector-cloud/odoo-oauth-client-secret
+  EXOSCALE_API_KEY: t-silent-test-1234/c-green-test-1234/billing-collector-cloudservices/exoscale-key
+  EXOSCALE_API_SECRET: t-silent-test-1234/c-green-test-1234/billing-collector-cloudservices/exoscale-secret
+  KUBERNETES_SERVER_TOKEN: t-silent-test-1234/c-green-test-1234/billing-collector-cloudservices/cluster-token
+  KUBERNETES_SERVER_URL: t-silent-test-1234/c-green-test-1234/billing-collector-cloudservices/cluster-server
+  ODOO_OAUTH_CLIENT_ID: t-silent-test-1234/c-green-test-1234/billing-collector-cloudservices/odoo-oauth-client-id
+  ODOO_OAUTH_CLIENT_SECRET: t-silent-test-1234/c-green-test-1234/billing-collector-cloudservices/odoo-oauth-client-secret
 type: Opaque
diff --git a/...ector-managed/exoDbaasServiceAccount.yaml → ...cloudservices/exoDbaasServiceAccount.yaml b/...ector-managed/exoDbaasServiceAccount.yaml → ...cloudservices/exoDbaasServiceAccount.yaml
diff --git a/...-managed/exoObjectStorageClusterRole.yaml → ...services/exoObjectStorageClusterRole.yaml b/...-managed/exoObjectStorageClusterRole.yaml → ...services/exoObjectStorageClusterRole.yaml