fix: Cluster operator degraded#995
Closed
aali309 wants to merge 5 commits intoredhat-developer:masterfrom
Closed
Conversation
|
Skipping CI for Draft Pull Request. |
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: The full list of commands accepted by this bot can be found here. DetailsNeeds approval from an approver in each of these files:Approvers can indicate their approval by writing |
anandf
reviewed
Nov 1, 2025
anandf
reviewed
Nov 1, 2025
aali309
force-pushed
the
ClusterOperatorDegraded
branch
from
b3b5e0a to
0f877c6
Compare
aali309
force-pushed
the
ClusterOperatorDegraded
branch
2 times, most recently
from
8d19285 to
3ee2b0d
Compare
svghadi
requested changes
Dec 15, 2025
controllers/consoleplugin.go
Outdated
Comment on lines
62
to
63
| TerminationMessagePath: corev1.TerminationMessagePathDefault, | ||
| TerminationMessagePolicy: corev1.TerminationMessageReadFile, |
Member
There was a problem hiding this comment.
Why are these required? some new required container params?
Comment on lines
534
to
594
| err = retry.RetryOnConflict(retry.DefaultRetry, func() error { | ||
| if err := r.Client.Get(context.TODO(), types.NamespacedName{Name: existingArgoCD.Name, Namespace: existingArgoCD.Namespace}, existingArgoCD); err != nil { | ||
| return err | ||
| } | ||
| changed := false | ||
| if existingArgoCD.Spec.ApplicationSet != nil { | ||
| if existingArgoCD.Spec.ApplicationSet.Resources == nil { | ||
| existingArgoCD.Spec.ApplicationSet.Resources = defaultArgoCDInstance.Spec.ApplicationSet.Resources | ||
| changed = true | ||
| } | ||
| } | ||
| if existingArgoCD.Spec.Controller.Resources == nil { | ||
| existingArgoCD.Spec.Controller.Resources = defaultArgoCDInstance.Spec.Controller.Resources | ||
| changed = true | ||
| } | ||
| if argocdcontroller.UseDex(existingArgoCD) { | ||
| if existingArgoCD.Spec.SSO != nil && existingArgoCD.Spec.SSO.Provider == argoapp.SSOProviderTypeDex { | ||
| if existingArgoCD.Spec.SSO.Dex != nil { | ||
| if existingArgoCD.Spec.SSO.Dex.Resources == nil { | ||
| existingArgoCD.Spec.SSO.Dex.Resources = defaultArgoCDInstance.Spec.SSO.Dex.Resources | ||
| changed = true | ||
| } | ||
| } | ||
| } | ||
| } | ||
| //lint:ignore SA1019 known to be deprecated | ||
| if existingArgoCD.Spec.Grafana.Resources == nil { //nolint:staticcheck // SA1019: We must test deprecated fields. | ||
| //lint:ignore SA1019 known to be deprecated | ||
| existingArgoCD.Spec.Grafana.Resources = defaultArgoCDInstance.Spec.Grafana.Resources //nolint:staticcheck // SA1019: We must test deprecated fields. | ||
| changed = true | ||
| } | ||
| if existingArgoCD.Spec.HA.Resources == nil { | ||
| existingArgoCD.Spec.HA.Resources = defaultArgoCDInstance.Spec.HA.Resources | ||
| changed = true | ||
| } | ||
| if existingArgoCD.Spec.Redis.Resources == nil { | ||
| existingArgoCD.Spec.Redis.Resources = defaultArgoCDInstance.Spec.Redis.Resources | ||
| changed = true | ||
| } | ||
| if existingArgoCD.Spec.Repo.Resources == nil { | ||
| existingArgoCD.Spec.Repo.Resources = defaultArgoCDInstance.Spec.Repo.Resources | ||
| changed = true | ||
| } | ||
| if existingArgoCD.Spec.Server.Resources == nil { | ||
| existingArgoCD.Spec.Server.Resources = defaultArgoCDInstance.Spec.Server.Resources | ||
| changed = true | ||
| } | ||
| if defaultArgoCDInstance.Spec.NodePlacement != nil { | ||
| if !equality.Semantic.DeepEqual(existingArgoCD.Spec.NodePlacement, defaultArgoCDInstance.Spec.NodePlacement) { | ||
| existingArgoCD.Spec.NodePlacement = defaultArgoCDInstance.Spec.NodePlacement | ||
| changed = true | ||
| } | ||
| } else if existingArgoCD.Spec.NodePlacement != nil { | ||
| existingArgoCD.Spec.NodePlacement = defaultArgoCDInstance.Spec.NodePlacement | ||
| changed = true | ||
| } | ||
| if !changed { | ||
| return nil | ||
| } | ||
| return r.Client.Update(context.TODO(), existingArgoCD) | ||
| }) |
Member
There was a problem hiding this comment.
Can you recheck this logic? Seems like similar checks exists here:
gitops-operator/controllers/gitopsservice_controller.go
Lines 470 to 530 in 9be8c92
Signed-off-by: Atif Ali <[email protected]>
Signed-off-by: Atif Ali <[email protected]>
Signed-off-by: Atif Ali <[email protected]>
Signed-off-by: Atif Ali <[email protected]>
aali309
force-pushed
the
ClusterOperatorDegraded
branch
from
9be8c92 to
134a3b5
Compare
Signed-off-by: Atif Ali <[email protected]>
Contributor
Author
|
Replaced by: #1060 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes: GITOPS-8042