*: clean up samples (#4035)

Author: Eric Stroczynski

.gitignore

@@ -110,3 +110,5 @@ website/public/
 website/resources/
 website/node_modules/
 website/tech-doc-hugo
+
+*\.DS_Store

example/memcached-operator/memcached_controller.go.tmpl

@@ -27,8 +27,6 @@ import (
 	"github.com/operator-framework/operator-sdk/internal/testutils"
 )
 
-const testdata = "/testdata/"
-
 var (
 	binaryName string
 )
@@ -43,7 +41,7 @@ func main() {
 		os.Exit(1)
 	}
 
-	samplesPath := filepath.Join(currentPath, testdata)
+	samplesPath := filepath.Join(currentPath, "testdata")
 	log.Infof("using the path: (%v)", samplesPath)
 
 	log.Infof("creating Helm Memcached Sample")

hack/generate/samples/generate_all.go

@@ -16,6 +16,7 @@ package gosamples
 
 import (
 	"fmt"
+	"os"
 	"path/filepath"
 	"strings"
 
@@ -93,6 +94,9 @@ func (mh *MemcachedGoWithWebhooks) Run() {
 	mh.uncommentKustomizationFile()
 
 	pkg.RunOlmIntegration(mh.ctx)
+
+	// Clean up built binaries, if any.
+	pkg.CheckError("cleaning up", os.RemoveAll(filepath.Join(mh.ctx.Dir, "bin")))
 }
 
 // uncommentKustomizationFile will uncomment the file kustomization.yaml
@@ -225,7 +229,7 @@ func (mh *MemcachedGoWithWebhooks) implementingAPI() {
 		filepath.Join(mh.ctx.Dir, "api", mh.ctx.Version, fmt.Sprintf("%s_types.go", strings.ToLower(mh.ctx.Kind))),
 		fmt.Sprintf("type %sSpec struct {\n\t// INSERT ADDITIONAL SPEC FIELDS - desired state of cluster\n\t// Important: Run \"make\" to regenerate code after modifying this file", mh.ctx.Kind),
 		`
-	
+
 	// Size defines the number of Memcached instances
 	Size int32 `+"`"+`json:"size,omitempty"`+"`"+`
 `)
@@ -236,8 +240,8 @@ func (mh *MemcachedGoWithWebhooks) implementingAPI() {
 		filepath.Join(mh.ctx.Dir, "api", mh.ctx.Version, fmt.Sprintf("%s_types.go", strings.ToLower(mh.ctx.Kind))),
 		fmt.Sprintf("type %sStatus struct {\n\t// INSERT ADDITIONAL STATUS FIELD - define observed state of cluster\n\t// Important: Run \"make\" to regenerate code after modifying this file", mh.ctx.Kind),
 		`
-	
-	// Nodes store the name of the pods which are running Memcached instances 
+
+	// Nodes store the name of the pods which are running Memcached instances
 	Nodes []string `+"`"+`json:"nodes,omitempty"`+"`"+`
 `)
 	pkg.CheckError("inserting Node Status", err)

hack/generate/samples/internal/go/memcached_with_webhooks.go

@@ -44,10 +44,3 @@ func NewSampleContext(binary string, path string, env ...string) (s SampleContex
 
 	return s, err
 }
-
-// NewSampleContextWithTestContext returns a SampleContext containing the kubebuilder TestContext informed
-// It is useful to allow the samples code be re-used in the e2e tests.
-func NewSampleContextWithTestContext(tc *testutils.TestContext) (s SampleContext, err error) {
-	s.TestContext = *tc
-	return s, err
-}

hack/generate/samples/internal/pkg/context.go

@@ -27,7 +27,7 @@ import (
 type MemcachedSpec struct {
 	// INSERT ADDITIONAL SPEC FIELDS - desired state of cluster
 	// Important: Run "make" to regenerate code after modifying this file
-	
+
 	// Size defines the number of Memcached instances
 	Size int32 `json:"size,omitempty"`
 
@@ -40,8 +40,8 @@ type MemcachedSpec struct {
 type MemcachedStatus struct {
 	// INSERT ADDITIONAL STATUS FIELD - define observed state of cluster
 	// Important: Run "make" to regenerate code after modifying this file
-	
-	// Nodes store the name of the pods which are running Memcached instances 
+
+	// Nodes store the name of the pods which are running Memcached instances
 	Nodes []string `json:"nodes,omitempty"`
 
 }