Moved cloud controller manager into one app with csi

argocd/app-of-apps/test/values.yaml

@@ -1,12 +1,5 @@
 applications:
-  - name: hcloud-csi
-    project: default
-    targetRevision: main
-    namespace: hcloud
-    createNamespace: false
-    repoURL: https://git.2martens.de/2martens/cloud-configuration.git
-    syncWave: 1
-  - name: hcloud-ccm
+  - name: hcloud-csi-ccm
     project: default
     targetRevision: main
     namespace: hcloud

argocd/hcloud-ccm/test/Chart.lock

@@ -1,6 +0,0 @@
-dependencies:
-- name: hcloud-cloud-controller-manager
-  repository: https://charts.hetzner.cloud
-  version: v1.18.0
-digest: sha256:3fe129b917d3681a3be4d87f2f3d75eb92139052f9995c6c26cb73426acb1dba
-generated: "2023-11-15T22:51:27.313237+01:00"

argocd/hcloud-ccm/test/Chart.yaml

@@ -1,9 +0,0 @@
-apiVersion: v2
-name: hcloud-ccm
-description: Installs the HCloud cloud controller
-type: application
-version: 0.1.0
-dependencies:
-  - name: hcloud-cloud-controller-manager
-    version: v1.18.0
-    repository: https://charts.hetzner.cloud

argocd/hcloud-ccm/test/argocd_values.yaml

@@ -1,7 +0,0 @@
-hcloud-cloud-controller-manager:
-  monitoring:
-    podMonitor:
-      enabled: true
-  networking:
-    enabled: true
-    clusterCIDR: 10.1.0.0/16

argocd/hcloud-csi-ccm/test/Chart.lock

@@ -0,0 +1,9 @@
+dependencies:
+- name: hcloud-csi
+  repository: https://charts.hetzner.cloud
+  version: 2.6.0
+- name: hcloud-cloud-controller-manager
+  repository: https://charts.hetzner.cloud
+  version: v1.18.0
+digest: sha256:65a5c3b5124bce0fcb3cc97fee4b24ed9c2cb9e7f289db790a0d353f57d9cc94
+generated: "2023-11-15T22:55:46.975466+01:00"

argocd/hcloud-csi-ccm/test/Chart.yaml

@@ -6,4 +6,7 @@ version: 0.1.0
 dependencies:
   - name: hcloud-csi
     version: 2.6.0
+    repository: https://charts.hetzner.cloud
+  - name: hcloud-cloud-controller-manager
+    version: v1.18.0
     repository: https://charts.hetzner.cloud

argocd/hcloud-csi-ccm/test/argocd_values.yaml

@@ -1,3 +1,11 @@
+hcloud-cloud-controller-manager:
+  monitoring:
+    podMonitor:
+      enabled: true
+  networking:
+    enabled: true
+    clusterCIDR: 10.1.0.0/16
+
 hcloud-csi:
   storageClasses:
   - name: hcloud-volumes

argocd/hcloud-csi/test/Chart.lock

@@ -1,6 +0,0 @@
-dependencies:
-- name: hcloud-csi
-  repository: https://charts.hetzner.cloud
-  version: 2.6.0
-digest: sha256:a3aa35928d01a5065c182972c10d4130e54b3c942896612959e70fc2374b6523
-generated: "2023-11-08T18:45:00.927197+01:00"

argocd/hcloud-csi/test/templates

@@ -1 +0,0 @@
-../templates

argocd/hcloud-csi/test/values.yaml

@@ -1 +0,0 @@
-../values.yaml