Move kubernetes-helm and kubernetes-knative into kubernetes (#31805)

Author: qmonmert

.blueprint/github-build-matrix/support/__snapshots__/git-chages.spec.ts.snap

@@ -616,50 +616,6 @@ exports[`git-changes generators/kubernetes/index.ts should match changes snapsho
 }
 `;
 
-exports[`git-changes generators/kubernetes-helm/index.ts should match changes snapshot 1`] = `
-{
-  "angular": false,
-  "angularWorkflow": false,
-  "base": false,
-  "ci": false,
-  "client": false,
-  "common": false,
-  "devBlueprint": false,
-  "devserverWorkflow": false,
-  "e2e": false,
-  "graalvm": false,
-  "java": false,
-  "react": false,
-  "reactWorkflow": false,
-  "sonarPr": false,
-  "vue": false,
-  "vueWorkflow": false,
-  "workspaces": true,
-}
-`;
-
-exports[`git-changes generators/kubernetes-knative/index.ts should match changes snapshot 1`] = `
-{
-  "angular": false,
-  "angularWorkflow": false,
-  "base": false,
-  "ci": false,
-  "client": false,
-  "common": false,
-  "devBlueprint": false,
-  "devserverWorkflow": false,
-  "e2e": false,
-  "graalvm": false,
-  "java": false,
-  "react": false,
-  "reactWorkflow": false,
-  "sonarPr": false,
-  "vue": false,
-  "vueWorkflow": false,
-  "workspaces": true,
-}
-`;
-
 exports[`git-changes generators/languages/index.ts should match changes snapshot 1`] = `
 {
   "angular": false,

.github/labeler.yml

@@ -114,5 +114,5 @@
   - changed-files:
       - any-glob-to-any-file:
           - generators/kubernetes/**/*
-          - generators/kubernetes-helm/**/*
-          - generators/kubernetes-knative/**/*
+          - generators/kubernetes/generators/helm/**/*
+          - generators/kubernetes/generators/knative/**/*

cli/commands.ts

@@ -119,11 +119,11 @@ const defaultCommands = {
     alias: 'k8s',
     desc: 'Deploy the current application to Kubernetes',
   },
-  'kubernetes-helm': {
+  'kubernetes:helm': {
     alias: 'helm',
     desc: 'Deploy the current application to Kubernetes using Helm package manager',
   },
-  'kubernetes-knative': {
+  'kubernetes:knative': {
     alias: 'knative',
     desc: 'Deploy the current application to Kubernetes using knative constructs',
   },

generators/base/__snapshots__/generator.spec.ts.snap

@@ -46,8 +46,8 @@ Commands:
   jdl|import-jdl                  Create entities from the JDL file/URL/content passed in argument.
       Use the '--interactive' flag to generate multiple applications in series.
   kubernetes|k8s                  Deploy the current application to Kubernetes
-  kubernetes-helm|helm            Deploy the current application to Kubernetes using Helm package manager
-  kubernetes-knative|knative      Deploy the current application to Kubernetes using knative constructs
+  kubernetes:helm|helm            Deploy the current application to Kubernetes using Helm package manager
+  kubernetes:knative|knative      Deploy the current application to Kubernetes using knative constructs
   languages                       Select languages from a list of available languages. The i18n files will be copied to the /webapp/i18n folder
   maven                           Create Maven project (alpha)
   project-name                    Configure project name (alpha)

generators/generate-blueprint/__snapshots__/generator.spec.ts.snap

@@ -899,58 +899,58 @@ exports[`generator - generate-blueprint with all option should match snapshot 1`
   "generators/jdl/templates/template-file-jdl.ejs": {
     "stateCleared": "modified",
   },
-  "generators/kubernetes-helm/command.js": {
+  "generators/kubernetes/command.js": {
     "stateCleared": "modified",
   },
-  "generators/kubernetes-helm/generator.js": {
+  "generators/kubernetes/generator.js": {
     "stateCleared": "modified",
   },
-  "generators/kubernetes-helm/generator.spec.js": {
+  "generators/kubernetes/generator.spec.js": {
     "stateCleared": "modified",
   },
-  "generators/kubernetes-helm/index.js": {
+  "generators/kubernetes/generators/bootstrap/command.js": {
     "stateCleared": "modified",
   },
-  "generators/kubernetes-helm/templates/template-file-kubernetes-helm.ejs": {
+  "generators/kubernetes/generators/bootstrap/generator.js": {
     "stateCleared": "modified",
   },
-  "generators/kubernetes-knative/command.js": {
+  "generators/kubernetes/generators/bootstrap/generator.spec.js": {
     "stateCleared": "modified",
   },
-  "generators/kubernetes-knative/generator.js": {
+  "generators/kubernetes/generators/bootstrap/index.js": {
     "stateCleared": "modified",
   },
-  "generators/kubernetes-knative/generator.spec.js": {
+  "generators/kubernetes/generators/bootstrap/templates/template-file-kubernetes:bootstrap.ejs": {
     "stateCleared": "modified",
   },
-  "generators/kubernetes-knative/index.js": {
+  "generators/kubernetes/generators/helm/command.js": {
     "stateCleared": "modified",
   },
-  "generators/kubernetes-knative/templates/template-file-kubernetes-knative.ejs": {
+  "generators/kubernetes/generators/helm/generator.js": {
     "stateCleared": "modified",
   },
-  "generators/kubernetes/command.js": {
+  "generators/kubernetes/generators/helm/generator.spec.js": {
     "stateCleared": "modified",
   },
-  "generators/kubernetes/generator.js": {
+  "generators/kubernetes/generators/helm/index.js": {
     "stateCleared": "modified",
   },
-  "generators/kubernetes/generator.spec.js": {
+  "generators/kubernetes/generators/helm/templates/template-file-kubernetes:helm.ejs": {
     "stateCleared": "modified",
   },
-  "generators/kubernetes/generators/bootstrap/command.js": {
+  "generators/kubernetes/generators/knative/command.js": {
     "stateCleared": "modified",
   },
-  "generators/kubernetes/generators/bootstrap/generator.js": {
+  "generators/kubernetes/generators/knative/generator.js": {
     "stateCleared": "modified",
   },
-  "generators/kubernetes/generators/bootstrap/generator.spec.js": {
+  "generators/kubernetes/generators/knative/generator.spec.js": {
     "stateCleared": "modified",
   },
-  "generators/kubernetes/generators/bootstrap/index.js": {
+  "generators/kubernetes/generators/knative/index.js": {
     "stateCleared": "modified",
   },
-  "generators/kubernetes/generators/bootstrap/templates/template-file-kubernetes:bootstrap.ejs": {
+  "generators/kubernetes/generators/knative/templates/template-file-kubernetes:knative.ejs": {
     "stateCleared": "modified",
   },
   "generators/kubernetes/index.js": {

generators/generate-blueprint/internal/lookup-namespaces.spec.ts

@@ -83,9 +83,9 @@ describe('lookupGeneratorsNamespaces', () => {
   "jdl",
   "jdl:bootstrap",
   "kubernetes",
-  "kubernetes-helm",
-  "kubernetes-knative",
   "kubernetes:bootstrap",
+  "kubernetes:helm",
+  "kubernetes:knative",
   "languages",
   "languages:bootstrap",
   "liquibase",

generators/kubernetes-helm/USAGE …erators/kubernetes/generators/helm/USAGEgenerators/kubernetes-helm/USAGE renamed to generators/kubernetes/generators/helm/USAGE generators/kubernetes-helm/USAGE renamed to generators/kubernetes/generators/helm/USAGE

@@ -2,4 +2,4 @@ Description:
     Creates all required helm packages for the selected applications to deploy in kubernetes.
 
 Example:
-    jhipster kubernetes-helm
+    jhipster kubernetes:helm