generator-jhipster 7.1.0 → 7.4.0

package/generators/kubernetes/index.js

@@ -16,30 +16,51 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+/* eslint-disable consistent-return */
 const chalk = require('chalk');
 const fs = require('fs');
 const prompts = require('./prompts');
-const writeFiles = require('./files').writeFiles;
+const { writeFiles } = require('./files');
 const BaseDockerGenerator = require('../generator-base-docker');
+const { KAFKA } = require('../../jdl/jhipster/message-broker-types');
+const { GENERATOR_KUBERNETES } = require('../generator-list');
+const { MAVEN } = require('../../jdl/jhipster/build-tool-types');
 const { checkImages, generateJwtSecret, configureImageNames, setAppsFolderPaths } = require('../docker-base');
-const { checkKubernetes, loadConfig, saveConfig, setupKubernetesConstants } = require('../kubernetes-base');
+const {
+  checkKubernetes,
+  loadConfig,
+  saveConfig,
+  setupKubernetesConstants,
+  derivedKubernetesPlatformProperties,
+} = require('../kubernetes-base');
 const statistics = require('../statistics');
 
 module.exports = class extends BaseDockerGenerator {
-  get initializing() {
+  async _postConstruct() {
+    if (!this.fromBlueprint) {
+      await this.composeWithBlueprints(GENERATOR_KUBERNETES);
+    }
+  }
+
+  _initializing() {
     return {
       sayHello() {
         this.log(chalk.white(`${chalk.bold('⎈')} Welcome to the JHipster Kubernetes Generator ${chalk.bold('⎈')}`));
         this.log(chalk.white(`Files will be generated in folder: ${chalk.yellow(this.destinationRoot())}`));
       },
-      ...super.initializing,
+      ...super._initializing(),
       checkKubernetes,
       loadConfig,
       setupKubernetesConstants,
     };
   }
 
-  get prompting() {
+  get initializing() {
+    if (this.delegateToBlueprint) return {};
+    return this._initializing();
+  }
+
+  _prompting() {
     return {
       askForApplicationType: prompts.askForApplicationType,
       askForPath: prompts.askForPath,
@@ -60,10 +81,15 @@ module.exports = class extends BaseDockerGenerator {
     };
   }
 
-  get configuring() {
+  get prompting() {
+    if (this.delegateToBlueprint) return {};
+    return this._prompting();
+  }
+
+  _configuring() {
     return {
       insight() {
-        statistics.sendSubGenEvent('generator', 'kubernetes');
+        statistics.sendSubGenEvent('generator', GENERATOR_KUBERNETES);
       },
 
       checkImages,
@@ -74,7 +100,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;
           }
         });
@@ -83,69 +109,105 @@ 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 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 configuration successfully generated!')}`);
-    }
+  _loading() {
+    return {
+      loadSharedConfig() {
+        this.appConfigs.forEach(element => {
+          this.loadServerConfig(element, element);
+          this.loadDerivedAppConfig(element);
+        });
+        this.loadDeploymentConfig(this);
+        derivedKubernetesPlatformProperties(this);
+      },
+    };
+  }
 
-    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}`)}`);
-    }
+  get loading() {
+    if (this.delegateToBlueprint) return {};
+    return this._loading();
+  }
+
+  _writing() {
+    return writeFiles();
+  }
 
-    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}`;
+  get writing() {
+    if (this.delegateToBlueprint) return {};
+    return this._writing();
+  }
+
+  _end() {
+    return {
+      deploy() {
+        if (this.hasWarning) {
+          this.log(`\n${chalk.yellow.bold('WARNING!')} Kubernetes 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 {
-          runCommand = `./gradlew bootJar -Pprod jib -Djib.to.image=${appConfig.targetImageName}`;
+          this.log(`\n${chalk.bold.green('Kubernetes 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}`)}`);
         }
-        this.log(`  ${chalk.cyan(`${runCommand}`)} in ${this.destinationPath(this.directoryPath + appsFolder)}`);
-      });
-    }
 
-    this.log('\nYou can deploy all your apps by running the following kubectl command:');
-    this.log(`  ${chalk.cyan('bash kubectl-apply.sh -f')}`);
-    this.log('\n[OR]');
-    this.log('\nIf you want to use kustomize configuration, then run the following command:');
-    this.log(`  ${chalk.cyan('bash kubectl-apply.sh -k')}`);
-    if (this.gatewayNb + this.monolithicNb >= 1) {
-      const namespaceSuffix = this.kubernetesNamespace === 'default' ? '' : ` -n ${this.kubernetesNamespace}`;
-      this.log("\nUse these commands to find your application's IP addresses:");
-      for (let i = 0; i < this.appsFolders.length; i++) {
-        if (this.appConfigs[i].applicationType === 'gateway' || this.appConfigs[i].applicationType === 'monolith') {
-          this.log(`  ${chalk.cyan(`kubectl get svc ${this.appConfigs[i].baseName.toLowerCase()}${namespaceSuffix}`)}`);
+        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 jib -Djib.to.image=${appConfig.targetImageName}`;
+            }
+            this.log(`  ${chalk.cyan(`${runCommand}`)} in ${this.destinationPath(this.directoryPath + appsFolder)}`);
+          });
         }
-      }
-      this.log();
-    }
-    // Make the apply script executable
-    try {
-      fs.chmodSync('kubectl-apply.sh', '755');
-    } catch (err) {
-      this.log(
-        `${chalk.yellow.bold('WARNING!')}Failed to make 'kubectl-apply.sh' executable, you may need to run 'chmod +x kubectl-apply.sh'`
-      );
-    }
+        this.log('\nYou can deploy all your apps by running the following kubectl command:');
+        this.log(`  ${chalk.cyan('bash kubectl-apply.sh -f')}`);
+        this.log('\n[OR]');
+        this.log('\nIf you want to use kustomize configuration, then run the following command:');
+        this.log(`  ${chalk.cyan('bash kubectl-apply.sh -k')}`);
+        if (this.gatewayNb + this.monolithicNb >= 1) {
+          const namespaceSuffix = this.kubernetesNamespace === 'default' ? '' : ` -n ${this.kubernetesNamespace}`;
+          this.log("\nUse these commands to find your application's IP addresses:");
+          for (let i = 0; i < this.appsFolders.length; i++) {
+            if (this.appConfigs[i].applicationType === 'gateway' || this.appConfigs[i].applicationType === 'monolith') {
+              this.log(`  ${chalk.cyan(`kubectl get svc ${this.appConfigs[i].baseName.toLowerCase()}${namespaceSuffix}`)}`);
+            }
+          }
+          this.log();
+        }
+        // Make the apply script executable
+        try {
+          fs.chmodSync('kubectl-apply.sh', '755');
+        } catch (err) {
+          this.log(
+            `${chalk.yellow.bold('WARNING!')}Failed to make 'kubectl-apply.sh' executable, you may need to run 'chmod +x kubectl-apply.sh'`
+          );
+        }
+      },
+    };
+  }
+
+  get end() {
+    if (this.delegateToBlueprint) return {};
+    return this._end();
   }
 };

package/generators/kubernetes/kubernetes-constants.js

@@ -0,0 +1,50 @@
+/**
+ * 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.
+ */
+
+const { NO } = require('../../jdl/jhipster/monitoring-types');
+const { ServiceTypes, IngressTypes, GeneratorTypes } = require('../../jdl/jhipster/kubernetes-platform-types');
+
+const { LOAD_BALANCER } = ServiceTypes;
+const { NGINX } = IngressTypes;
+const { K8S } = GeneratorTypes;
+
+const kubernetesDefaultConfig = {
+  kubernetesNamespace: 'default',
+  kubernetesServiceType: LOAD_BALANCER,
+  monitoring: NO,
+  istio: false,
+};
+
+const ingressDefaultConfig = {
+  ingressType: NGINX,
+};
+
+const generatorDefaultConfig = {
+  generatorType: K8S,
+};
+
+const defaultKubernetesConfig = {
+  ...kubernetesDefaultConfig,
+};
+
+module.exports = {
+  defaultKubernetesConfig,
+  ingressDefaultConfig,
+  generatorDefaultConfig,
+};

package/generators/kubernetes/prompts.js

@@ -18,6 +18,15 @@
  */
 const execSync = require('child_process').execSync;
 const dockerPrompts = require('../docker-prompts');
+const { MONOLITH } = require('../../jdl/jhipster/application-types');
+const { IngressTypes, ServiceTypes } = require('../../jdl/jhipster/kubernetes-platform-types');
+
+const databaseTypes = require('../../jdl/jhipster/database-types');
+const { defaultKubernetesConfig, ingressDefaultConfig } = require('./kubernetes-constants');
+
+const NO_DATABASE = databaseTypes.NO;
+const { LOAD_BALANCER, INGRESS, NODE_PORT } = ServiceTypes;
+const { GKE, NGINX } = IngressTypes;
 
 module.exports = {
   askForKubernetesNamespace,
@@ -38,7 +47,7 @@ async function askForKubernetesNamespace() {
       type: 'input',
       name: 'kubernetesNamespace',
       message: 'What should we use for the Kubernetes namespace?',
-      default: this.kubernetesNamespace ? this.kubernetesNamespace : 'default',
+      default: this.kubernetesNamespace ? this.kubernetesNamespace : defaultKubernetesConfig.kubernetesNamespace,
     },
   ];
 
@@ -53,25 +62,25 @@ async function askForKubernetesServiceType() {
 
   const prompts = [
     {
-      when: () => istio === false,
+      when: () => !istio,
       type: 'list',
       name: 'kubernetesServiceType',
       message: 'Choose the Kubernetes service type for your edge services',
       choices: [
         {
-          value: 'LoadBalancer',
+          value: LOAD_BALANCER,
           name: 'LoadBalancer - Let a Kubernetes cloud provider automatically assign an IP',
         },
         {
-          value: 'NodePort',
+          value: NODE_PORT,
           name: 'NodePort - expose the services to a random port (30000 - 32767) on all cluster nodes',
         },
         {
-          value: 'Ingress',
+          value: INGRESS,
           name: 'Ingress - create ingresses for your services. Requires a running ingress controller',
         },
       ],
-      default: this.kubernetesServiceType ? this.kubernetesServiceType : 'LoadBalancer',
+      default: this.kubernetesServiceType ? this.kubernetesServiceType : defaultKubernetesConfig.kubernetesServiceType,
     },
   ];
 
@@ -85,21 +94,21 @@ async function askForIngressType() {
 
   const prompts = [
     {
-      when: () => kubernetesServiceType === 'Ingress',
+      when: () => kubernetesServiceType === INGRESS,
       type: 'list',
       name: 'ingressType',
       message: 'Choose the Kubernetes Ingress type',
       choices: [
         {
-          value: 'nginx',
+          value: NGINX,
           name: 'NGINX Ingress - choose this if you are running on Minikube',
         },
         {
-          value: 'gke',
+          value: GKE,
           name: 'Google Kubernetes Engine Ingress - choose this if you are running on GKE',
         },
       ],
-      default: this.ingressType ? this.ingressType : 'nginx',
+      default: this.ingressType ? this.ingressType : ingressDefaultConfig.ingressType,
     },
   ];
 
@@ -128,20 +137,20 @@ async function askForIngressDomain() {
     } catch (ex) {
       istioMessage = `Unable to determine Istio Ingress IP address. You can find the Istio Ingress IP address by running the command line:\n    ${istioIpCommand}`;
     }
-  } else if (this.ingressType === 'nginx') {
+  } else if (this.ingressType === NGINX) {
     defaultValue = '192.168.99.100.nip.io';
   } else {
     defaultValue = 'none';
   }
 
   const examples = ['example.com', '192.168.99.100.nip.io'];
-  if (this.ingressType !== 'nginx' && !istio) {
+  if (this.ingressType !== NGINX && !istio) {
     examples.push('none');
   }
 
   const prompts = [
     {
-      when: () => kubernetesServiceType === 'Ingress' || istio === true,
+      when: () => kubernetesServiceType === INGRESS || istio === true,
       type: 'input',
       name: 'ingressDomain',
       message: `${istioMessage}${istioMessage ? '\n' : ''}What is the root FQDN for your ingress services (e.g. ${examples.join(', ')})?`,
@@ -150,7 +159,7 @@ async function askForIngressDomain() {
       default: defaultValue,
       validate: input => {
         if (input.length === 0) {
-          if (this.ingressType === 'nginx' || istio) {
+          if (this.ingressType === NGINX || istio) {
             return 'domain name cannot be empty';
           }
           return true;
@@ -177,7 +186,7 @@ async function askForIngressDomain() {
 
 async function askForIstioSupport() {
   if (this.regenerate) return;
-  if (this.deploymentApplicationType === 'monolith') {
+  if (this.deploymentApplicationType === MONOLITH) {
     this.istio = false;
     return;
   }
@@ -209,7 +218,7 @@ async function askForPersistentStorage() {
   if (this.regenerate) return;
   let usingDataBase = false;
   this.appConfigs.forEach((appConfig, index) => {
-    if (appConfig.prodDatabaseType !== 'no') {
+    if (appConfig.prodDatabaseType !== NO_DATABASE) {
       usingDataBase = true;
     }
   });

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

@@ -6,9 +6,9 @@ You will need to push your image to a registry. If you have not done so, use the
 
 ```
 <%_ 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 %>
 <%_ } _%>
 ```
@@ -40,11 +40,11 @@ skaffold run [or] skaffold deploy
 Use these commands to find your application's IP addresses:
 
 ```
-<%_ for (let i = 0; i < appsFolders.length; i++) { _%>
-<%_ if (appConfigs[i].applicationType === 'gateway' || appConfigs[i].applicationType === 'monolith') { _%>
+  <%_ for (let i = 0; i < appsFolders.length; i++) { _%>
+    <%_ if (appConfigs[i].applicationTypeGateway || appConfigs[i].applicationTypeMonolith) { _%>
 $ kubectl get svc <%= appConfigs[i].baseName.toLowerCase() %><%= kubernetesNamespace === 'default' ? '' : ` -n ${kubernetesNamespace}` %>
-        <%_ } _%>
     <%_ } _%>
+  <%_ } _%>
 <%_ } _%>
 ```
 
@@ -67,7 +67,7 @@ $ kubectl set image deployment/<app-name>-app <app-name>=<new-image> <%= kuberne
 Using livenessProbes and readinessProbe allow you to tell Kubernetes about the state of your applications, in order to ensure availablity of your services. You will need minimum 2 replicas for every application deployment if you want to have zero-downtime deployed.
 This is because the rolling upgrade strategy first stops a running replica in order to place a new. Running only one replica, will cause a short downtime during upgrades.
 
-<%_ if (monitoring === 'prometheus') { _%>
+<%_ if (monitoringPrometheus) { _%>
 ## Monitoring tools
 
 ### Prometheus metrics
@@ -79,12 +79,12 @@ Generator is also packaged with [Prometheus operator by CoreOS](https://github.c
 Application metrics can be explored in Prometheus through,
 
 ```
-$ kubectl get svc jhipster-prometheus<%= kubernetesNamespace === 'default' ? '' : ` -n ${kubernetesNamespace}` %>
+$ kubectl get svc jhipster-prometheus<%= kubernetesNamespaceDefault ? '' : ` -n ${kubernetesNamespace}` %>
 ```
 
 Also the visualisation can be explored in Grafana which is pre-configured with a dashboard view. You can find the service details by
 ```
-$ kubectl get svc jhipster-grafana<%= kubernetesNamespace === 'default' ? '' : ` -n ${kubernetesNamespace}` %>
+$ kubectl get svc jhipster-grafana<%= kubernetesNamespaceDefault ? '' : ` -n ${kubernetesNamespace}` %>
 ```
 
 * If you have chosen *Ingress*, then you should be able to access Grafana using the given ingress domain.
@@ -93,25 +93,25 @@ $ kubectl get svc jhipster-grafana<%= kubernetesNamespace === 'default' ? '' : `
 
 <%_ } _%>
 
-<%_ if (app.serviceDiscoveryType === 'eureka') { _%>
+<%_ if (app.serviceDiscoveryEureka) { _%>
 ## JHipster registry
 
 The registry is deployed using a headless service in kubernetes, so the primary service has no IP address, and cannot get a node port. You can create a secondary service for any type, using:
 
 ```
-$ kubectl expose service jhipster-registry --type=NodePort --name=exposed-registry<%= kubernetesNamespace === 'default' ? '' : ` -n ${kubernetesNamespace}` %>
+$ kubectl expose service jhipster-registry --type=NodePort --name=exposed-registry<%= kubernetesNamespaceDefault ? '' : ` -n ${kubernetesNamespace}` %>
 ```
 
 and explore the details using
 
 ```
-$ kubectl get svc exposed-registry<%= kubernetesNamespace === 'default' ? '' : ` -n ${kubernetesNamespace}` %>
+$ kubectl get svc exposed-registry<%= kubernetesNamespaceDefault ? '' : ` -n ${kubernetesNamespace}` %>
 ```
 
 For scaling the JHipster registry, use
 
 ```
-$ kubectl scale statefulset jhipster-registry --replicas 3<%= kubernetesNamespace === 'default' ? '' : ` -n ${kubernetesNamespace}` %>
+$ kubectl scale statefulset jhipster-registry --replicas 3<%= kubernetesNamespaceDefault ? '' : ` -n ${kubernetesNamespace}` %>
 ```
 <%_ } _%>
 
@@ -129,4 +129,3 @@ This can occur if your cluster has low resource (e.g. Minikube). Increase the `i
 > my applications are starting very slow, despite I have a cluster with many resources
 
 The default setting are optimized for middle-scale clusters. You are free to increase the JAVA_OPTS environment variable, and resource requests and limits to improve the performance. Be careful!
-

package/generators/kubernetes/templates/db/couchbase.yml.ejs

@@ -57,10 +57,10 @@ spec:
     metadata:
       labels:
         app: <%= app.baseName.toLowerCase() %>-couchbase
-     <%_ if (istio) { _%>
+<%_ if (istio) { _%>
       annotations:
         sidecar.istio.io/inject: "false"
-     <%_ } _%>
+<%_ } _%>
     spec:
       containers:
       - name: <%= app.baseName.toLowerCase() %>-couchbase
@@ -204,7 +204,7 @@ spec:
 apiVersion: <%= KUBERNETES_CORE_API_VERSION  %>
 kind: Service
 metadata:
-  name: <%= app.baseName.toLowerCase() %>-couchbase
+  name: <%= app.baseName.toLowerCase() %>-couchbase-cluster-srv
   namespace: <%= kubernetesNamespace %>
   labels:
     app: <%= app.baseName.toLowerCase() %>-couchbase

package/generators/kubernetes/templates/db/elasticsearch.yml.ejs

@@ -47,21 +47,21 @@ spec:
     metadata:
       labels:
         app: <%= app.baseName.toLowerCase() %>-elasticsearch
-     <%_ if (istio) { _%>
+<%_ if (istio) { _%>
       annotations:
         sidecar.istio.io/inject: "false"
-     <%_ } _%>
+<%_ } _%>
     spec:
       securityContext:
         fsGroup: 1000
       volumes:
       - name: data
-        <%_ if (kubernetesUseDynamicStorage) { _%>
+<%_ if (kubernetesUseDynamicStorage) { _%>
         persistentVolumeClaim:
           claimName: <%= app.baseName.toLowerCase() %>-elasticsearch-pvc
-        <%_ } else { _%>
+<%_ } else { _%>
         emptyDir: {}
-        <%_ } _%>
+<%_ } _%>
       initContainers:
       - name: init-sysctl
         image: busybox

package/generators/kubernetes/templates/db/mariadb.yml.ejs

@@ -58,19 +58,19 @@ spec:
     metadata:
       labels:
         app: <%= app.baseName.toLowerCase() %>-mariadb
-     <%_ if (istio) { _%>
+<%_ if (istio) { _%>
       annotations:
         sidecar.istio.io/inject: "false"
-     <%_ } _%>
+<%_ } _%>
     spec:
       volumes:
       - name: data
-        <%_ if (kubernetesUseDynamicStorage) { _%>
+<%_ if (kubernetesUseDynamicStorage) { _%>
         persistentVolumeClaim:
           claimName: <%= app.baseName.toLowerCase() %>-mariadb-pvc
-        <%_ } else { _%>
+<%_ } else { _%>
         emptyDir: {}
-        <%_ } _%>
+<%_ } _%>
       containers:
       - name: mariadb
         image: <%= DOCKER_MARIADB %>

package/generators/kubernetes/templates/db/mongodb.yml.ejs

@@ -183,10 +183,10 @@ spec:
     metadata:
       labels:
         app: <%= app.baseName.toLowerCase() %>-mongodb
-     <%_ if (istio) { _%>
+<%_ if (istio) { _%>
       annotations:
         sidecar.istio.io/inject: "false"
-     <%_ } _%>
+<%_ } _%>
     spec:
       initContainers:
         - name: config

package/generators/kubernetes/templates/db/mssql.yml.ejs

@@ -47,22 +47,22 @@ spec:
     metadata:
       labels:
         app: <%= app.baseName.toLowerCase() %>-mssql
-     <%_ if (istio) { _%>
+<%_ if (istio) { _%>
       annotations:
         sidecar.istio.io/inject: "false"
-     <%_ } _%>
+<%_ } _%>
     spec:
       volumes:
       - name: mssqldb
         persistentVolumeClaim:
           claimName: mssql-data
       - name: data
-        <%_ if (kubernetesUseDynamicStorage) { _%>
+<%_ if (kubernetesUseDynamicStorage) { _%>
         persistentVolumeClaim:
           claimName: <%= app.baseName.toLowerCase() %>-mssql-pvc
-        <%_ } else { _%>
+<%_ } else { _%>
         emptyDir: {}
-        <%_ } _%>
+<%_ } _%>
       containers:
       - name: mysql
         image: <%= DOCKER_MSSQL %>

package/generators/kubernetes/templates/db/mysql.yml.ejs

@@ -47,19 +47,19 @@ spec:
     metadata:
       labels:
         app: <%= app.baseName.toLowerCase() %>-mysql
-     <%_ if (istio) { _%>
+<%_ if (istio) { _%>
       annotations:
         sidecar.istio.io/inject: "false"
-     <%_ } _%>
+<%_ } _%>
     spec:
       volumes:
       - name: data
-        <%_ if (kubernetesUseDynamicStorage) { _%>
+<%_ if (kubernetesUseDynamicStorage) { _%>
         persistentVolumeClaim:
           claimName: <%= app.baseName.toLowerCase() %>-mysql-pvc
-        <%_ } else { _%>
+<%_ } else { _%>
         emptyDir: {}
-        <%_ } _%>
+<%_ } _%>
       containers:
       - name: mysql
         image: <%= DOCKER_MYSQL %>