Skip to content

Commit

Permalink
Remove the kubernetes-plugin hack for running tests
Browse files Browse the repository at this point in the history
Signed-off-by: Yingrong Zhao <[email protected]>
  • Loading branch information
VinozzZ committed Dec 5, 2022
1 parent e9bb870 commit e2c7bab
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 13 deletions.
19 changes: 12 additions & 7 deletions magefiles/magefile.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -54,12 +56,15 @@ const (
porterVersion = "v1.0.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 = porterVersion
var (
porterAgentImgRepository = "ghcr.io/getporter/porter-agent"
porterAgentImgVersion = "v1.0.2"
)

// Local porter agent image name to use for local testing
var localAgentImgName = "localhost:5000/porter-agent:canary-dev"
Expand Down Expand Up @@ -115,7 +120,7 @@ func GenerateController() error {

// Build the porter-operator bundle.
func BuildBundle() {
mg.SerialDeps(getPlugins, getMixins, StartDockerRegistry, PublishImages)
mg.SerialDeps(getMixins, StartDockerRegistry, PublishImages)

buildManifests()

Expand Down Expand Up @@ -642,7 +647,7 @@ func buildPorterCmd(args ...string) shx.PreparedCommand {

func BuildLocalPorterAgent() {
mg.SerialDeps(porter.UseBinForPorterHome, ensurePorterAt)
mg.SerialDeps(getPlugins, getMixins)
mg.SerialDeps(getMixins)
porterRegistry := "ghcr.io/getporter"
buildImage := func(img string) error {
_, err := shx.Output("docker", "build", "-t", img,
Expand Down
4 changes: 0 additions & 4 deletions tests/integration/testdata/Dockerfile.k8s-plugin-agent

This file was deleted.

3 changes: 1 addition & 2 deletions tests/integration/testdata/operator_porter_config.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
debug: true
debug-plugins: true
default-secrets: "kubernetes-secrets"
verbosity: "debug"
default-storage: "in-cluster-mongodb"
storage:
- name: "in-cluster-mongodb"
Expand Down

0 comments on commit e2c7bab

Please sign in to comment.