generator-jhipster 7.1.0 → 7.4.0

package/generators/kubernetes-knative/index.js

@@ -16,24 +16,45 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+/* eslint-disable consistent-return */
 const chalk = require('chalk');
 const shelljs = require('shelljs');
 const fs = require('fs');
 const prompts = require('./prompts');
-const writeFiles = require('./files').writeFiles;
+const { writeFiles } = require('./files');
 const BaseDockerGenerator = require('../generator-base-docker');
+const { GENERATOR_KUBERNETES_KNATIVE } = require('../generator-list');
+const { MAVEN } = require('../../jdl/jhipster/build-tool-types');
+const { KAFKA } = require('../../jdl/jhipster/message-broker-types');
 const { checkImages, generateJwtSecret, configureImageNames, setAppsFolderPaths } = require('../docker-base');
-const { checkHelm, checkKubernetes, loadConfig, saveConfig, setupKubernetesConstants, setupHelmConstants } = require('../kubernetes-base');
+const {
+  checkHelm,
+  checkKubernetes,
+  loadConfig,
+  saveConfig,
+  setupKubernetesConstants,
+  setupHelmConstants,
+  derivedKubernetesPlatformProperties,
+} = require('../kubernetes-base');
 const statistics = require('../statistics');
+const { GeneratorTypes } = require('../../jdl/jhipster/kubernetes-platform-types');
+
+const { K8S } = GeneratorTypes;
 
 module.exports = class extends BaseDockerGenerator {
-  get initializing() {
+  async _postConstruct() {
+    if (!this.fromBlueprint) {
+      await this.composeWithBlueprints(GENERATOR_KUBERNETES_KNATIVE);
+    }
+  }
+
+  _initializing() {
     return {
       sayHello() {
         this.log(chalk.white(`${chalk.bold('☸')} Welcome to the JHipster Kubernetes Knative Generator ${chalk.bold('☸')}`));
         this.log(chalk.white(`Files will be generated in the folder: ${chalk.yellow(this.destinationRoot())}`));
       },
-      ...super.initializing,
+      ...super._initializing(),
       checkKubernetes,
       checkHelm,
       checkKnative() {
@@ -63,7 +84,12 @@ module.exports = class extends BaseDockerGenerator {
     };
   }
 
-  get prompting() {
+  get initializing() {
+    if (this.delegateToBlueprint) return {};
+    return this._initializing();
+  }
+
+  _prompting() {
     return {
       askForPath: prompts.askForPath,
       askForApps: prompts.askForApps,
@@ -79,10 +105,15 @@ module.exports = class extends BaseDockerGenerator {
     };
   }
 
-  get configuring() {
+  get prompting() {
+    if (this.delegateToBlueprint) return {};
+    return this._prompting();
+  }
+
+  _configuring() {
     return {
       insight() {
-        statistics.sendSubGenEvent('generator', 'k8s-knative');
+        statistics.sendSubGenEvent('generator', GENERATOR_KUBERNETES_KNATIVE);
       },
 
       checkImages,
@@ -93,7 +124,7 @@ module.exports = class extends BaseDockerGenerator {
       setPostPromptProp() {
         this.appConfigs.forEach(element => {
           element.clusteredDb ? (element.dbPeerCount = 3) : (element.dbPeerCount = 1);
-          if (element.messageBroker === 'kafka') {
+          if (element.messageBroker === KAFKA) {
             this.useKafka = true;
           }
         });
@@ -102,78 +133,109 @@ module.exports = class extends BaseDockerGenerator {
     };
   }
 
-  get writing() {
-    return writeFiles();
+  get configuring() {
+    if (this.delegateToBlueprint) return {};
+    return this._configuring();
   }
 
-  end() {
-    if (this.hasWarning) {
-      this.log(`\n${chalk.yellow.bold('WARNING!')} Kubernetes Knative configuration generated, but no Jib cache found`);
-      this.log('If you forgot to generate the Docker image for this application, please run:');
-      this.log(this.warningMessage);
-    } else {
-      this.log(`\n${chalk.bold.green('Kubernetes Knative configuration successfully generated!')}`);
-    }
-
-    this.log(
-      `\n${chalk.yellow.bold(
-        'WARNING!'
-      )} You will need to push your image to a registry. If you have not done so, use the following commands to tag and push the images:`
-    );
-    for (let i = 0; i < this.appsFolders.length; i++) {
-      const originalImageName = this.appConfigs[i].baseName.toLowerCase();
-      const targetImageName = this.appConfigs[i].targetImageName;
-      if (originalImageName !== targetImageName) {
-        this.log(`  ${chalk.cyan(`docker image tag ${originalImageName} ${targetImageName}`)}`);
-      }
-      this.log(`  ${chalk.cyan(`${this.dockerPushCommand} ${targetImageName}`)}`);
-    }
+  _loading() {
+    return {
+      loadSharedConfig() {
+        this.appConfigs.forEach(element => {
+          this.loadServerConfig(element, element);
+          this.loadDerivedAppConfig(element);
+        });
+        this.loadDeploymentConfig(this);
+        derivedKubernetesPlatformProperties(this);
+      },
+    };
+  }
 
-    if (this.dockerRepositoryName) {
-      this.log(`\n${chalk.green.bold('INFO!')} Alternatively, you can use Jib to build and push image directly to a remote registry:`);
-      this.appsFolders.forEach((appsFolder, index) => {
-        const appConfig = this.appConfigs[index];
-        let runCommand = '';
-        if (appConfig.buildTool === 'maven') {
-          runCommand = `./mvnw -ntp -Pprod verify jib:build -Djib.to.image=${appConfig.targetImageName}`;
-        } else {
-          runCommand = `./gradlew bootJar -Pprod jibBuild -Djib.to.image=${appConfig.targetImageName}`;
-        }
-        this.log(`  ${chalk.cyan(`${runCommand}`)} in ${this.destinationPath(this.directoryPath + appsFolder)}`);
-      });
-    }
+  get loading() {
+    if (this.delegateToBlueprint) return {};
+    return this._loading();
+  }
 
-    this.log('\nYou can deploy all your apps by running the following script:');
+  _writing() {
+    return writeFiles();
+  }
 
-    if (this.generatorType === 'k8s') {
-      this.log(`  ${chalk.cyan('bash kubectl-knative-apply.sh')}`);
+  get writing() {
+    if (this.delegateToBlueprint) return {};
+    return this._writing();
+  }
 
-      // Make the apply script executable
-      try {
-        fs.chmodSync('kubectl-knative-apply.sh', '755');
-      } catch (err) {
-        this.log(
-          `${chalk.yellow.bold(
-            'WARNING!'
-          )}Failed to make 'kubectl-knative-apply.sh' executable, you may need to run 'chmod +x kubectl-knative-apply.sh'`
-        );
-      }
-    } else {
-      this.log(`  ${chalk.cyan('bash helm-knative-apply.sh or ./helm-knative-apply.sh')}`);
-      this.log('\nYou can upgrade (after any changes) all your apps by running the following script:');
-      this.log(`  ${chalk.cyan('bash helm-knative-upgrade.sh or ./helm-knative-upgrade.sh')}`);
-
-      // Make the apply script executable
-      try {
-        fs.chmodSync('helm-knative-apply.sh', '755');
-        fs.chmodSync('helm-knative-upgrade.sh', '755');
-      } catch (err) {
+  _end() {
+    return {
+      deploy() {
+        if (this.hasWarning) {
+          this.log(`\n${chalk.yellow.bold('WARNING!')} Kubernetes Knative configuration generated, but no Jib cache found`);
+          this.log('If you forgot to generate the Docker image for this application, please run:');
+          this.log(this.warningMessage);
+        } else {
+          this.log(`\n${chalk.bold.green('Kubernetes Knative configuration successfully generated!')}`);
+        }
         this.log(
-          `${chalk.yellow.bold(
+          `\n${chalk.yellow.bold(
             'WARNING!'
-          )}Failed to make 'helm-knative-apply.sh', 'helm-knative-upgrade.sh' executable, you may need to run 'chmod +x helm-knative-apply.sh helm-knative-upgrade.sh`
+          )} You will need to push your image to a registry. If you have not done so, use the following commands to tag and push the images:`
         );
-      }
-    }
+        for (let i = 0; i < this.appsFolders.length; i++) {
+          const originalImageName = this.appConfigs[i].baseName.toLowerCase();
+          const targetImageName = this.appConfigs[i].targetImageName;
+          if (originalImageName !== targetImageName) {
+            this.log(`  ${chalk.cyan(`docker image tag ${originalImageName} ${targetImageName}`)}`);
+          }
+          this.log(`  ${chalk.cyan(`${this.dockerPushCommand} ${targetImageName}`)}`);
+        }
+        if (this.dockerRepositoryName) {
+          this.log(`\n${chalk.green.bold('INFO!')} Alternatively, you can use Jib to build and push image directly to a remote registry:`);
+          this.appsFolders.forEach((appsFolder, index) => {
+            const appConfig = this.appConfigs[index];
+            let runCommand = '';
+            if (appConfig.buildTool === MAVEN) {
+              runCommand = `./mvnw -ntp -Pprod verify jib:build -Djib.to.image=${appConfig.targetImageName}`;
+            } else {
+              runCommand = `./gradlew bootJar -Pprod jibBuild -Djib.to.image=${appConfig.targetImageName}`;
+            }
+            this.log(`  ${chalk.cyan(`${runCommand}`)} in ${this.destinationPath(this.directoryPath + appsFolder)}`);
+          });
+        }
+        this.log('\nYou can deploy all your apps by running the following script:');
+        if (this.generatorType === K8S) {
+          this.log(`  ${chalk.cyan('bash kubectl-knative-apply.sh')}`);
+          // Make the apply script executable
+          try {
+            fs.chmodSync('kubectl-knative-apply.sh', '755');
+          } catch (err) {
+            this.log(
+              `${chalk.yellow.bold(
+                'WARNING!'
+              )}Failed to make 'kubectl-knative-apply.sh' executable, you may need to run 'chmod +x kubectl-knative-apply.sh'`
+            );
+          }
+        } else {
+          this.log(`  ${chalk.cyan('bash helm-knative-apply.sh or ./helm-knative-apply.sh')}`);
+          this.log('\nYou can upgrade (after any changes) all your apps by running the following script:');
+          this.log(`  ${chalk.cyan('bash helm-knative-upgrade.sh or ./helm-knative-upgrade.sh')}`);
+          // Make the apply script executable
+          try {
+            fs.chmodSync('helm-knative-apply.sh', '755');
+            fs.chmodSync('helm-knative-upgrade.sh', '755');
+          } catch (err) {
+            this.log(
+              `${chalk.yellow.bold(
+                'WARNING!'
+              )}Failed to make 'helm-knative-apply.sh', 'helm-knative-upgrade.sh' executable, you may need to run 'chmod +x helm-knative-apply.sh helm-knative-upgrade.sh`
+            );
+          }
+        }
+      },
+    };
+  }
+
+  get end() {
+    if (this.delegateToBlueprint) return {};
+    return this._end();
   }
 };

package/generators/kubernetes-knative/prompts.js

@@ -17,6 +17,10 @@
  * limitations under the License.
  */
 const k8sPrompts = require('../kubernetes/prompts');
+const { GeneratorTypes } = require('../../jdl/jhipster/kubernetes-platform-types');
+const { generatorDefaultConfig } = require('../kubernetes/kubernetes-constants');
+
+const { HELM, K8S } = GeneratorTypes;
 
 module.exports = {
   askForGeneratorType,
@@ -33,15 +37,15 @@ async function askForGeneratorType() {
       message: 'Which *type* of generator would you like to base this on?',
       choices: [
         {
-          value: 'k8s',
+          value: K8S,
           name: 'Kubernetes generator',
         },
         {
-          value: 'helm',
+          value: HELM,
           name: 'Helm Kubernetes generator',
         },
       ],
-      default: this.generatorType ? this.generatorType : 'k8s',
+      default: this.generatorType ? this.generatorType : generatorDefaultConfig.generatorType,
     },
   ];
 

package/generators/kubernetes-knative/templates/README-KUBERNETES-KNATIVE.md.ejs

@@ -9,9 +9,9 @@ in the cluster. Follow [this link](https://knative.dev/docs/install/) for instru
 
 ```
 <%_ for (let i = 0; i < appsFolders.length; i++) { _%>
-<%_ if (appConfigs[i].baseName.toLowerCase() !== appConfigs[i].targetImageName) { _%>
+  <%_ if (appConfigs[i].baseName.toLowerCase() !== appConfigs[i].targetImageName) { _%>
     $ docker image tag <%= appConfigs[i].baseName.toLowerCase() %> <%= appConfigs[i].targetImageName %>
-<%_ } _%>
+  <%_ } _%>
 $ <%= dockerPushCommand %> <%= appConfigs[i].targetImageName %>
 <%_ } _%>
 ```
@@ -20,16 +20,16 @@ $ <%= dockerPushCommand %> <%= appConfigs[i].targetImageName %>
 ## Deployment
 
 You can deploy all your apps by running the below terminal command:
-<%_ if (generatorType === 'k8s') { _%>
+<%_ if (generatorTypeK8s) { _%>
 ```
 bash kubectl-knative-apply.sh (or) ./kubectl-knative-apply.sh
 ```
 <%_ } _%>
-<%_ if (generatorType === 'helm') { _%>
+<%_ if (generatorTypeHelm) { _%>
 ```
 bash helm-knative-apply.sh (or) ./helm-knative-apply.sh
 ```
-    
+
 `helm-apply.sh` will always do a clean install. Any of the existing charts with the same identity gets removed first and then it does a clean install.
 
 You can upgrade all your apps (if you have made any changes to the generated manifests) by running the following bash command:

package/generators/kubernetes-knative/templates/helm-apply.sh.ejs

@@ -21,7 +21,7 @@
 # Usage: bash helm-apply.sh
 cs=csvc
 suffix=knative
-<%_ if (kubernetesNamespace !== 'default') { _%>
+<%_ if (!kubernetesNamespaceDefault) { _%>
 kubectl apply -f namespace.yml
 <%_ } _%>
 <%_ if (istio) { _%>

package/generators/kubernetes-knative/templates/istio/gateway.yml.ejs

@@ -16,6 +16,9 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
+# This configuration uses 'http' and is not recommended for production use.
+# Refer https://istio.io/latest/docs/reference/config/networking/gateway/ for a more secure 'https' config
+# using certificates and prefer that for production use
 apiVersion: <%= KUBERNETES_ISTIO_NETWORKING_API_VERSION %>
 kind: Gateway
 metadata:
@@ -54,11 +57,13 @@ spec:
   gateways:
   - <%= app.baseName.toLowerCase() %>-gateway
   http:
-  <%_ if (!app.serviceDiscoveryType) { _%>
-    <%_ appConfigs.filter(config => config.baseName !== app.baseName).forEach(config => { _%>
+<%_ if (!app.serviceDiscoveryType) { _%>
+  <%_ appConfigs.filter(config => config.baseName !== app.baseName).forEach(config => { _%>
   - match:
     - uri:
         prefix: /services/<%= config.baseName.toLowerCase() %>/
+    rewrite:
+      uri: /
     route:
     - destination:
         host: <%= config.baseName.toLowerCase() %>-knative
@@ -67,12 +72,9 @@ spec:
           add:
             Knative-Serving-Namespace: <%= kubernetesNamespace %>
             Knative-Serving-Revision: <%= config.baseName.toLowerCase() %>-knative
-    <%_ }); _%>
-  <%_ } _%>
-  - match:
-    - uri:
-        prefix: /
-    route:
+  <%_ }); _%>
+<%_ } _%>
+  - route:
     - destination:
         host: <%= app.baseName.toLowerCase() %>-knative
       headers:

package/generators/kubernetes-knative/templates/kubectl-apply.sh.ejs

@@ -22,43 +22,48 @@
 
 logSummary(){
     echo ""
-    <%_ if (monitoring === 'prometheus' || kubernetesServiceType === 'Ingress' || istio) { _%>
+<%_ if (monitoringPrometheus || kubernetesServiceTypeIngress || istio) { _%>
         echo "#####################################################"
         echo "Please find the below useful endpoints,"
-        <%_ if (monitoring === 'prometheus') { _%>
+  <%_ if (monitoringPrometheus) { _%>
         echo "JHipster Grafana - http://jhipster-grafana.<%= kubernetesNamespace %>.<%= ingressDomain %>"
-        <%_ } _%>
-        <%_ if (istio) { _%>
-        <%_ appConfigs.forEach((appConfig) =>  { _%>
-        <%_ if (appConfig.applicationType === 'gateway') {_%>
+  <%_ } _%>
+  <%_ if (istio) { _%>
+    <%_ appConfigs.forEach((appConfig) =>  { _%>
+      <%_ if (appConfig.applicationTypeGateway) {_%>
         echo "Gateway - http://<%= appConfig.baseName.toLowerCase() %>.<%= kubernetesNamespace %>.<%= ingressDomain %>"
-        <%_ } _%><%_ if (appConfig.applicationType === 'monolith') {_%>
+      <%_ } _%>
+      <%_ if (appConfig.applicationTypeMonolith) {_%>
         echo "<%= appConfig.baseName %> - http://<%= appConfig.baseName.toLowerCase() %>.<%= kubernetesNamespace %>.<%= ingressDomain %>"
-        <%_ } _%>
-        <%_ }) _%>
-        <%_ if (istio) { _%>
+      <%_ } _%>
+    <%_ }) _%>
+    <%_ if (istio) { _%>
         echo "Jaeger - http://jaeger.istio-system.<%= ingressDomain %>"
         echo "Grafana - http://grafana.istio-system.<%= ingressDomain %>"
         echo "Kiali - http://kiali.istio-system.<%= ingressDomain %>"
-        <%_ } _%>
-        <%_ } _%>
-        echo "#####################################################"
     <%_ } _%>
+  <%_ } _%>
+        echo "#####################################################"
+<%_ } _%>
 }
 
 suffix=knative
-<%_ if (kubernetesNamespace !== 'default') { _%>
+<%_ if (!kubernetesNamespaceDefault) { _%>
 kubectl apply -f namespace.yml
-<%_ } _%> <%_ if (serviceDiscoveryType === 'eureka' || serviceDiscoveryType === 'consul') { _%>
+<%_ } _%>
+<%_ if (serviceDiscoveryEureka || serviceDiscoveryConsul) { _%>
 kubectl apply -f registry-${suffix}/
-<%_ } _%> <%_ if (istio) { _%>
+<%_ } _%>
+<%_ if (istio) { _%>
 kubectl label namespace <%-kubernetesNamespace%> istio-injection=enabled --overwrite=true
-<%_ } _%> <%_ appConfigs.forEach((appConfig, index) =>  { _%>
+<%_ } _%>
+<%_ appConfigs.forEach((appConfig, index) =>  { _%>
 kubectl apply -f <%- appConfig.baseName.toLowerCase() %>-${suffix}/
 <%_ }) _%>
-<%_ if (useKafka === true) { _%>
+<%_ if (useKafka) { _%>
 kubectl apply -f messagebroker-${suffix}/
-<%_ } _%><%_ if (monitoring === 'prometheus') { _%>
+<%_ } _%>
+<%_ if (monitoringPrometheus) { _%>
 kubectl apply -f monitoring-${suffix}/jhipster-prometheus-crd.yml
 until [ $(kubectl get crd prometheuses.monitoring.coreos.com 2>>/dev/null | wc -l) -ge 2 ]; do
     echo "Waiting for the custom resource prometheus operator to get initialised";

package/generators/kubernetes-knative/templates/service.yml.ejs

@@ -45,7 +45,7 @@ spec:
             env:
             - name: SPRING_PROFILES_ACTIVE
               value: prod
-            <%_ if (app.serviceDiscoveryType === 'eureka') { _%>
+<%_ if (app.serviceDiscoveryEureka) { _%>
             - name: SPRING_CLOUD_CONFIG_URI
               value: http://admin:${jhipster.registry.password}@jhipster-registry.<%= kubernetesNamespace %>.svc.cluster.local:8761/config
             - name: JHIPSTER_REGISTRY_PASSWORD
@@ -55,46 +55,46 @@ spec:
                   key: registry-admin-password
             - name: EUREKA_CLIENT_SERVICE_URL_DEFAULTZONE
               value: http://admin:${jhipster.registry.password}@jhipster-registry.<%= kubernetesNamespace %>.svc.cluster.local:8761/eureka/
-              <%_ if (istio) { _%>
+  <%_ if (istio) { _%>
             - name: EUREKA_INSTANCE_PREFER_IP_ADDRESS
               value: "false"
             - name: EUREKA_INSTANCE_HOSTNAME
               value: <%= app.baseName.toLowerCase() %>
-              <%_ } _%>
-            <%_ } _%>
-            <%_ if (app.serviceDiscoveryType === 'consul') { _%>
+  <%_ } _%>
+<%_ } _%>
+<%_ if (app.serviceDiscoveryConsul) { _%>
             - name: SPRING_CLOUD_CONSUL_HOST
               value: consul.<%= kubernetesNamespace %>.svc.cluster.local
             - name: SPRING_CLOUD_CONSUL_PORT
               value: "8500"
-              <%_ if (istio) { _%>
+  <%_ if (istio) { _%>
             - name: SPRING_CLOUD_CONSUL_DISCOVERY_PREFER_IP_ADDRESS
               value: "false"
             - name: SPRING_CLOUD_CONSUL_DISCOVERY_HOSTNAME
               value: <%= app.baseName.toLowerCase() %>
             - name: SPRING_CLOUD_CONSUL_DISCOVERY_SERVICE_NAME
               value: <%= app.baseName.toLowerCase() %>
-              <%_ } _%>
-            <%_ } _%>
-            <%_ if (!app.serviceDiscoveryType && app.authenticationType === 'jwt') { _%>
+  <%_ } _%>
+<%_ } _%>
+<%_ if (!app.serviceDiscoveryType && app.authenticationTypeJwt) { _%>
             - name: JHIPSTER_SECURITY_AUTHENTICATION_JWT_BASE64_SECRET
               valueFrom:
                 secretKeyRef:
                   name: jwt-secret
                   key: secret
-            <%_ } _%>
-            <%_ if (app.prodDatabaseType === 'mysql' || app.prodDatabaseType === 'mariadb') { _%>
+<%_ } _%>
+<%_ if (app.prodDatabaseTypeMysql || app.prodDatabaseTypeMariadb) { _%>
             - name: SPRING_DATASOURCE_URL
               value: <%- getJDBCUrl(app.prodDatabaseType, { hostname: `${app.baseName.toLowerCase()}-${app.prodDatabaseType}.${kubernetesNamespace}.svc.cluster.local`, databaseName: app.baseName.toLowerCase() }) %>
-            <%_ } _%>
-            <%_ if (app.prodDatabaseType === 'mariadb') { _%>
+<%_ } _%>
+<%_ if (app.prodDatabaseTypeMariadb) { _%>
             - name: SPRING_DATASOURCE_PASSWORD
               valueFrom:
                 secretKeyRef:
                   name: <%= app.baseName.toLowerCase() %>-mariadb
                   key: mariadb-root-password
-            <%_ } _%>
-            <%_ if (app.prodDatabaseType === 'postgresql') { _%>
+<%_ } _%>
+<%_ if (app.prodDatabaseTypePostgres) { _%>
             - name: SPRING_DATASOURCE_URL
               value: <%- getJDBCUrl(app.prodDatabaseType, { hostname: `${app.baseName.toLowerCase()}-${app.prodDatabaseType}.${kubernetesNamespace}.svc.cluster.local`, databaseName: app.baseName }) %>
             - name: SPRING_DATASOURCE_USERNAME
@@ -104,24 +104,24 @@ spec:
                 secretKeyRef:
                   name: <%= app.baseName.toLowerCase() %>-postgresql
                   key: postgresql-password
-            <%_ } _%>
-            <%_ if (app.prodDatabaseType === 'mongodb') { _%>
+<%_ } _%>
+<%_ if (app.prodDatabaseTypeMongodb) { _%>
             - name: SPRING_DATA_MONGODB_DATABASE
               value: <%= app.baseName %>
             - name: SPRING_DATA_MONGODB_URI
               value: "mongodb://<% for (let i = 0; i < app.dbPeerCount; i++) { %><%= app.baseName.toLowerCase() %>-mongodb-<%= i %>.<%= app.baseName.toLowerCase() %>-mongodb.<%= kubernetesNamespace %>:27017<% if (app.reactive) { %>/?waitQueueMultiple=1000<% } %><% if (i < (app.dbPeerCount-1)) { %>,<% }} %>"
-            <%_ } _%>
-            <%_ if (app.prodDatabaseType === 'couchbase') { _%>
-            - name: SPRING_COUCHBASE_BOOTSTRAP_HOSTS
+<%_ } _%>
+<%_ if (app.prodDatabaseTypeCouchbase) { _%>
+            - name: SPRING_COUCHBASE_CONNECTION_STRING
               value: "<% for (let i = 0; i < app.dbPeerCount; i++) { %><%= app.baseName.toLowerCase() %>-couchbase-<%= i %>.<%= app.baseName.toLowerCase() %>-couchbase<% if (i < (app.dbPeerCount-1)) { %>,<% }} %>"
-            - name: SPRING_COUCHBASE_BUCKET_NAME
+            - name: JHIPSTER_DATABASE_COUCHBASE_BUCKET_NAME
               value: <%= app.baseName.toLowerCase() %>
-            <%_ } _%>
-            <%_ if (app.searchEngine === 'elasticsearch') { _%>
+<%_ } _%>
+<%_ if (app.searchEngineElasticsearch) { _%>
             - name: SPRING_ELASTICSEARCH_REST_URIS
               value: http://<%= app.baseName.toLowerCase() %>-elasticsearch.<%= kubernetesNamespace %>.svc.cluster.local:9200
-            <%_ } _%>
-            <%_ if (app.messageBroker === 'kafka') { _%>
+<%_ } _%>
+<%_ if (app.messageBrokerKafka) { _%>
             - name: KAFKA_CONSUMER_KEY_DESERIALIZER
               value: 'org.apache.kafka.common.serialization.StringDeserializer'
             - name: KAFKA_CONSUMER_VALUE_DESERIALIZER
@@ -138,15 +138,15 @@ spec:
               value: 'org.apache.kafka.common.serialization.StringDeserializer'
             - name: KAFKA_PRODUCER_VALUE_DESERIALIZER
               value: 'org.apache.kafka.common.serialization.StringDeserializer'
-            <%_ } _%>
-            <%_ if (monitoring === 'prometheus') { _%>
+<%_ } _%>
+<%_ if (monitoringPrometheus) { _%>
             - name: MANAGEMENT_METRICS_EXPORT_PROMETHEUS_ENABLED
               value: 'true'
-            <%_ } _%>
-            <%_ if (deploymentApplicationType === 'microservice') { _%>
+<%_ } _%>
+<%_ if (deploymentApplicationTypeMicroservice) { _%>
             - name: SPRING_SLEUTH_PROPAGATION_KEYS
               value: "x-request-id,x-ot-span-context"
-            <%_ } _%>
+<%_ } _%>
             - name: JAVA_OPTS
               value: " -Xmx256m -Xms256m"
             - name: SERVER_SHUTDOWN
@@ -162,14 +162,14 @@ spec:
             - containerPort: <%= app.serverPort %>
             readinessProbe:
               httpGet:
-                path: <%= app.applicationType === 'microservice' && !app.serviceDiscoveryType ? `/services/${app.baseName.toLowerCase()}` : '' %>/management/health/readiness
+                path: <%= app.applicationTypeMicroservice && !app.serviceDiscoveryType ? `/services/${app.baseName.toLowerCase()}` : '' %>/management/health/readiness
               initialDelaySeconds: 20
               periodSeconds: 15
               failureThreshold: 6
               timeoutSeconds: 5
             livenessProbe:
               httpGet:
-                path: <%= app.applicationType === 'microservice' && !app.serviceDiscoveryType ? `/services/${app.baseName.toLowerCase()}` : '' %>/management/health/liveness
+                path: <%= app.applicationTypeMicroservice && !app.serviceDiscoveryType ? `/services/${app.baseName.toLowerCase()}` : '' %>/management/health/liveness
               initialDelaySeconds: 120
               timeoutSeconds: 5
   traffic:

package/generators/languages/esm.mjs

@@ -0,0 +1,21 @@
+/**
+ * Copyright 2013-2021 the original author or authors from the JHipster project.
+ *
+ * This file is part of the JHipster project, see https://www.jhipster.tech/
+ * for more information.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import generator from './index.js';
+
+export default generator;