Merge main to 1.4

components/operator/controllers/serverless_controller.go

@@ -41,12 +41,12 @@ type serverlessReconciler struct {
 	log              *zap.SugaredLogger
 }
 
-func NewServerlessReconciler(client client.Client, config *rest.Config, recorder record.EventRecorder, log *zap.SugaredLogger, chartPath string, ns string) *serverlessReconciler {
+func NewServerlessReconciler(client client.Client, config *rest.Config, recorder record.EventRecorder, log *zap.SugaredLogger, chartPath string) *serverlessReconciler {
 	cache := chart.NewSecretManifestCache(client)
 
 	return &serverlessReconciler{
 		initStateMachine: func(log *zap.SugaredLogger) state.StateReconciler {
-			return state.NewMachine(client, config, recorder, log, cache, chartPath, ns)
+			return state.NewMachine(client, config, recorder, log, cache, chartPath)
 		},
 		client: client,
 		log:    log,

components/operator/controllers/suite_test.go

@@ -97,9 +97,8 @@ var _ = BeforeSuite(func() {
 		k8sManager.GetConfig(),
 		record.NewFakeRecorder(100),
 		reconcilerLogger.Sugar(),
-		chartPath,
-		"",
-	)).SetupWithManager(k8sManager)
+		chartPath)).
+		SetupWithManager(k8sManager)
 	Expect(err).ToNot(HaveOccurred())
 
 	go func() {

components/operator/internal/config/config.go

@@ -3,8 +3,7 @@ package config
 import "github.com/vrischmann/envconfig"
 
 type Config struct {
-	ChartPath                  string `envconfig:"default=/module-chart"`
-	ServerlessManagerNamespace string `envconfig:"default=default"`
+	ChartPath string `envconfig:"default=/module-chart"`
 }
 
 func GetConfig(prefix string) (Config, error) {

components/operator/internal/state/fsm.go

@@ -31,7 +31,6 @@ type stateFn func(context.Context, *reconciler, *systemState) (stateFn, *ctrl.Re
 type cfg struct {
 	finalizer     string
 	chartPath     string
-	namespace     string
 	managerPodUID string
 }
 

components/operator/internal/state/new.go

@@ -17,15 +17,14 @@ type StateReconciler interface {
 	Reconcile(ctx context.Context, v v1alpha1.Serverless) (ctrl.Result, error)
 }
 
-func NewMachine(client client.Client, config *rest.Config, recorder record.EventRecorder, log *zap.SugaredLogger, cache chart.ManifestCache, chartPath, namespace string) StateReconciler {
+func NewMachine(client client.Client, config *rest.Config, recorder record.EventRecorder, log *zap.SugaredLogger, cache chart.ManifestCache, chartPath string) StateReconciler {
 	return &reconciler{
 		fn:    sFnServedFilter,
 		cache: cache,
 		log:   log,
 		cfg: cfg{
 			finalizer:     v1alpha1.Finalizer,
 			chartPath:     chartPath,
-			namespace:     namespace,
 			managerPodUID: os.Getenv("SERVERLESS_MANAGER_UID"),
 		},
 		k8s: k8s{

components/operator/main.go

@@ -88,7 +88,7 @@ func main() {
 	ctx, cancel := context.WithTimeout(context.Background(), cleanupTimeout)
 	defer cancel()
 
-	setupLog.Info("cleaning orphan depricated resources")
+	setupLog.Info("cleaning orphan deprecated resources")
 	err = cleanupOrphanDeprecatedResources(ctx)
 	if err != nil {
 		setupLog.Error(err, "while removing orphan resources")
@@ -131,8 +131,7 @@ func main() {
 		mgr.GetClient(), mgr.GetConfig(),
 		mgr.GetEventRecorderFor("serverless-operator"),
 		reconcilerLogger.Sugar(),
-		cfg.ChartPath,
-		cfg.ServerlessManagerNamespace)
+		cfg.ChartPath)
 
 	if err = reconciler.SetupWithManager(mgr); err != nil {
 		setupLog.Error(err, "unable to create controller", "controller", "Serverless")

config/operator/base/deployment/deployment.yaml

@@ -32,10 +32,6 @@ spec:
         image: controller:latest
         name: manager
         env:
-        - name: SERVERLESS_MANAGER_NAMESPACE
-          valueFrom:
-            fieldRef:
-              fieldPath: metadata.namespace
         - name: SERVERLESS_MANAGER_UID
           valueFrom:
             fieldRef:

sec-scanners-config.yaml

@@ -1,5 +1,5 @@
 module-name: serverless
-rc-tag: 1.3.0
+rc-tag: 1.4.0
 protecode:
   - europe-docker.pkg.dev/kyma-project/prod/serverless-operator:main
   - europe-docker.pkg.dev/kyma-project/prod/function-controller:main