feat: remove the grafana deprecated plugin (#3079)

mesosphere · Jan 30, 2025 · a9c1d9e · a9c1d9e
1 parent a523f5f
commit a9c1d9e
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 58 deletions.
diff --git a/licenses.d2iq.yaml b/licenses.d2iq.yaml
@@ -1,5 +1,4 @@
 ignore:
-  - ghcr.io/mesosphere/dkp-container-images/docker.io/mesosphere/grafana-plugins:v0.0.1-d2iq.0
   - docker.io/mesosphere/trivy-bundles:0.56.2-20241104T225447Z
   - docker.io/library/alpine:3.20.3
 

diff --git a/services/centralized-grafana/67.6.0/defaults/cm.yaml b/services/centralized-grafana/67.6.0/defaults/cm.yaml
@@ -107,21 +107,6 @@ data:
         pspUseAppArmor: false
         pspEnabled: false
 
-      # to avoid needing to download any plugins at runtime, use a container and a shared volume
-      # do not enable the plugins here, instead rebuild the mesosphere/grafana-plugins image with the new plugins
-      plugins: []
-      #  - grafana-piechart-panel
-      extraEmptyDirMounts:
-        - name: plugins
-          mountPath: /var/lib/grafana/plugins/
-      extraInitContainers:
-        - name: grafana-plugins-install
-          image: ghcr.io/mesosphere/dkp-container-images/docker.io/mesosphere/grafana-plugins:v0.0.1-d2iq.0
-          command: ["/bin/sh", "-c", "cp -a /var/lib/grafana/plugins/. /var/lib/grafana/shared-plugins/"]
-          volumeMounts:
-          - name: plugins
-            mountPath: /var/lib/grafana/shared-plugins/
-
     # Disable everything else
     defaultRules:
       create: false

diff --git a/services/grafana-logging/8.8.5/defaults/cm.yaml b/services/grafana-logging/8.8.5/defaults/cm.yaml
@@ -91,17 +91,3 @@ data:
     rbac:
       pspUseAppArmor: false
       pspEnabled: false
-    # to avoid needing to download any plugins at runtime, use a container and a shared volume
-    # do not enable the plugins here, instead rebuild the mesosphere/grafana-plugins image with the new plugins
-    plugins: []
-    #  - grafana-piechart-panel
-    extraEmptyDirMounts:
-      - name: plugins
-        mountPath: /var/lib/grafana/plugins/
-    extraInitContainers:
-      - name: grafana-plugins-install
-        image: ghcr.io/mesosphere/dkp-container-images/docker.io/mesosphere/grafana-plugins:v0.0.1-d2iq.0
-        command: ["/bin/sh", "-c", "cp -a /var/lib/grafana/plugins/. /var/lib/grafana/shared-plugins/"]
-        volumeMounts:
-        - name: plugins
-          mountPath: /var/lib/grafana/shared-plugins/
diff --git a/services/kube-prometheus-stack/67.6.0/defaults/cm.yaml b/services/kube-prometheus-stack/67.6.0/defaults/cm.yaml
@@ -429,20 +429,6 @@ data:
         failureThreshold: 10
       rbac:
         pspUseAppArmor: false
-      # to avoid needing to download any plugins at runtime, use a container and a shared volume
-      # do not enable the plugins here, instead rebuild the mesosphere/grafana-plugins image with the new plugins
-      plugins: []
-      #  - grafana-piechart-panel
-      extraEmptyDirMounts:
-        - name: plugins
-          mountPath: /var/lib/grafana/plugins/
-      extraInitContainers:
-        - name: grafana-plugins-install
-          image: ghcr.io/mesosphere/dkp-container-images/docker.io/mesosphere/grafana-plugins:v0.0.1-d2iq.0
-          command: ["/bin/sh", "-c", "cp -a /var/lib/grafana/plugins/. /var/lib/grafana/shared-plugins/"]
-          volumeMounts:
-          - name: plugins
-            mountPath: /var/lib/grafana/shared-plugins/
     kubeEtcd:
       # enable grafana dashboard for etcd
       enabled: true

diff --git a/services/project-grafana-logging/8.8.5/defaults/cm.yaml b/services/project-grafana-logging/8.8.5/defaults/cm.yaml
@@ -93,17 +93,3 @@ data:
       namespaced: true
       pspUseAppArmor: false
       pspEnabled: false
-    # to avoid needing to download any plugins at runtime, use a container and a shared volume
-    # do not enable the plugins here, instead rebuild the mesosphere/grafana-plugins image with the new plugins
-    plugins: []
-    #  - grafana-piechart-panel
-    extraEmptyDirMounts:
-      - name: plugins
-        mountPath: /var/lib/grafana/plugins/
-    extraInitContainers:
-      - name: grafana-plugins-install
-        image: ghcr.io/mesosphere/dkp-container-images/docker.io/mesosphere/grafana-plugins:v0.0.1-d2iq.0
-        command: ["/bin/sh", "-c", "cp -a /var/lib/grafana/plugins/. /var/lib/grafana/shared-plugins/"]
-        volumeMounts:
-        - name: plugins
-          mountPath: /var/lib/grafana/shared-plugins/