RHIDP-5569-default-disable-dynamic-plugin-cache-pvc

Signed-off-by: rhdh-bot service account <rhdh-bot@redhat.com>
redhat-developer · Feb 6, 2025 · ccd918c · ccd918c
1 parent 4096934
commit ccd918c
Show file tree

Hide file tree

Showing 6 changed files with 56 additions and 22 deletions.
diff --git a/charts/backstage/Chart.yaml b/charts/backstage/Chart.yaml
@@ -44,4 +44,4 @@ sources:
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 2.30.0
+version: 3.0.0
diff --git a/charts/backstage/README.md b/charts/backstage/README.md
@@ -2,7 +2,7 @@
 # RHDH Backstage Helm Chart for OpenShift (Community Version)
 
 [![Artifact Hub](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/rhdh-chart&style=flat-square)](https://artifacthub.io/packages/search?repo=rhdh-chart)
-![Version: 2.30.0](https://img.shields.io/badge/Version-2.30.0-informational?style=flat-square)
+![Version: 3.0.0](https://img.shields.io/badge/Version-3.0.0-informational?style=flat-square)
 ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
 
 A Helm chart for deploying Red Hat Developer Hub.
@@ -212,6 +212,7 @@ Kubernetes: `>= 1.25.0-0`
 | test.image.repository | Test connection pod image repository. Note that the image needs to have both the `sh` and `curl` binaries in it. | string | `"curl/curl"` |
 | test.image.tag | Test connection pod image tag. Note that the image needs to have both the `sh` and `curl` binaries in it. | string | `"latest"` |
 | upstream | Upstream Backstage [chart configuration](https://github.com/backstage/charts/blob/main/charts/backstage/values.yaml) | object | Use Openshift compatible settings |
+| upstream.backstage.extraVolumes[0].ephemeral.volumeClaimTemplate.spec.resources.requests.storage | Size of the volume that will contain the dynamic plugins. It should be large enough to contain all the plugins. | string | `"5Gi"` |
 | upstream.backstage.initContainers[0].image | Image used by the initContainer to install dynamic plugins into the `dynamic-plugins-root` volume mount. It could be replaced by a custom image based on this one. | string | `quay.io/janus-idp/backstage-showcase:latest` |
 
 ## Opinionated Backstage deployment

diff --git a/charts/backstage/ci/with-custom-dynamic-pvc-claim-spec-values.yaml b/charts/backstage/ci/with-custom-dynamic-pvc-claim-spec-values.yaml
@@ -8,11 +8,32 @@ upstream:
         # This custom-sc storage class is created in the test GH Workflow
         storageClass: custom-sc
 
-dynamicPlugins:
-  cache:
-    volumeClaimSpec:
-      resources:
-        requests:
-          storage: 3Gi
-      # This custom-sc storage class is created in the test GH Workflow
-      storageClassName: custom-sc
+  backstage:
+    extraVolumes:
+      - name: dynamic-plugins-root
+        ephemeral:
+          volumeClaimTemplate:
+            spec:
+              accessModes:
+                - ReadWriteOnce
+              resources:
+                requests:
+                  storage: 3Gi
+              storageClassName: custom-sc
+      - name: dynamic-plugins
+        configMap:
+          defaultMode: 420
+          name: '{{ printf "%s-dynamic-plugins" .Release.Name }}'
+          optional: true
+      - name: dynamic-plugins-npmrc
+        secret:
+          defaultMode: 420
+          optional: true
+          secretName: '{{ printf "%s-dynamic-plugins-npmrc" .Release.Name }}'
+      - name: dynamic-plugins-registry-auth
+        secret:
+          defaultMode: 420
+          optional: true
+          secretName: '{{ printf "%s-dynamic-plugins-registry-auth" .Release.Name }}'
+      - name: npmcacache
+        emptyDir: {}
diff --git a/charts/backstage/templates/pvcs.yaml b/charts/backstage/templates/pvcs.yaml
diff --git a/charts/backstage/values.schema.json b/charts/backstage/values.schema.json
@@ -2678,10 +2678,21 @@
                         "extraVolumes": {
                             "default": [
                                 {
-                                    "name": "dynamic-plugins-root",
-                                    "persistentVolumeClaim": {
-                                        "claimName": "{{ printf \"%s-dynamic-plugins-root\" .Release.Name }}"
-                                    }
+                                    "ephemeral": {
+                                        "volumeClaimTemplate": {
+                                            "spec": {
+                                                "accessModes": [
+                                                    "ReadWriteOnce"
+                                                ],
+                                                "resources": {
+                                                    "requests": {
+                                                        "storage": "5Gi"
+                                                    }
+                                                }
+                                            }
+                                        }
+                                    },
+                                    "name": "dynamic-plugins-root"
                                 },
                                 {
                                     "configMap": {

diff --git a/charts/backstage/values.yaml b/charts/backstage/values.yaml
@@ -144,8 +144,15 @@ upstream:
         mountPath: /tmp
     extraVolumes:
       - name: dynamic-plugins-root
-        persistentVolumeClaim:
-          claimName: '{{ printf "%s-dynamic-plugins-root" .Release.Name }}'
+        ephemeral:
+          volumeClaimTemplate:
+            spec:
+              accessModes:
+                - ReadWriteOnce
+              resources:
+                requests:
+                  # -- Size of the volume that will contain the dynamic plugins. It should be large enough to contain all the plugins.
+                  storage: 5Gi
       # Volume that will expose the `dynamic-plugins.yaml` file from the `dynamic-plugins` config map.
       # The `dynamic-plugins` config map is created by the helm chart from the content of the `global.dynamic` field.
       - name: dynamic-plugins