generator-jhipster 7.3.1 → 7.4.0

package/generators/gae/index.js

@@ -35,11 +35,11 @@ const { MAVEN, GRADLE } = require('../../jdl/jhipster/build-tool-types');
 
 const NO_CACHE_PROVIDER = cacheProviders.NO;
 
-let useBlueprints;
 module.exports = class extends BaseBlueprintGenerator {
-  constructor(args, options, features) {
-    super(args, options, features);
-    useBlueprints = !this.fromBlueprint && this.instantiateBlueprints(GENERATOR_GAE);
+  async _postConstruct() {
+    if (!this.fromBlueprint) {
+      await this.composeWithBlueprints(GENERATOR_GAE);
+    }
   }
 
   _initializing() {
@@ -121,7 +121,7 @@ module.exports = class extends BaseBlueprintGenerator {
   }
 
   get initializing() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._initializing();
   }
 
@@ -607,7 +607,7 @@ module.exports = class extends BaseBlueprintGenerator {
   }
 
   get prompting() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._prompting();
   }
 
@@ -748,7 +748,7 @@ module.exports = class extends BaseBlueprintGenerator {
   }
 
   get configuring() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._configuring();
   }
 
@@ -761,7 +761,7 @@ module.exports = class extends BaseBlueprintGenerator {
   }
 
   get loading() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._loading();
   }
 
@@ -831,7 +831,7 @@ module.exports = class extends BaseBlueprintGenerator {
   }
 
   get writing() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._writing();
   }
 
@@ -877,7 +877,7 @@ module.exports = class extends BaseBlueprintGenerator {
   }
 
   get end() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._end();
   }
 

package/generators/generator-base-blueprint.js

@@ -224,44 +224,6 @@ module.exports = class JHipsterBaseBlueprintGenerator extends BaseGenerator {
     return false;
   }
 
-  /**
-   * @private
-   * @deprecated
-   * Instantiates the blueprint generators, if any.
-   * @param {string} subGen - sub generator
-   * @param {any} extraOptions - extra options to pass to blueprint generator
-   * @return {true} useBlueprints - true if one or more blueprints generators have been constructed; false otherwise
-   */
-  instantiateBlueprints(subGen, extraOptions) {
-    if (this.options.help) {
-      // Ignore blueprint registered options.
-      return false;
-    }
-    let useBlueprints = false;
-
-    if (!this.configOptions.blueprintConfigured) {
-      this.configOptions.blueprintConfigured = true;
-      this._configureBlueprints();
-    }
-
-    const blueprints = this.jhipsterConfig.blueprints;
-    if (blueprints && blueprints.length > 0) {
-      blueprints.forEach(blueprint => {
-        const blueprintGenerator = this._composeBlueprint(blueprint.name, subGen, extraOptions);
-        if (blueprintGenerator) {
-          if (blueprintGenerator.sbsBlueprint) {
-            // If sbsBlueprint, add templatePath to the original generator templatesFolder.
-            this.jhipsterTemplatesFolders.unshift(blueprintGenerator.templatePath());
-          } else {
-            // If the blueprints does not sets sbsBlueprint property, ignore normal workflow.
-            useBlueprints = true;
-          }
-        }
-      });
-    }
-    return useBlueprints;
-  }
-
   /**
    * @private
    * Composes with blueprint generators, if any.
@@ -353,7 +315,7 @@ module.exports = class JHipsterBaseBlueprintGenerator extends BaseGenerator {
    * @param {any} options - options to pass to blueprint generator
    * @return {Generator|undefined}
    */
-  _composeBlueprint(blueprint, subGen, extraOptions = {}) {
+  async _composeBlueprint(blueprint, subGen, extraOptions = {}) {
     blueprint = normalizeBlueprintName(blueprint);
     if (!this.configOptions.skipChecks && !this.options.skipChecks) {
       this._checkBlueprint(blueprint);
@@ -362,16 +324,17 @@ module.exports = class JHipsterBaseBlueprintGenerator extends BaseGenerator {
     const generatorName = packageNameToNamespace(blueprint);
     const generatorNamespace = `${generatorName}:${subGen}`;
     if (!this.env.isPackageRegistered(generatorName)) {
-      this.env.lookup({ filterPaths: true, packagePatterns: blueprint });
+      await this.env.lookup({ filterPaths: true, packagePatterns: blueprint });
     }
-    if (!this.env.get(generatorNamespace)) {
+    if (!(await this.env.get(generatorNamespace))) {
       this.debug(
-        `No blueprint found for blueprint ${chalk.yellow(blueprint)} and ${chalk.yellow(
-          subGen
+        `No blueprint found for blueprint ${chalk.yellow(blueprint)} and ${chalk.yellow(subGen)} with namespace ${chalk.yellow(
+          generatorNamespace
         )} subgenerator: falling back to default generator`
       );
       return undefined;
     }
+    this.debug(`Found blueprint ${chalk.yellow(blueprint)} and ${chalk.yellow(subGen)} with namespace ${chalk.yellow(generatorNamespace)}`);
 
     const finalOptions = {
       ...this.options,
@@ -380,7 +343,7 @@ module.exports = class JHipsterBaseBlueprintGenerator extends BaseGenerator {
       jhipsterContext: this,
     };
 
-    const blueprintGenerator = this.composeWith(generatorNamespace, finalOptions, true);
+    const blueprintGenerator = await this.composeWith(generatorNamespace, finalOptions, true);
     if (blueprintGenerator instanceof Error) {
       throw blueprintGenerator;
     }

package/generators/generator-base.js

@@ -2752,6 +2752,8 @@ templates: ${JSON.stringify(existingTemplates, null, 2)}`;
     dest.testFrameworks = config.testFrameworks || [];
     dest.cypressCoverage = config.cypressCoverage;
 
+    dest.remotes = Object.entries(config.applications || {}).map(([baseName, config]) => ({ baseName, ...config })) || [];
+
     dest.gatlingTests = dest.testFrameworks.includes(GATLING);
     dest.cucumberTests = dest.testFrameworks.includes(CUCUMBER);
     dest.protractorTests = dest.testFrameworks.includes(PROTRACTOR);
@@ -2779,6 +2781,11 @@ templates: ${JSON.stringify(existingTemplates, null, 2)}`;
       dest.humanizedBaseName =
         dest.humanizedBaseName || (dest.baseName.toLowerCase() === 'jhipster' ? 'JHipster' : _.startCase(dest.baseName));
       dest.projectDescription = dest.projectDescription || `Description for ${this.baseName}`;
+      dest.endpointPrefix = !dest.applicationType || dest.applicationTypeMicroservice ? `services/${dest.lowercaseBaseName}` : '';
+    }
+
+    if (dest.remotes) {
+      dest.remotes.forEach(app => this.loadDerivedAppConfig(app));
     }
   }
 

package/generators/generator-constants.js

@@ -26,7 +26,7 @@ const JAVA_VERSION = '11';
 const JAVA_COMPATIBLE_VERSIONS = ['11', '12', '13', '14', '15', '16', '17'];
 
 // Version of Node, NPM
-const NODE_VERSION = '14.17.6';
+const NODE_VERSION = '14.18.1';
 const NPM_VERSION = commonPackageJson.devDependencies.npm;
 const OPENAPI_GENERATOR_CLI_VERSION = '1.0.13-4.3.1';
 
@@ -34,10 +34,10 @@ const GRADLE_VERSION = '7.0.2';
 const JIB_VERSION = '3.1.4';
 
 // Libraries version
-const JHIPSTER_DEPENDENCIES_VERSION = '7.3.1';
+const JHIPSTER_DEPENDENCIES_VERSION = '7.4.0';
 // 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.5.5';
-const LIQUIBASE_VERSION = '4.5.0';
+const SPRING_BOOT_VERSION = '2.5.7';
+const LIQUIBASE_VERSION = '4.6.1';
 const LIQUIBASE_DTD_VERSION = LIQUIBASE_VERSION.split('.', 3).slice(0, 2).join('.');
 const HIBERNATE_VERSION = '5.4.32.Final';
 
@@ -51,27 +51,27 @@ const DOCKER_COMPOSE_FORMAT_VERSION = '3.8';
 const DOCKER_JHIPSTER_REGISTRY = 'jhipster/jhipster-registry:v7.1.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.26';
-const DOCKER_MARIADB = 'mariadb:10.6.4';
-const DOCKER_POSTGRESQL = 'postgres:13.4';
-const DOCKER_MONGODB = 'mongo:4.4.8';
+const DOCKER_MYSQL = 'mysql:8.0.27';
+const DOCKER_MARIADB = 'mariadb:10.7.1';
+const DOCKER_POSTGRESQL = 'postgres:13.5';
+const DOCKER_MONGODB = 'mongo:4.4.10';
 const DOCKER_COUCHBASE = 'couchbase/server:7.0.0';
 const DOCKER_CASSANDRA = 'cassandra:3.11.11';
-const DOCKER_MSSQL = 'mcr.microsoft.com/mssql/server:2019-CU12-ubuntu-20.04';
-const DOCKER_NEO4J = 'neo4j:4.2.11';
+const DOCKER_MSSQL = 'mcr.microsoft.com/mssql/server:2019-CU13-ubuntu-20.04';
+const DOCKER_NEO4J = 'neo4j:4.3.7';
 const DOCKER_HAZELCAST_MANAGEMENT_CENTER = 'hazelcast/management-center:4.2021.06';
-const DOCKER_MEMCACHED = 'memcached:1.6.10-alpine';
-const DOCKER_REDIS = 'redis:6.2.5';
+const DOCKER_MEMCACHED = 'memcached:1.6.12-alpine';
+const DOCKER_REDIS = 'redis:6.2.6';
 const DOCKER_KEYCLOAK = 'jboss/keycloak:15.0.2'; // 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.13.3'; // The version should be coherent with the one from spring-data-elasticsearch project
 const DOCKER_KAFKA = `confluentinc/cp-kafka:${KAFKA_VERSION}`;
 const DOCKER_ZOOKEEPER = `confluentinc/cp-zookeeper:${KAFKA_VERSION}`;
-const DOCKER_SONAR = 'sonarqube:8.9.2-community';
-const DOCKER_CONSUL = 'consul:1.9.9';
+const DOCKER_SONAR = 'sonarqube:9.1.0-community';
+const DOCKER_CONSUL = 'consul:1.10.4';
 const DOCKER_CONSUL_CONFIG_LOADER = 'jhipster/consul-config-loader:v0.4.1';
-const DOCKER_PROMETHEUS = 'prom/prometheus:v2.29.2';
+const DOCKER_PROMETHEUS = 'prom/prometheus:v2.31.1';
 const DOCKER_PROMETHEUS_ALERTMANAGER = 'prom/alertmanager:v0.23.0';
-const DOCKER_GRAFANA = 'grafana/grafana:8.1.3';
+const DOCKER_GRAFANA = 'grafana/grafana:8.2.4';
 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';
@@ -83,7 +83,7 @@ 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_ISTIO_NETWORKING_API_VERSION = 'networking.istio.io/v1alpha3';
+const KUBERNETES_ISTIO_NETWORKING_API_VERSION = 'networking.istio.io/v1beta1';
 const KUBERNETES_RBAC_API_VERSION = 'rbac.authorization.k8s.io/v1';
 
 // Helm versions
@@ -95,6 +95,7 @@ const HELM_MYSQL = '^1.4.0';
 const HELM_MARIADB = '^6.12.2';
 const HELM_POSTGRESQL = '^6.5.3';
 const HELM_MOGODB_REPLICASET = '^3.10.1';
+const HELM_COUCHBASE_OPERATOR = '^2.2.1';
 
 // all constants used throughout all generators
 
@@ -254,7 +255,7 @@ const LANGUAGES = [
            And https://github.com/jhipster/generator-jhipster/issues/9494
            Java 17 supports 'id' locale, for compatibility with java 11, we will keep legacy 'in' value while we support java 11.
            When running with java 17 users must set 'java.locale.useOldISOCodes=true' environment variable.
-           See https://bugs.openjdk.java.net/browse/JDK-8267069. 
+           See https://bugs.openjdk.java.net/browse/JDK-8267069.
         */
     value: 'in',
     localeId: 'id',
@@ -425,6 +426,7 @@ const constants = {
   HELM_MARIADB,
   HELM_POSTGRESQL,
   HELM_MOGODB_REPLICASET,
+  HELM_COUCHBASE_OPERATOR,
 };
 
 module.exports = constants;

package/generators/generator-transforms.js

@@ -18,24 +18,28 @@
  */
 const { State } = require('mem-fs-editor');
 const path = require('path');
-const { createFileTransform } = require('yeoman-environment/lib/util/transform');
+const { passthrough } = require('p-transform');
 const prettier = require('prettier');
 const prettierPluginJava = require('prettier-plugin-java');
 const prettierPluginPackagejson = require('prettier-plugin-packagejson');
+const { patternSpy } = require('yeoman-environment/transform');
 
 const { isFileStateDeleted } = State;
 
-const prettierTransform = function (options, generator, ignoreErrors = false) {
-  return createFileTransform((file, encoding, callback) => {
-    if (isFileStateDeleted(file)) {
-      callback(null, file);
-      return Promise.resolve();
-    }
-    /* resolve from the projects config */
-    let fileContent;
-    return prettier
-      .resolveConfig(file.relative)
-      .then(function (resolvedDestinationFileOptions) {
+const prettierTransform = function (options, generator, transformOptions = {}) {
+  if (typeof transformOptions === 'boolean') {
+    transformOptions = { ignoreErrors: transformOptions };
+  }
+  const { ignoreErrors = false, extensions = generator.getPrettierExtensions() } = transformOptions;
+  return patternSpy(
+    async file => {
+      if (isFileStateDeleted(file)) {
+        return file;
+      }
+      /* resolve from the projects config */
+      let fileContent;
+      try {
+        const resolvedDestinationFileOptions = await prettier.resolveConfig(file.relative);
         const prettierOptions = {
           plugins: [],
           // Config from disk
@@ -52,9 +56,8 @@ const prettierTransform = function (options, generator, ignoreErrors = false) {
         fileContent = file.contents.toString('utf8');
         const data = prettier.format(fileContent, prettierOptions);
         file.contents = Buffer.from(data);
-        callback(null, file);
-      })
-      .catch(error => {
+        return file;
+      } catch (error) {
         const errorMessage = `Error parsing file ${file.relative}: ${error}
 
 At: ${fileContent
@@ -63,16 +66,18 @@ At: ${fileContent
           .join('\n')}`;
         if (ignoreErrors) {
           generator.warning(errorMessage);
-          callback(null, file);
-        } else {
-          callback(new Error(errorMessage));
+          return file;
         }
-      });
-  });
+        throw new Error(errorMessage);
+      }
+    },
+    `**/*.{${extensions}}`,
+    { dot: true }
+  ).name('jhipster:prettier');
 };
 
 const generatedAnnotationTransform = generator => {
-  return createFileTransform(function (file, encoding, callback) {
+  return passthrough(file => {
     if (
       !file.path.endsWith('package-info.java') &&
       !file.path.endsWith('MavenWrapperDownloader.java') &&
@@ -92,8 +97,7 @@ const generatedAnnotationTransform = generator => {
         file.contents = Buffer.from(newContent);
       }
     }
-    callback(null, file);
-  });
+  }, 'jhipster:generated-by-annotation');
 };
 
 module.exports = {

package/generators/heroku/index.js

@@ -39,8 +39,6 @@ const { EUREKA } = require('../../jdl/jhipster/service-discovery-types');
 const NO_CACHE_PROVIDER = cacheProviderOptions.NO;
 const execCmd = util.promisify(ChildProcess.exec);
 
-let useBlueprints;
-
 module.exports = class extends BaseBlueprintGenerator {
   constructor(args, options, features) {
     super(args, options, features);
@@ -64,8 +62,12 @@ module.exports = class extends BaseBlueprintGenerator {
     this.randomPassword = crypto.randomBytes(20).toString('hex');
     this.herokuSkipBuild = this.options.skipBuild;
     this.herokuSkipDeploy = this.options.skipDeploy || this.options.skipBuild;
+  }
 
-    useBlueprints = !this.fromBlueprint && this.instantiateBlueprints(GENERATOR_HEROKU);
+  async _postConstruct() {
+    if (!this.fromBlueprint) {
+      await this.composeWithBlueprints(GENERATOR_HEROKU);
+    }
   }
 
   _initializing() {
@@ -99,7 +101,7 @@ module.exports = class extends BaseBlueprintGenerator {
   }
 
   get initializing() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._initializing();
   }
 
@@ -248,7 +250,7 @@ module.exports = class extends BaseBlueprintGenerator {
   }
 
   get prompting() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._prompting();
   }
 
@@ -280,7 +282,7 @@ module.exports = class extends BaseBlueprintGenerator {
   }
 
   get configuring() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._configuring();
   }
 
@@ -300,7 +302,7 @@ module.exports = class extends BaseBlueprintGenerator {
   }
 
   get loading() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._loading();
   }
 
@@ -575,7 +577,7 @@ module.exports = class extends BaseBlueprintGenerator {
   }
 
   get default() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._default();
   }
 
@@ -622,7 +624,7 @@ module.exports = class extends BaseBlueprintGenerator {
   }
 
   get writing() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._writing();
   }
 
@@ -850,7 +852,7 @@ module.exports = class extends BaseBlueprintGenerator {
   }
 
   get end() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._end();
   }
 };

package/generators/init/constants.cjs

@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-const NODE_VERSION = '14.17.1';
+const NODE_VERSION = '14.18.1';
 
 const PRETTIER_DEFAULT_INDENT = 'prettierDefaultIndent';
 const PRETTIER_DEFAULT_INDENT_DEFAULT_VALUE = 2;

package/generators/kubernetes/files.js

@@ -57,6 +57,9 @@ function writeFiles() {
         if (!this.app.serviceDiscoveryType && this.app.authenticationType === JWT) {
           this.template('secret/jwt-secret.yml.ejs', `${appOut}/jwt-secret.yml`);
         }
+        if (this.app.prodDatabaseTypeCouchbase) {
+          this.template('secret/couchbase-secret.yml.ejs', `${appOut}/templates/couchbase-secret.yml`);
+        }
         if (this.monitoring === PROMETHEUS) {
           this.template('monitoring/jhipster-prometheus-sm.yml.ejs', `${appOut}/${appName}-prometheus-sm.yml`);
         }

package/generators/kubernetes/index.js

@@ -35,11 +35,11 @@ const {
 } = require('../kubernetes-base');
 const statistics = require('../statistics');
 
-let useBlueprints;
 module.exports = class extends BaseDockerGenerator {
-  constructor(args, options, features) {
-    super(args, options, features);
-    useBlueprints = !this.fromBlueprint && this.instantiateBlueprints(GENERATOR_KUBERNETES);
+  async _postConstruct() {
+    if (!this.fromBlueprint) {
+      await this.composeWithBlueprints(GENERATOR_KUBERNETES);
+    }
   }
 
   _initializing() {
@@ -56,7 +56,7 @@ module.exports = class extends BaseDockerGenerator {
   }
 
   get initializing() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._initializing();
   }
 
@@ -82,7 +82,7 @@ module.exports = class extends BaseDockerGenerator {
   }
 
   get prompting() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._prompting();
   }
 
@@ -110,7 +110,7 @@ module.exports = class extends BaseDockerGenerator {
   }
 
   get configuring() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._configuring();
   }
 
@@ -128,7 +128,7 @@ module.exports = class extends BaseDockerGenerator {
   }
 
   get loading() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._loading();
   }
 
@@ -137,7 +137,7 @@ module.exports = class extends BaseDockerGenerator {
   }
 
   get writing() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._writing();
   }
 
@@ -207,7 +207,7 @@ module.exports = class extends BaseDockerGenerator {
   }
 
   get end() {
-    if (useBlueprints) return;
+    if (this.delegateToBlueprint) return {};
     return this._end();
   }
 };

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

@@ -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/deployment.yml.ejs

@@ -67,7 +67,7 @@ spec:
                   rt=$(nc -z -w 1 <%= app.baseName.toLowerCase() %>-mongodb 27017)
 <%_ } _%>
 <%_ if (app.prodDatabaseTypeCouchbase) { _%>
-                  rt=$(nc -z -w 1 <%= app.baseName.toLowerCase() %>-couchbase 8091)
+                  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)
@@ -177,9 +177,14 @@ spec:
 <%_ } _%>
 <%_ 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: JHIPSTER_COUCHBASE_BUCKET_NAME
+          value: "<%= app.baseName.toLowerCase() %>-couchbase-cluster-srv"
+        - name: JHIPSTER_DATABASE_COUCHBASE_BUCKET_NAME
           value: <%= app.baseName.toLowerCase() %>
+        - name: SPRING_COUCHBASE_BUCKET_PASSWORD
+          valueFrom:
+            secretKeyRef:
+              name: couchbase-secret
+              key: password
 <%_ } _%>
 <%_ if (app.searchEngineElasticsearch) { _%>
         - name: SPRING_ELASTICSEARCH_REST_URIS

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