Moved cloud controller manager into one app with csi

argocd/hcloud-csi-ccm/templates/_helpers.tpl

@@ -0,0 +1,73 @@
+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "template.name" -}}
+{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
+{{- end }}
+
+{{/*
+Create a default fully qualified app name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+If release name contains chart name it will be used as a full name.
+*/}}
+{{- define "template.fullname" -}}
+{{- if .Values.fullnameOverride }}
+{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}
+{{- else }}
+{{- $name := default .Chart.Name .Values.nameOverride }}
+{{- if contains $name .Release.Name }}
+{{- .Release.Name | trunc 63 | trimSuffix "-" }}
+{{- else }}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }}
+{{- end }}
+{{- end }}
+{{- end }}
+
+{{/*
+Create chart name and version as used by the chart label.
+*/}}
+{{- define "template.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
+{{- end }}
+
+{{/*
+Common labels
+*/}}
+{{- define "template.labels" -}}
+helm.sh/chart: {{ include "template.chart" . }}
+{{ include "template.selectorLabels" . }}
+app.kubernetes.io/managed-by: {{ .Release.Service }}
+{{- end }}
+
+{{/*
+Selector labels
+*/}}
+{{- define "template.selectorLabels" -}}
+app.kubernetes.io/name: {{ include "template.name" . }}
+app.kubernetes.io/instance: {{ .Release.Name }}
+{{- end }}
+
+{{/*
+Create the name of the service account to use
+*/}}
+{{- define "template.serviceAccountName" -}}
+{{- if .Values.serviceAccount.create }}
+{{- default (include "template.fullname" .) .Values.serviceAccount.name }}
+{{- else }}
+{{- default "default" .Values.serviceAccount.name }}
+{{- end }}
+{{- end }}
+
+{{- /*
+template.util.merge will merge two YAML templates and output the result.
+This takes an array of three values:
+- the top context
+- the template name of the overrides (destination)
+- the template name of the base (source)
+*/}}
+{{- define "template.util.merge" -}}
+{{- $top := first . -}}
+{{- $overrides := fromYaml (include (index . 1) $top) | default (dict ) -}}
+{{- $tpl := fromYaml (include (index . 2) $top) | default (dict ) -}}
+{{- toYaml (merge $overrides $tpl) -}}
+{{- end -}}

argocd/hcloud-csi-ccm/templates/vault-secrets-app.yaml

@@ -0,0 +1,19 @@
+{{- if .Values.vault.enabled }}
+apiVersion: secrets.hashicorp.com/v1beta1
+kind: HCPVaultSecretsApp
+metadata:
+  name: {{ include "template.fullname" . }}
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "template.labels" . | nindent 4 }}
+spec:
+  appName: {{ .Values.vault.applicationName }}
+  hcpAuthRef: {{ .Values.vault.operatorNamespace | default "vault-secrets-operator-system" }}/hcp-auth
+  destination:
+    create: true
+    labels:
+      {{- include "template.labels" . | nindent 6 }}
+      hvs: "true"
+    name: hcloud
+  refreshAfter: 1h
+{{- end }}

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

@@ -0,0 +1,12 @@
+apiVersion: v2
+name: hcloud-csi
+description: Installs the HCloud CSI driver
+type: application
+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

@@ -0,0 +1,23 @@
+hcloud-cloud-controller-manager:
+  monitoring:
+    podMonitor:
+      enabled: true
+  networking:
+    enabled: true
+    clusterCIDR: 10.1.0.0/16
+
+hcloud-csi:
+  storageClasses:
+  - name: hcloud-volumes
+    defaultStorageClass: true
+    reclaimPolicy: Retain
+  metrics:
+    enabled: true
+    serviceMonitor:
+      enabled: true
+      namespace: observability
+  node:
+    kubeletDir: /var/snap/microk8s/common/var/lib/kubelet
+vault:
+  enabled: true
+  applicationName: hcloud

argocd/hcloud-csi-ccm/test/templates

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

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

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

argocd/hcloud-csi-ccm/values.yaml

@@ -0,0 +1,4 @@
+vault:
+  enabled: false
+  applicationName: ""
+  operatorNamespace: ""