Merge branch 'master' into feature/bump-go

Author: davidkarlsen

.github/workflows/build.yaml

@@ -24,9 +24,9 @@ jobs:
           go-version-file: 'go.mod'
 
       - name: golangci-lint
-        uses: reviewdog/action-golangci-lint@v2
+        uses: golangci/golangci-lint[email protected]
         with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
+          args: --timeout=10m
 
       - name: Test and build image
         run: |

main.go

@@ -30,7 +30,6 @@ import (
 	clientgoscheme "k8s.io/client-go/kubernetes/scheme"
 	_ "k8s.io/client-go/plugin/pkg/client/auth/gcp"
 	ctrl "sigs.k8s.io/controller-runtime"
-	"sigs.k8s.io/controller-runtime/pkg/cache"
 	"sigs.k8s.io/controller-runtime/pkg/healthz"
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 
@@ -71,15 +70,12 @@ func main() {
 		Scheme:                     scheme,
 		MetricsBindAddress:         metricsAddr,
 		HealthProbeBindAddress:     healthProbeAddr,
-		Port:                       9443,
-		Namespace:                  namespace,
 		LeaderElection:             enableLeaderElection,
 		LeaderElectionID:           "4ef9cd91.tietoevry.com",
 		LeaderElectionResourceLock: "configmapsleases",
 	}
 	if strings.Contains(namespace, ",") {
-		options.Namespace = ""
-		options.NewCache = cache.MultiNamespacedCacheBuilder(strings.Split(namespace, ","))
+		options.Cache.Namespaces = strings.Split(namespace, ",")
 	}
 	mgr, err := ctrl.NewManager(ctrl.GetConfigOrDie(), options)