Skip to content

Integration test helpers rewrite #103

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
carolynvs merged 6 commits into from
Jun 10, 2022
Merged

Integration test helpers rewrite #103

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
cc701f7
chore: Moved agent image used for testing to published version that h…
Jun 3, 2022
5ae6956
chore: Testing out dynamic client
Jun 7, 2022
10f50d6
chore: Improved reliability of the waitForPorter
Jun 8, 2022
954024b
chore: removed extra params from waitForResourceDeleted
Jun 8, 2022
eb25325
chore: Removed local agent publish from mage deploy
Jun 9, 2022
0c12f56
chore: Addressed review comments
Jun 10, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion controllers/agentaction_controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ func TestPorterResourceStatus_ApplyAgentAction(t *testing.T) {
tests := []struct {
name string
action *porterv1.AgentAction
resource porterResource
resource PorterResource
wantStatus porterv1.PorterResourceStatus
}{
{
Expand Down
12 changes: 6 additions & 6 deletions controllers/porter_resource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (
"sigs.k8s.io/controller-runtime/pkg/predicate"
)

type porterResource interface {
type PorterResource interface {
client.Object
GetStatus() porterv1.PorterResourceStatus
SetStatus(value porterv1.PorterResourceStatus)
Expand Down Expand Up @@ -57,7 +57,7 @@ func PatchObjectWithRetry(ctx context.Context, log logr.Logger, clnt client.Clie
}
}

func applyAgentAction(log logr.Logger, resource porterResource, action *porterv1.AgentAction) {
func applyAgentAction(log logr.Logger, resource PorterResource, action *porterv1.AgentAction) {
log.V(Log5Trace).Info(fmt.Sprintf("Syncing AgentAction status with %s", resource.GetObjectKind().GroupVersionKind().Kind))
status := resource.GetStatus()
status.ObservedGeneration = resource.GetGeneration()
Expand Down Expand Up @@ -88,18 +88,18 @@ func applyAgentAction(log logr.Logger, resource porterResource, action *porterv1
}

// this is our kubectl delete check
func isDeleted(resource porterResource) bool {
func isDeleted(resource PorterResource) bool {
timestamp := resource.GetDeletionTimestamp()
return timestamp != nil && !timestamp.IsZero()
}

// ensure delete action is completed before delete
func isDeleteProcessed(resource porterResource) bool {
func isDeleteProcessed(resource PorterResource) bool {
status := resource.GetStatus()
return isDeleted(resource) && apimeta.IsStatusConditionTrue(status.Conditions, string(porterv1.ConditionComplete))
}

func isFinalizerSet(resource porterResource) bool {
func isFinalizerSet(resource PorterResource) bool {
for _, finalizer := range resource.GetFinalizers() {
if finalizer == porterv1.FinalizerName {
return true
Expand All @@ -109,7 +109,7 @@ func isFinalizerSet(resource porterResource) bool {
}

// ensureFinalizerSet sets a finalizer on the resource and saves it, if necessary.
func ensureFinalizerSet(ctx context.Context, log logr.Logger, client client.Client, resource porterResource) (updated bool, err error) {
func ensureFinalizerSet(ctx context.Context, log logr.Logger, client client.Client, resource PorterResource) (updated bool, err error) {
// Ensure all resources have a finalizer to we can react when they are deleted
if !isDeleted(resource) {
// The object is not being deleted, so if it does not have our finalizer,
Expand Down
38 changes: 20 additions & 18 deletions magefiles/magefile.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,16 +54,18 @@ const (
registryContainer = "registry"

// Porter home for running commands
porterVersion = "v1.0.0-alpha.19"
porterVersion = "v1.0.0-alpha.20"
)

var srcDirs = []string{"api", "config", "controllers", "installer", "installer-olm"}
var binDir = "bin"

//TODO: sort out getting k8s plugin into porter-agent
var localAgentImgRepository = "localhost:5000/porter-agent-kubernetes"
var localAgentImgVersion = "canary-dev"
var localAgentImgName = fmt.Sprintf("%s:%s", localAgentImgRepository, localAgentImgVersion)
// Porter agent that has k8s plugin included
var porterAgentImgRepository = "ghcr.io/getporter/dev/porter-agent-kubernetes"
var porterAgentImgVersion = "v1.0.0-alpha.20"

// Local porter agent image name to use for local testing
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}
Expand Down Expand Up @@ -236,9 +238,9 @@ func Publish() {
// Push the porter-operator bundle to a registry. Defaults to the local test registry.
func PublishBundle() {
mg.SerialDeps(PublishImages, BuildBundle)
buildPorterCmd("publish", "--registry", Env.Registry, "-f=porter.yaml").In("installer").Must().RunV()

meta := releases.LoadMetadata()
buildPorterCmd("publish", "--registry", Env.Registry, "-f=porter.yaml", "--tag", meta.Version).In("installer").Must().RunV()

buildPorterCmd("publish", "--registry", Env.Registry, "-f=porter.yaml", "--tag", meta.Permalink).In("installer").Must().RunV()
}

Expand Down Expand Up @@ -318,13 +320,13 @@ func TestIntegration() {
kubectl("delete", "deployment", "porter-operator-controller-manager", "-n=porter-operator-system").RunV()

if os.Getenv("PORTER_AGENT_REPOSITORY") != "" && os.Getenv("PORTER_AGENT_VERSION") != "" {
localAgentImgRepository = os.Getenv("PORTER_AGENT_REPOSITORY")
localAgentImgVersion = os.Getenv("PORTER_AGENT_VERSION")
porterAgentImgRepository = os.Getenv("PORTER_AGENT_REPOSITORY")
porterAgentImgVersion = os.Getenv("PORTER_AGENT_VERSION")
}
//"-p", "-nodes", "4",
must.Command("ginkgo").Args("-v", "-tags=integration", "./tests/integration/...", "-coverprofile=coverage-integration.out").
Env(fmt.Sprintf("PORTER_AGENT_REPOSITORY=%s", localAgentImgRepository),
fmt.Sprintf("PORTER_AGENT_VERSION=%s", localAgentImgVersion),
Env(fmt.Sprintf("PORTER_AGENT_REPOSITORY=%s", porterAgentImgRepository),
fmt.Sprintf("PORTER_AGENT_VERSION=%s", porterAgentImgVersion),
"ACK_GINKGO_DEPRECATIONS=1.16.5",
"ACK_GINKGO_RC=true",
fmt.Sprintf("KUBECONFIG=%s/kind.config", pwd())).RunV()
Expand Down Expand Up @@ -361,7 +363,6 @@ func Deploy() {
}
meta := releases.LoadMetadata()
if rebuild {
PublishLocalPorterAgent()
PublishBundle()
buildPorterCmd("credentials", "apply", "hack/creds.yaml", "-n=operator").Must().RunV()
}
Expand Down Expand Up @@ -470,7 +471,6 @@ func SetupNamespace(name string) {

// Only specify the parameter set we have the env vars set
// It would be neat if Porter could handle this for us
PublishLocalPorterAgent()
buildPorterCmd("parameters", "apply", "./hack/params.yaml", "-n=operator").RunV()
ps := ""
if os.Getenv("PORTER_AGENT_REPOSITORY") != "" && os.Getenv("PORTER_AGENT_VERSION") != "" {
Expand Down Expand Up @@ -634,20 +634,22 @@ func pwd() string {
return wd
}

func ensurePorterAt() {
porter.EnsurePorterAt(porterVersion)
}

// Run porter using the local storage, not the in-cluster storage
func buildPorterCmd(args ...string) shx.PreparedCommand {
mg.SerialDeps(porter.UseBinForPorterHome, porter.EnsurePorter)
mg.SerialDeps(porter.UseBinForPorterHome, ensurePorterAt)
return must.Command(filepath.Join(pwd(), "bin/porter")).Args(args...).
Env("PORTER_DEFAULT_STORAGE=",
"PORTER_DEFAULT_STORAGE_PLUGIN=mongodb-docker",
fmt.Sprintf("PORTER_HOME=%s", filepath.Join(pwd(), "bin")))
//mg.Deps(EnsureLocalPorter)
// return shx.Command(filepath.Join(GetPorterHome(), "porter")).Args(args...).
// Env("PORTER_DEFAULT_STORAGE=", "PORTER_DEFAULT_STORAGE_PLUGIN=mongodb-docker")
}

func BuildLocalPorterAgent() {
mg.SerialDeps(porter.UseBinForPorterHome, porter.EnsurePorter, getPlugins, getMixins)
mg.SerialDeps(porter.UseBinForPorterHome, ensurePorterAt)
mg.SerialDeps(getPlugins, getMixins)
porterRegistry := "ghcr.io/getporter"
buildImage := func(img string) error {
_, err := shx.Output("docker", "build", "-t", img,
Expand Down
Loading