Merge pull request #205 from acornett21/bump/k8s-1.27

removing packagemanifest tests
varshaprasad96 · Oct 10, 2023 · d573720 · d573720
2 parents b38b849 + 172b7e6
commit d573720
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 248 deletions.
diff --git a/internal/testutils/olm.go b/internal/testutils/olm.go
@@ -15,65 +15,16 @@
 package testutils
 
 import (
-	"fmt"
-	"os"
 	"path/filepath"
 
 	_ "sigs.k8s.io/kubebuilder/v3/pkg/config/v2" // Register config/v2 for `config.New`
 	_ "sigs.k8s.io/kubebuilder/v3/pkg/config/v3" // Register config/v3 for `config.New`
-
-	"github.com/operator-framework/operator-sdk/internal/util/projutil"
 )
 
 const (
 	OlmVersionForTestSuite = "0.25.0"
 )
 
-var makefilePackagemanifestsFragment = `
-# Options for "packagemanifests".
-ifneq ($(origin FROM_VERSION), undefined)
-PKG_FROM_VERSION := --from-version=$(FROM_VERSION)
-endif
-ifneq ($(origin CHANNEL), undefined)
-PKG_CHANNELS := --channel=$(CHANNEL)
-endif
-ifeq ($(IS_CHANNEL_DEFAULT), 1)
-PKG_IS_DEFAULT_CHANNEL := --default-channel
-endif
-PKG_MAN_OPTS ?= $(PKG_FROM_VERSION) $(PKG_CHANNELS) $(PKG_IS_DEFAULT_CHANNEL)
-
-# Generate package manifests.
-packagemanifests: kustomize %s
-	$(OPERATOR_SDK) generate kustomize manifests -q --interactive=false
-	cd config/manager && $(KUSTOMIZE) edit set image controller=$(IMG)
-	$(KUSTOMIZE) build config/manifests | $(OPERATOR_SDK) generate packagemanifests -q --version $(VERSION) $(PKG_MAN_OPTS)
-`
-
-// AddPackagemanifestsTarget will append the packagemanifests target to the makefile
-// in order to test the steps described in the docs.
-// More info:  https://v1-0-x.sdk.operatorframework.io/docs/olm-integration/generation/#package-manifests-formats
-func (tc TestContext) AddPackagemanifestsTarget(operatorType projutil.OperatorType) error {
-	makefileBytes, err := os.ReadFile(filepath.Join(tc.Dir, "Makefile"))
-	if err != nil {
-		return err
-	}
-
-	// add the manifests target when is a Go project.
-	replaceTarget := ""
-	if operatorType == projutil.OperatorTypeGo {
-		replaceTarget = "manifests"
-	}
-	makefilePackagemanifestsFragment = fmt.Sprintf(makefilePackagemanifestsFragment, replaceTarget)
-
-	// update makefile by adding the packagemanifests target
-	makefileBytes = append([]byte(makefilePackagemanifestsFragment), makefileBytes...)
-	err = os.WriteFile(filepath.Join(tc.Dir, "Makefile"), makefileBytes, 0644)
-	if err != nil {
-		return err
-	}
-	return nil
-}
-
 // DisableManifestsInteractiveMode will update the Makefile to disable the interactive mode
 func (tc TestContext) DisableManifestsInteractiveMode() error {
 	// Todo: check if we cannot improve it since the replace/content will exists in the

diff --git a/test/e2e/ansible/olm_test.go b/test/e2e/ansible/olm_test.go
diff --git a/test/e2e/helm/olm_test.go b/test/e2e/helm/olm_test.go
diff --git a/test/integration/packagemanifests_test.go b/test/integration/packagemanifests_test.go
diff --git a/test/integration/suite_test.go b/test/integration/suite_test.go
@@ -28,7 +28,6 @@ import (
 	"sigs.k8s.io/yaml"
 
 	"github.com/operator-framework/operator-sdk/internal/testutils"
-	"github.com/operator-framework/operator-sdk/internal/util/projutil"
 )
 
 // TestIntegration tests operator-sdk projects with OLM.
@@ -64,9 +63,6 @@ var _ = BeforeSuite(func() {
 	By("copying sample to a temporary e2e directory")
 	Expect(exec.Command("cp", "-r", "../../testdata/go/v3/memcached-operator", tc.Dir).Run()).To(Succeed())
 
-	By("updating the project configuration")
-	Expect(tc.AddPackagemanifestsTarget(projutil.OperatorTypeGo)).To(Succeed())
-
 	By("installing OLM")
 	Expect(tc.InstallOLMVersion(testutils.OlmVersionForTestSuite)).To(Succeed())
 
@@ -92,16 +88,6 @@ var _ = BeforeSuite(func() {
 	}
 	Expect(writeCSV(&tc, "0.0.1", csv, false)).To(Succeed())
 
-	// TODO(estroz): enable when bundles can be tested locally.
-	//
-	// By("generating the operator bundle")
-	// err = tc.Make("bundle", "IMG="+tc.ImageName)
-	// Expect(err).NotTo(HaveOccurred())
-	//
-	// By("building the operator bundle image")
-	// err = tc.Make("bundle-build", "BUNDLE_IMG="+tc.BundleImageName)
-	// Expect(err).NotTo(HaveOccurred())
-
 	By("creating the test namespace")
 	_, err = tc.Kubectl.Command("create", "namespace", tc.Kubectl.Namespace)
 	Expect(err).NotTo(HaveOccurred())
@@ -127,24 +113,6 @@ func warn(output string, err error) {
 	}
 }
 
-func runPackageManifests(tc *testutils.TestContext, args ...string) error {
-	allArgs := []string{"run", "packagemanifests", "--timeout", "6m", "--namespace", tc.Kubectl.Namespace}
-	output, err := tc.Run(exec.Command(tc.BinaryName, append(allArgs, args...)...))
-	if err == nil {
-		fmt.Fprintln(GinkgoWriter, string(output))
-	}
-	return err
-}
-
-func cleanup(tc *testutils.TestContext) (string, error) {
-	allArgs := []string{"cleanup", tc.ProjectName, "--timeout", "4m", "--namespace", tc.Kubectl.Namespace}
-	output, err := tc.Run(exec.Command(tc.BinaryName, allArgs...))
-	if err == nil {
-		fmt.Fprintln(GinkgoWriter, string(output))
-	}
-	return string(output), err
-}
-
 func readCSV(tc *testutils.TestContext, version string, isBundle bool) (*v1alpha1.ClusterServiceVersion, error) {
 	b, err := os.ReadFile(csvPath(tc, version, isBundle))
 	if err != nil {