Update

Author: jgwest

cmd/main.go

@@ -27,6 +27,7 @@ import (
 	// Import all Kubernetes client auth plugins (e.g. Azure, GCP, OIDC, etc.)
 	// to ensure that exec-entrypoint and run can make use of them.
 	"go.uber.org/zap/zapcore"
+	"k8s.io/client-go/kubernetes"
 	_ "k8s.io/client-go/plugin/pkg/client/auth"
 
 	rolloutManagerApi "github.com/argoproj-labs/argo-rollouts-manager/api/v1alpha1"
@@ -47,10 +48,10 @@ import (
 	monitoringv1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1"
 	crdv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
 	"k8s.io/apimachinery/pkg/labels"
-
 	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
 	clientgoscheme "k8s.io/client-go/kubernetes/scheme"
 	ctrl "sigs.k8s.io/controller-runtime"
+	"sigs.k8s.io/controller-runtime/pkg/client/config"
 	controllerconfig "sigs.k8s.io/controller-runtime/pkg/config"
 	"sigs.k8s.io/controller-runtime/pkg/healthz"
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
@@ -214,10 +215,17 @@ func main() {
 	}
 	setupLog.Info(fmt.Sprintf("Watching label-selector \"%s\"", labelSelectorFlag))
 
+	k8sClient, err := initK8sClient()
+	if err != nil {
+		setupLog.Error(err, "Failed to initialize Kubernetes client")
+		os.Exit(1)
+	}
+
 	if err = (&argocdprovisioner.ReconcileArgoCD{
 		Client:        mgr.GetClient(),
 		Scheme:        mgr.GetScheme(),
 		LabelSelector: labelSelectorFlag,
+		K8sClient:     k8sClient,
 	}).SetupWithManager(mgr); err != nil {
 		setupLog.Error(err, "unable to create controller", "controller", "Argo CD")
 		os.Exit(1)
@@ -300,3 +308,19 @@ func registerComponentOrExit(mgr manager.Manager, f func(*k8sruntime.Scheme) err
 	}
 	setupLog.Info(fmt.Sprintf("Component registered: %v", reflect.ValueOf(f)))
 }
+
+func initK8sClient() (*kubernetes.Clientset, error) {
+	cfg, err := config.GetConfig()
+	if err != nil {
+		setupLog.Error(err, "unable to get k8s config")
+		return nil, err
+	}
+
+	k8sClient, err := kubernetes.NewForConfig(cfg)
+	if err != nil {
+		setupLog.Error(err, "unable to create k8s client")
+		return nil, err
+	}
+
+	return k8sClient, nil
+}

scripts/openshift-CI-kuttl-tests.sh

@@ -2,6 +2,8 @@
 
 set -ex
 
+echo WTF1
+
 export CI="prow"
 go mod vendor
 
@@ -10,18 +12,22 @@ source $(dirname $0)/e2e-common.sh
 # Script entry point.
 KUBECONFIG=${KUBECONFIG:-$HOME/.kube/config}
 
+echo WTF2
 # Copy kubeconfig to temporary kubeconfig file and grant read and Write permission to temporary kubeconfig file
 TMP_DIR=$(mktemp -d)
 cp $KUBECONFIG $TMP_DIR/kubeconfig
 chmod 640 $TMP_DIR/kubeconfig
 export KUBECONFIG=$TMP_DIR/kubeconfig
 cp $KUBECONFIG /go/src/github.com/redhat-developer/gitops-operator/kubeconfig
 
+echo WTF3
 # Ensuring proper installation
 pod=openshift-gitops-operator-controller-manager && oc get pods `oc get pods --all-namespaces | grep $pod | head -1 | awk '{print $2}'` -n openshift-gitops-operator -o yaml
 subscription=gitops-operator- && oc get subscription `oc get subscription --all-namespaces | grep $subscription | head -1 | awk '{print $2}'` -n openshift-gitops-operator
 oc wait --for=condition=Ready -n openshift-gitops pod --timeout=15m  -l 'app.kubernetes.io/name in (cluster,openshift-gitops-application-controller,openshift-gitops-applicationset-controller,openshift-gitops-dex-server,openshift-gitops-redis,openshift-gitops-repo-server,openshift-gitops-server)' 
 
+echo WTF4
+
 # Check argocd instance creation
 oc create ns test-argocd
 cat << EOF | oc apply -f -

scripts/openshift-interop-kuttl-tests.sh

@@ -4,23 +4,30 @@ set -ex
 
 go mod vendor
 
+
+
 source $(dirname $0)/e2e-common.sh
 
+echo AWTF1
 # Script entry point.
 KUBECONFIG=${KUBECONFIG:-$HOME/.kube/config}
 
+echo AWTF2
 # Copy kubeconfig to temporary kubeconfig file and grant read and Write permission to temporary kubeconfig file
 TMP_DIR=$(mktemp -d)
 cp $KUBECONFIG $TMP_DIR/kubeconfig
 chmod 640 $TMP_DIR/kubeconfig
 export KUBECONFIG=$TMP_DIR/kubeconfig
 cp $KUBECONFIG /go/src/github.com/redhat-developer/gitops-operator/kubeconfig
 
+echo AWTF3
 # Ensuring proper installation
 pod=openshift-gitops-operator-controller-manager && oc get pods `oc get pods --all-namespaces | grep $pod | head -1 | awk '{print $2}'` -n openshift-gitops-operator -o yaml
 oc get subscription -n openshift-gitops-operator
 oc wait --for=condition=Ready -n openshift-gitops pod --timeout=15m  -l 'app.kubernetes.io/name in (cluster,openshift-gitops-application-controller,openshift-gitops-applicationset-controller,openshift-gitops-dex-server,openshift-gitops-redis,openshift-gitops-repo-server,openshift-gitops-server)' 
 
+echo AWTF3
+
 # Check argocd instance creation
 oc create ns test-argocd
 cat << EOF | oc apply -f -