diff --git a/chart/templates/apps.yaml b/chart/templates/apps.yaml index 5398fd0..8da917e 100644 --- a/chart/templates/apps.yaml +++ b/chart/templates/apps.yaml @@ -3,7 +3,7 @@ apiVersion: argoproj.io/v1alpha1 kind: Application metadata: - name: {{ $app_name }} + name: {{ index (splitList "/" $app_name) 0 }} namespace: argocd finalizers: - resources-finalizer.argocd.argoproj.io diff --git a/chart/values.yaml b/chart/values.yaml index 3a105ef..27f40fa 100644 --- a/chart/values.yaml +++ b/chart/values.yaml @@ -5,17 +5,5 @@ tools: hashicorp-vault: {} crowdsec: {} redis: {} - clickhouse: - patches: - - target: - kind: StatefulSet - name: clickhouse - patch: |- - - op: add - path: /spec/template/spec/containers/0/volumeMounts/- - value: - name: config-volume - mountPath: /etc/clickhouse-server/users.d/custom-users.xml - subPath: custom-users.xml - readOnly: true + clickhouse: {} grafana: {} \ No newline at end of file diff --git a/clickhouse/Chart.yaml b/clickhouse/chart/Chart.yaml similarity index 100% rename from clickhouse/Chart.yaml rename to clickhouse/chart/Chart.yaml diff --git a/clickhouse/templates/helm-chart-config.yaml b/clickhouse/chart/templates/helm-chart-config.yaml similarity index 100% rename from clickhouse/templates/helm-chart-config.yaml rename to clickhouse/chart/templates/helm-chart-config.yaml diff --git a/clickhouse/templates/helm-chart.yaml b/clickhouse/chart/templates/helm-chart.yaml similarity index 100% rename from clickhouse/templates/helm-chart.yaml rename to clickhouse/chart/templates/helm-chart.yaml diff --git a/clickhouse/values.yaml b/clickhouse/chart/values.yaml similarity index 100% rename from clickhouse/values.yaml rename to clickhouse/chart/values.yaml diff --git a/clickhouse/kustomization.yaml b/clickhouse/kustomization.yaml new file mode 100644 index 0000000..e5859bf --- /dev/null +++ b/clickhouse/kustomization.yaml @@ -0,0 +1,8 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization + +resources: + - ./chart # remonte vers le chart ClickHouse (Chart.yaml) + +patchesStrategicMerge: + - patch-volumeMount.yaml diff --git a/clickhouse/patch-volumeMount.yaml b/clickhouse/patch-volumeMount.yaml new file mode 100644 index 0000000..5ea7d07 --- /dev/null +++ b/clickhouse/patch-volumeMount.yaml @@ -0,0 +1,14 @@ +apiVersion: apps/v1 +kind: StatefulSet +metadata: + name: clickhouse +spec: + template: + spec: + containers: + - name: clickhouse + volumeMounts: + - name: config-volume + mountPath: /etc/clickhouse-server/users.d/custom-users.xml + subPath: custom-users.xml + readOnly: true