fix: grafana ingress class

Signed-off-by: Andrei Kvapil <kvapss@gmail.com>

packages/apps/clickhouse/templates/clickhouse.yaml

@@ -3,27 +3,16 @@ kind: "ClickHouseInstallation"
 metadata:
   name: "{{ .Release.Name }}"
 spec:
-  {{- with .Values.size }}
   defaults:
     templates:
       dataVolumeClaimTemplate: data-volume-template
-  {{- end }}
+      logVolumeClaimTemplate: log-volume-template
   configuration:
-    {{- with .Values.users }}
-    users:
-      {{- range $name, $u := . }}
-      {{ $name }}/password_sha256_hex: {{ sha256sum $u.password }}
-      {{ $name }}/profile: {{ ternary "readonly" "default" (index $u "readonly" | default false) }}
-      {{- end }}
-    {{- end }}
-    profiles:
-      readonly/readonly: "1"
     clusters:
       - name: "clickhouse"
         layout:
           shardsCount: 1
           replicasCount: 2
-  {{- with .Values.size }}
   templates:
     volumeClaimTemplates:
       - name: data-volume-template
@@ -32,5 +21,11 @@ spec:
             - ReadWriteOnce
           resources:
             requests:
-              storage: {{ . }}
-  {{- end }}
+              storage: {{ .Values.data.size }}
+      - name: log-volume-template
+        spec:
+          accessModes:
+            - ReadWriteOnce
+          resources:
+            requests:
+              storage: {{ .Values.log.size }}

packages/apps/clickhouse/values.yaml

@@ -1,8 +1,4 @@
-size: 10Gi
-
-users:
-  user1:
-    password: strongpassword
-  user2:
-    readonly: true
-    password: hackme
+data:
+  size: 10Gi
+log:
+  size: 1Gi

packages/extra/monitoring/templates/grafana/grafana.yaml

@@ -67,7 +67,7 @@ spec:
   ingress:
     metadata:
       annotations:
-        kubernetes.io/ingress.class: "{{ $ingress }}"
+        acme.cert-manager.io/http01-ingress-class: "{{ $ingress }}"
         cert-manager.io/cluster-issuer: letsencrypt-prod
     spec:
       ingressClassName: "{{ $ingress }}"