code cleanup: remove glooctl v2 references

changelog/v1.17.0-beta35/glooctl-v2-naming.yaml

@@ -0,0 +1,6 @@
+changelog:
+  - type: NON_USER_FACING
+    issueLink: https://github.com/solo-io/solo-projects/issues/6080
+    resolvesIssue: false
+    description: >-
+      Code cleanup: remove v2 references from glooctl code

projects/gloo/cli/install.sh

@@ -85,18 +85,11 @@ echo "Add the gloo CLI to your path with:"
 echo "  export PATH=\$HOME/.gloo/bin:\$PATH"
 echo ""
 
-# if version 2, only one install command exists
-
 echo "Now run:"
-if [[ $gloo_version == v2* ]]; then
-  echo "  glooctl install     # install gloo gateway v2 into the 'gloo-system' namespace"
-  echo "Please see visit the Gloo Installation guides for more:  https://docs.solo.io/gloo-gateway/v2/"
-else
-  echo "  glooctl install gateway     # install gloo's function gateway functionality into the 'gloo-system' namespace"
-  echo "  glooctl install ingress     # install very basic Kubernetes Ingress support with Gloo into namespace gloo-system"
-  echo "  glooctl install knative     # install Knative serving with Gloo configured as the default cluster ingress"
-  echo "Please see visit the Gloo Installation guides for more:  https://docs.solo.io/gloo-edge/latest/installation/"
-fi
+echo "  glooctl install gateway     # install gloo's function gateway functionality into the 'gloo-system' namespace"
+echo "  glooctl install ingress     # install very basic Kubernetes Ingress support with Gloo into namespace gloo-system"
+echo "  glooctl install knative     # install Knative serving with Gloo configured as the default cluster ingress"
+echo "Please see visit the Gloo Installation guides for more:  https://docs.solo.io/gloo-edge/latest/installation/"
 exit 0
 done
 

projects/gloo/cli/pkg/cmd/check/internal/v2/check.go → projects/gloo/cli/pkg/cmd/check/internal/kubegateway/check.go

@@ -1,4 +1,4 @@
-package v2
+package kubegateway
 
 import (
 	"context"

projects/gloo/cli/pkg/cmd/check/root.go

@@ -73,12 +73,12 @@ func RootCmd(opts *options.Options, optionsFunc ...cliutils.OptionsFunc) *cobra.
 			printer := printers.P{OutputType: opts.Top.Output}
 			printer.CheckResult = printer.NewCheckResult()
 
-			// TODO add back the v2 check (probably better to pass in as a flag rather than try to infer it)
+			// TODO add back the kubegateway check (probably better to pass in as a flag rather than try to infer it)
 			// var err error
-			// call v2 check if k8s gateway crds are detected, otherwise call v1 check
-			// isV2 := detectCrdsV2(opts.Top.KubeContext)
-			// if isV2 {
-			// 	err = v2.Check(ctx, printer, opts)
+			// call kubegateway check if k8s gateway crds are detected, otherwise call classic check
+			// isKubeGateway := detectKubeGatewayCrds(opts.Top.KubeContext)
+			// if isKubeGateway {
+			// 	err = kubegateway.Check(ctx, printer, opts)
 			// } else {
 			err := CheckResources(ctx, printer, opts)
 			// }
@@ -92,8 +92,8 @@ func RootCmd(opts *options.Options, optionsFunc ...cliutils.OptionsFunc) *cobra.
 				printer.AppendMessage("No problems detected.")
 			}
 
-			// TODO add back the v2 check
-			// if !isV2 {
+			// TODO add back the kubegateway check
+			// if !isKubeGateway {
 			CheckMulticlusterResources(ctx, printer, opts)
 			// }
 
@@ -1007,8 +1007,8 @@ func isCrdNotFoundErr(crd crd.Crd, err error) bool {
 	}
 }
 
-// copied from projects/gloo/cli/pkg/cmd/install/v2/install.go (TODO: dedupe/clean up)
-func detectCrdsV2(kubeContext string) bool {
+// copied from projects/gloo/cli/pkg/cmd/install/kubegateway/install.go (TODO: dedupe/clean up)
+func detectKubeGatewayCrds(kubeContext string) bool {
 	cfg, err := kubeutils.GetRestConfigWithKubeContext(kubeContext)
 	if err != nil {
 		return false

projects/gloo/cli/pkg/cmd/install/v2/install.go → projects/gloo/cli/pkg/cmd/install/kubegateway/install.go

@@ -1,4 +1,4 @@
-package v2
+package kubegateway
 
 import (
 	"context"

projects/gloo/cli/pkg/cmd/install/v2/root.go → projects/gloo/cli/pkg/cmd/install/kubegateway/root.go

@@ -1,4 +1,4 @@
-package v2
+package kubegateway
 
 import (
 	"github.com/solo-io/gloo/projects/gloo/cli/pkg/cmd/options"
@@ -34,7 +34,6 @@ func InstallCmd(opts *options.Options, optionsFunc ...cliutils.OptionsFunc) *cob
 		Short: constants.INSTALL_COMMAND.Short,
 		Long:  constants.INSTALL_COMMAND.Long,
 		RunE: func(cmd *cobra.Command, args []string) error {
-			// Default to Gloo Gateway V2
 			return install(opts, installOpts)
 		},
 	}

projects/gloo/cli/pkg/cmd/install/v2/uninstall.go → projects/gloo/cli/pkg/cmd/install/kubegateway/uninstall.go

@@ -1,4 +1,4 @@
-package v2
+package kubegateway
 
 import (
 	"context"

projects/gloo/cli/pkg/cmd/root.go

@@ -130,8 +130,8 @@ func CommandWithContext(ctx context.Context) *cobra.Command {
 			istio.RootCmd(opts),
 			initpluginmanager.Command(context.Background()),
 			// TODO: re-enable this when it's working again
-			// v2.InstallCmd(opts),
-			// v2.UninstallCmd(opts),
+			// kubegateway.InstallCmd(opts),
+			// kubegateway.UninstallCmd(opts),
 			completionCmd(),
 		)
 	}