@yarkivaev/scada 2.3.112 → 2.3.113

package/charts/scada/Chart.yaml

@@ -2,5 +2,5 @@ apiVersion: v2
 name: scada
 description: Generic SCADA site — site-server, supervisor-sink, collectors, Postgres, RabbitMQ, optional ClickHouse
 type: application
-version: 0.2.1
-appVersion: "2.3.112"
+version: 0.2.3
+appVersion: "2.3.113"

package/charts/scada/templates/_helpers.tpl

@@ -2,6 +2,31 @@
 app.kubernetes.io/name: scada
 app.kubernetes.io/instance: {{ .Release.Name }}
 app.kubernetes.io/managed-by: {{ .Release.Service }}
+{{- include "scada.extraLabels" . }}
+{{- end }}
+
+{{- define "scada.extraLabels" -}}
+{{- range $key, $val := (.Values.extraLabels | default dict) }}
+{{ $key }}: {{ $val | quote }}
+{{- end }}
+{{- end }}
+
+{{- define "scada.match" -}}
+app: {{ .app }}
+{{- range $key, $val := (.ctx.Values.extraLabels | default dict) }}
+{{ $key }}: {{ $val | quote }}
+{{- end }}
+{{- end }}
+
+{{- define "scada.claim" -}}
+accessModes: ["ReadWriteOnce"]
+{{- if .class }}
+storageClassName: {{ .class | quote }}
+{{- end }}
+resources:
+  requests:
+    storage: {{ .size | quote }}
+volumeMode: Filesystem
 {{- end }}
 
 {{- define "scada.device" -}}

package/charts/scada/templates/clickhouse.yaml

@@ -12,9 +12,14 @@ spec:
     - name: http
       port: 8123
       targetPort: http
+    - name: native
+      port: 9000
+      targetPort: native
+    - name: metrics
+      port: 9363
+      targetPort: metrics
   selector:
-    app: clickhouse
-    app.kubernetes.io/instance: {{ .Release.Name }}
+    {{- include "scada.match" (dict "app" "clickhouse" "ctx" .) | nindent 4 }}
 ---
 apiVersion: apps/v1
 kind: StatefulSet
@@ -29,13 +34,12 @@ spec:
   replicas: 1
   selector:
     matchLabels:
-      app: clickhouse
-      app.kubernetes.io/instance: {{ .Release.Name }}
+      {{- include "scada.match" (dict "app" "clickhouse" "ctx" .) | nindent 6 }}
   template:
     metadata:
       labels:
         {{- include "scada.labels" . | nindent 8 }}
-        app: clickhouse
+        {{- include "scada.match" (dict "app" "clickhouse" "ctx" .) | nindent 8 }}
     spec:
       containers:
         - name: clickhouse
@@ -43,6 +47,10 @@ spec:
           ports:
             - name: http
               containerPort: 8123
+            - name: native
+              containerPort: 9000
+            - name: metrics
+              containerPort: 9363
           volumeMounts:
             - name: data
               mountPath: /var/lib/clickhouse
@@ -50,8 +58,5 @@ spec:
     - metadata:
         name: data
       spec:
-        accessModes: ["ReadWriteOnce"]
-        resources:
-          requests:
-            storage: 20Gi
+        {{- include "scada.claim" (dict "size" .Values.clickhouse.storage "class" .Values.clickhouse.storageClass) | nindent 8 }}
 {{- end }}

package/charts/scada/templates/collector.yaml

@@ -62,14 +62,13 @@ spec:
   replicas: 1
   selector:
     matchLabels:
-      app: collector
-      app.kubernetes.io/instance: {{ $.Release.Name }}
+      {{- include "scada.match" (dict "app" "collector" "ctx" $) | nindent 6 }}
       scada/command: {{ $slug }}
   template:
     metadata:
       labels:
         {{- include "scada.labels" $ | nindent 8 }}
-        app: collector
+        {{- include "scada.match" (dict "app" "collector" "ctx" $) | nindent 8 }}
         scada/command: {{ $slug }}
     spec:
       {{- with $.Values.pullSecret }}

package/charts/scada/templates/postgres.yaml

@@ -13,8 +13,7 @@ spec:
       port: 5432
       targetPort: postgres
   selector:
-    app: postgres
-    app.kubernetes.io/instance: {{ .Release.Name }}
+    {{- include "scada.match" (dict "app" "postgres" "ctx" .) | nindent 4 }}
 ---
 apiVersion: apps/v1
 kind: StatefulSet
@@ -29,13 +28,12 @@ spec:
   replicas: 1
   selector:
     matchLabels:
-      app: postgres
-      app.kubernetes.io/instance: {{ .Release.Name }}
+      {{- include "scada.match" (dict "app" "postgres" "ctx" .) | nindent 6 }}
   template:
     metadata:
       labels:
         {{- include "scada.labels" . | nindent 8 }}
-        app: postgres
+        {{- include "scada.match" (dict "app" "postgres" "ctx" .) | nindent 8 }}
     spec:
       containers:
         - name: postgres
@@ -56,6 +54,8 @@ spec:
                 secretKeyRef:
                   name: {{ .Values.postgres.secret }}
                   key: password
+            - name: PGDATA
+              value: {{ .Values.postgres.data | quote }}
           volumeMounts:
             - name: data
               mountPath: /var/lib/postgresql/data
@@ -63,8 +63,5 @@ spec:
     - metadata:
         name: data
       spec:
-        accessModes: ["ReadWriteOnce"]
-        resources:
-          requests:
-            storage: 10Gi
+        {{- include "scada.claim" (dict "size" .Values.postgres.storage "class" .Values.postgres.storageClass) | nindent 8 }}
 {{- end }}

package/charts/scada/templates/rabbitmq.yaml

@@ -85,19 +85,38 @@ metadata:
     {{- include "scada.labels" . | nindent 4 }}
     app: rabbitmq
 spec:
+  {{- $svc := .Values.rabbitmq.service | default dict }}
+  type: {{ $svc.type | default "ClusterIP" }}
   ports:
     - name: amqp
       port: 5672
       targetPort: amqp
+      {{- with $svc.nodePorts }}
+      {{- if .amqp }}
+      nodePort: {{ .amqp }}
+      {{- end }}
+      {{- end }}
     - name: mqtt
       port: 1883
       targetPort: mqtt
     - name: stomp
       port: 61613
       targetPort: stomp
+      {{- with $svc.nodePorts }}
+      {{- if .stomp }}
+      nodePort: {{ .stomp }}
+      {{- end }}
+      {{- end }}
+    - name: management
+      port: 15672
+      targetPort: management
+      {{- with $svc.nodePorts }}
+      {{- if .management }}
+      nodePort: {{ .management }}
+      {{- end }}
+      {{- end }}
   selector:
-    app: rabbitmq
-    app.kubernetes.io/instance: {{ .Release.Name }}
+    {{- include "scada.match" (dict "app" "rabbitmq" "ctx" .) | nindent 4 }}
 ---
 apiVersion: apps/v1
 kind: StatefulSet
@@ -112,13 +131,12 @@ spec:
   replicas: 1
   selector:
     matchLabels:
-      app: rabbitmq
-      app.kubernetes.io/instance: {{ .Release.Name }}
+      {{- include "scada.match" (dict "app" "rabbitmq" "ctx" .) | nindent 6 }}
   template:
     metadata:
       labels:
         {{- include "scada.labels" . | nindent 8 }}
-        app: rabbitmq
+        {{- include "scada.match" (dict "app" "rabbitmq" "ctx" .) | nindent 8 }}
     spec:
       containers:
         - name: rabbitmq
@@ -130,9 +148,18 @@ spec:
               containerPort: 1883
             - name: stomp
               containerPort: 61613
+            - name: management
+              containerPort: 15672
           volumeMounts:
             - name: config
-              mountPath: /etc/rabbitmq
+              mountPath: /etc/rabbitmq/enabled_plugins
+              subPath: enabled_plugins
+            - name: config
+              mountPath: /etc/rabbitmq/rabbitmq.conf
+              subPath: rabbitmq.conf
+            - name: config
+              mountPath: /etc/rabbitmq/definitions.json
+              subPath: definitions.json
             - name: data
               mountPath: /var/lib/rabbitmq
       volumes:
@@ -143,8 +170,5 @@ spec:
     - metadata:
         name: data
       spec:
-        accessModes: ["ReadWriteOnce"]
-        resources:
-          requests:
-            storage: 5Gi
+        {{- include "scada.claim" (dict "size" .Values.rabbitmq.storage "class" .Values.rabbitmq.storageClass) | nindent 8 }}
 {{- end }}

package/charts/scada/templates/site-server.yaml

@@ -10,13 +10,12 @@ spec:
   replicas: 1
   selector:
     matchLabels:
-      app: site-server
-      app.kubernetes.io/instance: {{ .Release.Name }}
+      {{- include "scada.match" (dict "app" "site-server" "ctx" .) | nindent 6 }}
   template:
     metadata:
       labels:
         {{- include "scada.labels" . | nindent 8 }}
-        app: site-server
+        {{- include "scada.match" (dict "app" "site-server" "ctx" .) | nindent 8 }}
     spec:
       {{- with .Values.pullSecret }}
       imagePullSecrets:
@@ -85,8 +84,7 @@ spec:
       port: {{ .Values.service.internalPort }}
       targetPort: internal-api
   selector:
-    app: site-server
-    app.kubernetes.io/instance: {{ .Release.Name }}
+    {{- include "scada.match" (dict "app" "site-server" "ctx" .) | nindent 4 }}
 {{- if gt (int .Values.service.nodePort) 0 }}
 ---
 apiVersion: v1
@@ -105,6 +103,5 @@ spec:
       targetPort: http
       nodePort: {{ .Values.service.nodePort }}
   selector:
-    app: site-server
-    app.kubernetes.io/instance: {{ .Release.Name }}
+    {{- include "scada.match" (dict "app" "site-server" "ctx" .) | nindent 4 }}
 {{- end }}

package/charts/scada/templates/supervisor-sink.yaml

@@ -10,13 +10,12 @@ spec:
   replicas: 1
   selector:
     matchLabels:
-      app: supervisor-sink
-      app.kubernetes.io/instance: {{ .Release.Name }}
+      {{- include "scada.match" (dict "app" "supervisor-sink" "ctx" .) | nindent 6 }}
   template:
     metadata:
       labels:
         {{- include "scada.labels" . | nindent 8 }}
-        app: supervisor-sink
+        {{- include "scada.match" (dict "app" "supervisor-sink" "ctx" .) | nindent 8 }}
     spec:
       {{- with .Values.pullSecret }}
       imagePullSecrets:
@@ -60,5 +59,4 @@ spec:
       port: {{ .Values.service.internalPort }}
       targetPort: state
   selector:
-    app: supervisor-sink
-    app.kubernetes.io/instance: {{ .Release.Name }}
+    {{- include "scada.match" (dict "app" "supervisor-sink" "ctx" .) | nindent 4 }}

package/charts/scada/values.yaml

@@ -6,6 +6,7 @@ machines: []
 sites: []
 collectors: []
 env: []
+extraLabels: {}
 service:
   port: 3000
   internalPort: 8081
@@ -15,12 +16,21 @@ postgres:
   image: postgres:16
   secret: scada-postgres
   database: scada
+  storage: 10Gi
+  storageClass: ""
+  data: /var/lib/postgresql/data/pgdata
 rabbitmq:
   enabled: true
   image: rabbitmq:3.13-management
+  storage: 5Gi
+  storageClass: ""
+  service:
+    type: ClusterIP
 clickhouse:
   enabled: false
   image: clickhouse/clickhouse-server:24.8
+  storage: 20Gi
+  storageClass: ""
 resources:
   requests:
     cpu: 100m

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yarkivaev/scada",
-  "version": "2.3.112",
+  "version": "2.3.113",
   "description": "SCADA domain objects, state persistence, and plant monitoring",
   "repository": {
     "type": "git",