fix

2024-05-14 11:01:41 +02:00
parent 372c45c5b8
commit e58f82534c
10 changed files with 96 additions and 80 deletions
--- a/monitor/grafana/apps_v1_Deployment_grafana.yaml
+++ b/monitor/grafana/apps_v1_Deployment_grafana.yaml
@@ -5,10 +5,10 @@ metadata:
  name: grafana
  namespace: vynil-monitor
  labels:
-    helm.sh/chart: grafana-7.3.2
+    helm.sh/chart: grafana-7.3.11
    app.kubernetes.io/name: grafana
    app.kubernetes.io/instance: grafana
-    app.kubernetes.io/version: "10.3.3"
+    app.kubernetes.io/version: "10.4.1"
    app.kubernetes.io/managed-by: Helm
 spec:
  replicas: 1
@@ -31,7 +31,7 @@ spec:
    spec:
      
      serviceAccountName: grafana
-      automountServiceAccountToken: false
+      automountServiceAccountToken: true
      securityContext:
        fsGroup: 472
        runAsGroup: 472
@@ -60,7 +60,7 @@ spec:
      enableServiceLinks: true
      containers:
        - name: grafana-sc-dashboard
-          image: "quay.io/kiwigrid/k8s-sidecar:1.25.2"
+          image: "quay.io/kiwigrid/k8s-sidecar:1.26.1"
          imagePullPolicy: IfNotPresent
          env:
            - name: METHOD
@@ -96,7 +96,7 @@ spec:
            - name: sc-dashboard-volume
              mountPath: "/tmp/dashboards"
        - name: grafana-sc-datasources
-          image: "quay.io/kiwigrid/k8s-sidecar:1.25.2"
+          image: "quay.io/kiwigrid/k8s-sidecar:1.26.1"
          imagePullPolicy: IfNotPresent
          env:
            - name: METHOD
@@ -132,7 +132,7 @@ spec:
            - name: sc-datasources-volume
              mountPath: "/etc/grafana/provisioning/datasources"
        - name: grafana-sc-notifiers
-          image: "quay.io/kiwigrid/k8s-sidecar:1.25.2"
+          image: "quay.io/kiwigrid/k8s-sidecar:1.26.1"
          imagePullPolicy: IfNotPresent
          env:
            - name: METHOD
@@ -168,7 +168,7 @@ spec:
            - name: sc-notifiers-volume
              mountPath: "/etc/grafana/provisioning/notifiers"
        - name: grafana-sc-plugins
-          image: "quay.io/kiwigrid/k8s-sidecar:1.25.2"
+          image: "quay.io/kiwigrid/k8s-sidecar:1.26.1"
          imagePullPolicy: IfNotPresent
          env:
            - name: METHOD
@@ -204,7 +204,7 @@ spec:
            - name: sc-plugins-volume
              mountPath: "/etc/grafana/provisioning/plugins"
        - name: grafana
-          image: "docker.io/grafana/grafana:10.3.3"
+          image: "docker.io/grafana/grafana:10.4.1"
          imagePullPolicy: IfNotPresent
          securityContext:
            allowPrivilegeEscalation: false
--- a/monitor/grafana/index.rhai
+++ b/monitor/grafana/index.rhai
@@ -0,0 +1,15 @@
+const NS=config.namespace;
+const SRC=src;
+const DEST=dest;
+fn pre_pack() {
+    shell("helm repo add grafana https://grafana.github.io/helm-charts");
+    shell(`helm template grafana grafana/grafana --namespace=vynil-monitor -a "monitoring.coreos.com/v1/ServiceMonitor" -a "monitoring.coreos.com/v1/PrometheusRule" --values values.yml >${global::SRC}/chart.yaml`);
+}
+fn post_pack() {
+    for file in [
+        "*test*",
+        "v1_ConfigMap_grafana.yaml"
+    ] {
+        shell(`rm -f ${global::DEST}/${file}`);
+    }
+}
--- a/monitor/grafana/index.yaml
+++ b/monitor/grafana/index.yaml
@@ -11,69 +11,21 @@ options:
    examples:
    - grafana_admin
    type: string
-  storage:
-    default:
-      volume:
-        accessMode: ReadWriteOnce
-        class: ''
-        size: 10Gi
-        type: Filesystem
-    description: Configure this app storage
-    examples:
-    - volume:
-        accessMode: ReadWriteOnce
-        class: ''
-        size: 10Gi
-        type: Filesystem
-    properties:
-      volume:
-        default:
-          accessMode: ReadWriteOnce
-          class: ''
-          size: 10Gi
-          type: Filesystem
-        properties:
-          accessMode:
-            default: ReadWriteOnce
-            enum:
-            - ReadWriteOnce
-            - ReadOnlyMany
-            - ReadWriteMany
-            type: string
-          class:
-            default: ''
-            type: string
-          size:
-            default: 10Gi
-            type: string
-          type:
-            default: Filesystem
-            enum:
-            - Filesystem
-            - Block
-            type: string
-        type: object
-    type: object
  app_group:
    default: monitor
    examples:
    - monitor
    type: string
-  domain_name:
-    default: your_company.com
-    examples:
-    - your_company.com
-    type: string
-  issuer:
-    default: letsencrypt-prod
-    examples:
-    - letsencrypt-prod
-    type: string
  domain:
    default: your-company
    examples:
    - your-company
    type: string
+  domain_name:
+    default: your_company.com
+    examples:
+    - your_company.com
+    type: string
  images:
    default:
      busybox:
@@ -171,16 +123,64 @@ options:
            type: string
        type: object
    type: object
-  sub_domain:
-    default: grafana
-    examples:
-    - grafana
-    type: string
  ingress_class:
    default: traefik
    examples:
    - traefik
    type: string
+  issuer:
+    default: letsencrypt-prod
+    examples:
+    - letsencrypt-prod
+    type: string
+  storage:
+    default:
+      volume:
+        accessMode: ReadWriteOnce
+        class: ''
+        size: 10Gi
+        type: Filesystem
+    description: Configure this app storage
+    examples:
+    - volume:
+        accessMode: ReadWriteOnce
+        class: ''
+        size: 10Gi
+        type: Filesystem
+    properties:
+      volume:
+        default:
+          accessMode: ReadWriteOnce
+          class: ''
+          size: 10Gi
+          type: Filesystem
+        properties:
+          accessMode:
+            default: ReadWriteOnce
+            enum:
+            - ReadWriteOnce
+            - ReadOnlyMany
+            - ReadWriteMany
+            type: string
+          class:
+            default: ''
+            type: string
+          size:
+            default: 10Gi
+            type: string
+          type:
+            default: Filesystem
+            enum:
+            - Filesystem
+            - Block
+            type: string
+        type: object
+    type: object
+  sub_domain:
+    default: grafana
+    examples:
+    - grafana
+    type: string
 dependencies: []
 providers:
  kubernetes: true
--- a/monitor/grafana/monitoring.coreos.com_v1_ServiceMonitor_grafana.yaml
+++ b/monitor/grafana/monitoring.coreos.com_v1_ServiceMonitor_grafana.yaml
@@ -5,10 +5,10 @@ metadata:
  name: grafana
  namespace: vynil-monitor
  labels:
-    helm.sh/chart: grafana-7.3.2
+    helm.sh/chart: grafana-7.3.11
    app.kubernetes.io/name: grafana
    app.kubernetes.io/instance: grafana
-    app.kubernetes.io/version: "10.3.3"
+    app.kubernetes.io/version: "10.4.1"
    app.kubernetes.io/managed-by: Helm
 spec:
  endpoints:
--- a/monitor/grafana/rbac.authorization.k8s.io_v1_RoleBinding_grafana.yaml
+++ b/monitor/grafana/rbac.authorization.k8s.io_v1_RoleBinding_grafana.yaml
@@ -5,10 +5,10 @@ metadata:
  name: grafana
  namespace: vynil-monitor
  labels:
-    helm.sh/chart: grafana-7.3.2
+    helm.sh/chart: grafana-7.3.11
    app.kubernetes.io/name: grafana
    app.kubernetes.io/instance: grafana
-    app.kubernetes.io/version: "10.3.3"
+    app.kubernetes.io/version: "10.4.1"
    app.kubernetes.io/managed-by: Helm
 roleRef:
  apiGroup: rbac.authorization.k8s.io
--- a/monitor/grafana/rbac.authorization.k8s.io_v1_Role_grafana.yaml
+++ b/monitor/grafana/rbac.authorization.k8s.io_v1_Role_grafana.yaml
@@ -5,10 +5,10 @@ metadata:
  name: grafana
  namespace: vynil-monitor
  labels:
-    helm.sh/chart: grafana-7.3.2
+    helm.sh/chart: grafana-7.3.11
    app.kubernetes.io/name: grafana
    app.kubernetes.io/instance: grafana
-    app.kubernetes.io/version: "10.3.3"
+    app.kubernetes.io/version: "10.4.1"
    app.kubernetes.io/managed-by: Helm
 rules:
  - apiGroups: [""] # "" indicates the core API group
--- a/monitor/grafana/v1_ConfigMap_grafana-config-dashboards.yaml
+++ b/monitor/grafana/v1_ConfigMap_grafana-config-dashboards.yaml
@@ -3,10 +3,10 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
  labels:
-    helm.sh/chart: grafana-7.3.2
+    helm.sh/chart: grafana-7.3.11
    app.kubernetes.io/name: grafana
    app.kubernetes.io/instance: grafana
-    app.kubernetes.io/version: "10.3.3"
+    app.kubernetes.io/version: "10.4.1"
    app.kubernetes.io/managed-by: Helm
  name: grafana-config-dashboards
  namespace: vynil-monitor
--- a/monitor/grafana/v1_PersistentVolumeClaim_grafana.yaml
+++ b/monitor/grafana/v1_PersistentVolumeClaim_grafana.yaml
@@ -5,10 +5,10 @@ metadata:
  name: grafana
  namespace: vynil-monitor
  labels:
-    helm.sh/chart: grafana-7.3.2
+    helm.sh/chart: grafana-7.3.11
    app.kubernetes.io/name: grafana
    app.kubernetes.io/instance: grafana
-    app.kubernetes.io/version: "10.3.3"
+    app.kubernetes.io/version: "10.4.1"
    app.kubernetes.io/managed-by: Helm
  finalizers:
    - kubernetes.io/pvc-protection
--- a/monitor/grafana/v1_ServiceAccount_grafana.yaml
+++ b/monitor/grafana/v1_ServiceAccount_grafana.yaml
@@ -2,12 +2,13 @@
 # Source: grafana/templates/serviceaccount.yaml
 apiVersion: v1
 kind: ServiceAccount
+automountServiceAccountToken: true
 metadata:
  labels:
-    helm.sh/chart: grafana-7.3.2
+    helm.sh/chart: grafana-7.3.11
    app.kubernetes.io/name: grafana
    app.kubernetes.io/instance: grafana
-    app.kubernetes.io/version: "10.3.3"
+    app.kubernetes.io/version: "10.4.1"
    app.kubernetes.io/managed-by: Helm
  name: grafana
  namespace: vynil-monitor
--- a/monitor/grafana/v1_Service_grafana.yaml
+++ b/monitor/grafana/v1_Service_grafana.yaml
@@ -5,10 +5,10 @@ metadata:
  name: grafana
  namespace: vynil-monitor
  labels:
-    helm.sh/chart: grafana-7.3.2
+    helm.sh/chart: grafana-7.3.11
    app.kubernetes.io/name: grafana
    app.kubernetes.io/instance: grafana
-    app.kubernetes.io/version: "10.3.3"
+    app.kubernetes.io/version: "10.4.1"
    app.kubernetes.io/managed-by: Helm
 spec:
  type: ClusterIP