generator-jhipster 7.8.1 → 7.9.2

package/generators/generator-constants.js

@@ -25,66 +25,99 @@ const commonPackageJson = require('./common/templates/package.json');
 // Version of Java
 const JAVA_VERSION = '11';
 const JAVA_COMPATIBLE_VERSIONS = ['11', '12', '13', '14', '15', '16', '17', '18'];
+const GRADLE_VERSION = gradleOptions.GRADLE_VERSION;
 
 // Version of Node, NPM
-const NODE_VERSION = '16.14.0';
+const NODE_VERSION = '16.16.0';
 const NPM_VERSION = commonPackageJson.devDependencies.npm;
-const OPENAPI_GENERATOR_CLI_VERSION = '1.0.13-4.3.1';
-
-const GRADLE_VERSION = gradleOptions.GRADLE_VERSION;
-const JIB_VERSION = '3.2.1';
+const OPENAPI_GENERATOR_CLI_VERSION = '2.5.1';
 
 // Libraries version
-const JHIPSTER_DEPENDENCIES_VERSION = '7.8.1';
+const JHIPSTER_DEPENDENCIES_VERSION = '7.9.2';
 // The spring-boot version should match the one managed by https://mvnrepository.com/artifact/tech.jhipster/jhipster-dependencies/JHIPSTER_DEPENDENCIES_VERSION
-const SPRING_BOOT_VERSION = '2.6.6';
-const LIQUIBASE_VERSION = '4.6.1';
-const LIQUIBASE_DTD_VERSION = LIQUIBASE_VERSION.split('.', 3).slice(0, 2).join('.');
-const HIBERNATE_VERSION = '5.6.7.Final';
-
-const JACOCO_VERSION = '0.8.7';
-const KAFKA_VERSION = '5.5.7';
-const JACKSON_DATABIND_NULLABLE_VERSION = '0.2.2';
+const SPRING_BOOT_VERSION = '2.7.2';
+const LIQUIBASE_VERSION = '4.12.0';
+// TODO v8: Remove this constant
+const LIQUIBASE_DTD_VERSION = 'latest';
+const HIBERNATE_VERSION = '5.6.10.Final';
+const JACOCO_VERSION = '0.8.8';
+const JACKSON_DATABIND_NULLABLE_VERSION = '0.2.3';
+const JIB_VERSION = '3.2.1';
+// TODO upgrade to h2 v2 once liquibase issues has been addressed
+const H2_VERSION = '1.4.200';
+// Version 0.9.x is not compatible with h2 v1
+const H2_R2DBC_VERSION = '0.8.5.RELEASE';
 
 // Version of docker images
 const DOCKER_COMPOSE_FORMAT_VERSION = '3.8';
 // const DOCKER_JHIPSTER_REGISTRY = 'ghcr.io/jhipster/jhipster-registry:main';
-const DOCKER_JHIPSTER_REGISTRY = 'jhipster/jhipster-registry:v7.3.0';
-const DOCKER_JHIPSTER_CONTROL_CENTER = 'jhipster/jhipster-control-center:v0.5.0';
-const DOCKER_JAVA_JRE = 'eclipse-temurin:11-jre-focal';
-const DOCKER_MYSQL = 'mysql:8.0.28';
-const DOCKER_MARIADB = 'mariadb:10.7.1';
-const DOCKER_POSTGRESQL = 'postgres:14.2';
-const DOCKER_MONGODB = 'mongo:4.4.12';
-const DOCKER_COUCHBASE = 'couchbase/server:7.0.3';
-const DOCKER_CASSANDRA = 'cassandra:3.11.12';
-const DOCKER_MSSQL = 'mcr.microsoft.com/mssql/server:2019-CU15-ubuntu-20.04';
-const DOCKER_NEO4J = 'neo4j:4.4.4';
-const DOCKER_HAZELCAST_MANAGEMENT_CENTER = 'hazelcast/management-center:4.2022.01';
-const DOCKER_MEMCACHED = 'memcached:1.6.14-alpine';
-const DOCKER_REDIS = 'redis:6.2.6';
-const DOCKER_KEYCLOAK = 'jboss/keycloak:16.1.0'; // The version should match the attribute 'keycloakVersion' from /docker-compose/templates/realm-config/jhipster-realm.json.ejs and /server/templates/src/main/docker/config/realm-config/jhipster-realm.json.ejs
-const DOCKER_ELASTICSEARCH = 'docker.elastic.co/elasticsearch/elasticsearch:7.15.2'; // The version should be coherent with the one from spring-data-elasticsearch project
+const DOCKER_JHIPSTER_REGISTRY_VERSION = 'v7.3.0';
+const DOCKER_JHIPSTER_REGISTRY = `jhipster/jhipster-registry:${DOCKER_JHIPSTER_REGISTRY_VERSION}`;
+const DOCKER_JHIPSTER_CONTROL_CENTER_VERSION = 'v0.5.0';
+const DOCKER_JHIPSTER_CONTROL_CENTER = `jhipster/jhipster-control-center:${DOCKER_JHIPSTER_CONTROL_CENTER_VERSION}`;
+const DOCKER_JAVA_JRE_VERSION = '11-jre-focal';
+const DOCKER_JAVA_JRE = `eclipse-temurin:${DOCKER_JAVA_JRE_VERSION}`;
+const DOCKER_MYSQL_VERSION = '8.0.29';
+const DOCKER_MYSQL = `mysql:${DOCKER_MYSQL_VERSION}`;
+const DOCKER_MARIADB_VERSION = '10.8.3';
+const DOCKER_MARIADB = `mariadb:${DOCKER_MARIADB_VERSION}`;
+const DOCKER_POSTGRESQL_VERSION = '14.4';
+const DOCKER_POSTGRESQL = `postgres:${DOCKER_POSTGRESQL_VERSION}`;
+const DOCKER_MONGODB_VERSION = '4.4.14';
+const DOCKER_MONGODB = `mongo:${DOCKER_MONGODB_VERSION}`;
+const DOCKER_COUCHBASE_VERSION = '7.0.3';
+const DOCKER_COUCHBASE = `couchbase/server:${DOCKER_COUCHBASE_VERSION}`;
+const DOCKER_CASSANDRA_VERSION = '3.11.13';
+const DOCKER_CASSANDRA = `cassandra:${DOCKER_CASSANDRA_VERSION}`;
+const DOCKER_MSSQL_VERSION = '2019-CU16-ubuntu-20.04';
+const DOCKER_MSSQL = `mcr.microsoft.com/mssql/server:${DOCKER_MSSQL_VERSION}`;
+const DOCKER_NEO4J_VERSION = '4.4.8';
+const DOCKER_NEO4J = `neo4j:${DOCKER_NEO4J_VERSION}`;
+const DOCKER_HAZELCAST_MANAGEMENT_CENTER_VERSION = '5.1.3';
+const DOCKER_HAZELCAST_MANAGEMENT_CENTER = `hazelcast/management-center:${DOCKER_HAZELCAST_MANAGEMENT_CENTER_VERSION}`;
+const DOCKER_MEMCACHED_VERSION = '1.6.15-alpine';
+const DOCKER_MEMCACHED = `memcached:${DOCKER_MEMCACHED_VERSION}`;
+const DOCKER_REDIS_VERSION = '6.2.7';
+const DOCKER_REDIS = `redis:${DOCKER_REDIS_VERSION}`;
+const DOCKER_KEYCLOAK_VERSION = '18.0.0';
+const DOCKER_KEYCLOAK = `quay.io/keycloak/keycloak:${DOCKER_KEYCLOAK_VERSION}`;
+const DOCKER_ELASTICSEARCH_CONTAINER = 'docker.elastic.co/elasticsearch/elasticsearch';
+// TODO V8 Rename ELASTICSEARCH_VERSION to DOCKER_ELASTICSEARCH_VERSION
+const ELASTICSEARCH_VERSION = '7.17.4'; // The version should be coherent with the one from spring-data-elasticsearch project
+const DOCKER_ELASTICSEARCH = `${DOCKER_ELASTICSEARCH_CONTAINER}:${ELASTICSEARCH_VERSION}`;
+// TODO V8 Rename KAFKA_VERSION to DOCKER_KAFKA_VERSION
+const KAFKA_VERSION = '7.1.1';
 const DOCKER_KAFKA = `confluentinc/cp-kafka:${KAFKA_VERSION}`;
 const DOCKER_ZOOKEEPER = `confluentinc/cp-zookeeper:${KAFKA_VERSION}`;
-const DOCKER_SONAR = 'sonarqube:9.3.0-community';
-const DOCKER_CONSUL = 'consul:1.11.3';
-const DOCKER_CONSUL_CONFIG_LOADER = 'jhipster/consul-config-loader:v0.4.1';
-const DOCKER_PROMETHEUS = 'prom/prometheus:v2.33.3';
-const DOCKER_PROMETHEUS_ALERTMANAGER = 'prom/alertmanager:v0.23.0';
-const DOCKER_GRAFANA = 'grafana/grafana:8.4.1';
-const DOCKER_JENKINS = 'jenkins/jenkins:lts-jdk11';
-const DOCKER_SWAGGER_EDITOR = 'swaggerapi/swagger-editor:latest';
-const DOCKER_PROMETHEUS_OPERATOR = 'quay.io/coreos/prometheus-operator:v0.42.1';
-const DOCKER_GRAFANA_WATCHER = 'quay.io/coreos/grafana-watcher:v0.0.8';
-const DOCKER_ZIPKIN = 'openzipkin/zipkin:2.23';
+const DOCKER_SONAR_VERSION = '9.5.0-community';
+const DOCKER_SONAR = `sonarqube:${DOCKER_SONAR_VERSION}`;
+const DOCKER_CONSUL_VERSION = '1.12.2';
+const DOCKER_CONSUL = `consul:${DOCKER_CONSUL_VERSION}`;
+const DOCKER_CONSUL_CONFIG_LOADER_VERSION = 'v0.4.1';
+const DOCKER_CONSUL_CONFIG_LOADER = `jhipster/consul-config-loader:${DOCKER_CONSUL_CONFIG_LOADER_VERSION}`;
+const DOCKER_PROMETHEUS_VERSION = 'v2.36.2';
+const DOCKER_PROMETHEUS = `prom/prometheus:${DOCKER_PROMETHEUS_VERSION}`;
+const DOCKER_PROMETHEUS_ALERTMANAGER_VERSION = 'v0.24.0';
+const DOCKER_PROMETHEUS_ALERTMANAGER = `prom/alertmanager:${DOCKER_PROMETHEUS_ALERTMANAGER_VERSION}`;
+const DOCKER_GRAFANA_VERSION = '9.0.1';
+const DOCKER_GRAFANA = `grafana/grafana:${DOCKER_GRAFANA_VERSION}`;
+const DOCKER_JENKINS_VERSION = 'lts-jdk11';
+const DOCKER_JENKINS = `jenkins/jenkins:${DOCKER_JENKINS_VERSION}`;
+const DOCKER_SWAGGER_EDITOR_VERSION = 'latest';
+const DOCKER_SWAGGER_EDITOR = `swaggerapi/swagger-editor:${DOCKER_SWAGGER_EDITOR_VERSION}`;
+const DOCKER_PROMETHEUS_OPERATOR_VERSION = 'v0.42.1';
+const DOCKER_PROMETHEUS_OPERATOR = `quay.io/coreos/prometheus-operator:${DOCKER_PROMETHEUS_OPERATOR_VERSION}`;
+const DOCKER_GRAFANA_WATCHER_VERSION = 'v0.0.8';
+const DOCKER_GRAFANA_WATCHER = `quay.io/coreos/grafana-watcher:${DOCKER_GRAFANA_WATCHER_VERSION}`;
+const DOCKER_ZIPKIN_VERSION = '2.23';
+const DOCKER_ZIPKIN = `openzipkin/zipkin:${DOCKER_ZIPKIN_VERSION}`;
 
 // Kubernetes versions
 const KUBERNETES_CORE_API_VERSION = 'v1';
 const KUBERNETES_BATCH_API_VERSION = 'batch/v1';
 const KUBERNETES_DEPLOYMENT_API_VERSION = 'apps/v1';
 const KUBERNETES_STATEFULSET_API_VERSION = 'apps/v1';
-const KUBERNETES_INGRESS_API_VERSION = 'networking.k8s.io/v1beta1';
+const KUBERNETES_INGRESS_API_VERSION = 'networking.k8s.io/v1';
 const KUBERNETES_ISTIO_NETWORKING_API_VERSION = 'networking.istio.io/v1beta1';
 const KUBERNETES_RBAC_API_VERSION = 'rbac.authorization.k8s.io/v1';
 
@@ -352,6 +385,9 @@ const constants = {
   SERVER_TEST_SRC_DIR: `${TEST_DIR}java/`,
   SERVER_TEST_RES_DIR: `${TEST_DIR}resources/`,
 
+  R2DBC_DB_OPTIONS,
+  SQL_DB_OPTIONS,
+
   // server related
   OFFICIAL_DATABASE_TYPE_NAMES,
 
@@ -361,23 +397,59 @@ const constants = {
   JHIPSTER_DOCUMENTATION_URL,
   JHIPSTER_DOCUMENTATION_ARCHIVE_PATH,
 
+  JAVA_VERSION,
+  JAVA_COMPATIBLE_VERSIONS,
+  GRADLE_VERSION,
+
+  // NPM
+  NODE_VERSION,
+  NPM_VERSION,
+  OPENAPI_GENERATOR_CLI_VERSION,
+
+  // Libraries
+  JHIPSTER_DEPENDENCIES_VERSION,
+  SPRING_BOOT_VERSION,
+  LIQUIBASE_VERSION,
+  // TODO v8: Remove this constant
+  LIQUIBASE_DTD_VERSION,
+  HIBERNATE_VERSION,
+  JIB_VERSION,
+  JACOCO_VERSION,
+  JACKSON_DATABIND_NULLABLE_VERSION,
+  H2_VERSION,
+  H2_R2DBC_VERSION,
+
+  // Docker
+  DOCKER_COMPOSE_FORMAT_VERSION,
   DOCKER_JHIPSTER_REGISTRY,
   DOCKER_JHIPSTER_CONTROL_CENTER,
   DOCKER_JAVA_JRE,
   DOCKER_MYSQL,
+  DOCKER_MYSQL_VERSION,
   DOCKER_MARIADB,
+  DOCKER_MARIADB_VERSION,
   DOCKER_POSTGRESQL,
+  DOCKER_POSTGRESQL_VERSION,
   DOCKER_MONGODB,
+  DOCKER_MONGODB_VERSION,
   DOCKER_COUCHBASE,
+  DOCKER_COUCHBASE_VERSION,
   DOCKER_CASSANDRA,
+  DOCKER_CASSANDRA_VERSION,
   DOCKER_MSSQL,
+  DOCKER_MSSQL_VERSION,
   DOCKER_NEO4J,
+  DOCKER_NEO4J_VERSION,
   DOCKER_HAZELCAST_MANAGEMENT_CENTER,
   DOCKER_MEMCACHED,
   DOCKER_REDIS,
   DOCKER_ELASTICSEARCH,
+  DOCKER_ELASTICSEARCH_CONTAINER,
+  ELASTICSEARCH_VERSION,
   DOCKER_KEYCLOAK,
+  DOCKER_KEYCLOAK_VERSION,
   DOCKER_KAFKA,
+  KAFKA_VERSION,
   DOCKER_ZOOKEEPER,
   DOCKER_SONAR,
   DOCKER_CONSUL,
@@ -385,33 +457,13 @@ const constants = {
   DOCKER_PROMETHEUS,
   DOCKER_PROMETHEUS_ALERTMANAGER,
   DOCKER_GRAFANA,
-  JAVA_VERSION,
-  JAVA_COMPATIBLE_VERSIONS,
-  KAFKA_VERSION,
-  GRADLE_VERSION,
-
-  // Libraries
-  JIB_VERSION,
-  JHIPSTER_DEPENDENCIES_VERSION,
-  SPRING_BOOT_VERSION,
-  LIQUIBASE_VERSION,
-  LIQUIBASE_DTD_VERSION,
-  HIBERNATE_VERSION,
-  JACOCO_VERSION,
-  JACKSON_DATABIND_NULLABLE_VERSION,
-
-  // NPM
-  NODE_VERSION,
-  NPM_VERSION,
-  OPENAPI_GENERATOR_CLI_VERSION,
-
+  DOCKER_ZIPKIN,
   DOCKER_JENKINS,
   DOCKER_SWAGGER_EDITOR,
-  R2DBC_DB_OPTIONS,
-  SQL_DB_OPTIONS,
-  DOCKER_COMPOSE_FORMAT_VERSION,
   DOCKER_PROMETHEUS_OPERATOR,
   DOCKER_GRAFANA_WATCHER,
+
+  // Kubernetes
   KUBERNETES_CORE_API_VERSION,
   KUBERNETES_BATCH_API_VERSION,
   KUBERNETES_DEPLOYMENT_API_VERSION,
@@ -419,8 +471,8 @@ const constants = {
   KUBERNETES_INGRESS_API_VERSION,
   KUBERNETES_ISTIO_NETWORKING_API_VERSION,
   KUBERNETES_RBAC_API_VERSION,
-  DOCKER_ZIPKIN,
 
+  // Helm
   HELM_KAFKA,
   HELM_ELASTICSEARCH,
   HELM_PROMETHEUS,

package/generators/generator-defaults.js

@@ -115,6 +115,7 @@ const defaultConfigMicroservice = {
   ...appDefaultConfig,
   ...serverDefaultConfig,
   ...translationDefaultConfig,
+  microfrontend: false,
 };
 
 const entityDefaultConfig = {

package/generators/heroku/index.js

@@ -489,13 +489,14 @@ module.exports = class extends BaseBlueprintGenerator {
 
         this.log(chalk.bold('\nProvisioning addons'));
         if (this.searchEngine === ELASTICSEARCH) {
-          ChildProcess.exec(
-            `heroku addons:create bonsai:sandbox --as BONSAI --app ${this.herokuAppName}`,
-            addonCreateCallback.bind(this, 'Elasticsearch')
-          );
+          this.log(chalk.bold('\nProvisioning bonsai elasticsearch addon'));
+          ChildProcess.exec(`heroku addons:create bonsai:sandbox-6 --as BONSAI --app ${this.herokuAppName}`, (err, stdout, stderr) => {
+            addonCreateCallback.bind('Elasticsearch', err, stdout, stderr);
+          });
         }
 
         if (this.useOkta) {
+          this.log(chalk.bold('\nProvisioning okta addon'));
           ChildProcess.exec(`heroku addons:create okta --app ${this.herokuAppName}`, (err, stdout, stderr) => {
             addonCreateCallback('Okta', err, stdout, stderr);
           });

package/generators/heroku/templates/application-heroku.yml.ejs

@@ -76,8 +76,7 @@ spring:
 <%_ } _%>
 <%_ if (searchEngineElasticsearch) { _%>
   elasticsearch:
-    rest:
-      uris: ${BONSAI_URL}
+    uris: ${BONSAI_URL}
 <%_ } _%>
 <%_ if (useOkta) { _%>
   security:

package/generators/heroku/templates/heroku.gradle.ejs

@@ -22,7 +22,23 @@ heroku {
     appName = "<%= herokuAppName %>"
     buildpacks = ["heroku/jvm"]
 }
+
+// force dependency version as used bonsai add-on as of now only supports 7.10.x
+// https://github.com/jhipster/generator-jhipster/issues/18650
+def bonsaiElasticSearchVersion = "7.10.2"
 <%_ if (herokuDeployType === 'git') { _%>
+if (System.getenv("DYNO") != null) {
+    configurations {
+        all {
+            resolutionStrategy {
+                force "org.elasticsearch.client:elasticsearch-rest-client:${bonsaiElasticSearchVersion}"
+                force "org.elasticsearch.client:elasticsearch-rest-high-level-client:${bonsaiElasticSearchVersion}"
+                force "org.elasticsearch:elasticsearch:${bonsaiElasticSearchVersion}"
+                force "org.elasticsearch.plugin:transport-netty4-client:${bonsaiElasticSearchVersion}"
+            }
+        }
+    }
+}
 
 // Task stage is used by Heroku, see also
 // https://devcenter.heroku.com/articles/deploying-gradle-apps-on-heroku
@@ -38,4 +54,15 @@ gradle.taskGraph.whenReady {taskGraph ->
         }
     }
 }
-<%_ } _%>
+<%_ } else { _%>
+configurations {
+    all {
+        resolutionStrategy {
+            force "org.elasticsearch.client:elasticsearch-rest-client:${bonsaiElasticSearchVersion}"
+            force "org.elasticsearch.client:elasticsearch-rest-high-level-client:${bonsaiElasticSearchVersion}"
+            force "org.elasticsearch:elasticsearch:${bonsaiElasticSearchVersion}"
+            force "org.elasticsearch.plugin:transport-netty4-client:${bonsaiElasticSearchVersion}"
+        }
+    }
+}
+<%_ }  _%>

package/generators/heroku/templates/pom-profile.xml.ejs

@@ -1,3 +1,32 @@
+            <!-- force dependency version as used bonsai add-on as of now only supports 7.10.x -->
+            <!-- https://github.com/jhipster/generator-jhipster/issues/18650 -->
+            <properties>
+                <bonsai.elasticsearch.version>7.10.2</bonsai.elasticsearch.version>
+            </properties>
+            <dependencyManagement>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.elasticsearch.client</groupId>
+                        <artifactId>elasticsearch-rest-client</artifactId>
+                        <version>${bonsai.elasticsearch.version}</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.elasticsearch.client</groupId>
+                        <artifactId>elasticsearch-rest-high-level-client</artifactId>
+                        <version>${bonsai.elasticsearch.version}</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.elasticsearch</groupId>
+                        <artifactId>elasticsearch</artifactId>
+                        <version>${bonsai.elasticsearch.version}</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.elasticsearch.plugin</groupId>
+                        <artifactId>transport-netty4-client</artifactId>
+                        <version>${bonsai.elasticsearch.version}</version>
+                    </dependency>
+                </dependencies>
+            </dependencyManagement>
             <build>
                 <plugins>
                     <plugin>

package/generators/java/index.cjs

@@ -270,8 +270,8 @@ module.exports = class extends MixedChain {
 
   /**
    * Validates packageName
-   * @param String input - Package name to be checked
-   * @returns Boolean
+   * @param {string} input - Package name to be checked
+   * @returns {Boolean|string} true if valid, error message otherwise
    */
   validatePackageName(input) {
     if (!/^([a-z_]{1}[a-z0-9_]*(\.[a-z_]{1}[a-z0-9_]*)*)$/.test(input)) {

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

@@ -208,8 +208,6 @@ metadata:
   namespace: <%= kubernetesNamespace %>
   labels:
     app: <%= app.baseName.toLowerCase() %>-couchbase
-  annotations:
-    service.alpha.kubernetes.io/tolerate-unready-endpoints: "true"
 spec:
   ports:
     -
@@ -234,6 +232,7 @@ spec:
       targetPort: 11210
   clusterIP: None
   type: ClusterIP
+  publishNotReadyAddresses: true
   selector:
     app: <%= app.baseName.toLowerCase() %>-couchbase
 ---

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

@@ -339,13 +339,12 @@ spec:
 apiVersion: <%= KUBERNETES_CORE_API_VERSION  %>
 kind: Service
 metadata:
-  annotations:
-    service.alpha.kubernetes.io/tolerate-unready-endpoints: "true"
   name: <%= app.baseName.toLowerCase() %>-mongodb
   namespace: <%= kubernetesNamespace %>
 spec:
   type: ClusterIP
   clusterIP: None
+  publishNotReadyAddresses: true
   ports:
     - name: peer
       port: 27017

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

@@ -22,6 +22,7 @@ metadata:
   name: <%= app.baseName.toLowerCase() %>
   namespace: <%= kubernetesNamespace %>
 spec:
+  ingressClassName: <%= ingressType || "nginx" %>
   rules:
   <%_ if (ingressDomain) { _%>
   - host: <%= app.baseName.toLowerCase() %>.<%= kubernetesNamespace %>.<%= ingressDomain %>
@@ -31,14 +32,20 @@ spec:
   <%_ } _%>
       paths:
       - path: /<%= ingressTypeNginx ? "" : "*" %>
+        pathType: Prefix
         backend:
-          serviceName: <%= app.baseName.toLowerCase() %>
-          servicePort: <%= app.serverPort %>
+          service:
+            name: <%= app.baseName.toLowerCase() %>
+            port:
+              name: http
       <%_ if (!app.serviceDiscoveryType) { _%>
         <%_ appConfigs.filter(config => config.baseName !== app.baseName).forEach(config => { _%>
       - path: /services/<%= config.baseName.toLowerCase() %>/<%= ingressTypeNginx ? "" : "*" %>
+        pathType: Prefix
         backend:
-          serviceName: <%= config.baseName.toLowerCase() %>
-          servicePort: <%= config.serverPort %>
+          service:
+            name: <%= config.baseName.toLowerCase() %>
+            port:
+              name: http
         <%_ }); _%>
       <%_ } _%>

package/generators/kubernetes/templates/monitoring/jhipster-grafana.yml.ejs

@@ -106,12 +106,16 @@ metadata:
   name: jhipster-grafana
   namespace: <%= kubernetesNamespace %>
 spec:
+  ingressClassName: nginx
   rules:
   - host: jhipster-grafana.<%= kubernetesNamespace %>.<%= ingressDomain %>
     http:
       paths:
       - path: /
+        pathType: Prefix
         backend:
-          serviceName: jhipster-grafana
-          servicePort: 3000
+          service:
+            name: jhipster-grafana
+            port: 
+              number: 3000
 <%_ } _%>

package/generators/kubernetes/templates/registry/consul.yml.ejs

@@ -49,8 +49,6 @@ metadata:
   namespace: <%= kubernetesNamespace %>
   labels:
     app: consul
-  annotations:
-    service.alpha.kubernetes.io/tolerate-unready-endpoints: "true"
 spec:
   ports:
   - name: http
@@ -74,6 +72,7 @@ spec:
   - name: consuldns
     port: 8600
   clusterIP: None
+  publishNotReadyAddresses: true
   selector:
     app: consul
 ---

package/generators/kubernetes/templates/registry/jhipster-registry.yml.ejs

@@ -46,13 +46,12 @@ metadata:
   namespace: <%= kubernetesNamespace %>
   labels:
     app: jhipster-registry
-  annotations:
-    service.alpha.kubernetes.io/tolerate-unready-endpoints: "true"
 spec:
   ports:
   - port: 8761
     name: http
   clusterIP: None
+  publishNotReadyAddresses: true
   selector:
     app: jhipster-registry
 ---

package/generators/languages/templates/src/main/webapp/i18n/al/global.json.ejs

@@ -118,7 +118,8 @@
             "edit": "Përpuno",
             "open": "Hap",
             "save": "Ruaj",
-            "view": "Trego"
+            "view": "Trego",
+            "show": "Show {{otherEntity}}"
         },
         "detail": {
             "field": "Fusha",
@@ -139,6 +140,11 @@
             "number": "Kjo fushë duhet të jetë një numër.",
             "datetimelocal": "Kjo fushë duhet të jetë një datë dhe kohë.",
             "patternLogin": "Kjo fushë mund të ketë vetëm gërma, numra dhe adresa e-mali."
+        },
+        "filters": {
+          "set": "Following filters are set",
+          "clear": "Clear filter",
+          "clearAll": "Clear all filters"
         }
     },
     "error": {

package/generators/languages/templates/src/main/webapp/i18n/ar-ly/global.json.ejs

@@ -118,7 +118,8 @@
             "edit": "تعديل",
             "open": "فتح",
             "save": "حفظ",
-            "view": "عرض"
+            "view": "عرض",
+            "show": "Show {{otherEntity}}"
         },
         "detail": {
             "field": "حقل",
@@ -138,6 +139,11 @@
             "pattern": "هذا الحقل يجب أن يتبع نمط {{ pattern }}.",
             "number": "هذا الحقل يجب أن يكون رقم.",
             "datetimelocal": "هذا الحقل يجب أن يكون تاريخ ووقت."
+        },
+        "filters": {
+          "set": "Following filters are set",
+          "clear": "Clear filter",
+          "clearAll": "Clear all filters"
         }
     },
     "error": {

package/generators/languages/templates/src/main/webapp/i18n/bg/global.json.ejs

@@ -118,7 +118,8 @@
             "edit": "Редактиране",
             "open": "Отваряне",
             "save": "Запазване",
-            "view": "Преглед"
+            "view": "Преглед",
+            "show": "Show {{otherEntity}}"
         },
         "detail": {
             "field": "Поле",
@@ -139,6 +140,11 @@
             "number": "Това поле трябва да бъде число.",
             "datetimelocal": "Това поле трябва да бъде дата и час.",
             "patternLogin": "Това поле може да съдържа само букви, цифри и имейл адреси."
+        },
+        "filters": {
+          "set": "Following filters are set",
+          "clear": "Clear filter",
+          "clearAll": "Clear all filters"
         }
     },
     "error": {

package/generators/languages/templates/src/main/webapp/i18n/bn/global.json.ejs

@@ -118,7 +118,8 @@
             "edit": "Edit",
             "open": "Open",
             "save": "Save",
-            "view": "View"
+            "view": "View",
+            "show": "Show {{otherEntity}}"
         },
         "detail": {
             "field": "Field",
@@ -139,6 +140,11 @@
             "number": "This field should be a number.",
             "datetimelocal": "This field should be a date and time.",
             "patternLogin": "This field can only contain letters, digits and e-mail addresses."
+        },
+        "filters": {
+          "set": "Following filters are set",
+          "clear": "Clear filter",
+          "clearAll": "Clear all filters"
         }
     },
     "error": {

package/generators/languages/templates/src/main/webapp/i18n/by/global.json.ejs

@@ -118,7 +118,8 @@
             "edit": "Змяніць",
             "open": "Адкрыць",
             "save": "Захаваць",
-            "view": "Прагляд"
+            "view": "Прагляд",
+            "show": "Show {{otherEntity}}"
         },
         "detail": {
             "field": "Поле",
@@ -138,6 +139,11 @@
             "pattern": "Гэта поле павінна прытрымлівацца мадэлі {{pattern}}.",
             "number": "Гэта поле не можа быць лікам.",
             "datetimelocal": "Гэта поле павінна быць дата і час."
+        },
+        "filters": {
+          "set": "Following filters are set",
+          "clear": "Clear filter",
+          "clearAll": "Clear all filters"
         }
     },
     "error": {

package/generators/languages/templates/src/main/webapp/i18n/ca/global.json.ejs

@@ -118,7 +118,8 @@
             "edit": "Edita",
             "open": "Open",
             "save": "Desa",
-            "view": "Visualitza"
+            "view": "Visualitza",
+            "show": "Show {{otherEntity}}"
         },
         "detail": {
             "field": "Camp",
@@ -138,6 +139,11 @@
             "pattern": "Aquest camp ha de tenir el seguent patró {{pattern}}.",
             "number": "Aquest camp ha de ser numèric.",
             "datetimelocal": "Aquest camp ha de ser una data/hora."
+        },
+        "filters": {
+          "set": "Following filters are set",
+          "clear": "Clear filter",
+          "clearAll": "Clear all filters"
         }
     },
     "error": {