k8s: fixes and formating

- Add checkmk secrets example
- space-tab fixes (linter)
- switcher kener redis to statefulset
- disabled netronome voulme mount (not needed). postgres statefulset instead
-  switched naio to 8888 port (traefik port conflict)
- changed nextcloud ips and ports to prod

checkmk/k8s/secrets.yaml.example

@@ -0,0 +1,8 @@
+apiVersion: v1
+kind: Secret
+metadata:
+  name: checkmk-secrets
+  namespace: checkmk
+type: Opaque
+stringData:
+  CMK_PASSWORD: "password"

dockmon/k8s/dockmon.yaml

@@ -46,7 +46,7 @@ spec:
             failureThreshold: 3
           resources:
             requests:
-            memory: "512Gi"
+              memory: "512Mi"
               cpu: "200m"
             limits:
               memory: "2Gi"

kener/k8s/redis.yaml

@@ -1,21 +1,10 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: kener-redis-service
-  namespace: kener
-spec:
-  selector:
-    app: kener-redis
-  ports:
-  - port: 6379
-    targetPort: 6379
----
 apiVersion: apps/v1
-kind: Deployment
+kind: StatefulSet
 metadata:
-  name: kener-redis-deployment
+  name: kener-redis
   namespace: kener
 spec:
+  serviceName: kener-redis-service
   replicas: 1
   selector:
     matchLabels:
@@ -33,19 +22,11 @@ spec:
           volumeMounts:
             - name: redis-data
               mountPath: /data
-      volumes:
-      - name: redis-data
-        persistentVolumeClaim:
-          claimName: kener-redis-pvc
----
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
-  name: kener-redis-pvc
-  namespace: kener
+  volumeClaimTemplates:
+    - metadata:
+        name: redis-data
       spec:
-  accessModes:
-  - ReadWriteOnce
+        accessModes: ["ReadWriteOnce"]
         resources:
           requests:
             storage: 1Gi

netronome/k8s/netronome.yaml

@@ -42,12 +42,12 @@ spec:
             - name: NETRONOME__DB_USER
               valueFrom:
                 secretKeyRef:
-              name: netronome-secret
+                  name: netronome-secrets
                   key: NETRONOME__DB_USER
             - name: NETRONOME__DB_PASSWORD
               valueFrom:
                 secretKeyRef:
-              name: netronome-secret
+                  name: netronome-secrets
                   key: NETRONOME__DB_PASSWORD
           resources:
             requests:
@@ -56,22 +56,3 @@ spec:
             limits:
               memory: "1Gi"
               cpu: "1000m"
-        volumeMounts:
-        - name: netronome-data
-          mountPath: /data
-      volumes:
-      - name: netronome-data
-        persistentVolumeClaim:
-          claimName: netronome-pvc
----
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
-  name: netronome-pvc
-  namespace: netronome
-spec:
-  resources:
-    requests:
-      storage: 1Gi
-  accessModes:
-    - ReadWriteOnce

netronome/k8s/postgres.yaml

@@ -0,0 +1,71 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: netronome-postgres-service
+  namespace: netronome
+spec:
+  selector:
+    app: netronome-postgres
+  ports:
+    - protocol: TCP
+      port: 5432
+      targetPort: 5432
+---
+apiVersion: apps/v1
+kind: StatefulSet
+metadata:
+  name: netronome-postgres
+  namespace: netronome
+spec:
+  serviceName: "netronome-postgres-service"
+  replicas: 1
+  selector:
+    matchLabels:
+      app: netronome-postgres
+  template:
+    metadata:
+      labels:
+        app: netronome-postgres
+    spec:
+      containers:
+        - name: netronome-postgres
+          image: postgres:17-alpine
+          ports:
+            - name: postgres-port
+              protocol: TCP
+              containerPort: 5432
+          env:
+            - name: POSTGRES_USER
+              valueFrom:
+                secretKeyRef:
+                  name: netronome-secrets
+                  key: NETRONOME__DB_USER
+            - name: POSTGRES_PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: netronome-secrets
+                  key: NETRONOME__DB_PASSWORD
+            - name: POSTGRES_DB
+              valueFrom:
+                configMapKeyRef:
+                  name: netronome-config
+                  key: NETRONOME__DB_NAME
+          resources:
+            requests:
+              memory: "512Mi"
+              cpu: "500m"
+            limits:
+              memory: "1Gi"
+              cpu: "1000m"
+          volumeMounts:
+            - name: netronome-pg-data
+              mountPath: /var/lib/postgresql/data
+  volumeClaimTemplates:
+    - metadata:
+        name: netronome-pg-data
+      spec:
+        accessModes:
+          - ReadWriteOnce
+        resources:
+          requests:
+            storage: 1Gi

nextcloud/compose.yaml

@@ -9,7 +9,7 @@ services:
       - /var/run/docker.sock:/var/run/docker.sock
       - /dev/dri:/dev/dri
     ports:
-      - 8080:8080
+      - 8888:8080
     networks:
       - nextcloud-aio
       - proxy # Optional: Connects the mastercontainer to the proxy network in order to make the built-in reverse proxy detection work. See https://github.com/nextcloud/all-in-one/blob/main/reverse-proxy.md

nextcloud/k8s/external-service.yaml

@@ -21,7 +21,7 @@ ports:
     protocol: TCP
 endpoints:
   - addresses:
-  - "192.168.49.1"
+      - "192.168.88.100"
 ---
 apiVersion: v1
 kind: Service
@@ -31,7 +31,7 @@ metadata:
 spec:
   ports:
     - port: 8080
-    targetPort: 8080
+      targetPort: 8888
 ---
 apiVersion: discovery.k8s.io/v1
 kind: EndpointSlice
@@ -42,8 +42,8 @@ metadata:
     kubernetes.io/service-name: nextcloud-aio
 addressType: IPv4
 ports:
-- port: 8080
+  - port: 8888
     protocol: TCP
 endpoints:
   - addresses:
-  - "192.168.49.1"
+      - "192.168.88.100"

nextcloud/k8s/ingress.yaml

@@ -70,9 +70,9 @@ spec:
       kind: Rule
       services:
         - name: nextcloud-aio
-      port: 8080
+          port: 8888
           scheme: https
-      serversTransport: insecureTransport@file
+          serversTransport: insecure-transport # <-- Ссылка на ваш CRD ресурс вместо @file
   tls:
     certResolver: letsencrypt
 ---
@@ -89,9 +89,9 @@ spec:
       kind: Rule
       services:
         - name: nextcloud-aio
-      port: 8080
+          port: 8888
           scheme: https
-      serversTransport: insecureTransport@file
+          serversTransport: insecure-transport
   tls:
     secretName: local-tls
 ---
@@ -108,8 +108,8 @@ spec:
       kind: Rule
       services:
         - name: nextcloud-aio
-      port: 8080
+          port: 8888
           scheme: https
-      serversTransport: insecureTransport@file
+          serversTransport: insecure-transport
   tls:
     secretName: local-tls