Skip to content

[v1.17] Fix: Skip error log when console link is disabled and absent (#949) #955

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: v1.17
Choose a base branch
from
Open

[v1.17] Fix: Skip error log when console link is disabled and absent (#949) #955

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 16 additions & 15 deletions controllers/argocd_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,25 +142,26 @@ func (r *ReconcileArgoCDRoute) Reconcile(ctx context.Context, request reconcile.

consoleLink := newConsoleLink(argoCDRouteURL, "Cluster Argo CD")

found := &console.ConsoleLink{}
err = r.Client.Get(ctx, types.NamespacedName{Name: consoleLink.Name}, found)
if isConsoleLinkDisabled() {
return reconcile.Result{}, r.deleteConsoleLinkIfPresent(ctx, reqLogger)
} else {
found := &console.ConsoleLink{}
err = r.Client.Get(ctx, types.NamespacedName{Name: consoleLink.Name}, found)

if err != nil {
if errors.IsNotFound(err) {
if !isConsoleLinkDisabled() {
reqLogger.Info("Creating a new ConsoleLink", "ConsoleLink.Name", consoleLink.Name)
if err != nil {
if errors.IsNotFound(err) {
reqLogger.Info("Creating a new ConsoleLink ", "ConsoleLink.Name", consoleLink.Name)
return reconcile.Result{}, r.Client.Create(ctx, consoleLink)
} else {
reqLogger.Error(err, "Failed to get ConsoleLink", "ConsoleLink.Name", consoleLink.Name)
return reconcile.Result{}, err
}
}
reqLogger.Error(err, "ConsoleLink not found", "ConsoleLink.Name", consoleLink.Name)
return reconcile.Result{}, err
}
if isConsoleLinkDisabled() {
return reconcile.Result{}, r.deleteConsoleLinkIfPresent(ctx, reqLogger)
} else if found.Spec.Href != argoCDRouteURL {
reqLogger.Info("Updating the existing ConsoleLink", "ConsoleLink.Name", consoleLink.Name)
found.Spec.Href = argoCDRouteURL
return reconcile.Result{}, r.Client.Update(ctx, found)
if found.Spec.Href != argoCDRouteURL {
reqLogger.Info("Updating the existing ConsoleLink ", "ConsoleLink.Name", consoleLink.Name)
found.Spec.Href = argoCDRouteURL
return reconcile.Result{}, r.Client.Update(ctx, found)
}
}

reqLogger.Info("Skip reconcile: ConsoleLink already exists", "ConsoleLink.Name", consoleLink.Name)
Expand Down
19 changes: 18 additions & 1 deletion controllers/argocd_controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ func TestReconcile_delete_consolelink(t *testing.T) {
name string
setEnvVarFunc func(*testing.T, string)
envVar string
consoleLinkPrevExist bool
consoleLinkShouldExist bool
wantErr bool
Err error
Expand All @@ -92,6 +93,17 @@ func TestReconcile_delete_consolelink(t *testing.T) {
setEnvVarFunc: func(t *testing.T, envVar string) {
t.Setenv(disableArgoCDConsoleLink, envVar)
},
consoleLinkPrevExist: true,
consoleLinkShouldExist: false,
envVar: "true",
wantErr: false,
},
{
name: "DISABLE_DEFAULT_ARGOCD_CONSOLELINK is set to true and consoleLink doesn't exist previously",
setEnvVarFunc: func(t *testing.T, envVar string) {
t.Setenv(disableArgoCDConsoleLink, envVar)
},
consoleLinkPrevExist: false,
consoleLinkShouldExist: false,
envVar: "true",
wantErr: false,
Expand All @@ -102,13 +114,15 @@ func TestReconcile_delete_consolelink(t *testing.T) {
t.Setenv(disableArgoCDConsoleLink, envVar)
},
envVar: "false",
consoleLinkPrevExist: true,
consoleLinkShouldExist: true,
wantErr: false,
},
{
name: "DISABLE_DEFAULT_ARGOCD_CONSOLELINK isn't set and consoleLink doesn't get deleted",
setEnvVarFunc: nil,
envVar: "",
consoleLinkPrevExist: true,
consoleLinkShouldExist: true,
wantErr: false,
},
Expand All @@ -118,7 +132,10 @@ func TestReconcile_delete_consolelink(t *testing.T) {
t.Run(test.name, func(t *testing.T) {
reconcileArgoCD, fakeClient := newFakeReconcileArgoCD(argoCDRoute, consoleLink)
consoleLink := newConsoleLink("https://test.com", "Cluster Argo CD")
fakeClient.Create(context.TODO(), consoleLink)
if test.consoleLinkPrevExist {
err := fakeClient.Create(context.TODO(), consoleLink)
assert.NilError(t, err)
}

if test.setEnvVarFunc != nil {
test.setEnvVarFunc(t, test.envVar)
Expand Down