clean up

Signed-off-by: Yingrong Zhao <[email protected]>
getporter · Sep 30, 2022 · 28795f0 · 28795f0
1 parent 85d9d50
commit 28795f0
Show file tree

Hide file tree

Showing 15 changed files with 28 additions and 109 deletions.
diff --git a/agent-config.yaml b/agent-config.yaml
diff --git a/api/v1/testdata/credential-set.yaml b/api/v1/testdata/credential-set.yaml
@@ -10,4 +10,4 @@ spec:
   credentials:
     - name: kubeconfig
       source:
-        secret: ~/.kube/config
+        secret: test-secret
diff --git a/cred.yaml b/cred.yaml
diff --git a/kind-config.ymal b/kind-config.ymal
diff --git a/llama.yaml b/llama.yaml
diff --git a/mage.go b/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()) }
diff --git a/magefiles/kind.config b/magefiles/kind.config
diff --git a/magefile.go → magefiles/magefile.go b/magefile.go → magefiles/magefile.go
@@ -45,7 +45,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 +57,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 +366,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 {

diff --git a/notes.md b/notes.md
diff --git a/porter-config.yaml b/porter-config.yaml
diff --git a/test b/test
diff --git a/test-output b/test-output
diff --git a/test2 b/test2
diff --git a/tests/integration/suite_test.go b/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())

diff --git a/tests/integration/testdata/Dockerfile.k8s-plugin-agent b/tests/integration/testdata/Dockerfile.k8s-plugin-agent