generator-jhipster 7.1.0 → 7.4.0

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

@@ -2311,10 +2311,10 @@ spec:
     metadata:
       labels:
         job: jhipster-grafana-dashboard
-     <%_ if (istio) { _%>
+<%_ if (istio) { _%>
       annotations:
         sidecar.istio.io/inject: "false"
-     <%_ } _%>
+ <%_ } _%>
     spec:
       initContainers:
         - name: init-dependent-services-check

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

@@ -39,10 +39,10 @@ spec:
     metadata:
       labels:
         app: jhipster-grafana
-     <%_ if (istio) { _%>
+<%_ if (istio) { _%>
       annotations:
         sidecar.istio.io/inject: "false"
-     <%_ } _%>
+<%_ } _%>
     spec:
       containers:
       - name: jhipster-grafana
@@ -91,15 +91,15 @@ spec:
   - name: http
     port: 3000
     targetPort: 3000
-  <%_ if (kubernetesServiceType !== 'Ingress') { _%>
+<%_ if (!kubernetesServiceTypeIngress) { _%>
   type: <%= kubernetesServiceType %>
-  <%_ } else { _%>
+<%_ } else { _%>
   type: ClusterIP
-  <%_ } _%>
+<%_ } _%>
   selector:
     app: jhipster-grafana
 ---
-<%_ if (kubernetesServiceType === 'Ingress' && !istio ) { _%>
+<%_ if (kubernetesServiceTypeIngress && !istio ) { _%>
 apiVersion: <%= KUBERNETES_INGRESS_API_VERSION %>
 kind: Ingress
 metadata:

package/generators/kubernetes/templates/monitoring/jhipster-prometheus-crd.yml.ejs

@@ -106,10 +106,10 @@ spec:
     metadata:
       labels:
         k8s-app: prometheus-operator
-     <%_ if (istio) { _%>
+<%_ if (istio) { _%>
       annotations:
         sidecar.istio.io/inject: "false"
-     <%_ } _%>
+<%_ } _%>
     spec:
       containers:
       - args:

package/generators/kubernetes/templates/registry/application-configmap.yml.ejs

@@ -25,9 +25,9 @@ metadata:
 data:
   application.yml: |-
     configserver:
-      name: <% if (serviceDiscoveryType === 'eureka') { %> JHipster Registry<% } %><% if (serviceDiscoveryType === 'consul') { %>Consul<% } %>
-      status: Connected to <% if (serviceDiscoveryType === 'eureka') { %>the JHipster Registry<% } %><% if (serviceDiscoveryType === 'consul') { %>Consul<% } %> running in Kubernetes
-    <%_ if (serviceDiscoveryType === 'eureka') { _%>
+      name: <% if (serviceDiscoveryEureka) { %> JHipster Registry<% } %><% if (serviceDiscoveryConsul) { %>Consul<% } %>
+      status: Connected to <% if (serviceDiscoveryEureka) { %>the JHipster Registry<% } %><% if (serviceDiscoveryConsul) { %>Consul<% } %> running in Kubernetes
+<%_ if (serviceDiscoveryEureka) { _%>
     eureka:
       client:
         initial-instance-info-replication-interval-seconds: 15
@@ -39,17 +39,17 @@ data:
       instance:
         lease-renewal-interval-in-seconds: 10
         registry-default-open-for-traffic-count: 0
-    <%_ } _%>
+<%_ } _%>
     jhipster:
       security:
         authentication:
           jwt:
             base64-secret: <%= jwtSecretKey %>
   # app specific configuration
-  <%_ if (serviceDiscoveryType === 'eureka') {  _%>
+<%_ if (serviceDiscoveryEureka) {  _%>
   jhipster-registry.yml: |-
     eureka:
       client:
         service-url:
           defaultZone: http://admin:${spring.security.user.password}@jhipster-registry-0.jhipster-registry.<%= kubernetesNamespace %>.svc.cluster.local:8761/eureka/,http://admin:${spring.security.user.password}@jhipster-registry-1.jhipster-registry.<%= kubernetesNamespace %>.svc.cluster.local:8761/eureka/
-  <%_ } _%>
+<%_ } _%>

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

@@ -93,10 +93,10 @@ spec:
       name: consul
       labels:
         app: consul
-     <%_ if (istio) { _%>
+<%_ if (istio) { _%>
       annotations:
         sidecar.istio.io/inject: "false"
-     <%_ } _%>
+<%_ } _%>
     spec:
       securityContext:
         fsGroup: 1000

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

@@ -75,10 +75,10 @@ spec:
       labels:
         app: jhipster-registry
         version: "1.0"
-     <%_ if (istio) { _%>
+<%_ if (istio) { _%>
       annotations:
         sidecar.istio.io/inject: "false"
-     <%_ } _%>
+<%_ } _%>
     spec:
       terminationGracePeriodSeconds: 10
       containers:
@@ -96,10 +96,10 @@ spec:
             secretKeyRef:
               name: registry-secret
               key: registry-admin-password
-        <%_ if (istio) { _%>
+<%_ if (istio) { _%>
         - name: EUREKA_INSTANCE_PREFER_IP_ADDRESS
           value: "false"
-        <%_ } _%>
+<%_ } _%>
         - name: JHIPSTER_SECURITY_AUTHENTICATION_JWT_BASE64_SECRET
           value: YlhrdGMyVmpjbVYwTFhSdmEyVnVMWFJ2TFdOb1lXNW5aUzFwYmkxd2NtOWtkV04wYVc5dUxXRnVaQzEwYnkxclpXVndMV2x1TFdFdGMyVmpkWEpsTFhCc1lXTmwK
         - name: SPRING_CLOUD_CONFIG_SERVER_COMPOSITE_0_TYPE

package/generators/kubernetes/templates/secret/couchbase-secret.yml.ejs

@@ -0,0 +1,9 @@
+apiVersion: <%= KUBERNETES_CORE_API_VERSION  %>
+kind: Secret
+metadata:
+  name: couchbase-secret
+  namespace: <%= kubernetesNamespace %>
+type: Opaque
+data:
+  username: QWRtaW5pc3RyYXRvcg==
+  password: cGFzc3dvcmQ=

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

@@ -26,18 +26,18 @@ metadata:
 spec:
   selector:
     app: <%= app.baseName.toLowerCase() %>
-  <%_ if (app.applicationType === 'monolith' || app.applicationType === 'gateway') { _%>
-    <%_ if (kubernetesServiceType !== 'Ingress') { _%>
+<%_ if (app.applicationTypeMonolith || app.applicationTypeGateway) { _%>
+  <%_ if (!kubernetesServiceTypeIngress) { _%>
   type: <%= kubernetesServiceType %>
-    <%_ } else { _%>
-  type: <%= ingressType === 'gke' ? 'NodePort' : 'ClusterIP' %>
-    <%_ } _%>
+  <%_ } else { _%>
+  type: <%= ingressTypeGke ? 'NodePort' : 'ClusterIP' %>
   <%_ } _%>
+<%_ } _%>
   ports:
   - name: http
-  <%_ if (!app.serviceDiscoveryType) { _%>
+<%_ if (!app.serviceDiscoveryType) { _%>
     port: 80
     targetPort: <%= app.serverPort %>
-  <%_ } else { _%>
+<%_ } else { _%>
     port: <%= app.serverPort %>
-  <%_ } _%>
+<%_ } _%>

package/generators/kubernetes-base.js

@@ -16,11 +16,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+const _ = require('lodash');
+
 const shelljs = require('shelljs');
 const chalk = require('chalk');
 const crypto = require('crypto');
+const { defaultKubernetesConfig } = require('./kubernetes/kubernetes-constants');
 const { loadFromYoRc } = require('./docker-base');
 const constants = require('./generator-constants');
+const { MICROSERVICE } = require('../jdl/jhipster/application-types');
+const { GeneratorTypes, IngressTypes, ServiceTypes } = require('../jdl/jhipster/kubernetes-platform-types');
+
+const { INGRESS } = ServiceTypes;
+const { GKE, NGINX } = IngressTypes;
+const { K8S, HELM } = GeneratorTypes;
 
 module.exports = {
   checkKubernetes,
@@ -29,6 +38,7 @@ module.exports = {
   saveConfig,
   setupKubernetesConstants,
   setupHelmConstants,
+  derivedKubernetesPlatformProperties,
 };
 
 function checkKubernetes() {
@@ -79,24 +89,29 @@ function loadConfig() {
 }
 
 function saveConfig() {
-  this.config.set({
-    appsFolders: this.appsFolders,
-    directoryPath: this.directoryPath,
-    clusteredDbApps: this.clusteredDbApps,
-    serviceDiscoveryType: this.serviceDiscoveryType,
-    jwtSecretKey: this.jwtSecretKey,
-    dockerRepositoryName: this.dockerRepositoryName,
-    dockerPushCommand: this.dockerPushCommand,
-    kubernetesNamespace: this.kubernetesNamespace,
-    kubernetesServiceType: this.kubernetesServiceType,
-    kubernetesUseDynamicStorage: this.kubernetesUseDynamicStorage,
-    kubernetesStorageClassName: this.kubernetesStorageClassName,
-    generatorType: this.generatorType,
-    ingressType: this.ingressType,
-    ingressDomain: this.ingressDomain,
-    monitoring: this.monitoring,
-    istio: this.istio,
-  });
+  this.config.set(
+    _.defaults(
+      {
+        appsFolders: this.appsFolders,
+        directoryPath: this.directoryPath,
+        clusteredDbApps: this.clusteredDbApps,
+        serviceDiscoveryType: this.serviceDiscoveryType,
+        jwtSecretKey: this.jwtSecretKey,
+        dockerRepositoryName: this.dockerRepositoryName,
+        dockerPushCommand: this.dockerPushCommand,
+        kubernetesNamespace: this.kubernetesNamespace,
+        kubernetesServiceType: this.kubernetesServiceType,
+        kubernetesUseDynamicStorage: this.kubernetesUseDynamicStorage,
+        kubernetesStorageClassName: this.kubernetesStorageClassName,
+        generatorType: this.generatorType,
+        ingressType: this.ingressType,
+        ingressDomain: this.ingressDomain,
+        monitoring: this.monitoring,
+        istio: this.istio,
+      },
+      defaultKubernetesConfig
+    )
+  );
 }
 
 function setupKubernetesConstants() {
@@ -110,6 +125,16 @@ function setupKubernetesConstants() {
   this.KUBERNETES_RBAC_API_VERSION = constants.KUBERNETES_RBAC_API_VERSION;
 }
 
+function derivedKubernetesPlatformProperties(dest = _.defaults({}, this, defaultKubernetesConfig)) {
+  dest.deploymentApplicationTypeMicroservice = dest.deploymentApplicationType === MICROSERVICE;
+  dest.ingressTypeNginx = dest.ingressType === NGINX;
+  dest.ingressTypeGke = dest.ingressType === GKE;
+  dest.kubernetesServiceTypeIngress = dest.kubernetesServiceType === INGRESS;
+  dest.kubernetesNamespaceDefault = dest.kubernetesNamespace === 'default';
+  dest.generatorTypeK8s = dest.generatorType === K8S;
+  dest.generatorTypeHelm = dest.generatorType === HELM;
+}
+
 function setupHelmConstants() {
   this.HELM_KAFKA = constants.HELM_KAFKA;
   this.HELM_ELASTICSEARCH = constants.HELM_ELASTICSEARCH;
@@ -119,4 +144,5 @@ function setupHelmConstants() {
   this.HELM_MYSQL = constants.HELM_MYSQL;
   this.HELM_POSTGRESQL = constants.HELM_POSTGRESQL;
   this.HELM_MOGODB_REPLICASET = constants.HELM_MOGODB_REPLICASET;
+  this.HELM_COUCHBASE_OPERATOR = constants.HELM_COUCHBASE_OPERATOR;
 }

package/generators/kubernetes-helm/esm.mjs

@@ -0,0 +1,21 @@
+/**
+ * Copyright 2013-2021 the original author or authors from the JHipster project.
+ *
+ * This file is part of the JHipster project, see https://www.jhipster.tech/
+ * for more information.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import generator from './index.js';
+
+export default generator;

package/generators/kubernetes-helm/files.js

@@ -16,6 +16,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+const { ELASTICSEARCH } = require('../../jdl/jhipster/search-engine-types');
+const { GATEWAY, MONOLITH } = require('../../jdl/jhipster/application-types');
+const { JWT } = require('../../jdl/jhipster/authentication-types');
+const { PROMETHEUS } = require('../../jdl/jhipster/monitoring-types');
+const { CONSUL, EUREKA } = require('../../jdl/jhipster/service-discovery-types');
+const { ServiceTypes } = require('../../jdl/jhipster/kubernetes-platform-types');
+
+const { INGRESS } = ServiceTypes;
 
 module.exports = {
   writeFiles,
@@ -41,26 +49,22 @@ function writeFiles() {
         this.template('app/requirements.yml.ejs', `${appOut}/requirements.yaml`);
         this.template('app/helpers.tpl.ejs', `${appOut}/templates/_helpers.tpl`);
 
-        if (this.app.prodDatabaseType === 'couchbase') {
-          this.template(
-            `${kubernetesSubgenPath}/db/${this.app.prodDatabaseType}.yml.ejs`,
-            `${appOut}/templates/${appName}-${this.app.prodDatabaseType}.yml`
-          );
-        }
-
-        if (this.app.searchEngine === 'elasticsearch') {
+        if (this.app.searchEngine === ELASTICSEARCH) {
           this.template(`${kubernetesSubgenPath}/db/elasticsearch.yml.ejs`, `${appOut}/templates/${appName}-elasticsearch.yml`);
         }
-        if (this.app.applicationType === 'gateway' || this.app.applicationType === 'monolith') {
+        if (this.app.applicationType === GATEWAY || this.app.applicationType === MONOLITH) {
           if (this.istio) {
             this.template(`${kubernetesSubgenPath}/istio/gateway.yml.ejs`, `${appOut}/templates/${appName}-gateway.yml`);
-          } else if (this.kubernetesServiceType === 'Ingress') {
+          } else if (this.kubernetesServiceType === INGRESS) {
             this.template(`${kubernetesSubgenPath}/ingress.yml.ejs`, `${appOut}/templates/${appName}-ingress.yml`);
           }
         }
-        if (!this.app.serviceDiscoveryType && this.app.authenticationType === 'jwt') {
+        if (!this.app.serviceDiscoveryType && this.app.authenticationType === JWT) {
           this.template(`${kubernetesSubgenPath}/secret/jwt-secret.yml.ejs`, `${appOut}/templates/jwt-secret.yml`);
         }
+        if (this.app.prodDatabaseTypeCouchbase) {
+          this.template(`${kubernetesSubgenPath}/secret/couchbase-secret.yml.ejs`, `${appOut}/templates/couchbase-secret.yml`);
+        }
         if (this.istio) {
           this.template(`${kubernetesSubgenPath}/istio/destination-rule.yml.ejs`, `${appOut}/templates/${appName}-destination-rule.yml`);
           this.template(`${kubernetesSubgenPath}/istio/virtual-service.yml.ejs`, `${appOut}/templates/${appName}-virtual-service.yml`);
@@ -71,27 +75,22 @@ function writeFiles() {
     writeCommonServiceChart() {
       const k8s = this.fetchFromInstalledJHipster('kubernetes/templates');
       const csOut = 'csvc'.concat('-', suffix);
-      if (
-        this.useKafka ||
-        this.monitoring === 'prometheus' ||
-        this.serviceDiscoveryType === 'eureka' ||
-        this.serviceDiscoveryType === 'consul'
-      ) {
+      if (this.useKafka || this.monitoring === PROMETHEUS || this.serviceDiscoveryType === EUREKA || this.serviceDiscoveryType === CONSUL) {
         this.template('csvc/values.yml.ejs', `${csOut}/values.yaml`);
         this.template('csvc/Chart.yml.ejs', `${csOut}/Chart.yaml`);
         this.template('csvc/requirements.yml.ejs', `${csOut}/requirements.yaml`);
         this.template('csvc/helpers.tpl.ejs', `${csOut}/templates/_helpers.tpl`);
       }
-      if (this.monitoring === 'prometheus') {
-        if (this.istio && this.kubernetesServiceType === 'Ingress') {
+      if (this.monitoring === PROMETHEUS) {
+        if (this.istio && this.kubernetesServiceType === INGRESS) {
           this.template(`${k8s}/istio/gateway/jhipster-grafana-gateway.yml.ejs`, `${csOut}/templates/jhipster-grafana-gateway.yml`);
         }
       }
-      if (this.serviceDiscoveryType === 'eureka') {
+      if (this.serviceDiscoveryType === EUREKA) {
         this.template(`${k8s}/registry/jhipster-registry.yml.ejs`, `${csOut}/templates/jhipster-registry.yml`);
         this.template(`${k8s}/registry/application-configmap.yml.ejs`, `${csOut}/templates/application-configmap.yml`);
       }
-      if (this.serviceDiscoveryType === 'consul') {
+      if (this.serviceDiscoveryType === CONSUL) {
         this.template(`${k8s}/registry/consul.yml.ejs`, `${csOut}/templates/consul.yml`);
         this.template(`${k8s}/registry/consul-config-loader.yml.ejs`, `${csOut}/templates/consul-config-loader.yml`);
         this.template(`${k8s}/registry/application-configmap.yml.ejs`, `${csOut}/templates/application-configmap.yml`);

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

@@ -0,0 +1,44 @@
+/**
+ * Copyright 2013-2021 the original author or authors from the JHipster project.
+ *
+ * This file is part of the JHipster project, see https://www.jhipster.tech/
+ * for more information.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import expect from 'expect';
+import lodash from 'lodash';
+import { basename, dirname } from 'path';
+import { fileURLToPath } from 'url';
+
+import Generator from './index.js';
+
+const { snakeCase } = lodash;
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = dirname(__filename);
+
+const generator = basename(__dirname);
+
+describe(`JHipster ${generator} generator`, () => {
+  it('generator-list constant matches folder name', async () => {
+    await expect((await import('../generator-list.js')).default[`GENERATOR_${snakeCase(generator).toUpperCase()}`]).toBe(generator);
+  });
+  it('should be exported at package.json', async () => {
+    await expect((await import(`generator-jhipster/esm/generators/${generator}`)).default).toBe(Generator);
+  });
+  it('should support features parameter', () => {
+    const instance = new Generator([], { help: true }, { bar: true });
+    expect(instance.features.bar).toBe(true);
+  });
+});

package/generators/kubernetes-helm/index.js

@@ -16,23 +16,40 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+/* eslint-disable consistent-return */
 const chalk = require('chalk');
 const fs = require('fs');
 const prompts = require('../kubernetes/prompts');
-const writeFiles = require('./files').writeFiles;
+const { writeFiles } = require('./files');
 const BaseDockerGenerator = require('../generator-base-docker');
+const { GENERATOR_KUBERNETES_HELM } = require('../generator-list');
+const { KAFKA } = require('../../jdl/jhipster/message-broker-types');
 const { checkImages, generateJwtSecret, configureImageNames, setAppsFolderPaths } = require('../docker-base');
-const { checkKubernetes, checkHelm, loadConfig, saveConfig, setupKubernetesConstants, setupHelmConstants } = require('../kubernetes-base');
+const {
+  checkKubernetes,
+  checkHelm,
+  loadConfig,
+  saveConfig,
+  setupKubernetesConstants,
+  setupHelmConstants,
+  derivedKubernetesPlatformProperties,
+} = require('../kubernetes-base');
 const statistics = require('../statistics');
 
 module.exports = class extends BaseDockerGenerator {
-  get initializing() {
+  async _postConstruct() {
+    if (!this.fromBlueprint) {
+      await this.composeWithBlueprints(GENERATOR_KUBERNETES_HELM);
+    }
+  }
+
+  _initializing() {
     return {
       sayHello() {
         this.log(chalk.white(`${chalk.bold('⎈')} Welcome to the JHipster Kubernetes Helm Generator ${chalk.bold('⎈')}`));
         this.log(chalk.white(`Files will be generated in folder: ${chalk.yellow(this.destinationRoot())}`));
       },
-      ...super.initializing,
+      ...super._initializing(),
       checkKubernetes,
       checkHelm,
       loadConfig,
@@ -41,7 +58,12 @@ module.exports = class extends BaseDockerGenerator {
     };
   }
 
-  get prompting() {
+  get initializing() {
+    if (this.delegateToBlueprint) return {};
+    return this._initializing();
+  }
+
+  _prompting() {
     return {
       askForApplicationType: prompts.askForApplicationType,
       askForPath: prompts.askForPath,
@@ -60,10 +82,15 @@ module.exports = class extends BaseDockerGenerator {
     };
   }
 
-  get configuring() {
+  get prompting() {
+    if (this.delegateToBlueprint) return {};
+    return this._prompting();
+  }
+
+  _configuring() {
     return {
       insight() {
-        statistics.sendSubGenEvent('generator', 'kubernetes-helm');
+        statistics.sendSubGenEvent('generator', GENERATOR_KUBERNETES_HELM);
       },
 
       checkImages,
@@ -74,7 +101,7 @@ module.exports = class extends BaseDockerGenerator {
       setPostPromptProp() {
         this.appConfigs.forEach(element => {
           element.clusteredDb ? (element.dbPeerCount = 3) : (element.dbPeerCount = 1);
-          if (element.messageBroker === 'kafka') {
+          if (element.messageBroker === KAFKA) {
             this.useKafka = true;
           }
         });
@@ -83,49 +110,82 @@ module.exports = class extends BaseDockerGenerator {
     };
   }
 
-  get writing() {
-    return writeFiles();
+  get configuring() {
+    if (this.delegateToBlueprint) return {};
+    return this._configuring();
   }
 
-  end() {
-    if (this.hasWarning) {
-      this.log(`\n${chalk.yellow.bold('WARNING!')} Helm configuration generated, but no Jib cache found`);
-      this.log('If you forgot to generate the Docker image for this application, please run:');
-      this.log(this.warningMessage);
-    } else {
-      this.log(`\n${chalk.bold.green('Helm configuration successfully generated!')}`);
-    }
+  _loading() {
+    return {
+      loadSharedConfig() {
+        this.appConfigs.forEach(element => {
+          this.loadServerConfig(element, element);
+          this.loadDerivedAppConfig(element);
+        });
+        this.loadDeploymentConfig(this);
+        derivedKubernetesPlatformProperties(this);
+      },
+    };
+  }
 
-    this.log(
-      `${chalk.yellow.bold(
-        'WARNING!'
-      )} You will need to push your image to a registry. If you have not done so, use the following commands to tag and push the images:`
-    );
-    for (let i = 0; i < this.appsFolders.length; i++) {
-      const originalImageName = this.appConfigs[i].baseName.toLowerCase();
-      const targetImageName = this.appConfigs[i].targetImageName;
-      if (originalImageName !== targetImageName) {
-        this.log(`  ${chalk.cyan(`docker image tag ${originalImageName} ${targetImageName}`)}`);
-      }
-      this.log(`  ${chalk.cyan(`${this.dockerPushCommand} ${targetImageName}`)}`);
-    }
+  get loading() {
+    if (this.delegateToBlueprint) return {};
+    return this._loading();
+  }
 
-    this.log('\nYou can deploy all your apps by running the following script:');
-    this.log(`  ${chalk.cyan('bash helm-apply.sh')}`);
+  _writing() {
+    return writeFiles();
+  }
 
-    this.log('\nYou can upgrade (after any changes) all your apps by running the following script:');
-    this.log(`  ${chalk.cyan('bash helm-upgrade.sh')}`);
+  get writing() {
+    if (this.delegateToBlueprint) return {};
+    return this._writing();
+  }
 
-    // Make the apply script executable
-    try {
-      fs.chmodSync('helm-apply.sh', '755');
-      fs.chmodSync('helm-upgrade.sh', '755');
-    } catch (err) {
-      this.log(
-        `${chalk.yellow.bold(
-          'WARNING!'
-        )}Failed to make 'helm-apply.sh', 'helm-upgrade.sh' executable, you may need to run 'chmod +x helm-apply.sh helm-upgrade.sh`
-      );
-    }
+  _end() {
+    return {
+      deploy() {
+        if (this.hasWarning) {
+          this.log(`\n${chalk.yellow.bold('WARNING!')} Helm configuration generated, but no Jib cache found`);
+          this.log('If you forgot to generate the Docker image for this application, please run:');
+          this.log(this.warningMessage);
+        } else {
+          this.log(`\n${chalk.bold.green('Helm configuration successfully generated!')}`);
+        }
+        this.log(
+          `${chalk.yellow.bold(
+            'WARNING!'
+          )} You will need to push your image to a registry. If you have not done so, use the following commands to tag and push the images:`
+        );
+        for (let i = 0; i < this.appsFolders.length; i++) {
+          const originalImageName = this.appConfigs[i].baseName.toLowerCase();
+          const targetImageName = this.appConfigs[i].targetImageName;
+          if (originalImageName !== targetImageName) {
+            this.log(`  ${chalk.cyan(`docker image tag ${originalImageName} ${targetImageName}`)}`);
+          }
+          this.log(`  ${chalk.cyan(`${this.dockerPushCommand} ${targetImageName}`)}`);
+        }
+        this.log('\nYou can deploy all your apps by running the following script:');
+        this.log(`  ${chalk.cyan('bash helm-apply.sh')}`);
+        this.log('\nYou can upgrade (after any changes) all your apps by running the following script:');
+        this.log(`  ${chalk.cyan('bash helm-upgrade.sh')}`);
+        // Make the apply script executable
+        try {
+          fs.chmodSync('helm-apply.sh', '755');
+          fs.chmodSync('helm-upgrade.sh', '755');
+        } catch (err) {
+          this.log(
+            `${chalk.yellow.bold(
+              'WARNING!'
+            )}Failed to make 'helm-apply.sh', 'helm-upgrade.sh' executable, you may need to run 'chmod +x helm-apply.sh helm-upgrade.sh`
+          );
+        }
+      },
+    };
+  }
+
+  get end() {
+    if (this.delegateToBlueprint) return {};
+    return this._end();
   }
 };

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

@@ -6,9 +6,9 @@ You will need to push your image to a registry. If you have not done so, use the
 
 ```
 <%_ for (let i = 0; i < appsFolders.length; i++) { _%>
-    <%_ if (appConfigs[i].baseName.toLowerCase() !== appConfigs[i].targetImageName) { _%>
+  <%_ if (appConfigs[i].baseName.toLowerCase() !== appConfigs[i].targetImageName) { _%>
 $ docker image tag <%= appConfigs[i].baseName.toLowerCase() %> <%= appConfigs[i].targetImageName %>
-    <%_ } _%>
+  <%_ } _%>
 $ <%= dockerPushCommand %> <%= appConfigs[i].targetImageName %>
 <%_ } _%>
 ```
@@ -48,6 +48,5 @@ For Kubernetes specific information, refer to the `kubernetes` sub-generator Rea
 
 ### Backlogs to be covered
 
-* Couchbase is yet to be integrated with Helm repository, it is still referring the Kubernetes sub-generator manifest - to be tested
 * helm upgrade - to be tested
 * Istio - to be tested