clean up

Signed-off-by: Yingrong Zhao <[email protected]>

.github/workflows/build.yml

@@ -22,8 +22,9 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v3
         with:
-          go-version: 1.18
-          check-latest: true
+          go-version-file: go.mod
+          cache: true
+          cache-dependency-path: go.sum
       - name: Set up Mage
         run: go run mage.go EnsureMage
       - name: Test

api/v1/const.go

@@ -94,7 +94,7 @@ const (
 
 	// VolumePorterSharedName is the name of the volume shared between the porter
 	// agent and the invocation image.
-	VolumePorterPluginsName = "plugins"
+	VolumePorterPluginsName = "porter-plugins"
 
 	// VolumePorterConfigPath is the mount path of the volume containing Porter's
 	// config file.

api/v1/testdata/credential-set.yaml

@@ -1,13 +1,7 @@
-apiVersion: porter.sh/v1
-kind: CredentialSet
-metadata:
-  name: hello-3
-  namespace: test
-spec:
-  schemaVersion: 1.0.1
-  name: porter-test-me
-  namespace: test
-  credentials:
-    - name: kubeconfig
+schemaVersion: 1.0.1
+name: porter-test-me
+namespace: dev
+credentials:
+    - name: insecureValue
       source:
-        secret: ~/.kube/config
+        secret: test-secret

controllers/agentconfig_controller.go

@@ -106,7 +106,7 @@ func (r *AgentConfigReconciler) Reconcile(ctx context.Context, req ctrl.Request)
 	if err != nil {
 		return ctrl.Result{}, err
 	}
-	if readyPVC != nil && tempPVC == nil {
+	if readyPVC != nil && tempPVC == nil && !isDeleted(agentCfg) {
 		if readyPVC.Status.Phase != corev1.ClaimBound || agentCfg.Status.Phase == porterv1.PhaseSucceeded {
 			return ctrl.Result{}, nil
 		}
@@ -501,16 +501,6 @@ func (r *AgentConfigReconciler) cleanup(ctx context.Context, log logr.Logger, ag
 		return err
 	}
 
-	// remove owner reference
-	if idx, exist := containOwner(newPVC.GetOwnerReferences(), agentCfg); exist {
-		newPVC.OwnerReferences = removeOwnerByIdx(newPVC.GetOwnerReferences(), idx)
-		err := r.Update(ctx, newPVC)
-		if err != nil {
-			return err
-		}
-		return nil
-	}
-
 	pv := &corev1.PersistentVolume{}
 	pvKey := client.ObjectKey{Namespace: newPVC.Namespace, Name: newPVC.Spec.VolumeName}
 	err = r.Get(ctx, pvKey, pv)
@@ -530,6 +520,16 @@ func (r *AgentConfigReconciler) cleanup(ctx context.Context, log logr.Logger, ag
 		return nil
 	}
 
+	// remove owner reference
+	if idx, exist := containOwner(newPVC.GetOwnerReferences(), agentCfg); exist {
+		newPVC.OwnerReferences = removeOwnerByIdx(newPVC.GetOwnerReferences(), idx)
+		err := r.Update(ctx, newPVC)
+		if err != nil {
+			return err
+		}
+		return nil
+	}
+
 	return nil
 
 }
@@ -610,6 +610,7 @@ func (r *AgentConfigReconciler) DeleteTemporaryPVC(ctx context.Context, log logr
 }
 
 func (r *AgentConfigReconciler) isDeleteProcessed(ctx context.Context, agentCfg *porterv1.AgentConfig) (bool, error) {
+
 	if !isDeleted(agentCfg) {
 		return false, nil
 	}

go.mod

@@ -1,6 +1,6 @@
 module get.porter.sh/operator
 
-go 1.17
+go 1.18
 
 replace (
 	// a dependency of buildx (github.com/tonistiigi/fsutil) relies on an untagged version of Docker on the master branch

mage.go

@@ -0,0 +1,15 @@
+//go:build ignore
+// +build ignore
+
+package main
+
+import (
+	"os"
+
+	"github.com/magefile/mage/mage"
+)
+
+// This file allows someone to run mage commands without mage installed
+// by running `go run mage.go TARGET`.
+// See https://magefile.org/zeroinstall/
+func main() { os.Exit(mage.Main()) }

magefile.go → magefiles/magefile.go

@@ -19,6 +19,8 @@ import (
 	. "get.porter.sh/magefiles/docker"
 	"get.porter.sh/magefiles/porter"
 	"get.porter.sh/magefiles/releases"
+
+	//mage:import
 	. "get.porter.sh/magefiles/tests"
 	"get.porter.sh/magefiles/tools"
 	. "get.porter.sh/operator/mage"
@@ -45,7 +47,7 @@ const (
 	testNamespace = "test"
 
 	// Relative location of the KUBECONFIG for the test cluster
-	kubeconfig = "kind.config.yaml"
+	kubeconfig = "kind.config"
 
 	// Namespace of the porter operator
 	operatorNamespace = "porter-operator-system"
@@ -57,15 +59,18 @@ const (
 	porterVersion = "v1.0.0-rc.1"
 )
 
-var srcDirs = []string{"api", "config", "controllers", "installer", "installer-olm"}
-var binDir = "bin"
+var (
+	srcDirs = []string{"api", "config", "controllers", "installer", "installer-olm"}
+	binDir  = "bin"
+)
 
-// Porter agent that has k8s plugin included
-var porterAgentImgRepository = "ghcr.io/getporter/dev/porter-agent-kubernetes"
-var porterAgentImgVersion = "v1.0.0-rc.1"
+var (
+	porterAgentImgRepository = "ghcr.io/getporter/porter-agent"
+	porterAgentImgVersion    = "v1.0.0-rc.3"
+)
 
 // Local porter agent image name to use for local testing
-var localAgentImgName = "localhost:5000/porter-agent:test"
+var localAgentImgName = "localhost:5000/porter-agent:canary-dev"
 
 // Build a command that stops the build on if the command fails
 var must = shx.CommandBuilder{StopOnError: true}
@@ -363,9 +368,7 @@ func Deploy() {
 		buildPorterCmd("credentials", "apply", "hack/creds.yaml", "-n=operator").Must().RunV()
 	}
 	bundleRef := Env.BundlePrefix + meta.Version
-	//buildPorterCmd("install", "operator", "-r", bundleRef, "-c=kind", "--force", "-n=operator").Must().RunV()
-
-	buildPorterCmd("install", "operator", "-r", bundleRef, "--param", "porterRepository=localhost:5000/porter-agent", "--param", "porterVersion=canary-v1", "-c=kind", "--force", "-n=operator").Must().RunV()
+	buildPorterCmd("install", "operator", "-r", bundleRef, "-c=kind", "--force", "-n=operator").Must().RunV()
 }
 
 func isDeployed() bool {

tests/integration/suite_test.go

@@ -197,7 +197,7 @@ func createTestNamespace(ctx context.Context) string {
 			PorterVersion:              agentVersion,
 			ServiceAccount:             svc.Name,
 			InstallationServiceAccount: "installation-agent",
-			Plugins:                    porterv1.PluginList{porterv1.Plugin{Name: "kubernetes", FeedURL: "https://cdn.porter.sh/plugins/atom.xml", Version: "v1.0.0-beta.1"}},
+			Plugins:                    porterv1.PluginList{porterv1.Plugin{Name: "kubernetes", FeedURL: "https://cdn.porter.sh/plugins/atom.xml", Version: "v1.0.0-rc.1"}},
 		},
 	}
 	Expect(k8sClient.Create(ctx, agentCfg)).To(Succeed())