Fixed the kubernetesStorageClassName option

jhipster · Jun 8, 2021 · d4dd753 · d4dd753
1 parent ebbae42
commit d4dd753
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 2 deletions.
diff --git a/jdl/jhipster/deployment-options.js b/jdl/jhipster/deployment-options.js
@@ -104,6 +104,7 @@ Options.defaults = (deploymentType = Options.deploymentType.dockerCompose) => {
       kubernetesNamespace: Options.kubernetesNamespace,
       kubernetesServiceType: Options.kubernetesServiceType.loadBalancer,
       kubernetesUseDynamicStorage: Options.kubernetesUseDynamicStorage.false,
+      kubernetesStorageClassName: Options.kubernetesStorageClassName,
       ingressDomain: Options.ingressDomain,
       monitoring: Options.monitoring.no,
       istio: Options.istio.false,

diff --git a/jdl/parsing/validator.js b/jdl/parsing/validator.js
@@ -44,6 +44,7 @@ const LANGUAGE_PATTERN = /^[a-z]+(-[A-Za-z0-9]+)*$/;
 const PATH_PATTERN = /^"([^\/]+).*"$/;
 // const PASSWORD_PATTERN = /^(.+)$/;
 const REPONAME_PATTERN = /^"((?:http(s)?:\/\/)?[\w.-]+(?:\.[\w.-]+)+[\w\-._~:\/?#[\]@!$&'()*+,;=]+|[a-zA-Z0-9]+)"$/;
+const KUBERNETES_STORAGE_CLASS_NAME = /^"[A-Za-z]+"$/;
 const JWT_SECRET_KEY_PATTERN = /^\S+$/;
 const REMEMBER_ME_KEY_PATTERN = /^\S+$/;
 const NUMERIC = /^\d$/;
@@ -276,8 +277,8 @@ const deploymentConfigPropsValidations = {
     msg: 'kubernetesServiceType property',
   },
   KUBERNETES_STORAGE_CLASS_NAME: {
-    type: 'NAME',
-    pattern: ALPHABETIC,
+    type: 'STRING',
+    pattern: KUBERNETES_STORAGE_CLASS_NAME,
     msg: 'kubernetesStorageClassName property',
   },
   KUBERNETES_USE_DYNAMIC_STORAGE: { type: 'BOOLEAN' },

diff --git a/test/jdl/exporters/jhipster-deployment-exporter.spec.js b/test/jdl/exporters/jhipster-deployment-exporter.spec.js
@@ -133,6 +133,7 @@ describe('JHipsterDeploymentExporter', () => {
               kubernetesServiceType: 'LoadBalancer',
               monitoring: 'no',
               kubernetesUseDynamicStorage: false,
+              kubernetesStorageClassName: '',
               serviceDiscoveryType: 'eureka',
             });
           });

diff --git a/test/jdl/jdl-importer.spec.js b/test/jdl/jdl-importer.spec.js
@@ -1423,6 +1423,7 @@ relationship OneToOne {
             dockerRepositoryName: 'test',
             ingressDomain: '',
             kubernetesUseDynamicStorage: false,
+            kubernetesStorageClassName: 'KubernetesStorageClassName',
             istio: false,
             kubernetesNamespace: 'default',
             kubernetesServiceType: 'LoadBalancer',
@@ -1632,6 +1633,7 @@ relationship OneToOne {
             dockerPushCommand: 'docker push',
             kubernetesNamespace: 'default',
             kubernetesServiceType: 'LoadBalancer',
+            kubernetesStorageClassName: '',
             ingressDomain: '',
             istio: false,
             kubernetesUseDynamicStorage: false,

diff --git a/test/jdl/jhipster/deployment-options.spec.js b/test/jdl/jhipster/deployment-options.spec.js
@@ -68,6 +68,7 @@ describe('DeploymentOptions', () => {
             dockerPushCommand: 'docker push',
             dockerRepositoryName: '',
             kubernetesUseDynamicStorage: false,
+            kubernetesStorageClassName: '',
             monitoring: 'no',
             serviceDiscoveryType: 'eureka',
             ingressDomain: '',

diff --git a/test/jdl/test-files/deployments.jdl b/test/jdl/test-files/deployments.jdl
@@ -7,6 +7,7 @@ deployment {
   deploymentType kubernetes,
   appsFolders [tata, titi],
   dockerRepositoryName "test"
+  kubernetesStorageClassName "KubernetesStorageClassName"
 }
 deployment {
   deploymentType openshift,