some minor cleanup

Signed-off-by: Bryce Palmer <bpalmer@redhat.com>

pkg/testutils/e2e/certmanager/helpers.go

@@ -8,8 +8,8 @@ import (
 )
 
 // InstallCertManagerBundle installs CertManager onto a Kubernetes cluster
-func InstallCertManagerBundle(hasv1beta1CRs bool, kubectl kubernetes.Kubectl) error {
-	url, err := getCertManagerURL(hasv1beta1CRs, kubectl)
+func InstallCertManagerBundle(kubectl kubernetes.Kubectl) error {
+	url, err := getCertManagerURL(kubectl)
 	if err != nil {
 		return fmt.Errorf("encountered an error when getting the bundle URL: %w", err)
 	}
@@ -34,7 +34,7 @@ func InstallCertManagerBundle(hasv1beta1CRs bool, kubectl kubernetes.Kubectl) er
 
 // UninstallCertManagerBundle uninstalls CertManager from a Kubernetes cluster
 func UninstallCertManagerBundle(hasv1beta1CRs bool, kubectl kubernetes.Kubectl) error {
-	url, err := getCertManagerURL(hasv1beta1CRs, kubectl)
+	url, err := getCertManagerURL(kubectl)
 	if err != nil {
 		return fmt.Errorf("encountered an error when getting the bundle URL: %w", err)
 	}
@@ -49,14 +49,12 @@ func UninstallCertManagerBundle(hasv1beta1CRs bool, kubectl kubernetes.Kubectl)
 
 // getCertManagerUrl is a helper function to determine the CertManager
 // that should be installed on a cluster based on the Kubernetes version
-func getCertManagerURL(hasv1beta1CRs bool, kubectl kubernetes.Kubectl) (string, error) {
-	certmanagerVersionWithv1beta2CRs := "v0.11.0"
+func getCertManagerURL(kubectl kubernetes.Kubectl) (string, error) {
 	certmanagerLegacyVersion := "v1.0.4"
 	certmanagerVersion := "v1.5.3"
 
 	certmanagerURLTmplLegacy := "https://github.com/jetstack/cert-manager/releases/download/%s/cert-manager-legacy.yaml"
 	certmanagerURLTmpl := "https://github.com/jetstack/cert-manager/releases/download/%s/cert-manager.yaml"
-	// Return a URL for the manifest bundle with v1beta1 CRs.
 
 	kubeVersion, err := kubectl.Version()
 	if err != nil {
@@ -72,10 +70,6 @@ func getCertManagerURL(hasv1beta1CRs bool, kubectl kubernetes.Kubectl) (string,
 		return "", fmt.Errorf("encountered an error trying to parse Kubernetes Minor Version: %w", err)
 	}
 
-	if hasv1beta1CRs {
-		return fmt.Sprintf(certmanagerURLTmpl, certmanagerVersionWithv1beta2CRs), nil
-	}
-
 	// Determine which URL to use for a manifest bundle with v1 CRs.
 	// The most up-to-date bundle uses v1 CRDs, which were introduced in k8s v1.16.
 	if serverMajor <= 1 && serverMinor < 16 {

pkg/testutils/sample/cli/cli.go

@@ -8,11 +8,6 @@ import (
 	"github.com/operator-framework/ansible-operator-plugins/pkg/testutils/command"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"sigs.k8s.io/kubebuilder/v3/pkg/cli"
-	cfgv3 "sigs.k8s.io/kubebuilder/v3/pkg/config/v3"
-	"sigs.k8s.io/kubebuilder/v3/pkg/plugin"
-	kustomizev2Alpha "sigs.k8s.io/kubebuilder/v3/pkg/plugins/common/kustomize/v2-alpha"
-	"sigs.k8s.io/kubebuilder/v3/pkg/plugins/golang"
-	golangv4 "sigs.k8s.io/kubebuilder/v3/pkg/plugins/golang/v4"
 )
 
 // CliSample is a generalized object that implements the Sample interface. It is meant
@@ -112,41 +107,7 @@ func WithCLI(c *cli.CLI) CliSampleOption {
 
 // NewCliSample will return a new CliSample object. The values used in the CliSample can be modified using CliSampleOption functions
 func NewCliSample(opts ...CliSampleOption) (*CliSample, error) {
-	// Create a very basic default CLI with a go/v3 plugin
-	gov4Bundle, _ := plugin.NewBundle(golang.DefaultNameQualifier, golangv4.Plugin{}.Version(),
-		kustomizev2Alpha.Plugin{},
-		golangv4.Plugin{},
-	)
-
-	c, err := cli.New(
-		cli.WithCommandName("cli"),
-		cli.WithVersion("v0.0.0"),
-		cli.WithPlugins(
-			gov4Bundle,
-		),
-		cli.WithDefaultPlugins(cfgv3.Version, gov4Bundle),
-		cli.WithDefaultProjectVersion(cfgv3.Version),
-		cli.WithCompletion(),
-	)
-	if err != nil {
-		return nil, fmt.Errorf("encountered an error creating a new CliSample: %w", err)
-	}
-
-	gs := &CliSample{
-		domain: "example.com",
-		name:   "cli-sample",
-		gvks: []schema.GroupVersionKind{
-			{
-				Group:   "sample",
-				Version: "v1",
-				Kind:    "Cli",
-			},
-		},
-		repo:           "",
-		commandContext: command.NewGenericCommandContext(),
-		plugins:        []string{"go/v3"},
-		cli:            c,
-	}
+	gs := &CliSample{}
 
 	for _, opt := range opts {
 		opt(gs)