Merge pull request 'Update nodered/node-red Docker tag to v4.1.1' (#569) from renovate/nodered-node-red-4.x into master

Reviewed-on: #569

manifests/_apps/certmanager_chart.yaml

@@ -1,27 +1,3 @@
-apiVersion: argoproj.io/v1alpha1
-kind: Application
-metadata:
-  name: cert-manager-civo
-  namespace: argocd
-  finalizers:
-  - resources-finalizer.argocd.argoproj.io
-spec:
-  project: cluster.fun
-  destination:
-    namespace: cert-manager
-    name: civo
-  source:
-    path: manifests/certmanager-civo
-    repoURL: "https://git.cluster.fun/AverageMarcus/cluster.fun.git"
-    targetRevision: HEAD
-  syncPolicy:
-    automated: {}
-  ignoreDifferences:
-  - kind: Secret
-    jsonPointers:
-    - /data
----
-
 apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:

manifests/_apps/goldilocks.yaml

@@ -1,35 +1,35 @@
 
-apiVersion: argoproj.io/v1alpha1
+# apiVersion: argoproj.io/v1alpha1
-kind: Application
+# kind: Application
-metadata:
+# metadata:
-  name: cluster-fun-goldilocks
+#   name: cluster-fun-goldilocks
-  namespace: argocd
+#   namespace: argocd
-  finalizers:
+#   finalizers:
-  - resources-finalizer.argocd.argoproj.io
+#   - resources-finalizer.argocd.argoproj.io
-spec:
+# spec:
-  project: cluster.fun
+#   project: cluster.fun
-  destination:
+#   destination:
-    namespace: goldilocks
+#     namespace: goldilocks
-    name: cluster-fun (v2)
+#     name: cluster-fun (v2)
-  source:
+#   source:
-    repoURL: 'https://charts.fairwinds.com/stable'
+#     repoURL: 'https://charts.fairwinds.com/stable'
-    targetRevision: 10.1.0
+#     targetRevision: 10.1.0
-    chart: goldilocks
+#     chart: goldilocks
-    helm:
+#     helm:
-      version: v3
+#       version: v3
-      values: |-
+#       values: |-
-        vpa:
+#         vpa:
-          enabled: true
+#           enabled: true
-        controller:
+#         controller:
-          flags:
+#           flags:
-            on-by-default: true
+#             on-by-default: true
-        dashboard:
+#         dashboard:
-          flags:
+#           flags:
-            on-by-default: true
+#             on-by-default: true
-          replicaCount: 1
+#           replicaCount: 1
-  syncPolicy:
+#   syncPolicy:
-    automated: {}
+#     automated: {}
-    syncOptions:
+#     syncOptions:
-      - CreateNamespace=true
+#       - CreateNamespace=true
 
----
+# ---

manifests/_apps/mastodon-digest.yaml

@@ -1,25 +0,0 @@
-apiVersion: argoproj.io/v1alpha1
-kind: Application
-metadata:
-  name: cluster-fun-mastodon-digest
-  namespace: argocd
-  finalizers:
-  - resources-finalizer.argocd.argoproj.io
-spec:
-  project: cluster.fun
-  destination:
-    namespace: mastodon-digest
-    name: cluster-fun (v2)
-  source:
-    path: manifests/mastodon-digest
-    repoURL: "https://git.cluster.fun/AverageMarcus/cluster.fun.git"
-    targetRevision: HEAD
-  syncPolicy:
-    automated: {}
-    syncOptions:
-      - CreateNamespace=true
-  ignoreDifferences:
-  - kind: Secret
-    jsonPointers:
-    - /data
----

manifests/_apps/monitoring-civo.yaml

@@ -1,24 +0,0 @@
-apiVersion: argoproj.io/v1alpha1
-kind: Application
-metadata:
-  name: monitoring-civo
-  namespace: argocd
-  finalizers:
-  - resources-finalizer.argocd.argoproj.io
-spec:
-  project: cluster.fun
-  destination:
-    namespace: monitoring
-    name: civo
-  source:
-    path: manifests/monitoring-civo
-    repoURL: "https://git.cluster.fun/AverageMarcus/cluster.fun.git"
-    targetRevision: HEAD
-  syncPolicy:
-    automated: {}
-    syncOptions:
-      - CreateNamespace=true
-  ignoreDifferences:
-  - kind: Secret
-    jsonPointers:
-    - /data

manifests/_apps/priority-classes.yaml

@@ -1,17 +1,17 @@
 apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
-  name: cluster-fun-tank
+  name: cluster-fun-priority-classes
   namespace: argocd
   finalizers:
   - resources-finalizer.argocd.argoproj.io
 spec:
   project: cluster.fun
   destination:
-    namespace: tank
+    namespace: kube-system
     name: cluster-fun (v2)
   source:
-    path: manifests/tank
+    path: manifests/priority-classes
     repoURL: "https://git.cluster.fun/AverageMarcus/cluster.fun.git"
     targetRevision: HEAD
   syncPolicy:
@@ -22,5 +22,4 @@ spec:
   - kind: Secret
     jsonPointers:
     - /data
-
 ---

manifests/_apps/proxy-civo.yaml

@@ -1,24 +0,0 @@
-apiVersion: argoproj.io/v1alpha1
-kind: Application
-metadata:
-  name: proxy-civo
-  namespace: argocd
-  finalizers:
-  - resources-finalizer.argocd.argoproj.io
-spec:
-  project: cluster.fun
-  destination:
-    namespace: proxy-civo
-    name: civo
-  source:
-    path: manifests/proxy-civo
-    repoURL: "https://git.cluster.fun/AverageMarcus/cluster.fun.git"
-    targetRevision: HEAD
-  syncPolicy:
-    automated: {}
-    syncOptions:
-      - CreateNamespace=true
-  ignoreDifferences:
-  - kind: Secret
-    jsonPointers:
-    - /data

manifests/_apps/reloader.yaml

@@ -21,26 +21,3 @@ spec:
     jsonPointers:
     - /data
 ---
-apiVersion: argoproj.io/v1alpha1
-kind: Application
-metadata:
-  name: cluster-fun-reloader-civo
-  namespace: argocd
-  finalizers:
-  - resources-finalizer.argocd.argoproj.io
-spec:
-  project: cluster.fun
-  destination:
-    namespace: kube-system
-    name: civo
-  source:
-    repoURL: 'https://stakater.github.io/stakater-charts'
-    targetRevision: v0.0.89
-    chart: reloader
-  syncPolicy:
-    automated: {}
-  ignoreDifferences:
-  - kind: Secret
-    jsonPointers:
-    - /data
----

manifests/_apps/svg-to-dxf.yaml

@@ -9,9 +9,9 @@ spec:
   project: cluster.fun
   destination:
     namespace: svg-to-dxf
-    name: civo
-  source:
     name: cluster-fun (v2)
+  source:
+    path: manifests/svg-to-dxf
     repoURL: "https://git.cluster.fun/AverageMarcus/cluster.fun.git"
     targetRevision: HEAD
   syncPolicy:

manifests/_apps/text-to-dxf.yaml

@@ -9,9 +9,9 @@ spec:
   project: cluster.fun
   destination:
     namespace: text-to-dxf
-    name: civo
-  source:
     name: cluster-fun (v2)
+  source:
+    path: manifests/text-to-dxf
     repoURL: "https://git.cluster.fun/AverageMarcus/cluster.fun.git"
     targetRevision: HEAD
   syncPolicy:

manifests/_apps/traefik.yaml

@@ -1,24 +0,0 @@
-apiVersion: argoproj.io/v1alpha1
-kind: Application
-metadata:
-  name: traefik-civo
-  namespace: argocd
-  finalizers:
-  - resources-finalizer.argocd.argoproj.io
-spec:
-  project: cluster.fun
-  destination:
-    namespace: kube-system
-    name: civo
-  source:
-    path: manifests/traefik
-    repoURL: "https://git.cluster.fun/AverageMarcus/cluster.fun.git"
-    targetRevision: HEAD
-  syncPolicy:
-    automated: {}
-    syncOptions:
-      - CreateNamespace=true
-  ignoreDifferences:
-  - kind: Secret
-    jsonPointers:
-    - /data

manifests/auth-proxy/proxy.yaml

@@ -38,6 +38,7 @@ spec:
       labels:
         app: internal-proxy
     spec:
+      priorityClassName: critical
       serviceAccountName: default
       dnsPolicy: ClusterFirst
       dnsConfig:
@@ -101,9 +102,9 @@ spec:
           protocol: TCP
         resources:
           limits:
-            memory: 50Mi
+            memory: 80Mi
           requests:
-            memory: 50Mi
+            memory: 80Mi
       volumes:
       - name: host-mappings
         configMap:

manifests/base64/base64.yaml

@@ -29,6 +29,7 @@ spec:
     spec:
       imagePullSecrets:
         - name: docker-config
+      priorityClassName: low
       containers:
       - name: web
         image: rg.fr-par.scw.cloud/averagemarcus/base64:latest

manifests/bsky-screenshot/bsky-screenshot.yaml

@@ -36,9 +36,9 @@ spec:
           name: web
         resources:
           limits:
-            memory: 20Mi
+            memory: 105Mi
           requests:
-            memory: 20Mi
+            memory: 105Mi
 ---
 apiVersion: networking.k8s.io/v1
 kind: Ingress

manifests/certmanager-civo/certmanager_chart.yaml

@@ -1,23 +0,0 @@
-apiVersion: v1
-kind: Namespace
-metadata:
-  name: cert-manager
-  labels:
-    certmanager.k8s.io/disable-validation: "true"
-
----
-
-apiVersion: cert-manager.io/v1
-kind: ClusterIssuer
-metadata:
-  name: letsencrypt
-spec:
-  acme:
-    server: https://acme-v02.api.letsencrypt.org/directory
-    email: letsencrypt@marcusnoble.co.uk
-    privateKeySecretRef:
-      name: letsencrypt
-    solvers:
-    - http01:
-        ingress:
-          class: traefik

manifests/civo-versions/civo-versions.yaml

@@ -38,6 +38,7 @@ spec:
       labels:
         app: civo-versions
     spec:
+      priorityClassName: low
       containers:
       - name: web
         image: rg.fr-par.scw.cloud/averagemarcus/civo-versions:latest

manifests/cors-proxy/cors-proxy.yaml

@@ -37,6 +37,11 @@ spec:
         env:
         - name: ALLOWLIST
           value: cdn.bsky.app
+        resources:
+          requests:
+            memory: 184M
+          limits:
+            memory: 184M
 ---
 apiVersion: networking.k8s.io/v1
 kind: Ingress

manifests/feed-fetcher/feed-fetcher.yaml

@@ -34,6 +34,11 @@ spec:
         ports:
         - containerPort: 8080
           name: web
+        resources:
+          requests:
+            memory: 80M
+          limits:
+            memory: 80M
 ---
 apiVersion: networking.k8s.io/v1
 kind: Ingress

manifests/gitea/gitea.yaml

@@ -40,6 +40,7 @@ spec:
       labels:
         app: git
     spec:
+      priorityClassName: critical
       containers:
       - name: git
         image: gitea/gitea:1.24.6
@@ -76,7 +77,7 @@ spec:
           name: web
         resources:
           requests:
-            memory: 400Mi
+            memory: 800Mi
         volumeMounts:
         - mountPath: /data
           name: git-data

manifests/grist/grist.yaml

@@ -64,15 +64,18 @@ spec:
   selector:
     matchLabels:
       app.kubernetes.io/name: grist
+  strategy:
+    type: Recreate
   template:
     metadata:
       labels:
         app.kubernetes.io/name: grist
     spec:
       serviceAccountName: grist
+      priorityClassName: critical
       containers:
         - name: grist
-          image: gristlabs/grist-oss:1.7.3
+          image: gristlabs/grist-oss:1.7.4
           imagePullPolicy: IfNotPresent
           ports:
             - name: http
@@ -97,14 +100,17 @@ spec:
               value: default
             - name: GRIST_TELEMETRY_LEVEL
               value: "off"
-            - name: ALLOWED_WEBHOOK_DOMAINS
-              value: "tank.tank.svc,matrix.cluster.fun"
             - name: GRIST_ANON_PLAYGROUND
               value: "false"
             - name: GRIST_FORCE_LOGIN
               value: "true"
             - name: GRIST_SANDBOX_FLAVOR
               value: gvisor
+          resources:
+            requests:
+              memory: 300M
+            limits:
+              memory: 300M
           securityContext:
             capabilities:
               add:

manifests/link/link.yaml

@@ -69,6 +69,7 @@ spec:
       labels:
         app: link
     spec:
+      priorityClassName: critical
       containers:
       - name: web
         image: rg.fr-par.scw.cloud/averagemarcus/link:latest

manifests/mastodon-digest/mastodon_digest.yaml

@@ -1,229 +0,0 @@
-apiVersion: v1
-kind: Secret
-metadata:
-  name: docker-config
-  namespace: mastodon-digest
-  annotations:
-    kube-1password: i6ngbk5zf4k52xgwdwnfup5bby
-    kube-1password/vault: Kubernetes
-    kube-1password/secret-text-key: .dockerconfigjson
-type: kubernetes.io/dockerconfigjson
-data:
-  .dockerconfigjson: e30=
----
-apiVersion: v1
-kind: Secret
-metadata:
-  name: mastodon-digest-auth
-  namespace: mastodon-digest
-  annotations:
-    kube-1password: mr6spkkx7n3memkbute6ojaarm
-    kube-1password/vault: Kubernetes
-type: Opaque
----
-apiVersion: v1
-kind: Secret
-metadata:
-  name: mastodon-digest
-  namespace: mastodon-digest
-  annotations:
-    kube-1password: bfklz3yi3dn4e7xtsbttcvhata
-    kube-1password/vault: Kubernetes
-    kube-1password/secret-text-parse: "true"
-type: Opaque
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: config
-  namespace: mastodon-digest
-  labels:
-    app: mastodon-digest
-data:
-  config.json: |
-    [
-      {
-        "timeline": "home",
-        "hours": 12,
-        "scorer": "ExtendedSimpleWeighted",
-        "threshold": "lax",
-        "output": "/usr/share/nginx/html/home/"
-      },
-      {
-        "timeline": "federated",
-        "hours": 12,
-        "scorer": "ExtendedSimpleWeighted",
-        "threshold": "lax",
-        "output": "/usr/share/nginx/html/federated/"
-      }
-    ]
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: index
-  namespace: mastodon-digest
-  labels:
-    app: mastodon-digest
-data:
-  index.html: |
-    <!DOCTYPE html>
-    <html lang="en">
-    <head>
-        <meta chartset="utf-8" />
-        <meta name="viewport" content="width=device-width, initial-scale=1" />
-        <title>Mastodon Digest</title>
-        <style>
-        body { background-color: #292c36; font-family: "Arial", sans-serif; }
-        div#container { margin: auto; max-width: 640px; padding: 10px; text-align: center; margin: 0 auto; }
-        .links { align: center; }
-        h1 { color: white; }
-        a.button { background: #595aff; color: #fff; line-height: 1.2; min-height: 38px; min-width: 88px; padding: 0 30px; border: 0; border-radius: 6px;; display: inline-flex; justify-content: center; align-items: center; }
-    </style>
-    </head>
-    <body>
-        <div id="container">
-            <h1>Mastodon Digest</h1>
-            <section class="links">
-                <a href="home/" class="button">Home</a>
-                <a href="federated/" class="button">Federated</a>
-            </section>
-        </div>
-    </body>
-    </html>
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: mastodon-digest
-  namespace: mastodon-digest
-spec:
-  type: ClusterIP
-  ports:
-  - port: 80
-    targetPort: auth
-    name: web
-  selector:
-    app: mastodon-digest
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: mastodon-digest
-  namespace: mastodon-digest
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: mastodon-digest
-  template:
-    metadata:
-      labels:
-        app: mastodon-digest
-    spec:
-      imagePullSecrets:
-        - name: docker-config
-      containers:
-      - args:
-        - --cookie-secure=false
-        - --provider=oidc
-        - --provider-display-name=Auth0
-        - --upstream=http://localhost:80
-        - --http-address=$(HOST_IP):8000
-        - --redirect-url=https://mastodon-digest.cluster.fun/oauth2/callback
-        - --email-domain=marcusnoble.co.uk
-        - --pass-basic-auth=false
-        - --pass-access-token=false
-        - --oidc-issuer-url=https://marcusnoble.eu.auth0.com/
-        - --cookie-secret=KDGD6rrK6cBmryyZ4wcJ9xAUNW9AQNFT
-        env:
-        - name: HOST_IP
-          valueFrom:
-            fieldRef:
-              apiVersion: v1
-              fieldPath: status.podIP
-        - name: OAUTH2_PROXY_CLIENT_ID
-          valueFrom:
-            secretKeyRef:
-              key: username
-              name: mastodon-digest-auth
-        - name: OAUTH2_PROXY_CLIENT_SECRET
-          valueFrom:
-            secretKeyRef:
-              key: password
-              name: mastodon-digest-auth
-        image: quay.io/oauth2-proxy/oauth2-proxy:v7.12.0
-        name: oauth-proxy
-        ports:
-        - containerPort: 8000
-          protocol: TCP
-          name: auth
-        resources:
-          limits:
-            memory: 50Mi
-          requests:
-            memory: 50Mi
-
-      - name: web
-        image: nginx:stable
-        imagePullPolicy: IfNotPresent
-        ports:
-        - containerPort: 80
-          name: web
-        volumeMounts:
-        - name: html
-          mountPath: /usr/share/nginx/html
-        - name: index
-          mountPath: /usr/share/nginx/html/index.html
-          subPath: index.html
-
-      - name: digest
-        image: rg.fr-par.scw.cloud/averagemarcus-private/mastodon-digest:latest
-        imagePullPolicy: Always
-        env:
-        - name: CONFIG_FILE
-          value: /config.json
-        envFrom:
-        - secretRef:
-            name: mastodon-digest
-        volumeMounts:
-        - name: config
-          mountPath: /config.json
-          subPath: config.json
-        - name: html
-          mountPath: /usr/share/nginx/html
-      volumes:
-      - name: html
-        emptyDir: {}
-      - name: config
-        configMap:
-          name: config
-      - name: index
-        configMap:
-          name: index
----
-apiVersion: networking.k8s.io/v1
-kind: Ingress
-metadata:
-  name: mastodon-digest
-  namespace: mastodon-digest
-  annotations:
-    cert-manager.io/cluster-issuer: letsencrypt
-    nginx.ingress.kubernetes.io/force-ssl-redirect: "true"
-spec:
-  ingressClassName: nginx
-  tls:
-  - hosts:
-    - mastodon-digest.cluster.fun
-    secretName: mastodon-digest-ingress
-  rules:
-  - host: mastodon-digest.cluster.fun
-    http:
-      paths:
-      - path: /
-        pathType: ImplementationSpecific
-        backend:
-          service:
-            name: mastodon-digest
-            port:
-              number: 80

manifests/mealie/mealie.yaml

@@ -28,9 +28,10 @@ spec:
       labels:
         app: mealie
     spec:
+      priorityClassName: critical
       containers:
       - name: frontend
-        image: ghcr.io/mealie-recipes/mealie:v3.2.0
+        image: ghcr.io/mealie-recipes/mealie:v3.3.2
         imagePullPolicy: Always
         envFrom:
         - secretRef:
@@ -70,11 +71,11 @@ spec:
             name: data
         resources:
           requests:
-            cpu: 15m
+            cpu: 200m
-            memory: 443M
+            memory: 550M
           limits:
-            cpu: 15m
+            cpu: 1000m
-            memory: 443M
+            memory: 550M
       volumes:
       - name: data
         persistentVolumeClaim:

manifests/monitoring-civo/kube-state-metrics.yaml

@@ -1,255 +0,0 @@
-
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: kube-state-metrics
-  namespace: monitoring
-  labels:
-    app.kubernetes.io/name: kube-state-metrics
----
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRole
-metadata:
-  labels:
-    app.kubernetes.io/name: kube-state-metrics
-  name: kube-state-metrics
-rules:
-  - apiGroups: ["certificates.k8s.io"]
-    resources:
-    - certificatesigningrequests
-    verbs: ["list", "watch"]
-
-  - apiGroups: [""]
-    resources:
-    - configmaps
-    verbs: ["list", "watch"]
-
-  - apiGroups: ["batch"]
-    resources:
-    - cronjobs
-    verbs: ["list", "watch"]
-
-  - apiGroups: ["extensions", "apps"]
-    resources:
-    - daemonsets
-    verbs: ["list", "watch"]
-
-  - apiGroups: ["extensions", "apps"]
-    resources:
-    - deployments
-    verbs: ["list", "watch"]
-
-  - apiGroups: [""]
-    resources:
-    - endpoints
-    verbs: ["list", "watch"]
-
-  - apiGroups: ["autoscaling"]
-    resources:
-    - horizontalpodautoscalers
-    verbs: ["list", "watch"]
-
-  - apiGroups: ["extensions", "networking.k8s.io"]
-    resources:
-    - ingresses
-    verbs: ["list", "watch"]
-
-  - apiGroups: ["batch"]
-    resources:
-    - jobs
-    verbs: ["list", "watch"]
-
-  - apiGroups: [""]
-    resources:
-    - limitranges
-    verbs: ["list", "watch"]
-
-  - apiGroups: ["admissionregistration.k8s.io"]
-    resources:
-      - mutatingwebhookconfigurations
-    verbs: ["list", "watch"]
-
-  - apiGroups: [""]
-    resources:
-    - namespaces
-    verbs: ["list", "watch"]
-
-  - apiGroups: ["networking.k8s.io"]
-    resources:
-    - networkpolicies
-    verbs: ["list", "watch"]
-
-  - apiGroups: [""]
-    resources:
-    - nodes
-    verbs: ["list", "watch"]
-
-  - apiGroups: [""]
-    resources:
-    - persistentvolumeclaims
-    verbs: ["list", "watch"]
-
-  - apiGroups: [""]
-    resources:
-    - persistentvolumes
-    verbs: ["list", "watch"]
-
-  - apiGroups: ["policy"]
-    resources:
-      - poddisruptionbudgets
-    verbs: ["list", "watch"]
-
-  - apiGroups: [""]
-    resources:
-    - pods
-    verbs: ["list", "watch"]
-
-  - apiGroups: ["extensions", "apps"]
-    resources:
-    - replicasets
-    verbs: ["list", "watch"]
-
-  - apiGroups: [""]
-    resources:
-    - replicationcontrollers
-    verbs: ["list", "watch"]
-
-  - apiGroups: [""]
-    resources:
-    - resourcequotas
-    verbs: ["list", "watch"]
-
-  - apiGroups: [""]
-    resources:
-    - secrets
-    verbs: ["list", "watch"]
-
-  - apiGroups: [""]
-    resources:
-    - services
-    verbs: ["list", "watch"]
-
-  - apiGroups: ["apps"]
-    resources:
-    - statefulsets
-    verbs: ["list", "watch"]
-
-  - apiGroups: ["storage.k8s.io"]
-    resources:
-      - storageclasses
-    verbs: ["list", "watch"]
-
-  - apiGroups: ["admissionregistration.k8s.io"]
-    resources:
-      - validatingwebhookconfigurations
-    verbs: ["list", "watch"]
-
-  - apiGroups: ["storage.k8s.io"]
-    resources:
-      - volumeattachments
-    verbs: ["list", "watch"]
----
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRoleBinding
-metadata:
-  labels:
-    app.kubernetes.io/name: kube-state-metrics
-  name: kube-state-metrics
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: ClusterRole
-  name: kube-state-metrics
-subjects:
-- kind: ServiceAccount
-  name: kube-state-metrics
-  namespace: monitoring
----
-
-apiVersion: v1
-kind: Service
-metadata:
-  name: kube-state-metrics
-  namespace: monitoring
-  labels:
-    app.kubernetes.io/name: kube-state-metrics
-  annotations:
-    prometheus.io/scrape: 'true'
-spec:
-  type: "ClusterIP"
-  ports:
-  - name: "http"
-    protocol: TCP
-    port: 8080
-    targetPort: 8080
-  selector:
-    app.kubernetes.io/name: kube-state-metrics
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: kube-state-metrics
-  namespace: monitoring
-  labels:
-    app.kubernetes.io/name: kube-state-metrics
-spec:
-  selector:
-    matchLabels:
-      app.kubernetes.io/name: kube-state-metrics
-  replicas: 1
-  template:
-    metadata:
-      labels:
-        app.kubernetes.io/name: kube-state-metrics
-    spec:
-      serviceAccountName: kube-state-metrics
-      securityContext:
-        fsGroup: 65534
-        runAsGroup: 65534
-        runAsUser: 65534
-      containers:
-      - name: kube-state-metrics
-        args:
-        #- --resources=certificatesigningrequests
-        - --resources=configmaps
-        - --resources=cronjobs
-        - --resources=daemonsets
-        - --resources=deployments
-        #- --resources=endpoints
-        #- --resources=horizontalpodautoscalers
-        - --resources=ingresses
-        - --resources=jobs
-        #- --resources=limitranges
-        - --resources=mutatingwebhookconfigurations
-        - --resources=namespaces
-        #- --resources=networkpolicies
-        - --resources=nodes
-        - --resources=persistentvolumeclaims
-        - --resources=persistentvolumes
-        - --resources=poddisruptionbudgets
-        - --resources=pods
-        - --resources=replicasets
-        #- --resources=replicationcontrollers
-        #- --resources=resourcequotas
-        - --resources=secrets
-        - --resources=services
-        - --resources=statefulsets
-        - --resources=storageclasses
-        - --resources=validatingwebhookconfigurations
-        #- --resources=volumeattachments
-        imagePullPolicy: IfNotPresent
-        image: "registry.k8s.io/kube-state-metrics/kube-state-metrics:v2.17.0"
-        ports:
-        - containerPort: 8080
-        livenessProbe:
-          httpGet:
-            path: /healthz
-            port: 8080
-          initialDelaySeconds: 5
-          timeoutSeconds: 5
-        readinessProbe:
-          httpGet:
-            path: /
-            port: 8080
-          initialDelaySeconds: 5
-          timeoutSeconds: 5
----

manifests/monitoring-civo/prometheus-server.yaml

@@ -1,64 +0,0 @@
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: prometheus-server
-  namespace: monitoring
-  labels:
-    app.kubernetes.io/name: prometheus
-    app.kubernetes.io/component: server
----
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRole
-metadata:
-  labels:
-    app.kubernetes.io/name: prometheus
-    app.kubernetes.io/component: server
-  name: prometheus-server
-rules:
-  - apiGroups:
-      - ""
-    resources:
-      - nodes
-      - nodes/proxy
-      - nodes/metrics
-      - services
-      - endpoints
-      - pods
-      - ingresses
-      - configmaps
-    verbs:
-      - get
-      - list
-      - watch
-  - apiGroups:
-      - "extensions"
-      - "networking.k8s.io"
-    resources:
-      - ingresses/status
-      - ingresses
-    verbs:
-      - get
-      - list
-      - watch
-  - nonResourceURLs:
-      - "/metrics"
-    verbs:
-      - get
----
-
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRoleBinding
-metadata:
-  labels:
-    app.kubernetes.io/name: prometheus
-    app.kubernetes.io/component: server
-  name: prometheus-server
-subjects:
-  - kind: ServiceAccount
-    name: prometheus-server
-    namespace: monitoring
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: ClusterRole
-  name: prometheus-server
----

manifests/monitoring-civo/promtail.yaml

@@ -1,292 +0,0 @@
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: promtail
-  namespace: monitoring
-  labels:
-    app.kubernetes.io/name: promtail
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: promtail
-  namespace: monitoring
-  labels:
-    app.kubernetes.io/name: promtail
-data:
-  promtail.yaml: |
-    client:
-      backoff_config:
-        max_period: 5m
-        max_retries: 10
-        min_period: 500ms
-      batchsize: 1048576
-      batchwait: 1s
-      external_labels: {}
-      timeout: 10s
-    positions:
-      filename: /run/promtail/positions.yaml
-    server:
-      http_listen_port: 3101
-    clients:
-    - url: http://loki-distributed.proxy-civo.svc:80/loki/api/v1/push
-      external_labels:
-        kubernetes_cluster: civo
-    target_config:
-      sync_period: 10s
-    scrape_configs:
-    - job_name: kubernetes-pods
-      pipeline_stages:
-        - docker: {}
-        - cri: {}
-        - match:
-            selector: '{app="weave-net"}'
-            action: drop
-        - match:
-            selector: '{filename=~".*konnectivity.*"}'
-            action: drop
-        - match:
-            selector: '{name=~".*"} |~ ".*/healthz.*"'
-            action: drop
-        - match:
-            selector: '{name=~".*"} |~ ".*/api/health.*"'
-            action: drop
-        - match:
-            selector: '{name=~".*"} |~ ".*kube-probe/.*"'
-            action: drop
-        - match:
-            selector: '{app="internal-proxy"}'
-            action: drop
-        - match:
-            selector: '{app="non-auth-proxy"}'
-            action: drop
-        - match:
-            selector: '{app="vpa"}'
-            action: drop
-        - match:
-            selector: '{app="promtail"}'
-            action: drop
-        - match:
-            selector: '{app="csi-node"}'
-            action: drop
-        - match:
-            selector: '{app="victoria-metrics"}'
-            action: drop
-        - match:
-            selector: '{app="git-sync"}'
-            action: drop
-        - match:
-            selector: '{app="ingress-nginx"}'
-            stages:
-            - json:
-                expressions:
-                  request_host: host
-                  request_path: path
-                  request_method: method
-                  response_status: status
-            - drop:
-                source: "request_path"
-                value:  "/healthz"
-            - drop:
-                source: "request_path"
-                value:  "/health"
-            - labels:
-                request_host:
-                request_method:
-                response_status:
-        - match:
-            selector: '{app="traefik"}'
-            stages:
-            - json:
-                expressions:
-                  request_host: RequestHost
-                  request_path: RequestPath
-                  request_method: RequestMethod
-                  response_status: OriginStatus
-            - drop:
-                source: "request_path"
-                value:  "/healthz"
-            - drop:
-                source: "request_path"
-                value:  "/health"
-            - drop:
-                source: "request_path"
-                value:  "/ping"
-            - labels:
-                request_host:
-                request_method:
-                response_status:
-      kubernetes_sd_configs:
-        - role: pod
-      relabel_configs:
-        - source_labels:
-            - __meta_kubernetes_pod_controller_name
-          regex: ([0-9a-z-.]+?)(-[0-9a-f]{8,10})?
-          action: replace
-          target_label: __tmp_controller_name
-        - source_labels:
-            - __meta_kubernetes_pod_label_app_kubernetes_io_name
-            - __meta_kubernetes_pod_label_app
-            - __tmp_controller_name
-            - __meta_kubernetes_pod_name
-          regex: ^;*([^;]+)(;.*)?$
-          action: replace
-          target_label: app
-        - source_labels:
-            - __meta_kubernetes_pod_label_app_kubernetes_io_component
-            - __meta_kubernetes_pod_label_component
-          regex: ^;*([^;]+)(;.*)?$
-          action: replace
-          target_label: component
-        - action: replace
-          source_labels:
-            - __meta_kubernetes_pod_node_name
-          target_label: node_name
-        - action: replace
-          source_labels:
-            - __meta_kubernetes_namespace
-          target_label: namespace
-        - action: replace
-          replacement: $1
-          separator: /
-          source_labels:
-            - namespace
-            - app
-          target_label: job
-        - action: replace
-          source_labels:
-            - __meta_kubernetes_pod_name
-          target_label: pod
-        - action: replace
-          source_labels:
-            - __meta_kubernetes_pod_container_name
-          target_label: container
-        - action: replace
-          replacement: /var/log/pods/*$1/*.log
-          separator: /
-          source_labels:
-            - __meta_kubernetes_pod_uid
-            - __meta_kubernetes_pod_container_name
-          target_label: __path__
-        - action: replace
-          replacement: /var/log/pods/*$1/*.log
-          regex: true/(.*)
-          separator: /
-          source_labels:
-            - __meta_kubernetes_pod_annotationpresent_kubernetes_io_config_hash
-            - __meta_kubernetes_pod_annotation_kubernetes_io_config_hash
-            - __meta_kubernetes_pod_container_name
-          target_label: __path__
-        - action: labelmap
-          regex: __meta_kubernetes_pod_label_(.+)
-
----
-kind: ClusterRole
-apiVersion: rbac.authorization.k8s.io/v1
-metadata:
-  name: promtail-clusterrole
-  labels:
-    app.kubernetes.io/name: promtail
-rules:
-- apiGroups: [""] # "" indicates the core API group
-  resources:
-  - nodes
-  - nodes/proxy
-  - services
-  - endpoints
-  - pods
-  verbs: ["get", "watch", "list"]
----
-kind: ClusterRoleBinding
-apiVersion: rbac.authorization.k8s.io/v1
-metadata:
-  name: promtail-clusterrolebinding
-  labels:
-    app.kubernetes.io/name: promtail
-subjects:
-  - kind: ServiceAccount
-    name: promtail
-    namespace: monitoring
-roleRef:
-  kind: ClusterRole
-  name: promtail-clusterrole
-  apiGroup: rbac.authorization.k8s.io
----
-apiVersion: apps/v1
-kind: DaemonSet
-metadata:
-  name: promtail
-  namespace: monitoring
-  labels:
-    app.kubernetes.io/name: promtail
-  annotations:
-    configmap.reloader.stakater.com/reload: "promtail"
-spec:
-  selector:
-    matchLabels:
-      app.kubernetes.io/name: promtail
-  template:
-    metadata:
-      labels:
-        app.kubernetes.io/name: promtail
-      annotations:
-        prometheus.io/port: http-metrics
-        prometheus.io/scrape: "true"
-    spec:
-      serviceAccountName: promtail
-      containers:
-        - name: promtail
-          image: "grafana/promtail:2.9.15"
-          imagePullPolicy: IfNotPresent
-          args:
-            - "-config.file=/etc/promtail/promtail.yaml"
-          volumeMounts:
-            - name: config
-              mountPath: /etc/promtail
-            - name: run
-              mountPath: /run/promtail
-            - mountPath: /var/lib/docker/containers
-              name: docker
-              readOnly: true
-            - mountPath: /var/log/pods
-              name: pods
-              readOnly: true
-          env:
-            - name: HOSTNAME
-              valueFrom:
-                fieldRef:
-                  fieldPath: spec.nodeName
-          ports:
-            - containerPort: 3101
-              name: http-metrics
-          securityContext:
-            readOnlyRootFilesystem: true
-            runAsGroup: 0
-            runAsUser: 0
-          readinessProbe:
-            failureThreshold: 5
-            httpGet:
-              path: /ready
-              port: http-metrics
-            initialDelaySeconds: 10
-            periodSeconds: 10
-            successThreshold: 1
-            timeoutSeconds: 1
-      tolerations:
-        - effect: NoSchedule
-          key: node-role.kubernetes.io/master
-          operator: Exists
-      volumes:
-        - name: config
-          configMap:
-            name: promtail
-        - name: run
-          hostPath:
-            path: /run/promtail
-        - hostPath:
-            path: /var/lib/docker/containers
-          name: docker
-        - hostPath:
-            path: /var/log/pods
-          name: pods
----

manifests/monitoring-civo/vmagent.yaml

@@ -1,163 +0,0 @@
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: vmagent
-  namespace: monitoring
-  labels:
-    app.kubernetes.io/name: victoria-metrics
-    app.kubernetes.io/component: agent
-data:
-  prometheus.yml: |
-    global:
-      scrape_interval: 1m
-      external_labels:
-        source: civo
-        agent: vmagent
-    scrape_configs:
-    - job_name: 'vmagent'
-      static_configs:
-        - targets: ['localhost:8429']
-    - bearer_token_file: /var/run/secrets/kubernetes.io/serviceaccount/token
-      job_name: kubernetes-nodes
-      kubernetes_sd_configs:
-      - role: node
-      relabel_configs:
-      - action: labelmap
-        regex: __meta_kubernetes_node_label_(.+)
-      - replacement: kubernetes.default.svc:443
-        target_label: __address__
-      - regex: (.+)
-        replacement: /api/v1/nodes/$1/proxy/metrics
-        source_labels:
-        - __meta_kubernetes_node_name
-        target_label: __metrics_path__
-      scheme: https
-      tls_config:
-        ca_file: /var/run/secrets/kubernetes.io/serviceaccount/ca.crt
-        insecure_skip_verify: true
-    - job_name: kubernetes-service-endpoints
-      kubernetes_sd_configs:
-      - role: endpoints
-      relabel_configs:
-      - action: keep
-        regex: true
-        source_labels:
-        - __meta_kubernetes_service_annotation_prometheus_io_scrape
-      - action: replace
-        regex: (https?)
-        source_labels:
-        - __meta_kubernetes_service_annotation_prometheus_io_scheme
-        target_label: __scheme__
-      - action: replace
-        regex: (.+)
-        source_labels:
-        - __meta_kubernetes_service_annotation_prometheus_io_path
-        target_label: __metrics_path__
-      - action: replace
-        regex: ([^:]+)(?::\d+)?;(\d+)
-        replacement: $1:$2
-        source_labels:
-        - __address__
-        - __meta_kubernetes_service_annotation_prometheus_io_port
-        target_label: __address__
-      - action: labelmap
-        regex: __meta_kubernetes_service_label_(.+)
-      - action: replace
-        source_labels:
-        - __meta_kubernetes_namespace
-        target_label: kubernetes_namespace
-      - action: replace
-        source_labels:
-        - __meta_kubernetes_service_name
-        target_label: kubernetes_name
-      - action: replace
-        source_labels:
-        - __meta_kubernetes_endpoint_port_name
-        target_label: kubernetes_endpoint_port_name
-      - action: replace
-        source_labels:
-        - __meta_kubernetes_pod_node_name
-        target_label: kubernetes_node
-    - job_name: kubernetes-pods
-      kubernetes_sd_configs:
-      - role: pod
-      relabel_configs:
-      - action: keep
-        regex: true
-        source_labels:
-        - __meta_kubernetes_pod_annotation_prometheus_io_scrape
-      - action: replace
-        regex: (.+)
-        source_labels:
-        - __meta_kubernetes_pod_annotation_prometheus_io_path
-        target_label: __metrics_path__
-      - action: replace
-        regex: ([^:]+)(?::\d+)?;(\d+)
-        replacement: $1:$2
-        source_labels:
-        - __address__
-        - __meta_kubernetes_pod_annotation_prometheus_io_port
-        target_label: __address__
-      - action: labelmap
-        regex: __meta_kubernetes_pod_label_(.+)
-      - action: replace
-        source_labels:
-        - __meta_kubernetes_namespace
-        target_label: kubernetes_namespace
-      - action: replace
-        source_labels:
-        - __meta_kubernetes_pod_name
-        target_label: kubernetes_pod_name
-      - action: replace
-        source_labels:
-        - __meta_kubernetes_pod_container_port_name
-        target_label: kubernetes_port_name
-      - action: drop
-        regex: Pending|Succeeded|Failed
-        source_labels:
-        - __meta_kubernetes_pod_phase
-
-
----
-
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: vmagent
-  namespace: monitoring
-  labels:
-    app.kubernetes.io/name: victoria-metrics
-    app.kubernetes.io/component: agent
-  annotations:
-    configmap.reloader.stakater.com/reload: "vmagent"
-spec:
-  strategy:
-    type: Recreate
-  selector:
-    matchLabels:
-      app.kubernetes.io/name: victoria-metrics
-      app.kubernetes.io/component: agent
-  replicas: 1
-  template:
-    metadata:
-      labels:
-        app.kubernetes.io/name: victoria-metrics
-        app.kubernetes.io/component: agent
-    spec:
-      serviceAccountName: prometheus-server
-      containers:
-        - name: vmagent
-          image: "victoriametrics/vmagent:v1.125.1"
-          imagePullPolicy: "IfNotPresent"
-          args:
-            - -remoteWrite.url=http://vmcluster.proxy-civo.svc/insert/0/prometheus/
-            - -remoteWrite.showURL
-            - -promscrape.config=/config/prometheus.yml
-          volumeMounts:
-            - name: config-volume
-              mountPath: /config
-      volumes:
-        - name: config-volume
-          configMap:
-            name: vmagent
----

manifests/monitoring/cadvisor.yaml

@@ -0,0 +1,87 @@
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  labels:
+    app: cadvisor
+    app.kubernetes.io/name: cadvisor
+  name: cadvisor
+  namespace: monitoring
+---
+apiVersion: apps/v1
+kind: DaemonSet
+metadata:
+  annotations:
+    seccomp.security.alpha.kubernetes.io/pod: docker/default
+  labels:
+    app: cadvisor
+    app.kubernetes.io/name: cadvisor
+  name: cadvisor
+  namespace: monitoring
+spec:
+  selector:
+    matchLabels:
+      app: cadvisor
+      app.kubernetes.io/name: cadvisor
+      name: cadvisor
+  template:
+    metadata:
+      labels:
+        app: cadvisor
+        app.kubernetes.io/name: cadvisor
+        name: cadvisor
+      annotations:
+        scheduler.alpha.kubernetes.io/critical-pod: ''
+    spec:
+      priorityClassName: system-node-critical
+      tolerations:
+        - key: "CriticalAddonsOnly"
+          operator: "Exists"
+      automountServiceAccountToken: false
+      containers:
+      - image: ghcr.io/google/cadvisor:v0.53.0
+        name: cadvisor
+        ports:
+        - containerPort: 8080
+          name: http
+          protocol: TCP
+        resources:
+          limits:
+            cpu: 800m
+            memory: 2000Mi
+          requests:
+            cpu: 400m
+            memory: 400Mi
+        volumeMounts:
+        - mountPath: /rootfs
+          name: rootfs
+          readOnly: true
+        - mountPath: /var/run
+          name: var-run
+          readOnly: true
+        - mountPath: /sys
+          name: sys
+          readOnly: true
+        - mountPath: /var/lib/docker
+          name: docker
+          readOnly: true
+        - mountPath: /dev/disk
+          name: disk
+          readOnly: true
+      serviceAccountName: cadvisor
+      terminationGracePeriodSeconds: 30
+      volumes:
+      - hostPath:
+          path: /
+        name: rootfs
+      - hostPath:
+          path: /var/run
+        name: var-run
+      - hostPath:
+          path: /sys
+        name: sys
+      - hostPath:
+          path: /var/lib/docker
+        name: docker
+      - hostPath:
+          path: /dev/disk
+        name: disk

manifests/monitoring/ephemeral-storage-exporter.yaml

@@ -0,0 +1,142 @@
+---
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  labels:
+    app.kubernetes.io/name: k8s-ephemeral-storage-metrics
+  name: k8s-ephemeral-storage-metrics
+  namespace: monitoring
+---
+kind: ClusterRole
+apiVersion: rbac.authorization.k8s.io/v1
+metadata:
+  name: k8s-ephemeral-storage-metrics
+  labels:
+    app.kubernetes.io/name: k8s-ephemeral-storage-metrics
+rules:
+  - apiGroups: [""]
+    resources: ["nodes","nodes/proxy", "nodes/stats", "pods"]
+    verbs: ["get","list", "watch"]
+---
+kind: ClusterRoleBinding
+apiVersion: rbac.authorization.k8s.io/v1
+metadata:
+  name: k8s-ephemeral-storage-metrics
+  labels:
+    app.kubernetes.io/name: k8s-ephemeral-storage-metrics
+subjects:
+  - kind: ServiceAccount
+    name: k8s-ephemeral-storage-metrics
+    namespace: monitoring
+roleRef:
+  kind: ClusterRole
+  name: k8s-ephemeral-storage-metrics
+  apiGroup: rbac.authorization.k8s.io
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: k8s-ephemeral-storage-metrics
+  namespace: monitoring
+  labels:
+    app.kubernetes.io/name: k8s-ephemeral-storage-metrics
+  annotations:
+    prometheus.io/scrape: "true"
+    prometheus.io/port: "9100"
+spec:
+  type: ClusterIP
+  selector:
+    app.kubernetes.io/name: k8s-ephemeral-storage-metrics
+  ports:
+    - name: metrics
+      port: 9100
+      protocol: TCP
+      targetPort: metrics
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: k8s-ephemeral-storage-metrics
+  namespace: monitoring
+  labels:
+    app.kubernetes.io/name: k8s-ephemeral-storage-metrics
+spec:
+  replicas: 1
+  revisionHistoryLimit: 3
+  selector:
+    matchLabels:
+      app.kubernetes.io/name: k8s-ephemeral-storage-metrics
+  template:
+    metadata:
+      labels:
+        app.kubernetes.io/name: k8s-ephemeral-storage-metrics
+    spec:
+      serviceAccountName: k8s-ephemeral-storage-metrics
+      securityContext:
+        runAsNonRoot: true
+        seccompProfile:
+          type: RuntimeDefault
+      containers:
+        - name: metrics
+          image: ghcr.io/jmcgrath207/k8s-ephemeral-storage-metrics:1.18.2
+          imagePullPolicy: IfNotPresent
+          ports:
+            - name: metrics
+              containerPort: 9100
+              protocol: TCP
+          livenessProbe:
+            failureThreshold: 10
+            httpGet:
+              path: /metrics
+              port: 9100
+              scheme: HTTP
+            initialDelaySeconds: 10
+            periodSeconds: 10
+            successThreshold: 1
+            timeoutSeconds: 30
+          readinessProbe:
+            failureThreshold: 10
+            httpGet:
+              path: /metrics
+              port: 9100
+              scheme: HTTP
+            periodSeconds: 10
+            successThreshold: 1
+            timeoutSeconds: 1
+          securityContext:
+            allowPrivilegeEscalation: false
+            capabilities:
+              drop:
+              - ALL
+            privileged: false
+            readOnlyRootFilesystem: false
+            runAsNonRoot: true
+          env:
+            - name: DEPLOY_TYPE
+              value: "Deployment"
+            - name: SCRAPE_INTERVAL
+              value: "15"
+            - name: MAX_NODE_CONCURRENCY
+              value: "10"
+            - name: CLIENT_GO_QPS
+              value: "5"
+            - name: CLIENT_GO_BURST
+              value: "10"
+            - name: LOG_LEVEL
+              value: "info"
+            - name: EPHEMERAL_STORAGE_POD_USAGE
+              value: "true"
+            - name: EPHEMERAL_STORAGE_NODE_AVAILABLE
+              value: "true"
+            - name: EPHEMERAL_STORAGE_NODE_CAPACITY
+              value: "true"
+            - name: EPHEMERAL_STORAGE_NODE_PERCENTAGE
+              value: "true"
+            - name: EPHEMERAL_STORAGE_CONTAINER_LIMIT_PERCENTAGE
+              value: "true"
+            - name: EPHEMERAL_STORAGE_CONTAINER_VOLUME_USAGE
+              value: "true"
+            - name: EPHEMERAL_STORAGE_CONTAINER_VOLUME_LIMITS_PERCENTAGE
+              value: "true"
+            - name: EPHEMERAL_STORAGE_INODES
+              value: "true"

manifests/monitoring/kube-state-metrics.yaml

@@ -201,6 +201,7 @@ spec:
       labels:
         app.kubernetes.io/name: kube-state-metrics
     spec:
+      priorityClassName: system-cluster-critical
       serviceAccountName: kube-state-metrics
       securityContext:
         fsGroup: 65534

manifests/monitoring/node-exporter.yaml

@@ -51,6 +51,7 @@ spec:
         app.kubernetes.io/name: prometheus
         app.kubernetes.io/component: node-exporter
     spec:
+      priorityClassName: system-node-critical
       serviceAccountName: prometheus-node-exporter
       containers:
         - name: prometheus-node-exporter

manifests/monitoring/promtail.yaml

@@ -212,6 +212,7 @@ spec:
         prometheus.io/port: http-metrics
         prometheus.io/scrape: "true"
     spec:
+      priorityClassName: system-node-critical
       serviceAccountName: promtail
       containers:
         - name: promtail

manifests/monitoring/vmagent.yaml

@@ -17,6 +17,11 @@ data:
     - job_name: 'vmagent'
       static_configs:
         - targets: ['localhost:8429']
+      relabel_configs:
+      - action: drop
+        source_labels: [__name__]
+        regex: "flag"
+
     - bearer_token_file: /var/run/secrets/kubernetes.io/serviceaccount/token
       job_name: kubernetes-nodes
       kubernetes_sd_configs:
@@ -36,6 +41,38 @@ data:
         ca_file: /var/run/secrets/kubernetes.io/serviceaccount/ca.crt
         insecure_skip_verify: true
 
+    - job_name: cadvisor
+      bearer_token_file: /var/run/secrets/kubernetes.io/serviceaccount/token
+      scheme: https
+      tls_config:
+        ca_file: /var/run/secrets/kubernetes.io/serviceaccount/ca.crt
+        insecure_skip_verify: true
+      kubernetes_sd_configs:
+      - role: node
+      relabel_configs:
+      - action: labelmap
+        regex: __meta_kubernetes_node_label_(.+)
+      - replacement: kubernetes.default.svc:443
+        target_label: __address__
+      - source_labels: [__meta_kubernetes_node_name]
+        regex: (.+)
+        target_label: __metrics_path__
+        replacement: /api/v1/nodes/$1/proxy/metrics/cadvisor
+      # Drop high cardinality labels
+      - action: labeldrop
+        regex: id
+      # Drop unneeded labels
+      - action: labeldrop
+        regex: beta_kubernetes_io_os
+      - action: labeldrop
+        regex: beta_kubernetes_io_arch
+      - action: labeldrop
+        regex: kubernetes_io_arch
+      - action: labeldrop
+        regex: kubernetes_io_os
+      - action: labeldrop
+        regex: topology_jiva_openebs_io_nodeName
+
     - job_name: kubernetes-service-endpoints
       kubernetes_sd_configs:
       - role: endpoints
@@ -78,6 +115,21 @@ data:
         source_labels:
         - __meta_kubernetes_pod_node_name
         target_label: kubernetes_node
+      # We don't care about the flag metrics from VM
+      - action: drop
+        source_labels: [__name__]
+        regex: "flag"
+      # Drop unneeded labels
+      - action: labeldrop
+        regex: beta_kubernetes_io_os
+      - action: labeldrop
+        regex: beta_kubernetes_io_arch
+      - action: labeldrop
+        regex: kubernetes_io_arch
+      - action: labeldrop
+        regex: kubernetes_io_os
+      - action: labeldrop
+        regex: topology_jiva_openebs_io_nodeName
 
     - job_name: kubernetes-pods
       kubernetes_sd_configs:
@@ -116,6 +168,17 @@ data:
         regex: Pending|Succeeded|Failed
         source_labels:
         - __meta_kubernetes_pod_phase
+      # Drop unneeded labels
+      - action: labeldrop
+        regex: beta_kubernetes_io_os
+      - action: labeldrop
+        regex: beta_kubernetes_io_arch
+      - action: labeldrop
+        regex: kubernetes_io_arch
+      - action: labeldrop
+        regex: kubernetes_io_os
+      - action: labeldrop
+        regex: topology_jiva_openebs_io_nodeName
 
     - job_name: 'node-exporter'
       kubernetes_sd_configs:
@@ -150,10 +213,11 @@ spec:
         app.kubernetes.io/name: victoria-metrics
         app.kubernetes.io/component: agent
     spec:
+      priorityClassName: system-cluster-critical
       serviceAccountName: prometheus-server
       containers:
         - name: vmagent
-          image: "victoriametrics/vmagent:v1.125.1"
+          image: "victoriametrics/vmagent:v1.127.0"
           imagePullPolicy: "IfNotPresent"
           args:
             - -remoteWrite.url=http://vmcluster.auth-proxy.svc/insert/0/prometheus/

manifests/nextcloud_chart/manifest.yaml

@@ -201,9 +201,10 @@ spec:
         app.kubernetes.io/component: app
         nextcloud-nextcloud-redis-client: "true"
     spec:
+      priorityClassName: critical
       containers:
       - name: nextcloud
-        image: "nextcloud:31.0.8-apache"
+        image: "nextcloud:32.0.0-apache"
         imagePullPolicy: IfNotPresent
         env:
         - name: SQLITE_DATABASE
@@ -283,9 +284,10 @@ spec:
         resources:
           requests:
             cpu: 1038m
-            memory: 512M
+            memory: 765M
           limits:
             cpu: 1200m
+            memory: 765M
         volumeMounts:
         - name: nextcloud-data
           mountPath: /var/www/
@@ -377,7 +379,7 @@ spec:
           restartPolicy: Never
           containers:
             - name: nextcloud
-              image: "nextcloud:31.0.8-apache"
+              image: "nextcloud:32.0.0-apache"
               imagePullPolicy: IfNotPresent
               command: [ "curl" ]
               args:

manifests/nginx-lb/nginx-lb.yaml

@@ -492,7 +492,7 @@ spec:
               fieldPath: metadata.namespace
         - name: LD_PRELOAD
           value: /usr/local/lib/libmimalloc.so
-        image: registry.k8s.io/ingress-nginx/controller:v1.13.2@sha256:1f7eaeb01933e719c8a9f4acd8181e555e582330c7d50f24484fb64d2ba9b2ef
+        image: registry.k8s.io/ingress-nginx/controller:v1.13.3@sha256:1b044f6dcac3afbb59e05d98463f1dec6f3d3fb99940bc12ca5d80270358e3bd
         imagePullPolicy: IfNotPresent
         lifecycle:
           preStop:
@@ -533,7 +533,7 @@ spec:
         resources:
           requests:
             cpu: 100m
-            memory: 90Mi
+            memory: 150Mi
         securityContext:
           allowPrivilegeEscalation: true
           capabilities:

manifests/nodered/nodered.yaml

@@ -57,7 +57,7 @@ spec:
           - name: data
             mountPath: /data
       - name: update-native-modules
-        image: nodered/node-red:4.1.0-18
+        image: nodered/node-red:4.1.1-18
         imagePullPolicy: IfNotPresent
         command:
           - bash
@@ -73,11 +73,16 @@ spec:
             mountPath: /data
       containers:
       - name: web
-        image: nodered/node-red:4.1.0-18
+        image: nodered/node-red:4.1.1-18
         imagePullPolicy: Always
         ports:
         - containerPort: 1880
           name: web
+        resources:
+          requests:
+            memory: 200M
+          limits:
+            memory: 200M
         volumeMounts:
           - name: data
             mountPath: /data

manifests/outline/outline.yaml

@@ -43,9 +43,10 @@ spec:
       labels:
         app.kubernetes.io/name: outline
     spec:
+      priorityClassName: critical
       containers:
       - name: outline
-        image: outlinewiki/outline:0.87.3
+        image: outlinewiki/outline:0.87.4
         imagePullPolicy: IfNotPresent
         env:
         - name: ALLOWED_DOMAINS
@@ -72,7 +73,9 @@ spec:
         resources:
           requests:
             cpu: 8m
-            memory: 800Mi
+            memory: 1389M
+          limits:
+            memory: 1489M
         volumeMounts:
           - mountPath: /opt/outline/.env
             subPath: .env

manifests/priority-classes/critical.yaml

@@ -0,0 +1,7 @@
+apiVersion: scheduling.k8s.io/v1
+kind: PriorityClass
+metadata:
+  name: critical
+value: 1000
+globalDefault: false
+preemptionPolicy: PreemptLowerPriority

manifests/priority-classes/low.yaml

@@ -0,0 +1,7 @@
+apiVersion: scheduling.k8s.io/v1
+kind: PriorityClass
+metadata:
+  name: low
+value: 10
+globalDefault: false
+preemptionPolicy: Never

manifests/priority-classes/normal.yaml

@@ -0,0 +1,7 @@
+apiVersion: scheduling.k8s.io/v1
+kind: PriorityClass
+metadata:
+  name: normal
+value: 100
+globalDefault: true
+preemptionPolicy: PreemptLowerPriority

manifests/proxy-civo/non-auth-proxy.yaml

@@ -1,149 +0,0 @@
-apiVersion: v1
-kind: Secret
-metadata:
-  name: tailscale-auth
-  namespace: proxy-civo
-  annotations:
-    kube-1password: 2cqycmsgv5r7vcyvjpblcl2l4y
-    kube-1password/vault: Kubernetes
-type: Opaque
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: host-mappings
-  namespace: proxy-civo
-  labels:
-    app: proxy
-data:
-  mapping.json: |
-    {
-      "vmcluster.proxy-civo.svc": "vmcluster.cluster.local",
-      "loki.proxy-civo.svc": "loki-write.cluster.local",
-      "loki.proxy-civo.svc:80": "loki-write.cluster.local",
-      "loki-distributed.proxy-civo.svc": "loki-loki.cluster.local",
-      "loki-distributed.proxy-civo.svc:80": "loki-loki.cluster.local"
-    }
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: internal-proxy
-  namespace: proxy-civo
-  labels:
-    app: internal-proxy
-  annotations:
-    configmap.reloader.stakater.com/reload: "host-mappings"
-    secret.reloader.stakater.com/reload: "tailscale-auth"
-spec:
-  replicas: 1
-  strategy:
-    type: Recreate
-  selector:
-    matchLabels:
-      app: internal-proxy
-  template:
-    metadata:
-      labels:
-        app: internal-proxy
-    spec:
-      serviceAccountName: default
-      dnsPolicy: ClusterFirst
-      dnsConfig:
-        nameservers:
-          - 100.100.100.100
-      containers:
-      - name: proxy
-        image: rg.fr-par.scw.cloud/averagemarcus/proxy:latest
-        imagePullPolicy: Always
-        env:
-        - name: PROXY_DESTINATION
-          value: talos.tail4dfb.ts.net
-        - name: PORT
-          value: "8080"
-        - name: TS_AUTH_KEY
-          valueFrom:
-            secretKeyRef:
-              name: tailscale-auth
-              key: password
-        - name: TS_HOSTNAME
-          value: proxy-civo-internal-proxy
-        ports:
-        - containerPort: 8080
-          protocol: TCP
-        volumeMounts:
-        - name: host-mappings
-          mountPath: /config/
-      volumes:
-      - name: host-mappings
-        configMap:
-          name: host-mappings
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: loki
-  namespace: proxy-civo
-  labels:
-    app: internal-proxy
-spec:
-  ports:
-  - name: http
-    port: 80
-    protocol: TCP
-    targetPort: 8080
-  selector:
-    app: internal-proxy
-  type: ClusterIP
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: loki-distributed
-  namespace: proxy-civo
-  labels:
-    app: internal-proxy
-spec:
-  ports:
-  - name: http
-    port: 80
-    protocol: TCP
-    targetPort: 8080
-  selector:
-    app: internal-proxy
-  type: ClusterIP
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: prometheus
-  namespace: proxy-civo
-  labels:
-    app: internal-proxy
-spec:
-  ports:
-  - name: http
-    port: 80
-    protocol: TCP
-    targetPort: 8080
-  selector:
-    app: internal-proxy
-  type: ClusterIP
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: vmcluster
-  namespace: proxy-civo
-  labels:
-    app: internal-proxy
-spec:
-  ports:
-  - name: http
-    port: 80
-    protocol: TCP
-    targetPort: 8080
-  selector:
-    app: internal-proxy
-  type: ClusterIP
----

manifests/redis/redis.yaml

@@ -327,6 +327,7 @@ spec:
               weight: 1
         nodeAffinity:
       terminationGracePeriodSeconds: 30
+      priorityClassName: critical
       containers:
         - name: redis
           image: docker.io/bitnamilegacy/redis:7.2.4-debian-11-r11

manifests/rss/miniflux.yaml

@@ -25,6 +25,8 @@ data:
   POLLING_FREQUENCY: "15"
   BASE_URL: "https://miniflux.cluster.fun/"
   METRICS_COLLECTOR: "1"
+  CLEANUP_ARCHIVE_READ_DAYS: "365"
+  CLEANUP_ARCHIVE_UNREAD_DAYS: "365"
 ---
 apiVersion: v1
 kind: Service
@@ -66,7 +68,7 @@ spec:
     spec:
       containers:
       - name: web
-        image: ghcr.io/miniflux/miniflux:2.2.12
+        image: ghcr.io/miniflux/miniflux:2.2.13
         imagePullPolicy: IfNotPresent
         envFrom:
         - configMapRef:

manifests/svg-to-dxf/svg-to-dxf.yaml

@@ -27,6 +27,7 @@ spec:
       labels:
         app: svg-to-dxf
     spec:
+      priorityClassName: low
       containers:
       - name: web
         image: rg.fr-par.scw.cloud/averagemarcus/svg-to-dxf:latest

manifests/tank/tank.yaml

@@ -1,57 +0,0 @@
-
-apiVersion: v1
-kind: Secret
-metadata:
-  name: tank
-  namespace: tank
-  annotations:
-    kube-1password: g6xle67quzowvvekf6zukjbbm4
-    kube-1password/vault: Kubernetes
-    kube-1password/secret-text-parse: "true"
-type: Opaque
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: tank
-  namespace: tank
-spec:
-  type: ClusterIP
-  ports:
-  - port: 80
-    targetPort: web
-  selector:
-    app: tank
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: tank
-  namespace: tank
-  labels:
-    app: tank
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: tank
-  template:
-    metadata:
-      labels:
-        app: tank
-    spec:
-      containers:
-      - name: web
-        image: rg.fr-par.scw.cloud/averagemarcus/tank:latest
-        imagePullPolicy: Always
-        envFrom:
-          - secretRef:
-              name: tank
-        ports:
-        - containerPort: 3000
-          name: web
-        resources:
-          limits:
-            memory: 10Mi
-          requests:
-            memory: 10Mi

manifests/text-to-dxf/text-to-dxf.yaml

@@ -27,6 +27,7 @@ spec:
       labels:
         app: text-to-dxf
     spec:
+      priorityClassName: low
       containers:
       - name: web
         image: rg.fr-par.scw.cloud/averagemarcus/text-to-dxf:latest