Resolve conflicts after rebase

Signed-off-by: Abhi Kapoor <[email protected]>
zapier · Dec 16, 2024 · f584eb5 · f584eb5
1 parent 63c9ee9
commit f584eb5
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 10 deletions.
diff --git a/charts/kubechecks/values.yaml b/charts/kubechecks/values.yaml
@@ -7,7 +7,7 @@ commonLabels: {}
 configMap:
   create: false
   env: {}
-  # KUBECHECKS_ALLOWED_APPS_NAMESPACES: "*"
+  # KUBECHECKS_ADDITIONAL_APPS_NAMESPACES: "*"
   # KUBECHECKS_ARGOCD_API_INSECURE: "false"
   # KUBECHECKS_ARGOCD_API_PATH_PREFIX: /
   # KUBECHECKS_ARGOCD_API_NAMESPACE: argocd

diff --git a/localdev/kubechecks/values.yaml b/localdev/kubechecks/values.yaml
@@ -2,6 +2,7 @@ configMap:
   create: true
   env:
     GRPC_ENFORCE_ALPN_ENABLED: false
+    KUBECHECKS_ADDITIONAL_APPS_NAMESPACES: "*"
     KUBECHECKS_LOG_LEVEL: debug
     KUBECHECKS_ENABLE_WEBHOOK_CONTROLLER: "false"
     KUBECHECKS_ARGOCD_API_INSECURE: "true"

diff --git a/pkg/app_watcher/app_watcher.go b/pkg/app_watcher/app_watcher.go
@@ -12,6 +12,8 @@ import (
 	applisters "github.com/argoproj/argo-cd/v2/pkg/client/listers/application/v1alpha1"
 	"github.com/argoproj/argo-cd/v2/util/glob"
 	"github.com/rs/zerolog/log"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	apiruntime "k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/util/runtime"
 	"k8s.io/apimachinery/pkg/watch"
 	"k8s.io/client-go/tools/cache"
@@ -40,8 +42,8 @@ func NewApplicationWatcher(ctr container.Container) (*ApplicationWatcher, error)
 		return nil, fmt.Errorf("kubeCfg cannot be nil")
 	}
 	ctrl := ApplicationWatcher{
-		applicationClientset: appclientset.NewForConfigOrDie(kubeCfg),
-		vcsToArgoMap:         vcsToArgoMap,
+		applicationClientset: appclientset.NewForConfigOrDie((ctr.KubeClientSet.Config())),
+		vcsToArgoMap:         ctr.VcsToArgoMap,
 	}
 
 	appInformer, appLister := ctrl.newApplicationInformerAndLister(time.Second*30, ctr.Config)

diff --git a/pkg/app_watcher/appset_watcher.go b/pkg/app_watcher/appset_watcher.go
@@ -14,6 +14,8 @@ import (
 	"github.com/zapier/kubechecks/pkg/appdir"
 	"github.com/zapier/kubechecks/pkg/config"
 	"github.com/zapier/kubechecks/pkg/container"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	apiruntime "k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/util/runtime"
 	"k8s.io/apimachinery/pkg/watch"
 	"k8s.io/client-go/tools/cache"
@@ -38,13 +40,10 @@ func NewApplicationSetWatcher(ctr container.Container) (*ApplicationSetWatcher,
 		vcsToArgoMap:         ctr.VcsToArgoMap,
 	}
 
-	appInformer, appLister := ctrl.newApplicationSetInformerAndLister(time.Second*30, cfg)
-	for _, informer := range appInformer {
-		ctrl.appInformer = append(ctrl.appInformer, informer)
-	}
-	for _, lister := range appLister {
-		ctrl.appLister = append(ctrl.appLister, lister)
-	}
+	appInformer, appLister := ctrl.newApplicationSetInformerAndLister(time.Second*30, ctr.Config)
+
+	ctrl.appInformer = appInformer
+	ctrl.appLister = appLister
 
 	return &ctrl, nil
 }