diff --git a/magefiles/magefile.go b/magefiles/magefile.go index 4f5d5989..734dfb51 100644 --- a/magefiles/magefile.go +++ b/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" @@ -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" @@ -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() @@ -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, diff --git a/tests/integration/testdata/Dockerfile.k8s-plugin-agent b/tests/integration/testdata/Dockerfile.k8s-plugin-agent deleted file mode 100644 index 89e1ff99..00000000 --- a/tests/integration/testdata/Dockerfile.k8s-plugin-agent +++ /dev/null @@ -1,4 +0,0 @@ -ARG PORTER_VERSION -ARG REGISTRY -FROM $REGISTRY/porter-agent:$PORTER_VERSION -COPY --chown=65532:65532 bin/plugins/kubernetes/runtimes/kubernetes-runtime /app/.porter/plugins/kubernetes/kubernetes diff --git a/tests/integration/testdata/operator_porter_config.yaml b/tests/integration/testdata/operator_porter_config.yaml index 73a3646e..ca7c681f 100644 --- a/tests/integration/testdata/operator_porter_config.yaml +++ b/tests/integration/testdata/operator_porter_config.yaml @@ -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"