[DRAFT] Add cloud providers via configuration

backend/lib/routes/config.js

@@ -58,7 +58,8 @@ function sanitizeFrontendConfig (frontendConfig) {
     } = {},
     vendorHints = [],
     resourceQuotaHelp = '',
-    controlPlaneHighAvailabilityHelp = ''
+    controlPlaneHighAvailabilityHelp = '',
+    customCloudProviders = {}
   } = sanitizedFrontendConfig
 
   convertAndSanitize(alert, 'message')
@@ -90,5 +91,12 @@ function sanitizeFrontendConfig (frontendConfig) {
     convertAndSanitize(vendorHint, 'message')
   }
 
+  for (const key of Object.keys(customCloudProviders)) {
+    const secret = _.get(customCloudProviders, [key, 'secret'])
+    if (secret) {
+      convertAndSanitize(secret, 'help')
+    }
+  }
+
   return sanitizedFrontendConfig
 }

backend/lib/services/cloudprofiles.js

@@ -8,7 +8,6 @@
 
 const { NotFound, Forbidden } = require('http-errors')
 const authorization = require('./authorization')
-const logger = require('../logger')
 const _ = require('lodash')
 const { getCloudProfiles, getVisibleAndNotProtectedSeeds } = require('../cache')
 
@@ -65,17 +64,7 @@ exports.list = async function ({ user }) {
 
   const cloudProfiles = getCloudProfiles()
   const seeds = getVisibleAndNotProtectedSeeds()
-  return _
-    .chain(cloudProfiles)
-    .map(assignSeedsToCloudProfileIteratee(seeds))
-    .filter(cloudProfile => {
-      if (!_.isEmpty(cloudProfile.data.seedNames)) {
-        return true
-      }
-      logger.info(`No matching seed for cloud profile with name ${cloudProfile.metadata.name} found`)
-      return false
-    })
-    .value()
+  return _.map(cloudProfiles, assignSeedsToCloudProfileIteratee(seeds))
 }
 
 exports.read = async function ({ user, name }) {

backend/test/acceptance/__snapshots__/api.cloudprofiles.spec.js.snap

@@ -85,6 +85,27 @@ exports[`api cloudprofiles should return all cloudprofiles 2`] = `
       "name": "infra1-profileName2",
     },
   },
+  {
+    "data": {
+      "kubernetes": {
+        "versions": [
+          {
+            "version": "1.9.0",
+          },
+          {
+            "version": "1.8.5",
+          },
+        ],
+      },
+      "seedSelector": {},
+      "type": "infra2",
+    },
+    "metadata": {
+      "cloudProviderKind": "infra2",
+      "displayName": "infra2-profileName",
+      "name": "infra2-profileName",
+    },
+  },
   {
     "data": {
       "kubernetes": {

charts/__tests__/gardener-dashboard/runtime/dashboard/__snapshots__/configmap.spec.js.snap

@@ -114,6 +114,17 @@ exports[`gardener-dashboard configmap branding should render the template 1`] =
 }
 `;
 
+exports[`gardener-dashboard configmap cloudProviderList should render the template with cloudProviderList 1`] = `
+{
+  "frontend": {
+    "cloudProviderList": [
+      "foo",
+      "bar",
+    ],
+  },
+}
+`;
+
 exports[`gardener-dashboard configmap contentSecurityPolicy should render the template with connectSrc containing additional host sources 1`] = `
 {
   "contentSecurityPolicy": {
@@ -146,6 +157,60 @@ exports[`gardener-dashboard configmap controlPlaneHighAvailabilityHelp should re
 }
 `;
 
+exports[`gardener-dashboard configmap customCloudProviders should render the template with customCloudProviders 1`] = `
+{
+  "frontend": {
+    "customCloudProviders": {
+      "fooProvider": {
+        "secret": {
+          "fields": [
+            {
+              "hint": "Enter a valid namespace",
+              "key": "namespace",
+              "label": "Namespace",
+              "type": "text",
+              "validators": {
+                "required": {
+                  "type": "required",
+                },
+              },
+            },
+          ],
+          "help": "#Custom Cloud Provider
+foo",
+        },
+        "shoot": {
+          "createFields": [
+            {
+              "hint": "Select foo value",
+              "key": "selectFoo",
+              "label": "Select Foo",
+              "path": "spec.provider",
+              "type": "select",
+              "validators": {
+                "required": {
+                  "type": "required",
+                },
+              },
+              "values": {
+                "cloudprofilePath": "data.foo",
+                "key": "name",
+              },
+            },
+          ],
+          "specTemplate": {
+            "provider": {
+              "type": "custom",
+            },
+          },
+        },
+        "zoned": false,
+      },
+    },
+  },
+}
+`;
+
 exports[`gardener-dashboard configmap experimental should render the template with experimental features 1`] = `
 {
   "frontend": {
@@ -736,3 +801,15 @@ exports[`gardener-dashboard configmap vendorHints should render the template 1`]
   },
 }
 `;
+
+exports[`gardener-dashboard configmap vendors should render the template with vendors 1`] = `
+{
+  "frontend": {
+    "vendors": {
+      "foo": {
+        "icon": "foo_icon.svg",
+      },
+    },
+  },
+}
+`;

charts/__tests__/gardener-dashboard/runtime/dashboard/configmap.spec.js

@@ -796,6 +796,115 @@ describe('gardener-dashboard', function () {
       })
     })
 
+    describe('cloudProviderList', function () {
+      it('should render the template with cloudProviderList', async function () {
+        const values = {
+          global: {
+            dashboard: {
+              frontendConfig: {
+                cloudProviderList: [
+                  'foo',
+                  'bar'
+                ]
+              }
+            }
+          }
+        }
+        const documents = await renderTemplates(templates, values)
+        expect(documents).toHaveLength(1)
+        const [configMap] = documents
+        const config = yaml.load(configMap.data['config.yaml'])
+        expect(pick(config, ['frontend.cloudProviderList'])).toMatchSnapshot()
+      })
+    })
+
+    describe('customCloudProviders', function () {
+      it('should render the template with customCloudProviders', async function () {
+        const values = {
+          global: {
+            dashboard: {
+              frontendConfig: {
+                customCloudProviders: {
+                  fooProvider: {
+                    zoned: false,
+                    shoot: {
+                      createFields: [
+                        {
+                          key: 'selectFoo',
+                          path: 'spec.provider',
+                          hint: 'Select foo value',
+                          label: 'Select Foo',
+                          type: 'select',
+                          validators: {
+                            required: {
+                              type: 'required'
+                            }
+                          },
+                          values: {
+                            cloudprofilePath: 'data.foo',
+                            key: 'name'
+                          }
+                        }
+                      ],
+                      specTemplate: {
+                        provider: {
+                          type: 'custom'
+                        }
+                      }
+                    },
+                    secret: {
+                      fields: [
+                        {
+                          key: 'namespace',
+                          hint: 'Enter a valid namespace',
+                          label: 'Namespace',
+                          type: 'text',
+                          validators: {
+                            required: {
+                              type: 'required'
+                            }
+                          }
+                        }
+                      ],
+                      help: '#Custom Cloud Provider\nfoo'
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+        const documents = await renderTemplates(templates, values)
+        expect(documents).toHaveLength(1)
+        const [configMap] = documents
+        const config = yaml.load(configMap.data['config.yaml'])
+        expect(pick(config, ['frontend.customCloudProviders'])).toMatchSnapshot()
+      })
+    })
+
+    describe('vendors', function () {
+      it('should render the template with vendors', async function () {
+        const values = {
+          global: {
+            dashboard: {
+              frontendConfig: {
+                vendors: {
+                  foo: {
+                    icon: 'foo_icon.svg'
+                  }
+                }
+              }
+            }
+          }
+        }
+        const documents = await renderTemplates(templates, values)
+        expect(documents).toHaveLength(1)
+        const [configMap] = documents
+        const config = yaml.load(configMap.data['config.yaml'])
+        expect(pick(config, ['frontend.vendors'])).toMatchSnapshot()
+      })
+    })
+
     describe('knownConditions', function () {
       it('should render the template with knownConditions markdown', async function () {
         const values = {

charts/gardener-dashboard/charts/runtime/templates/dashboard/configmap-vendor-assets.yaml

@@ -0,0 +1,20 @@
+{{- if .Values.global.dashboard.enabled }}
+{{- if .Values.global.dashboard.frontendConfig.vendorAssets }}
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: dashboard-vendor-assets
+  namespace: {{ .Release.Namespace }}
+  labels:
+    app.kubernetes.io/name: gardener-dashboard
+    app.kubernetes.io/component: dashboard
+    helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+    app.kubernetes.io/instance: "{{ .Release.Name }}"
+    app.kubernetes.io/managed-by: "{{ .Release.Service }}"
+binaryData:
+{{- range $file, $content := .Values.global.dashboard.frontendConfig.vendorAssets }}
+  {{ $file }}: |
+    {{ $content }}
+{{- end }}
+{{- end }}
+{{- end }}

charts/gardener-dashboard/charts/runtime/templates/dashboard/configmap.yaml

@@ -343,6 +343,18 @@ data:
       {{- if .Values.global.dashboard.frontendConfig.serviceAccountDefaultTokenExpiration }}
       serviceAccountDefaultTokenExpiration: {{ .Values.global.dashboard.frontendConfig.serviceAccountDefaultTokenExpiration }}
       {{- end }}
+      {{- if .Values.global.dashboard.frontendConfig.cloudProviderList }}
+      cloudProviderList:
+        {{- range .Values.global.dashboard.frontendConfig.cloudProviderList }}
+        - {{ . }}
+        {{- end }}
+      {{- end }}
+      {{- if .Values.global.dashboard.frontendConfig.customCloudProviders }}
+      customCloudProviders: {{ toYaml .Values.global.dashboard.frontendConfig.customCloudProviders | nindent 8 }}
+      {{- end }}
+      {{- if .Values.global.dashboard.frontendConfig.vendors }}
+      vendors: {{ toYaml .Values.global.dashboard.frontendConfig.vendors | nindent 8  }}
+      {{- end }}
       {{- if .Values.global.dashboard.frontendConfig.knownConditions }}
       knownConditions: {{ toYaml .Values.global.dashboard.frontendConfig.knownConditions | nindent 8 }}
       {{- end }}

charts/gardener-dashboard/charts/runtime/templates/dashboard/deployment.yaml

@@ -81,6 +81,12 @@ spec:
           name: dashboard-assets
           defaultMode: 0444
       {{- end }}
+      {{- if .Values.global.dashboard.frontendConfig.vendorAssets }}
+      - name: vendor-assets
+        configMap:
+          name: dashboard-vendor-assets
+          defaultMode: 0444
+      {{- end }}
       {{- if .Values.global.dashboard.oidc }}
       - name: gardener-dashboard-oidc
         secret:
@@ -206,6 +212,10 @@ spec:
           - name: assets
             mountPath: /app/public/static/assets
           {{- end }}
+          {{- if .Values.global.dashboard.frontendConfig.vendorAssets }}
+          - name: vendor-assets
+            mountPath: /app/public/static/vendor-assets
+          {{- end }}
           {{- if .Values.global.dashboard.serviceAccountTokenVolumeProjection.enabled }}
           - name: service-account-token
             mountPath: /var/run/secrets/projected/serviceaccount