generator-jhipster 7.1.0 → 7.4.0

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

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

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

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

package/generators/kubernetes/templates/deployment.yml.ejs

@@ -54,24 +54,24 @@ spec:
             - |
                 while true
                 do
-                <%_ if (app.prodDatabaseType === 'mysql') { _%>
+<%_ if (app.prodDatabaseTypeMysql) { _%>
                   rt=$(nc -z -w 1 <%= app.baseName.toLowerCase() %>-mysql 3306)
-                <%_ } _%>
-                <%_ if (app.prodDatabaseType === 'mariadb') { _%>
+<%_ } _%>
+<%_ if (app.prodDatabaseTypeMariadb) { _%>
                   rt=$(nc -z -w 1 <%= app.baseName.toLowerCase() %>-mariadb 3306)
-                <%_ } _%>
-                <%_ if (app.prodDatabaseType === 'postgresql') { _%>
+<%_ } _%>
+<%_ if (app.prodDatabaseTypePostgres) { _%>
                   rt=$(nc -z -w 1 <%= app.baseName.toLowerCase() %>-postgresql 5432)
-                <%_ } _%>
-                <%_ if (app.prodDatabaseType === 'mongodb') { _%>
+<%_ } _%>
+<%_ if (app.prodDatabaseTypeMongodb) { _%>
                   rt=$(nc -z -w 1 <%= app.baseName.toLowerCase() %>-mongodb 27017)
-                <%_ } _%>
-                <%_ if (app.prodDatabaseType === 'couchbase') { _%>
-                  rt=$(nc -z -w 1 <%= app.baseName.toLowerCase() %>-couchbase 8091)
-                <%_ } _%>
-                <%_ if (app.prodDatabaseType === 'neo4j') { _%>
+<%_ } _%>
+<%_ if (app.prodDatabaseTypeCouchbase) { _%>
+                  rt=$(nc -z -w 1 <%= app.baseName.toLowerCase() %>-couchbase-cluster-srv 8091)
+<%_ } _%>
+<%_ if (app.prodDatabaseTypeNeo4j) { _%>
                   rt=$(nc -z -w 1 <%= app.baseName.toLowerCase() %>-neo4j 7474)
-                <%_ } _%>
+<%_ } _%>
                   if [ $? -eq 0 ]; then
                     echo "DB is UP"
                     break
@@ -85,7 +85,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
@@ -95,97 +95,102 @@ 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() }) %>
         - name: SPRING_LIQUIBASE_URL
           value: <%- getJDBCUrl(app.prodDatabaseType, { hostname: `${app.baseName.toLowerCase()}-${app.prodDatabaseType}.${kubernetesNamespace}.svc.cluster.local`, databaseName: app.baseName.toLowerCase() }) %>
-            <%_ if (app.reactive) { _%>
+  <%_ if (app.reactive) { _%>
         - name: SPRING_R2DBC_URL
           value: <%- getR2DBCUrl(app.prodDatabaseType, { hostname: `${app.baseName.toLowerCase()}-${app.prodDatabaseType}.${kubernetesNamespace}.svc.cluster.local`, databaseName: app.baseName.toLowerCase() }) %>
-            <%_ } _%>
-        <%_ } _%>
-        <%_ if (app.prodDatabaseType === 'mariadb') { _%>
-          <%_ if (app.reactive) { _%>
+  <%_ } _%>
+<%_ } _%>
+<%_ if (app.prodDatabaseTypeMariadb) { _%>
+  <%_ if (app.reactive) { _%>
         - name: SPRING_R2DBC_PASSWORD
-          <%_ } else { _%>
+  <%_ } else { _%>
         - 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
           value: <%= app.baseName %>
-          <%_ if (app.reactive) { _%>
+  <%_ if (app.reactive) { _%>
         - name: SPRING_R2DBC_PASSWORD
-          <%_ } else { _%>
+  <%_ } else { _%>
         - name: SPRING_DATASOURCE_PASSWORD
-          <%_ } _%>
+  <%_ } _%>
           valueFrom:
             secretKeyRef:
               name: <%= app.baseName.toLowerCase() %>-postgresql
               key: postgresql-password
         - name: SPRING_LIQUIBASE_URL
           value: <%- getJDBCUrl(app.prodDatabaseType, { hostname: `${app.baseName.toLowerCase()}-${app.prodDatabaseType}.${kubernetesNamespace}.svc.cluster.local`, databaseName: app.baseName.toLowerCase() }) %>
-            <%_ if (app.reactive) { _%>
+  <%_ if (app.reactive) { _%>
         - name: SPRING_R2DBC_URL
           value: <%- getR2DBCUrl(app.prodDatabaseType, { hostname: `${app.baseName.toLowerCase()}-${app.prodDatabaseType}.${kubernetesNamespace}.svc.cluster.local`, databaseName: app.baseName.toLowerCase() }) %>
-            <%_ } _%>
-        <%_ } _%>
-        <%_ 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 === 'neo4j') { _%>
+<%_ } _%>
+<%_ if (app.prodDatabaseTypeNeo4j) { _%>
         - name: SPRING_NEO4J_URI
           value: bolt://<%= app.baseName.toLowerCase() %>-neo4j.<%= kubernetesNamespace %>.svc.cluster.local:7687
-        <%_ } _%>
-        <%_ if (app.prodDatabaseType === 'couchbase') { _%>
-        - name: SPRING_COUCHBASE_BOOTSTRAP_HOSTS
-          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
+<%_ } _%>
+<%_ if (app.prodDatabaseTypeCouchbase) { _%>
+        - name: SPRING_COUCHBASE_CONNECTION_STRING
+          value: "<%= app.baseName.toLowerCase() %>-couchbase-cluster-srv"
+        - name: JHIPSTER_DATABASE_COUCHBASE_BUCKET_NAME
           value: <%= app.baseName.toLowerCase() %>
-        <%_ } _%>
-        <%_ if (app.searchEngine === 'elasticsearch') { _%>
+        - name: SPRING_COUCHBASE_BUCKET_PASSWORD
+          valueFrom:
+            secretKeyRef:
+              name: couchbase-secret
+              key: password
+<%_ } _%>
+<%_ 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
@@ -202,15 +207,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

package/generators/kubernetes/templates/ingress.yml.ejs

@@ -30,13 +30,13 @@ spec:
   - http:
   <%_ } _%>
       paths:
-      - path: /<%= ingressType === "nginx" ? "" : "*" %>
+      - path: /<%= ingressTypeNginx ? "" : "*" %>
         backend:
           serviceName: <%= app.baseName.toLowerCase() %>
           servicePort: <%= app.serverPort %>
       <%_ if (!app.serviceDiscoveryType) { _%>
         <%_ appConfigs.filter(config => config.baseName !== app.baseName).forEach(config => { _%>
-      - path: /services/<%= config.baseName.toLowerCase() %>/<%= ingressType === "nginx" ? "" : "*" %>
+      - path: /services/<%= config.baseName.toLowerCase() %>/<%= ingressTypeNginx ? "" : "*" %>
         backend:
           serviceName: <%= config.baseName.toLowerCase() %>
           servicePort: <%= config.serverPort %>

package/generators/kubernetes/templates/istio/destination-rule.yml.ejs

@@ -18,7 +18,7 @@ spec:
         maxRequestsPerConnection: 10
         maxRetries: 5
     outlierDetection:
-      consecutiveErrors: 5
+      consecutive5xxErrors: 5
       interval: 30s
       baseEjectionTime: 60s
   subsets:

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

@@ -16,7 +16,10 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
-apiVersion: networking.istio.io/v1alpha3
+# This configuration uses 'http' and is not recommended for production use.
+# Refer https://istio.io/latest/docs/tasks/observability/gateways/ for a more secure 'https' config
+# using a self signed certificate and prefer that for production use
+apiVersion: <%= KUBERNETES_ISTIO_NETWORKING_API_VERSION %>
 kind: Gateway
 metadata:
   name: grafana-observability-gateway
@@ -38,7 +41,7 @@ spec:
     hosts:
     - grafana.istio-system.<%= ingressDomain %>
 ---
-apiVersion: networking.istio.io/v1alpha3
+apiVersion: <%= KUBERNETES_ISTIO_NETWORKING_API_VERSION %>
 kind: VirtualService
 metadata:
   name: grafana-gw-virtualservice

package/generators/kubernetes/templates/istio/gateway/jhipster-grafana-gateway.yml.ejs

@@ -16,7 +16,10 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
-apiVersion: networking.istio.io/v1alpha3
+# This configuration uses 'http' and is not recommended for production use.
+# Refer https://istio.io/latest/docs/tasks/observability/gateways/ for a more secure 'https' config
+# using a self signed certificate and prefer that for production use
+apiVersion: <%= KUBERNETES_ISTIO_NETWORKING_API_VERSION %>
 kind: Gateway
 metadata:
   name: jhipster-grafana-gateway
@@ -38,7 +41,7 @@ spec:
     hosts:
     - jhipster-grafana.<%= kubernetesNamespace %>.<%= ingressDomain %>
 ---
-apiVersion: networking.istio.io/v1alpha3
+apiVersion: <%= KUBERNETES_ISTIO_NETWORKING_API_VERSION %>
 kind: VirtualService
 metadata:
   name: jhipster-grafana-gw-virtualservice

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

@@ -16,7 +16,10 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
-apiVersion: networking.istio.io/v1alpha3
+# This configuration uses 'http' and is not recommended for production use.
+# Refer https://istio.io/latest/docs/tasks/observability/gateways/ for a more secure 'https' config
+# using a self signed certificate and prefer that for production use
+apiVersion: <%= KUBERNETES_ISTIO_NETWORKING_API_VERSION %>
 kind: Gateway
 metadata:
   name: kiali-observability-gateway
@@ -38,7 +41,7 @@ spec:
     hosts:
     - kiali.istio-system.<%= ingressDomain %>
 ---
-apiVersion: networking.istio.io/v1alpha3
+apiVersion: <%= KUBERNETES_ISTIO_NETWORKING_API_VERSION %>
 kind: VirtualService
 metadata:
   name: kiali-gw-virtualservice
@@ -49,9 +52,8 @@ spec:
   gateways:
   - kiali-observability-gateway
   http:
-  - match:
-    - uri:
-        prefix: /
-    route:
-    - destination:
-        host: kiali
+    - route:
+        - destination:
+            host: kiali
+            port:
+              number: 20001

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

@@ -16,7 +16,10 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
-apiVersion: networking.istio.io/v1alpha3
+# This configuration uses 'http' and is not recommended for production use.
+# Refer https://istio.io/latest/docs/tasks/observability/gateways/ for a more secure 'https' config
+# using a self signed certificate and prefer that for production use
+apiVersion: <%= KUBERNETES_ISTIO_NETWORKING_API_VERSION %>
 kind: Gateway
 metadata:
   name: zipkin-observability-gateway
@@ -38,7 +41,7 @@ spec:
     hosts:
     - zipkin.istio-system.<%= ingressDomain %>
 ---
-apiVersion: networking.istio.io/v1alpha3
+apiVersion: <%= KUBERNETES_ISTIO_NETWORKING_API_VERSION %>
 kind: VirtualService
 metadata:
   name: zipkin-gw-virtualservice

package/generators/kubernetes/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,19 +57,18 @@ 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: /<%= config.baseName.toLowerCase() %>/
+        prefix: /services/<%= config.baseName.toLowerCase() %>/
+    rewrite:
+      uri: /
     route:
     - destination:
         host: <%= config.baseName.toLowerCase() %>
-    <%_ }); _%>
-  <%_ } _%>
-  - match:
-    - uri:
-        prefix: /
-    route:
+  <%_ }); _%>
+<%_ } _%>
+  - route:
     - destination:
         host: <%= app.baseName.toLowerCase() %>

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

@@ -38,44 +38,45 @@ exit 0
 
 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 (kubernetesServiceType === 'Ingress') { _%>
-        <%_ appConfigs.forEach((appConfig) =>  { _%>
-        <%_ if (appConfig.applicationType === 'gateway') {_%>
+  <%_ } _%>
+  <%_ if (kubernetesServiceTypeIngress) { _%>
+    <%_ 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 "Zipkin - http://zipkin.istio-system.<%= ingressDomain %>"
         echo "Grafana - http://grafana.istio-system.<%= ingressDomain %>"
         echo "Kiali - http://kiali.istio-system.<%= ingressDomain %>"
-        <%_ } _%>
-        <%_ } _%>
-        echo "#####################################################"
     <%_ } _%>
+  <%_ } _%>
+        echo "#####################################################"
+<%_ } _%>
 }
 
 default() {
     suffix=k8s
-    <%_ 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";
@@ -84,11 +85,11 @@ default() {
     kubectl apply -f monitoring-${suffix}/jhipster-prometheus-cr.yml
     kubectl apply -f monitoring-${suffix}/jhipster-grafana.yml
     kubectl apply -f monitoring-${suffix}/jhipster-grafana-dashboard.yml
-    <%_ } _%>
+<%_ } _%>
 
-    <%_ if (istio && kubernetesServiceType === 'Ingress') { _%>
+<%_ if (istio && kubernetesServiceTypeIngress) { _%>
     kubectl apply -f istio-${suffix}/
-    <%_ } _%>
+<%_ } _%>
 }
 
 kustomize() {

package/generators/kubernetes/templates/kustomize/kustomization.yml.ejs

@@ -1,13 +1,13 @@
 commonLabels:
   app.kubernetes.io/genereted-by: JHipster
 
-<%_ if (kubernetesNamespace !== 'default') { _%>
+<%_ if (!kubernetesNamespaceDefault) { _%>
 namespace: <%= kubernetesNamespace %>
 <%_ } _%>
 
 resources:
 <%_
-if (kubernetesNamespace !== 'default') { _%>
+if (!kubernetesNamespaceDefault) { _%>
 - namespace.yml
 <%_ } _%>
 # Individual apps
@@ -18,58 +18,58 @@ const appName = appConfig.baseName.toLowerCase();
 const appOut = appName.concat('-', suffix); _%>
 - <%= appOut %>/<%= appName %>-deployment.yml
 - <%= appOut %>/<%= appName %>-service.yml
-<%_
-  if (appConfig.prodDatabaseType !== 'no') { _%>
+  <%_ if (!appConfig.databaseTypeNo) { _%>
 - <%= appOut %>/<%= appName %>-<%= appConfig.prodDatabaseType %>.yml
-<%_  }
-  if (appConfig.searchEngine === 'elasticsearch') { _%>
+  <%_ } _%>
+  <%_ if (appConfig.searchEngineElasticsearch) { _%>
 - <%= appOut %>/<%= appName %>-elasticsearch.yml
-<%_  }
-  if (appConfig.applicationType === 'gateway' || appConfig.applicationType === 'monolith') {
-    if (istio) { _%>
+  <%_ } _%>
+  <%_ if (appConfig.applicationTypeGateway || appConfig.applicationTypeMonolith) { _%>
+    <%_ if (istio) { _%>
 - <%= appOut %>/<%= appName %>-gateway.yml
-<%_    } else if (kubernetesServiceType === 'Ingress') { _%>
+    <%_ } else if (kubernetesServiceTypeIngress) { _%>
 - <%= appOut %>/<%= appName %>-ingress.yml
-<%_    }
-  }
-  if (!appConfig.serviceDiscoveryType && appConfig.authenticationType === 'jwt') { _%>
+    <%_ } _%>
+  <%_ } _%>
+  <%_ if (!appConfig.serviceDiscoveryType && appConfig.authenticationTypeJwt) { _%>
 - <%= appOut %>/jwt-secret.yml
-<%_  }
-  if (monitoring === 'prometheus') { _%>
+  <%_ } _%>
+  <%_ if (monitoringPrometheus) { _%>
 - <%= appOut %>/<%= appName %>-prometheus-sm.yml
-<%_  }
-  if (istio) { _%>
+  <%_ } _%>
+  <%_ if (istio) { _%>
 - <%= appOut %>/<%= appName %>-destination-rule.yml
 - <%= appOut %>/<%= appName %>-virtual-service.yml
-<%_  } _%>
+  <%_  } _%>
 <%_ }) _%>
 <%_ if (useKafka) { _%>
 # messagebroker
 - messagebroker-<%= suffix %>/kafka.yml
 <%_ } _%>
-<%_ if (monitoring === 'prometheus') {
-    const monitOut = 'monitoring'.concat('-', suffix); _%>
+<%_ if (monitoringPrometheus) {
+  const monitOut = 'monitoring'.concat('-', suffix); _%>
 # monitoring prometheus
 - <%= monitOut %>/jhipster-prometheus-cr.yml
 - <%= monitOut %>/jhipster-prometheus-crd.yml
 - <%= monitOut %>/jhipster-grafana.yml
 - <%= monitOut %>/jhipster-grafana-dashboard.yml
-<%_ if (istio) { _%>
+  <%_ if (istio) { _%>
 - <%= monitOut %>/jhipster-grafana-gateway.yml
-<%_ } } _%>
+  <%_ } _%>
+<%_ } _%>
 # service discovery eureka/consul
-<%_ if (serviceDiscoveryType === 'eureka') {
-    const registryOut = 'registry'.concat('-', suffix); _%>
+<%_ if (serviceDiscoveryEureka) {
+  const registryOut = 'registry'.concat('-', suffix); _%>
 - <%= registryOut %>/jhipster-registry.yml
 - <%= registryOut %>/application-configmap.yml
-<%_ }  else if (serviceDiscoveryType === 'consul') {
+<%_ }  else if (serviceDiscoveryConsul) {
     const registryOut = 'registry'.concat('-', suffix);_%>
 - <%= registryOut %>/consul.yml
 - <%= registryOut %>/consul-config-loader.yml
 - <%= registryOut %>/application-configmap.yml
 <%_ } _%>
 <%_ if (istio) {
-    const istioOut = 'istio'.concat('-', suffix); _%>
+  const istioOut = 'istio'.concat('-', suffix); _%>
 # istio
 - <%= istioOut %>/grafana-gateway.yml
 - <%= istioOut %>/zipkin-gateway.yml
@@ -78,7 +78,7 @@ const appOut = appName.concat('-', suffix); _%>
 
 patchesJson6902:
 <%_ if (istio) {
-    const patchOut = 'patch'.concat('-', suffix); _%>
+  const patchOut = 'patch'.concat('-', suffix); _%>
 - target:
     version: v1
     kind: Namespace

package/generators/kubernetes/templates/messagebroker/kafka.yml.ejs

@@ -30,10 +30,10 @@ spec:
     metadata:
       labels:
         app: jhipster-kafka
-     <%_ if (istio) { _%>
+<%_ if (istio) { _%>
       annotations:
         sidecar.istio.io/inject: "false"
-     <%_ } _%>
+<%_ } _%>
     spec:
       containers:
       - name: kafka
@@ -82,10 +82,10 @@ spec:
     metadata:
       labels:
         app: jhipster-zookeeper
-     <%_ if (istio) { _%>
+<%_ if (istio) { _%>
       annotations:
         sidecar.istio.io/inject: "false"
-     <%_ } _%>
+<%_ } _%>
     spec:
       containers:
       - name: zookeeper