Install e2e test chart without make/deploy

.github/scripts/run-e2e-tests.sh

@@ -58,8 +58,8 @@ popd
 
 echo "Running tests for environment '$FLC_ENVIRONMENT'..."
 
-if [[ -z "${TARGET_IMAGE}" ]]; then
-  make IMG="$TARGET_IMAGE" test/e2e-publish
+if [[ -n "${TARGET_IMAGE}" ]]; then
+  make IMAGE_URI="$TARGET_IMAGE" test/e2e-publish
 else
   echo "fall back to default branch target"
   make BRANCH="$TARGET_BRANCH" test/e2e-publish

cmd/webhook/cmd.go

@@ -81,6 +81,7 @@ func run(cmd *cobra.Command, args []string) error {
 		switch {
 		case err == nil:
 			logd.Get().WithName("platform").Info("detected platform", "platform", "openshift")
+
 			isOpenShift = true
 		case k8serrors.IsNotFound(err):
 			logd.Get().WithName("platform").Info("detected platform", "platform", "kubernetes")

hack/make/deploy/deploy.mk

@@ -3,6 +3,15 @@ DEBUG_LOGS ?= true
 PLATFORM ?= "kubernetes"
 HELM_CHART ?= config/helm/chart/default
 
+## Display the image name used to deploy the helm chart
+deploy/show-image-ref:
+	@echo $(IMAGE_URI)
+
+## Display the image name used to deploy the FIPS helm chart
+deploy/show-image-ref/fips:
+	@# Don't call make here to omit the make[1] lines for normal CLI usage.
+	@echo $(IMAGE_URI)-fips
+
 ## Deploy the operator without the csi-driver
 deploy/no-csi:
 	@make ENABLE_CSI=false $(@D)

pkg/controllers/dynakube/apimonitoring/reconciler_test.go

@@ -137,7 +137,6 @@ func TestReconcile(t *testing.T) {
 		require.NoError(t, err)
 		assert.Equal(t, testObjectID, actual)
 	})
-
 }
 
 func TestReconcileErrors(t *testing.T) {

test/features/cloudnative/upgrade/upgrade.go

@@ -40,7 +40,7 @@ func Feature(t *testing.T) features.Feature {
 
 	// update to snapshot
 	withCSI := true
-	builder.Assess("upgrade operator", helpers.ToFeatureFunc(operator.InstallViaMake(withCSI), true))
+	builder.Assess("upgrade operator", helpers.ToFeatureFunc(operator.InstallLocal(withCSI), true))
 	builder.Assess("restart half of sample apps", sampleApp.Restart())
 	cloudnative.AssessSampleInitContainers(builder, sampleApp)
 

test/features/extensions/upgrade/upgrade.go

@@ -38,7 +38,7 @@ func Feature(t *testing.T) features.Feature {
 
 	// update to snapshot
 	withCSI := false
-	builder.Assess("upgrade operator", helpers.ToFeatureFunc(operator.InstallViaMake(withCSI), true))
+	builder.Assess("upgrade operator", helpers.ToFeatureFunc(operator.InstallLocal(withCSI), true))
 
 	builder.Assess("extensions execution controller started", statefulset.WaitFor(testDynakube.Extensions().GetExecutionControllerStatefulsetName(), testDynakube.Namespace))
 

test/helpers/components/operator/installation.go

@@ -5,14 +5,18 @@ package operator
 import (
 	"bytes"
 	"context"
+	"errors"
 	"fmt"
 	"os"
 	"os/exec"
+	"path/filepath"
+	"strings"
 
 	"github.com/Dynatrace/dynatrace-operator/test/helpers/components/csi"
 	"github.com/Dynatrace/dynatrace-operator/test/helpers/components/webhook"
 	"github.com/Dynatrace/dynatrace-operator/test/helpers/platform"
 	"github.com/Dynatrace/dynatrace-operator/test/project"
+	"k8s.io/klog/v2"
 	"sigs.k8s.io/e2e-framework/pkg/env"
 	"sigs.k8s.io/e2e-framework/pkg/envconf"
 	"sigs.k8s.io/e2e-framework/third_party/helm"
@@ -22,22 +26,25 @@ const (
 	helmRegistryURL = "oci://public.ecr.aws/dynatrace/dynatrace-operator"
 )
 
-func InstallViaMake(withCSI bool) env.Func {
+// Install the operator chart with the specified tag and CSI mode.
+func Install(releaseTag string, withCSI bool) env.Func {
 	return func(ctx context.Context, envConfig *envconf.Config) (context.Context, error) {
-		rootDir := project.RootDir()
-		err := execMakeCommand(rootDir, "deploy", fmt.Sprintf("ENABLE_CSI=%t", withCSI))
+		if releaseTag == "" {
+			return ctx, errors.New("missing release tag")
+		}
+		err := installViaHelm(releaseTag, withCSI)
 		if err != nil {
 			return ctx, err
 		}
-		ctx, err = VerifyInstall(ctx, envConfig, withCSI)
 
-		return ctx, err
+		return VerifyInstall(ctx, envConfig, withCSI)
 	}
 }
 
-func InstallViaHelm(releaseTag string, withCSI bool, namespace string) env.Func {
+// InstallLocal deploys the operator helm chart from filesystem.
+func InstallLocal(withCSI bool) env.Func {
 	return func(ctx context.Context, envConfig *envconf.Config) (context.Context, error) {
-		err := installViaHelm(releaseTag, withCSI, namespace)
+		err := installViaHelm("", withCSI)
 		if err != nil {
 			return ctx, err
 		}
@@ -46,7 +53,7 @@ func InstallViaHelm(releaseTag string, withCSI bool, namespace string) env.Func
 	}
 }
 
-func UninstallViaMake(withCSI bool) env.Func {
+func Uninstall(withCSI bool) env.Func {
 	return func(ctx context.Context, envConfig *envconf.Config) (context.Context, error) {
 		rootDir := project.RootDir()
 		if withCSI {
@@ -90,33 +97,90 @@ func execMakeCommand(rootDir, makeTarget string, envVariables ...string) error {
 	err := command.Run()
 
 	if len(b.String()) != 0 {
-		fmt.Println("out:", b.String()) //nolint
+		fmt.Println("out:", b.String()) //nolint:forbidigo
 	}
 
 	if len(bErr.String()) != 0 {
-		fmt.Println("err:", bErr.String()) //nolint
+		fmt.Println("err:", bErr.String()) //nolint:forbidigo
 	}
 
 	return err
 }
 
-func installViaHelm(releaseTag string, withCsi bool, namespace string) error {
+func installViaHelm(releaseTag string, withCSI bool) error {
 	manager := helm.New("''")
 
 	_platform, err := platform.NewResolver().GetPlatform()
 	if err != nil {
 		return err
 	}
 
-	return manager.RunUpgrade(helm.WithNamespace(namespace),
+	opts := []helm.Option{
 		helm.WithReleaseName("dynatrace-operator"),
-		helm.WithArgs(helmRegistryURL),
-		helm.WithVersion(releaseTag),
+		helm.WithNamespace("dynatrace"),
 		helm.WithArgs("--create-namespace"),
 		helm.WithArgs("--install"),
 		helm.WithArgs("--set", fmt.Sprintf("platform=%s", _platform)),
 		helm.WithArgs("--set", "installCRD=true"),
-		helm.WithArgs("--set", fmt.Sprintf("csidriver.enabled=%t", withCsi)),
+		helm.WithArgs("--set", fmt.Sprintf("csidriver.enabled=%t", withCSI)),
 		helm.WithArgs("--set", "manifests=true"),
-	)
+		helm.WithArgs("--set", "debugLogs=true"),
+	}
+
+	if releaseTag == "" {
+		// Install from filesystem
+		rootDir := project.RootDir()
+		imageRef, err := getImageRef(rootDir)
+		if err != nil {
+			return err
+		}
+
+		if imageRef == "" {
+			return errors.New("could not determine operator image")
+		}
+
+		opts = append(opts,
+			helm.WithArgs(filepath.Join(rootDir, "config", "helm", "chart", "default")),
+			helm.WithArgs("--set", "image="+strings.TrimSpace(imageRef)),
+		)
+	} else {
+		// Install from registry
+		opts = append(opts,
+			helm.WithArgs(helmRegistryURL),
+			helm.WithVersion(releaseTag),
+		)
+	}
+
+	var klogLevel klog.Level
+	// Show helm command args and output
+	// Set only fails if the input does not conform to stronv.ParseInt(x, 10, 32)
+	_ = klogLevel.Set("4")
+	defer func() {
+		// Reset to default value to prevent other logs from showing up
+		_ = klogLevel.Set("0")
+	}()
+
+	return manager.RunUpgrade(opts...)
+}
+
+func getImageRef(rootDir string) (string, error) {
+	command := exec.Command("make", "-C", rootDir, "deploy/show-image-ref")
+	command.Env = os.Environ()
+	stdout, stderr := new(bytes.Buffer), new(bytes.Buffer)
+	command.Stdout = stdout
+	command.Stderr = stderr
+	err := command.Run()
+	if err != nil || stderr.String() != "" {
+		return "", fmt.Errorf("%s: %w", stderr, err)
+	}
+	lines := strings.Split(strings.TrimSpace(stdout.String()), "\n")
+	stdout.Reset()
+	for _, line := range lines {
+		// make prints things to stdout, e.g. make[1]: Entering directory
+		if !strings.HasPrefix(line, "make[") {
+			stdout.WriteString(line)
+		}
+	}
+
+	return stdout.String(), nil
 }

test/scenarios/istio/istio_test.go

@@ -37,11 +37,11 @@ func TestMain(m *testing.M) {
 	testEnv.Setup(
 		helpers.SetScheme,
 		namespace.CreateForEnv(nsWithIstio),
-		operator.InstallViaMake(true),
+		operator.InstallLocal(true),
 	)
 	// If we cleaned up during a fail-fast (aka.: /debug) it wouldn't be possible to investigate the error.
 	if !cfg.FailFast() {
-		testEnv.Finish(operator.UninstallViaMake(true))
+		testEnv.Finish(operator.Uninstall(true))
 		testEnv.Finish(namespace.CreateForEnv(nsWithoutIstio))
 	}
 

test/scenarios/nocsi/no_csi_test.go

@@ -36,11 +36,11 @@ func TestMain(m *testing.M) {
 	testEnv = env.NewWithConfig(cfg)
 	testEnv.Setup(
 		helpers.SetScheme,
-		operator.InstallViaMake(false),
+		operator.InstallLocal(false),
 	)
 	// If we cleaned up during a fail-fast (aka.: /debug) it wouldn't be possible to investigate the error.
 	if !cfg.FailFast() {
-		testEnv.Finish(operator.UninstallViaMake(false))
+		testEnv.Finish(operator.Uninstall(false))
 	}
 
 	testEnv.AfterEachTest(func(ctx context.Context, c *envconf.Config, t *testing.T) (context.Context, error) {

test/scenarios/release/release_test.go

@@ -28,11 +28,11 @@ func TestMain(m *testing.M) {
 	testEnv = env.NewWithConfig(cfg)
 	testEnv.Setup(
 		helpers.SetScheme,
-		operator.InstallViaHelm(releaseTag, true, operator.DefaultNamespace), // TODO: add logic to get releaseTag in a dynamic way instead of hard coding it
+		operator.Install(releaseTag, true), // TODO: add logic to get releaseTag in a dynamic way instead of hard coding it
 	)
 	// If we cleaned up during a fail-fast (aka.: /debug) it wouldn't be possible to investigate the error.
 	if !cfg.FailFast() {
-		testEnv.Finish(operator.UninstallViaMake(true))
+		testEnv.Finish(operator.Uninstall(true))
 	}
 
 	testEnv.AfterEachTest(func(ctx context.Context, c *envconf.Config, t *testing.T) (context.Context, error) {

test/scenarios/standard/standard_test.go

@@ -32,11 +32,11 @@ func TestMain(m *testing.M) {
 	testEnv = env.NewWithConfig(cfg)
 	testEnv.Setup(
 		helpers.SetScheme,
-		operator.InstallViaMake(true),
+		operator.InstallLocal(true),
 	)
 	// If we cleaned up during a fail-fast (aka.: /debug) it wouldn't be possible to investigate the error.
 	if !cfg.FailFast() {
-		testEnv.Finish(operator.UninstallViaMake(true))
+		testEnv.Finish(operator.Uninstall(true))
 	}
 
 	testEnv.AfterEachTest(func(ctx context.Context, c *envconf.Config, t *testing.T) (context.Context, error) {