admin/kubesphere
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

clean up unnecessary warning logs (#6323)

Browse Source 
Signed-off-by: hongming <coder.scala@gmail.com>
(cherry picked from commit 255e9a228d)
This commit is contained in:
hongming
2024-12-25 11:08:09 +08:00
committed by hongming
parent 659fe1e3cb
commit 5613dc849c
1 changed files with 20 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
pkg/controller/core/installplan_controller.go
View File

@@ -63,30 +63,24 @@ import (
)
const (
installPlanController = "installplan"
installPlanProtection = "kubesphere.io/installplan-protection"
systemWorkspace = "system-workspace"
agentReleaseFormat = "%s-agent"
defaultRoleFormat = "kubesphere:%s:helm-executor"
defaultRoleBindingFormat = defaultRoleFormat
defaultClusterRoleFormat = "kubesphere:%s:helm-executor"
permissionDefinitionFile = "permissions.yaml"
defaultClusterRoleBindingFormat = defaultClusterRoleFormat
tagAgent = "agent"
tagExtension = "extension"
upgradeSuccessful = "UpgradeSuccessful"
upgradeFailed = "UpgradeFailed"
installSuccessful = "InstallSuccessful"
installFailed = "InstallFailed"
initialized = "Initialized"
uninstallSuccessful = "UninstallSuccessful"
uninstallFailed = "UninstallFailed"
relatedResourceNotReady = "RelatedResourceNotReady"
relatedResourceReady = "RelatedResourceReady"
typeHelmRelease = "helm.sh/release.v1"
installPlanController = "installplan"
installPlanProtection = "kubesphere.io/installplan-protection"
systemWorkspace = "system-workspace"
agentReleaseFormat = "%s-agent"
defaultRoleFormat = "kubesphere:%s:helm-executor"
defaultRoleBindingFormat = defaultRoleFormat
defaultClusterRoleFormat = "kubesphere:%s:helm-executor"
permissionDefinitionFile = "permissions.yaml"
defaultClusterRoleBindingFormat = defaultClusterRoleFormat
tagAgent = "agent"
tagExtension = "extension"
upgradeSuccessful = "UpgradeSuccessful"
upgradeFailed = "UpgradeFailed"
installSuccessful = "InstallSuccessful"
installFailed = "InstallFailed"
initialized = "Initialized"
uninstallFailed = "UninstallFailed"
typeHelmRelease = "helm.sh/release.v1"
globalExtensionIngressClassName = "global.extension.ingress.ingressClassName"
globalExtensionIngressDomainSuffix = "global.extension.ingress.domainSuffix"
globalExtensionIngressHTTPPort = "global.extension.ingress.httpPort"
@@ -274,7 +268,7 @@ func (r *InstallPlanReconciler) Reconcile(ctx context.Context, req ctrl.Request)
if !controllerutil.ContainsFinalizer(plan, installPlanProtection) {
expected := plan.DeepCopy()
controllerutil.AddFinalizer(expected, installPlanProtection)
return ctrl.Result{Requeue: true}, r.Patch(ctx, expected, client.MergeFrom(plan))
return ctrl.Result{}, r.Patch(ctx, expected, client.MergeFrom(plan))
}
targetNamespace := extensionVersion.Spec.Namespace
@@ -284,7 +278,7 @@ func (r *InstallPlanReconciler) Reconcile(ctx context.Context, req ctrl.Request)
if plan.Status.TargetNamespace != targetNamespace {
plan.Status.TargetNamespace = targetNamespace
return ctrl.Result{Requeue: true}, r.updateInstallPlan(ctx, plan)
return ctrl.Result{}, r.updateInstallPlan(ctx, plan)
}
if err := r.syncInstallPlanStatus(ctx, plan); err != nil {