From 0de96b2ff13c71a586346a567482980533902c66 Mon Sep 17 00:00:00 2001
From: Marcel Hild <hild@b4mad.net>
Date: Wed, 28 Aug 2024 20:05:15 +0200
Subject: [PATCH] Add volumeMount for dynamic-plugins-registry-auth (#41)

---
 charts/backstage/Chart.yaml         |  2 +-
 charts/backstage/README.md          |  2 +-
 charts/backstage/values.schema.json | 13 +++++++++++++
 charts/backstage/values.yaml        | 10 ++++++++++
 4 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/charts/backstage/Chart.yaml b/charts/backstage/Chart.yaml
index fac0471..5cb5c29 100644
--- a/charts/backstage/Chart.yaml
+++ b/charts/backstage/Chart.yaml
@@ -45,4 +45,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.18.0
+version: 2.19.0
diff --git a/charts/backstage/README.md b/charts/backstage/README.md
index e2fd48c..f1d8667 100644
--- 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.18.0](https://img.shields.io/badge/Version-2.18.0-informational?style=flat-square)
+![Version: 2.19.0](https://img.shields.io/badge/Version-2.19.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.
diff --git a/charts/backstage/values.schema.json b/charts/backstage/values.schema.json
index 612d672..b073291 100644
--- a/charts/backstage/values.schema.json
+++ b/charts/backstage/values.schema.json
@@ -2603,6 +2603,14 @@
                                         "secretName": "{{ printf \"%s-dynamic-plugins-npmrc\" .Release.Name }}"
                                     }
                                 },
+                                {
+                                    "name": "dynamic-plugins-registry-auth",
+                                    "secret": {
+                                        "defaultMode": 416,
+                                        "optional": true,
+                                        "secretName": "{{ printf \"%s-dynamic-plugins-registry-auth\" .Release.Name }}"
+                                    }
+                                },
                                 {
                                     "emptyDir": {},
                                     "name": "npmcacache"
@@ -4227,6 +4235,11 @@
                                             "readOnly": true,
                                             "subPath": ".npmrc"
                                         },
+                                        {
+                                            "mountPath": "/opt/app-root/src/.config/containers",
+                                            "name": "dynamic-plugins-registry-auth",
+                                            "readOnly": true
+                                        },
                                         {
                                             "mountPath": "/opt/app-root/src/.npm/_cacache",
                                             "name": "npmcacache"
diff --git a/charts/backstage/values.yaml b/charts/backstage/values.yaml
index e7b3625..b05d8ef 100644
--- a/charts/backstage/values.yaml
+++ b/charts/backstage/values.yaml
@@ -142,6 +142,13 @@ upstream:
           defaultMode: 420
           optional: true
           secretName: '{{ printf "%s-dynamic-plugins-npmrc" .Release.Name }}'
+      # Optional volume that allows adding a container registry `auth.json` file (through a `dynamic-plugins-registry-auth` secret)
+      # to be used when installing plugins from secure container registries during the dynamic plugins installation by the initContainer.
+      - name: dynamic-plugins-registry-auth
+        secret:
+          defaultMode: 416
+          optional: true
+          secretName: '{{ printf "%s-dynamic-plugins-registry-auth" .Release.Name }}'
       - name: npmcacache
         emptyDir: {}
     initContainers:
@@ -183,6 +190,9 @@ upstream:
             name: dynamic-plugins-npmrc
             readOnly: true
             subPath: .npmrc
+          - mountPath: /opt/app-root/src/.config/containers
+            name: dynamic-plugins-registry-auth
+            readOnly: true
           - mountPath: /opt/app-root/src/.npm/_cacache
             name: npmcacache
         workingDir: /opt/app-root/src