Skip to content

Commit 9aafd89

Browse files
committed
disable default instance on xKS clusters
Signed-off-by: Anand Kumar Singh <anandrkskd@gmail.com>
1 parent 2b779a2 commit 9aafd89

1 file changed

Lines changed: 6 additions & 1 deletion

File tree

cmd/main.go

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,8 +223,13 @@ func main() {
223223
registerComponentOrExit(mgr, argov1beta1api.AddToScheme)
224224

225225
// Setup Scheme for OpenShift Config if available
226+
var disableDefault bool
227+
disableDefault = strings.ToLower(os.Getenv(common.DisableDefaultInstallEnvVar)) == "true"
226228
if util.IsConfigAPIFound() {
227229
registerComponentOrExit(mgr, configv1.AddToScheme)
230+
} else {
231+
setupLog.Info("Non-OpenShift cluster detected, disabling default Argo CD instance")
232+
disableDefault = true
228233
}
229234

230235
registerComponentOrExit(mgr, rolloutManagerApi.AddToScheme)
@@ -257,7 +262,7 @@ func main() {
257262
if err = (&controllers.ReconcileGitopsService{
258263
Client: client,
259264
Scheme: mgr.GetScheme(),
260-
DisableDefaultInstall: strings.ToLower(os.Getenv(common.DisableDefaultInstallEnvVar)) == "true",
265+
DisableDefaultInstall: disableDefault,
261266
}).SetupWithManager(mgr); err != nil {
262267
setupLog.Error(err, "unable to create controller", "controller", "GitopsService")
263268
os.Exit(1)

0 commit comments

Comments
 (0)