generator-jhipster 8.0.0-beta.3 → 8.0.0

package/dist/generators/java/templates/src/test/java/_package_/_entityPackage_/domain/_persistClass_TestSamples.java.ejs

@@ -0,0 +1,85 @@
+<%#
+ Copyright 2013-2023 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.
+-%>
+package <%= entityAbsolutePackage %>.domain;
+
+import org.junit.jupiter.api.Test;
+import static org.assertj.core.api.Assertions.assertThat;
+import <%= packageName %>.web.rest.TestUtil;
+<%_ if (fields.some(field => field.fieldTypeString) || fields.some(field => field.fieldTypeUUID)) { _%>
+import java.util.UUID;
+<%_ } _%>
+<%_ if (fields.some(field => field.fieldTypeLong || field.fieldTypeInteger)) { _%>
+import java.util.Random;
+<%_ } _%>
+<%_ if (fields.some(field => field.fieldTypeLong)) { _%>
+import java.util.concurrent.atomic.AtomicLong;
+<%_ } _%>
+<%_ if (fields.some(field => field.fieldTypeInteger)) { _%>
+import java.util.concurrent.atomic.AtomicInteger;
+<%_ } _%>
+
+<%_ const sampleFields = fields.filter(field => !field.mapstructExpression && (field.fieldTypeInteger || field.fieldTypeLong || field.fieldTypeString || field.fieldTypeUUID)); _%>
+public class <%= persistClass %>TestSamples {
+
+<%_ if (fields.some(field => field.fieldTypeLong || field.fieldTypeInteger)) { _%>
+    private static final Random random = new Random();
+<%_ } _%>
+<%_ if (fields.some(field => field.fieldTypeLong)) { _%>
+    private static final AtomicLong longCount = new AtomicLong(random.nextInt() + ( 2 * Integer.MAX_VALUE ));
+<%_ } _%>
+<%_ if (fields.some(field => field.fieldTypeInteger)) { _%>
+    private static final AtomicInteger intCount = new AtomicInteger(random.nextInt() + ( 2 * Short.MAX_VALUE ));
+<%_ } _%>
+
+    public static <%= persistClass %> get<%= persistClass %>Sample1() {
+<%_ if (fluentMethods) { _%>
+        return new <%= persistClass %>()<% sampleFields.forEach(field => { %>.<%- field.fieldName %>(<%- field.javaValueSample1 %>)<% }) %>;
+<%_ } else { _%>
+        <%= persistClass %> <%= persistInstance %> = new <%= persistClass %>();
+  <%_ for (const field of sampleFields) { _%>
+        <%= persistInstance %>.set<%= field.fieldNameCapitalized %>(<%- field.javaValueSample1 %>);
+  <%_ } _%>
+        return <%= persistInstance %>;
+<%_ } _%>
+    }
+
+    public static <%= persistClass %> get<%= persistClass %>Sample2() {
+<%_ if (fluentMethods) { _%>
+        return new <%= persistClass %>()<% sampleFields.forEach(field => { %>.<%- field.fieldName %>(<%- field.javaValueSample2 %>)<% }) %>;
+<%_ } else { _%>
+        <%= persistClass %> <%= persistInstance %> = new <%= persistClass %>();
+  <%_ for (const field of sampleFields) { _%>
+        <%= persistInstance %>.set<%= field.fieldNameCapitalized %>(<%- field.javaValueSample2 %>);
+  <%_ } _%>
+        return <%= persistInstance %>;
+<%_ } _%>
+    }
+
+    public static <%= persistClass %> get<%= persistClass %>RandomSampleGenerator() {
+<%_ if (fluentMethods) { _%>
+        return new <%= persistClass %>()<% sampleFields.forEach(field => { %>.<%- field.fieldName %>(<%- field.javaValueGenerator %>)<% }) %>;
+<%_ } else { _%>
+        <%= persistClass %> <%= persistInstance %> = new <%= persistClass %>();
+  <%_ for (const field of sampleFields) { _%>
+        <%= persistInstance %>.set<%= field.fieldNameCapitalized %>(<%- field.javaValueGenerator %>);
+  <%_ } _%>
+        return <%= persistInstance %>;
+<%_ } _%>
+    }
+}

package/dist/generators/jdl/generator.mjs

@@ -17,10 +17,10 @@
  * limitations under the License.
  */
 import { extname } from 'path';
-import { existsSync } from 'fs';
-import _ from 'lodash';
+import * as _ from 'lodash-es';
 import { create as createMemFs } from 'mem-fs';
 import { create as createMemFsEditor } from 'mem-fs-editor';
+import { readFile } from 'fs/promises';
 import BaseGenerator from '../base/index.mjs';
 import command from './command.mjs';
 import { downloadJdlFile } from '../../cli/download.mjs';
@@ -31,6 +31,8 @@ import { createImporterFromContent } from '../../jdl/jdl-importer.js';
 import { GENERATOR_JHIPSTER, JHIPSTER_CONFIG_DIR } from '../generator-constants.mjs';
 import statistics from '../statistics.mjs';
 import { addApplicationIndex, allNewApplications, customizeForMicroservices } from './internal/index.mjs';
+import { mergeYoRcContent } from '../../jdl/index.js';
+import { normalizeBlueprintName } from '../base/internal/blueprint.mjs';
 const { upperFirst } = _;
 /**
  * Add jdl extension to the file
@@ -92,9 +94,15 @@ export default class JdlGenerator extends BaseGenerator {
             async downloadJdlFiles() {
                 if (this.jdlFiles) {
                     this.jdlFiles = await Promise.all(this.jdlFiles.map(toJdlFile).map(async (filename) => {
-                        if (!existsSync(this.destinationPath(filename))) {
+                        try {
+                            this.readDestination(filename);
+                        }
+                        catch {
                             this.log.warn(`File not found: ${filename}. Attempting download from jdl-samples repository`);
-                            return downloadJdlFile(filename, { skipSampleRepository: this.skipSampleRepository });
+                            const downloadedFile = await downloadJdlFile(filename, { skipSampleRepository: this.skipSampleRepository });
+                            // The file has null content at mem-fs, update with actual content.
+                            this.writeDestination(downloadedFile, (await readFile(downloadedFile)).toString());
+                            return downloadedFile;
                         }
                         return filename;
                     }));
@@ -120,8 +128,8 @@ export default class JdlGenerator extends BaseGenerator {
             },
             async parseJDL() {
                 const configuration = {
-                    applicationName: this.options.baseName ?? this.existingProject ? this.jhipsterConfig.baseName : undefined,
-                    databaseType: this.options.db ?? this.existingProject ? this.jhipsterConfigWithDefaults.prodDatabaseType : undefined,
+                    applicationName: this.options.baseName ?? (this.existingProject ? this.jhipsterConfig.baseName : undefined),
+                    databaseType: this.options.db ?? (this.existingProject ? this.jhipsterConfigWithDefaults.prodDatabaseType : undefined),
                     applicationType: this.options.applicationType,
                     skipUserManagement: this.options.skipUserManagement,
                 };
@@ -174,7 +182,7 @@ export default class JdlGenerator extends BaseGenerator {
                 if (this.jsonOnly) {
                     return;
                 }
-                const generatorOptions = { reproducible: this.reproducible, force: this.force };
+                const generatorOptions = { defaults: true, reproducible: this.reproducible, force: this.force };
                 if (this.ignoreApplication || this.applications.length === 0) {
                     if (this.applications.length === 0) {
                         const entities = this.exportedEntities;
@@ -264,16 +272,23 @@ export default class JdlGenerator extends BaseGenerator {
     }
     writeConfig(...applications) {
         for (const application of applications) {
-            const { folder = '', config, entities = [], sharedFs } = application;
+            const { folder = '', entities = [], sharedFs } = application;
+            let { config, namespaceConfigs } = application;
             const appPath = folder ? `${folder}/` : folder;
             const fs = sharedFs ? createMemFsEditor(sharedFs) : this.fs;
             if (config) {
                 const configFile = this.destinationPath(`${appPath}.yo-rc.json`);
                 const oldConfig = fs.readJSON(configFile, {});
-                fs.writeJSON(configFile, {
-                    ...oldConfig,
-                    [GENERATOR_JHIPSTER]: { ...oldConfig[GENERATOR_JHIPSTER], ...config },
-                });
+                if (Array.isArray(config.blueprints)) {
+                    config = {
+                        ...config,
+                        blueprints: config.blueprints.map(({ name, ...remaining }) => ({ ...remaining, name: normalizeBlueprintName(name) })),
+                    };
+                }
+                if (namespaceConfigs) {
+                    namespaceConfigs = Object.fromEntries(Object.entries(namespaceConfigs).map(([ns, config]) => [normalizeBlueprintName(ns), config]));
+                }
+                fs.writeJSON(configFile, mergeYoRcContent(oldConfig, { ...namespaceConfigs, [GENERATOR_JHIPSTER]: config }));
             }
             for (const entity of entities) {
                 const configFile = this.destinationPath(`${appPath}${JHIPSTER_CONFIG_DIR}/${upperFirst(entity.name)}.json`);

package/dist/generators/kubernetes/generator.mjs

@@ -25,8 +25,8 @@ import { writeFiles } from './files.mjs';
 import { buildToolTypes, messageBrokerTypes } from '../../jdl/jhipster/index.mjs';
 import { GENERATOR_KUBERNETES } from '../generator-list.mjs';
 import statistics from '../statistics.mjs';
-import { checkImages, generateJwtSecret, configureImageNames } from '../base-workspaces/internal/docker-base.mjs';
-import { checkKubernetes, loadConfig, saveConfig, setupKubernetesConstants, derivedKubernetesPlatformProperties, } from './kubernetes-base.mjs';
+import { checkImages, generateJwtSecret, configureImageNames, loadFromYoRc } from '../base-workspaces/internal/docker-base.mjs';
+import { checkKubernetes, loadConfig, setupKubernetesConstants, derivedKubernetesPlatformProperties } from './kubernetes-base.mjs';
 import { getJdbcUrl, getR2dbcUrl } from '../spring-data-relational/support/index.mjs';
 import { loadDeploymentConfig, loadDockerDependenciesTask } from '../base-workspaces/internal/index.mjs';
 import { checkDocker } from '../docker/support/index.mjs';
@@ -50,6 +50,9 @@ export default class KubernetesGenerator extends BaseWorkspacesGenerator {
                 this.log.log(chalk.white(`${chalk.bold('⎈')} Welcome to the JHipster Kubernetes Generator ${chalk.bold('⎈')}`));
                 this.log.log(chalk.white(`Files will be generated in folder: ${chalk.yellow(this.destinationRoot())}`));
             },
+            existingDeployment() {
+                this.regenerate = this.regenerate || this.config.existed;
+            },
             loadDockerDependenciesTask,
             checkDocker,
             checkKubernetes,
@@ -88,21 +91,7 @@ export default class KubernetesGenerator extends BaseWorkspacesGenerator {
             insight() {
                 statistics.sendSubGenEvent('generator', GENERATOR_KUBERNETES);
             },
-            checkImages,
             generateJwtSecret,
-            configureImageNames,
-            setPostPromptProp() {
-                this.appConfigs.forEach(element => {
-                    element.clusteredDb ? (element.dbPeerCount = 3) : (element.dbPeerCount = 1);
-                    if (element.messageBroker === KAFKA) {
-                        this.useKafka = true;
-                    }
-                });
-                this.usesOauth2 = this.appConfigs.some(appConfig => appConfig.authenticationTypeOauth2);
-                this.usesIngress = this.kubernetesServiceType === 'Ingress';
-                this.useKeycloak = this.usesOauth2 && this.usesIngress;
-            },
-            saveConfig,
         };
     }
     get [BaseWorkspacesGenerator.CONFIGURING]() {
@@ -110,6 +99,7 @@ export default class KubernetesGenerator extends BaseWorkspacesGenerator {
     }
     get loading() {
         return {
+            loadFromYoRc,
             loadSharedConfig() {
                 this.appConfigs.forEach(element => {
                     loadDerivedAppConfig({ application: element });
@@ -123,6 +113,25 @@ export default class KubernetesGenerator extends BaseWorkspacesGenerator {
     get [BaseWorkspacesGenerator.LOADING]() {
         return this.delegateTasksToBlueprint(() => this.loading);
     }
+    get preparing() {
+        return {
+            configureImageNames,
+            setPostPromptProp() {
+                this.appConfigs.forEach(element => {
+                    element.clusteredDb ? (element.dbPeerCount = 3) : (element.dbPeerCount = 1);
+                    if (element.messageBroker === KAFKA) {
+                        this.useKafka = true;
+                    }
+                });
+                this.usesOauth2 = this.appConfigs.some(appConfig => appConfig.authenticationTypeOauth2);
+                this.usesIngress = this.kubernetesServiceType === 'Ingress';
+                this.useKeycloak = this.usesOauth2 && this.usesIngress;
+            },
+        };
+    }
+    get [BaseWorkspacesGenerator.PREPARING]() {
+        return this.delegateTasksToBlueprint(() => this.preparing);
+    }
     get writing() {
         return writeFiles();
     }
@@ -131,6 +140,7 @@ export default class KubernetesGenerator extends BaseWorkspacesGenerator {
     }
     get end() {
         return {
+            checkImages,
             deploy() {
                 if (this.hasWarning) {
                     this.log.warn(`${chalk.yellow.bold('WARNING!')} Kubernetes configuration generated, but no Jib cache found`);

package/dist/generators/kubernetes/kubernetes-base.mjs

@@ -17,9 +17,7 @@
  * limitations under the License.
  */
 import crypto from 'crypto';
-import _ from 'lodash';
-import runAsync from 'run-async';
-import shelljs from 'shelljs';
+import * as _ from 'lodash-es';
 import { defaultKubernetesConfig } from './kubernetes-constants.mjs';
 import { loadFromYoRc } from '../base-workspaces/internal/docker-base.mjs';
 import { KUBERNETES_CORE_API_VERSION, KUBERNETES_BATCH_API_VERSION, KUBERNETES_DEPLOYMENT_API_VERSION, KUBERNETES_STATEFULSET_API_VERSION, KUBERNETES_INGRESS_API_VERSION, KUBERNETES_ISTIO_NETWORKING_API_VERSION, KUBERNETES_RBAC_API_VERSION, HELM_KAFKA, HELM_ELASTICSEARCH, HELM_PROMETHEUS, HELM_GRAFANA, HELM_MARIADB, HELM_MYSQL, HELM_POSTGRESQL, HELM_MONGODB_REPLICASET, HELM_COUCHBASE_OPERATOR, } from '../generator-constants.mjs';
@@ -29,41 +27,43 @@ const { GeneratorTypes, IngressTypes, ServiceTypes } = kubernetesPlatformTypes;
 const { INGRESS } = ServiceTypes;
 const { GKE, NGINX } = IngressTypes;
 const { K8S, HELM } = GeneratorTypes;
-export const checkKubernetes = runAsync(function () {
+export const checkKubernetes = async function () {
     if (this.skipChecks)
         return;
-    const done = this.async();
-    shelljs.exec('kubectl version', { silent: true }, (code, stdout, stderr) => {
-        if (stderr) {
-            this.log.warn('kubectl 1.2 or later is not installed on your computer.\n' +
-                'Make sure you have Kubernetes installed. Read https://kubernetes.io/docs/setup/\n');
-        }
-        done();
-    });
-});
-export const checkHelm = runAsync(function () {
+    try {
+        await this.spawnCommand('kubectl version');
+    }
+    catch {
+        this.log.warn('kubectl 1.2 or later is not installed on your computer.\n' +
+            'Make sure you have Kubernetes installed. Read https://kubernetes.io/docs/setup/\n');
+    }
+};
+export const checkHelm = async function () {
     if (this.skipChecks)
         return;
-    const done = this.async();
-    shelljs.exec('helm version --client | grep -E "(v2\\.1[2-9]{1,2}\\.[0-9]{1,3})|(v3\\.[0-9]{1,2}\\.[0-9]{1,3})"', { silent: true }, (code, stdout, stderr) => {
-        if (stderr || code !== 0) {
-            this.log.warn('helm 2.12.x or later is not installed on your computer.\n' +
-                'Make sure you have helm installed. Read https://github.com/helm/helm/\n');
-        }
-        done();
-    });
-});
+    try {
+        await this.spawnCommand('helm version --client | grep -E "(v2\\.1[2-9]{1,2}\\.[0-9]{1,3})|(v3\\.[0-9]{1,2}\\.[0-9]{1,3})"');
+    }
+    catch {
+        this.log.warn('helm 2.12.x or later is not installed on your computer.\n' +
+            'Make sure you have helm installed. Read https://github.com/helm/helm/\n');
+    }
+};
 export function loadConfig() {
     loadFromYoRc.call(this);
-    this.kubernetesNamespace = this.config.get('kubernetesNamespace');
-    this.kubernetesServiceType = this.config.get('kubernetesServiceType');
-    this.ingressType = this.config.get('ingressType');
-    this.ingressDomain = this.config.get('ingressDomain');
-    this.istio = this.config.get('istio');
-    this.dbRandomPassword = this.options.reproducibleTests ? 'SECRET-PASSWORD' : crypto.randomBytes(30).toString('hex');
-    this.kubernetesUseDynamicStorage = this.config.get('kubernetesUseDynamicStorage');
-    this.kubernetesStorageClassName = this.config.get('kubernetesStorageClassName');
-    this.generatorType = this.config.get('generatorType');
+    if (!this.jhipsterConfig.dbRandomPassword) {
+        this.jhipsterConfig.dbRandomPassword = this.options.reproducibleTests ? 'SECRET-PASSWORD' : crypto.randomBytes(30).toString('hex');
+    }
+    const kubernetesWithDefaults = _.defaults({}, this.jhipsterConfig, defaultKubernetesConfig);
+    this.kubernetesNamespace = kubernetesWithDefaults.kubernetesNamespace;
+    this.kubernetesServiceType = kubernetesWithDefaults.kubernetesServiceType;
+    this.ingressType = kubernetesWithDefaults.ingressType;
+    this.ingressDomain = kubernetesWithDefaults.ingressDomain;
+    this.istio = kubernetesWithDefaults.istio;
+    this.dbRandomPassword = kubernetesWithDefaults.dbRandomPassword;
+    this.kubernetesUseDynamicStorage = kubernetesWithDefaults.kubernetesUseDynamicStorage;
+    this.kubernetesStorageClassName = kubernetesWithDefaults.kubernetesStorageClassName;
+    this.generatorType = kubernetesWithDefaults.generatorType;
 }
 export function saveConfig() {
     this.config.set(_.defaults({
@@ -95,7 +95,7 @@ export function setupKubernetesConstants() {
     this.KUBERNETES_ISTIO_NETWORKING_API_VERSION = KUBERNETES_ISTIO_NETWORKING_API_VERSION;
     this.KUBERNETES_RBAC_API_VERSION = KUBERNETES_RBAC_API_VERSION;
 }
-export function derivedKubernetesPlatformProperties(dest = _.defaults({}, this, defaultKubernetesConfig)) {
+export function derivedKubernetesPlatformProperties(dest = this) {
     dest.deploymentApplicationTypeMicroservice = dest.deploymentApplicationType === MICROSERVICE;
     dest.ingressTypeNginx = dest.ingressType === NGINX;
     dest.ingressTypeGke = dest.ingressType === GKE;

package/dist/generators/kubernetes/prompts.mjs

@@ -35,7 +35,7 @@ export default {
     ...dockerPrompts,
 };
 export async function askForKubernetesNamespace() {
-    if (this.regenerate)
+    if (!this.options.askAnswered && (this.regenerate || this.config.existed))
         return;
     const prompts = [
         {
@@ -45,11 +45,11 @@ export async function askForKubernetesNamespace() {
             default: this.kubernetesNamespace ? this.kubernetesNamespace : defaultKubernetesConfig.kubernetesNamespace,
         },
     ];
-    const props = await this.prompt(prompts);
+    const props = await this.prompt(prompts, this.config);
     this.kubernetesNamespace = props.kubernetesNamespace;
 }
 export async function askForKubernetesServiceType() {
-    if (this.regenerate)
+    if (!this.options.askAnswered && (this.regenerate || this.config.existed))
         return;
     const istio = this.istio;
     const prompts = [
@@ -75,11 +75,11 @@ export async function askForKubernetesServiceType() {
             default: this.kubernetesServiceType ? this.kubernetesServiceType : defaultKubernetesConfig.kubernetesServiceType,
         },
     ];
-    const props = await this.prompt(prompts);
+    const props = await this.prompt(prompts, this.config);
     this.kubernetesServiceType = props.kubernetesServiceType;
 }
 export async function askForIngressType() {
-    if (this.regenerate)
+    if (!this.options.askAnswered && (this.regenerate || this.config.existed))
         return;
     const kubernetesServiceType = this.kubernetesServiceType;
     const prompts = [
@@ -101,11 +101,11 @@ export async function askForIngressType() {
             default: this.ingressType ? this.ingressType : ingressDefaultConfig.ingressType,
         },
     ];
-    const props = await this.prompt(prompts);
+    const props = await this.prompt(prompts, this.config);
     this.ingressType = props.ingressType;
 }
 export async function askForIngressDomain() {
-    if (this.regenerate)
+    if (!this.options.askAnswered && (this.regenerate || this.config.existed))
         return;
     const kubernetesServiceType = this.kubernetesServiceType;
     const istio = this.istio;
@@ -119,10 +119,8 @@ export async function askForIngressDomain() {
     else if (istio) {
         // If it's Istio, and no previous domain is configured, try to determine the default value
         try {
-            if (!this.skipChecks) {
-                const { stdout: istioIngressIp } = this.spawnCommandSync(istioIpCommand, { stdio: 'pipe' });
-                defaultValue = `${istioIngressIp}.nip.io`;
-            }
+            const { stdout: istioIngressIp } = this.spawnCommandSync(istioIpCommand, { stdio: 'pipe' });
+            defaultValue = `${istioIngressIp}.nip.io`;
         }
         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}`;
@@ -164,7 +162,7 @@ export async function askForIngressDomain() {
             },
         },
     ];
-    const props = await this.prompt(prompts);
+    const props = await this.prompt(prompts, this.config);
     if (props.ingressDomain === 'none') {
         this.ingressDomain = '';
     }
@@ -173,7 +171,7 @@ export async function askForIngressDomain() {
     }
 }
 export async function askForIstioSupport() {
-    if (this.regenerate)
+    if (!this.options.askAnswered && (this.regenerate || this.config.existed))
         return;
     if (this.deploymentApplicationType === MONOLITH) {
         this.istio = false;
@@ -197,11 +195,11 @@ export async function askForIstioSupport() {
             default: this.istio,
         },
     ];
-    const props = await this.prompt(prompts);
+    const props = await this.prompt(prompts, this.config);
     this.istio = props.istio;
 }
 export async function askForPersistentStorage() {
-    if (this.regenerate)
+    if (!this.options.askAnswered && (this.regenerate || this.config.existed))
         return;
     let usingDataBase = false;
     this.appConfigs.forEach(appConfig => {
@@ -228,11 +226,11 @@ export async function askForPersistentStorage() {
             default: this.kubernetesUseDynamicStorage,
         },
     ];
-    const props = await this.prompt(prompts);
+    const props = await this.prompt(prompts, this.config);
     this.kubernetesUseDynamicStorage = props.kubernetesUseDynamicStorage;
 }
 export async function askForStorageClassName() {
-    if (this.regenerate)
+    if (!this.options.askAnswered && (this.regenerate || this.config.existed))
         return;
     const kubernetesUseDynamicStorage = this.kubernetesUseDynamicStorage;
     const prompts = [
@@ -244,7 +242,7 @@ export async function askForStorageClassName() {
             default: this.kubernetesStorageClassName ? this.kubernetesStorageClassName : '',
         },
     ];
-    const props = await this.prompt(prompts);
+    const props = await this.prompt(prompts, this.config);
     // Add the StorageClass value only if dynamic storage is enabled
     if (kubernetesUseDynamicStorage) {
         this.kubernetesStorageClassName = props.kubernetesStorageClassName.trim();

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

@@ -94,7 +94,7 @@ kubectl get svc jhipster-grafana<%= kubernetesNamespaceDefault ? '' : ` -n ${kub
 
 <%_ } _%>
 
-<%_ if (app.serviceDiscoveryEureka) { _%>
+<%_ if (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:

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

@@ -60,7 +60,7 @@ spec:
 <%_ if (app.prodDatabaseTypeMariadb) { _%>
                   rt=$(nc -z -w 1 <%= app.baseName.toLowerCase() %>-mariadb 3306)
 <%_ } _%>
-<%_ if (app.prodDatabaseTypePostgres) { _%>
+<%_ if (app.prodDatabaseTypePostgresql) { _%>
                   rt=$(nc -z -w 1 <%= app.baseName.toLowerCase() %>-postgresql 5432)
 <%_ } _%>
 <%_ if (app.databaseTypeMongodb) { _%>
@@ -144,7 +144,7 @@ spec:
               name: <%= app.baseName.toLowerCase() %>-mariadb
               key: mariadb-root-password
 <%_ } _%>
-<%_ if (app.prodDatabaseTypePostgres) { _%>
+<%_ if (app.prodDatabaseTypePostgresql) { _%>
         - name: SPRING_DATASOURCE_URL
           value: <%- this.getJDBCUrl(app.prodDatabaseType, { hostname: `${app.baseName.toLowerCase()}-${app.prodDatabaseType}.${kubernetesNamespace}.svc.cluster.local`, databaseName: app.baseName }) %>
         - name: SPRING_DATASOURCE_USERNAME

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

@@ -24,7 +24,6 @@ metadata:
   <%_ if (useKeycloak && ingressTypeGke) { _%>
   annotations:
     kubernetes.io/ingress.allow-http: "true"
-    kubernetes.io/ingress.class: gce
     kubernetes.io/ingress.global-static-ip-name: <%= app.baseName.toLowerCase()%>-ip
     cert-manager.io/issuer: letsencrypt-staging
     acme.cert-manager.io/http01-edit-in-place: "true"

package/dist/generators/kubernetes-helm/generator.mjs

@@ -23,8 +23,8 @@ import BaseWorkspacesGenerator from '../base-workspaces/index.mjs';
 import prompts from '../kubernetes/prompts.mjs';
 import { writeFiles } from './files.mjs';
 import { GENERATOR_KUBERNETES_HELM } from '../generator-list.mjs';
-import { checkImages, generateJwtSecret, configureImageNames } from '../base-workspaces/internal/docker-base.mjs';
-import { checkKubernetes, checkHelm, loadConfig, saveConfig, setupKubernetesConstants, setupHelmConstants, derivedKubernetesPlatformProperties, } from '../kubernetes/kubernetes-base.mjs';
+import { checkImages, generateJwtSecret, configureImageNames, loadFromYoRc } from '../base-workspaces/internal/docker-base.mjs';
+import { checkKubernetes, checkHelm, loadConfig, setupKubernetesConstants, setupHelmConstants, derivedKubernetesPlatformProperties, } from '../kubernetes/kubernetes-base.mjs';
 import statistics from '../statistics.mjs';
 import { messageBrokerTypes } from '../../jdl/jhipster/index.mjs';
 import { getJdbcUrl, getR2dbcUrl } from '../spring-data-relational/support/index.mjs';
@@ -49,6 +49,9 @@ export default class KubernetesHelmGenerator extends BaseWorkspacesGenerator {
                 this.log.log(chalk.white(`${chalk.bold('⎈')} Welcome to the JHipster Kubernetes Helm Generator ${chalk.bold('⎈')}`));
                 this.log.log(chalk.white(`Files will be generated in folder: ${chalk.yellow(this.destinationRoot())}`));
             },
+            existingDeployment() {
+                this.regenerate = this.regenerate || this.config.existed;
+            },
             loadDockerDependenciesTask,
             checkDocker,
             checkKubernetes,
@@ -87,19 +90,7 @@ export default class KubernetesHelmGenerator extends BaseWorkspacesGenerator {
             insight() {
                 statistics.sendSubGenEvent('generator', GENERATOR_KUBERNETES_HELM);
             },
-            checkImages,
             generateJwtSecret,
-            configureImageNames,
-            setPostPromptProp() {
-                this.appConfigs.forEach(element => {
-                    element.clusteredDb ? (element.dbPeerCount = 3) : (element.dbPeerCount = 1);
-                    if (element.messageBroker === KAFKA) {
-                        this.useKafka = true;
-                    }
-                });
-                this.useKeycloak = false;
-            },
-            saveConfig,
         };
     }
     get [BaseWorkspacesGenerator.CONFIGURING]() {
@@ -107,6 +98,7 @@ export default class KubernetesHelmGenerator extends BaseWorkspacesGenerator {
     }
     get loading() {
         return {
+            loadFromYoRc,
             loadSharedConfig() {
                 this.appConfigs.forEach(element => {
                     loadDerivedAppConfig({ application: element });
@@ -120,6 +112,23 @@ export default class KubernetesHelmGenerator extends BaseWorkspacesGenerator {
     get [BaseWorkspacesGenerator.LOADING]() {
         return this.delegateTasksToBlueprint(() => this.loading);
     }
+    get preparing() {
+        return {
+            configureImageNames,
+            setPostPromptProp() {
+                this.appConfigs.forEach(element => {
+                    element.clusteredDb ? (element.dbPeerCount = 3) : (element.dbPeerCount = 1);
+                    if (element.messageBroker === KAFKA) {
+                        this.useKafka = true;
+                    }
+                });
+                this.useKeycloak = false;
+            },
+        };
+    }
+    get [BaseWorkspacesGenerator.PREPARING]() {
+        return this.delegateTasksToBlueprint(() => this.preparing);
+    }
     get writing() {
         return writeFiles();
     }
@@ -128,6 +137,7 @@ export default class KubernetesHelmGenerator extends BaseWorkspacesGenerator {
     }
     get end() {
         return {
+            checkImages,
             deploy() {
                 if (this.hasWarning) {
                     this.log.warn('Helm configuration generated, but no Jib cache found');

package/dist/generators/kubernetes-helm/templates/app/Chart.yml.ejs

@@ -21,7 +21,7 @@ dependencies:
   version: <%= HELM_MYSQL %>
   repository: https://charts.helm.sh/stable
   condition: mysql.enabled
-<%_ } else if (app.prodDatabaseTypePostgres) { _%>
+<%_ } else if (app.prodDatabaseTypePostgresql) { _%>
 - name: postgresql
   version: <%= HELM_POSTGRESQL %>
   repository: https://charts.bitnami.com/bitnami

package/dist/generators/kubernetes-helm/templates/app/helpers.tpl.ejs

@@ -21,7 +21,7 @@ mysql customisation
 {{- define "mysql.fullname" -}}
 {{- default "<%= app.baseName.toLowerCase() %>-mysql" -}}
 {{- end -}}
-<%_ } else if (app.prodDatabaseTypePostgres) { _%>
+<%_ } else if (app.prodDatabaseTypePostgresql) { _%>
 {{/*
 postgresql customisation
 */}}

package/dist/generators/kubernetes-helm/templates/app/requirements.yml.ejs

@@ -4,7 +4,7 @@ dependencies:
     version: <%= HELM_MYSQL %>
     repository: https://charts.helm.sh/stable
     condition: mysql.enabled
-<%_ } else if (app.prodDatabaseTypePostgres) { _%>
+<%_ } else if (app.prodDatabaseTypePostgresql) { _%>
   - name: postgresql
     version: <%= HELM_POSTGRESQL %>
     repository: https://charts.bitnami.com/bitnami

package/dist/generators/kubernetes-helm/templates/app/values.yml.ejs

@@ -10,7 +10,7 @@ mysql:
   initializationFiles:
     grant.sql: |-
       grant all privileges on *.* to root@'%' identified by '' with grant option;
-<%_ } else if (app.prodDatabaseTypePostgres) { _%>
+<%_ } else if (app.prodDatabaseTypePostgresql) { _%>
 postgresql:
   enabled: true
   postgresqlUsername: <%= app.baseName.toLowerCase() %>