CSPL-3898 Fixing int-helm tests failing after SDK upgrade (#1544)

Author: kasiakoziol

.github/workflows/helm-test-workflow.yml

@@ -5,6 +5,7 @@ on:
       - develop
       - main
       - feature**
+  workflow_dispatch:
 jobs:
   build-operator-image:
     runs-on: ubuntu-latest

cmd/main.go

@@ -19,11 +19,13 @@ package main
 import (
 	"flag"
 	"fmt"
+	"os"
+	"time"
+
 	intController "github.com/splunk/splunk-operator/internal/controller"
 	"github.com/splunk/splunk-operator/internal/controller/debug"
-	"os"
+	"github.com/splunk/splunk-operator/pkg/config"
 	"sigs.k8s.io/controller-runtime/pkg/metrics/filters"
-	"time"
 
 	// Import all Kubernetes client auth plugins (e.g. Azure, GCP, OIDC, etc.)
 	// to ensure that exec-entrypoint and run can make use of them.
@@ -108,7 +110,7 @@ func main() {
 	// Logging setup
 	ctrl.SetLogger(zap.New(zap.UseFlagOptions(&opts)))
 
-	mgr, err := ctrl.NewManager(ctrl.GetConfigOrDie(), ctrl.Options{
+	baseOptions := ctrl.Options{
 		Metrics: metricsserver.Options{
 			BindAddress:    metricsAddr,
 			FilterProvider: filters.WithAuthenticationAndAuthorization,
@@ -119,7 +121,12 @@ func main() {
 		LeaderElectionID:       "270bec8c.splunk.com",
 		LeaseDuration:          &leaseDuration,
 		RenewDeadline:          &renewDeadline,
-	})
+	}
+
+	// Apply namespace-specific configuration
+	managerOptions := config.ManagerOptionsWithNamespaces(setupLog, baseOptions)
+
+	mgr, err := ctrl.NewManager(ctrl.GetConfigOrDie(), managerOptions)
 
 	if err != nil {
 		setupLog.Error(err, "unable to start manager")

go.mod

@@ -141,4 +141,4 @@ require (
 	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
 	sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
 	sigs.k8s.io/yaml v1.4.0 // indirect
-)
+)

go.sum

@@ -492,4 +492,4 @@ sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h6
 sigs.k8s.io/structured-merge-diff/v4 v4.4.1 h1:150L+0vs/8DA78h1u02ooW1/fFq/Lwr+sGiqlzvrtq4=
 sigs.k8s.io/structured-merge-diff/v4 v4.4.1/go.mod h1:N8hJocpFajUSSeSJ9bOZ77VzejKZaXsTtZo4/u7Io08=
 sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E=
-sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY=
+sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY=

pkg/config/config.go

@@ -48,26 +48,26 @@ func GetWatchNamespaces() []string {
 
 // ManagerOptionsWithNamespaces returns an updated Options with namespaces information.
 func ManagerOptionsWithNamespaces(logger logr.Logger, opt ctrl.Options) ctrl.Options {
+	opts :=  cache.Options{}
 	namespaces := GetWatchNamespaces()
 	switch {
-	case len(namespaces) == 0:
-		logger.Info("Manager will watch and manage resources in all namespaces")
-		return ctrl.Options{Cache: cache.Options{DefaultNamespaces: map[string]cache.Config{
-			cache.AllNamespaces: {},
-		}}}
 	case len(namespaces) == 1:
 		logger.Info("Manager will be watching namespace", "namespace", namespaces[0])
-		return ctrl.Options{Cache: cache.Options{DefaultNamespaces: map[string]cache.Config{
+		opts = cache.Options{DefaultNamespaces: map[string]cache.Config{
 			namespaces[0]: {},
-		}}}
+		}}
 	case len(namespaces) > 1:
 		nsMap := map[string]cache.Config{}
 		for _, ns := range namespaces {
 			nsMap[ns] = cache.Config{}
 		}
 		logger.Info("Manager will be watching multiple namespaces", "namespaces", namespaces)
-		return ctrl.Options{Cache: cache.Options{DefaultNamespaces: nsMap}}
+		opts = cache.Options{DefaultNamespaces: nsMap}
 	}
 
+	// By default, the cache will watch and list requested objects in all namespaces.
+
+	opt.Cache = opts
+
 	return opt
 }