diff --git a/argocd/app-of-apps/test/values.yaml b/argocd/app-of-apps/test/values.yaml index a770dd5..0d04719 100644 --- a/argocd/app-of-apps/test/values.yaml +++ b/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 diff --git a/argocd/hcloud-ccm/test/Chart.lock b/argocd/hcloud-ccm/test/Chart.lock deleted file mode 100644 index 38247ea..0000000 --- a/argocd/hcloud-ccm/test/Chart.lock +++ /dev/null @@ -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" diff --git a/argocd/hcloud-ccm/test/Chart.yaml b/argocd/hcloud-ccm/test/Chart.yaml deleted file mode 100644 index a1c1b0d..0000000 --- a/argocd/hcloud-ccm/test/Chart.yaml +++ /dev/null @@ -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 \ No newline at end of file diff --git a/argocd/hcloud-ccm/test/argocd_values.yaml b/argocd/hcloud-ccm/test/argocd_values.yaml deleted file mode 100644 index 61b9ad5..0000000 --- a/argocd/hcloud-ccm/test/argocd_values.yaml +++ /dev/null @@ -1,7 +0,0 @@ -hcloud-cloud-controller-manager: - monitoring: - podMonitor: - enabled: true - networking: - enabled: true - clusterCIDR: 10.1.0.0/16 \ No newline at end of file diff --git a/argocd/hcloud-ccm/values.yaml b/argocd/hcloud-ccm/values.yaml deleted file mode 100644 index e69de29..0000000 diff --git a/argocd/hcloud-ccm/Chart.yaml b/argocd/hcloud-csi-ccm/Chart.yaml similarity index 100% rename from argocd/hcloud-ccm/Chart.yaml rename to argocd/hcloud-csi-ccm/Chart.yaml diff --git a/argocd/hcloud-csi/templates/_helpers.tpl b/argocd/hcloud-csi-ccm/templates/_helpers.tpl similarity index 100% rename from argocd/hcloud-csi/templates/_helpers.tpl rename to argocd/hcloud-csi-ccm/templates/_helpers.tpl diff --git a/argocd/hcloud-csi/templates/vault-secrets-app.yaml b/argocd/hcloud-csi-ccm/templates/vault-secrets-app.yaml similarity index 100% rename from argocd/hcloud-csi/templates/vault-secrets-app.yaml rename to argocd/hcloud-csi-ccm/templates/vault-secrets-app.yaml diff --git a/argocd/hcloud-csi-ccm/test/Chart.lock b/argocd/hcloud-csi-ccm/test/Chart.lock new file mode 100644 index 0000000..190e4b8 --- /dev/null +++ b/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" diff --git a/argocd/hcloud-csi/test/Chart.yaml b/argocd/hcloud-csi-ccm/test/Chart.yaml similarity index 51% rename from argocd/hcloud-csi/test/Chart.yaml rename to argocd/hcloud-csi-ccm/test/Chart.yaml index 3e9d46e..b9e0878 100644 --- a/argocd/hcloud-csi/test/Chart.yaml +++ b/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 \ No newline at end of file diff --git a/argocd/hcloud-csi/test/argocd_values.yaml b/argocd/hcloud-csi-ccm/test/argocd_values.yaml similarity index 63% rename from argocd/hcloud-csi/test/argocd_values.yaml rename to argocd/hcloud-csi-ccm/test/argocd_values.yaml index 0597c65..607a1e5 100644 --- a/argocd/hcloud-csi/test/argocd_values.yaml +++ b/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 diff --git a/argocd/hcloud-ccm/test/templates b/argocd/hcloud-csi-ccm/test/templates similarity index 100% rename from argocd/hcloud-ccm/test/templates rename to argocd/hcloud-csi-ccm/test/templates diff --git a/argocd/hcloud-ccm/test/values.yaml b/argocd/hcloud-csi-ccm/test/values.yaml similarity index 100% rename from argocd/hcloud-ccm/test/values.yaml rename to argocd/hcloud-csi-ccm/test/values.yaml diff --git a/argocd/hcloud-csi/values.yaml b/argocd/hcloud-csi-ccm/values.yaml similarity index 100% rename from argocd/hcloud-csi/values.yaml rename to argocd/hcloud-csi-ccm/values.yaml diff --git a/argocd/hcloud-csi/Chart.yaml b/argocd/hcloud-csi/Chart.yaml deleted file mode 100644 index e69de29..0000000 diff --git a/argocd/hcloud-csi/test/Chart.lock b/argocd/hcloud-csi/test/Chart.lock deleted file mode 100644 index e676a67..0000000 --- a/argocd/hcloud-csi/test/Chart.lock +++ /dev/null @@ -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" diff --git a/argocd/hcloud-csi/test/templates b/argocd/hcloud-csi/test/templates deleted file mode 120000 index 564a409..0000000 --- a/argocd/hcloud-csi/test/templates +++ /dev/null @@ -1 +0,0 @@ -../templates \ No newline at end of file diff --git a/argocd/hcloud-csi/test/values.yaml b/argocd/hcloud-csi/test/values.yaml deleted file mode 120000 index 5d1191e..0000000 --- a/argocd/hcloud-csi/test/values.yaml +++ /dev/null @@ -1 +0,0 @@ -../values.yaml \ No newline at end of file