feat(platform): update client go to 1.24 #2237
Merged
Conversation
This file contains 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
leoryu
force-pushed
the
update-client-go
branch
from
1866714 to
435860a
Compare
leoryu
force-pushed
the
update-client-go
branch
from
435860a to
f8612be
Compare
leoryu
commented
Mar 16, 2023
| @@ -395,7 +403,7 @@ func (c *Controller) syncAppFromRelease(ctx context.Context, cachedApp *cachedAp | |||
| rel, found := helmutil.Filter(rels, app.Spec.TargetNamespace, app.Spec.Name) | |||
| if !found { | |||
| // release not found, reinstall for reconcile | |||
| newStatus.Phase = applicationv1.AppPhaseInstalling | |||
leoryu
commented
Mar 16, 2023
| @@ -377,6 +382,9 @@ func (c *Controller) handlePhase(ctx context.Context, key string, cachedApp *cac | |||
| } | |||
|
|
|||
| func (c *Controller) syncAppFromRelease(ctx context.Context, cachedApp *cachedApp, app *applicationv1.App) (*applicationv1.App, error) { | |||
| if app.Status.Phase == applicationv1.AppPhaseSucceeded && hasSynced(app) { | |||
leoryu
commented
Mar 16, 2023
| @@ -40,7 +41,12 @@ func NewClient(helmDriver string, restClientGetter *config.RESTClientGetter) *Cl | |||
|
|
|||
| func (c *Client) buildActionConfig(namespace string) (*action.Configuration, error) { | |||
| actionConfig := new(action.Configuration) | |||
| if err := actionConfig.Init(c.restClientGetter, namespace, c.helmDriver, log.Debugf); err != nil { | |||
| err := actionConfig.Init(c.restClientGetter, namespace, c.helmDriver, log.Debugf) | |||
There was a problem hiding this comment.
必须给RegistryClient赋值，否则会调用helm方法的时候panic
leoryu
commented
Mar 16, 2023
| for _, rel := range rels { | ||
| if rel.Info.Status == release.StatusDeployed { | ||
| // release 记录已存在，状态为deployed，不再进行重复安装 | ||
| log.Infof("Release %s is already exist. igonre it now.", options.ReleaseName) |
leoryu
commented
Mar 16, 2023
| func (q *Type) isProcessing() bool { | ||
| q.cond.L.Lock() | ||
| defer q.cond.L.Unlock() | ||
| return q.processing.len() != 0 |
leoryu
force-pushed
the
update-client-go
branch
from
01b73e9 to
6e2c891
Compare
willzgli
requested changes
Mar 17, 2023
| chartPathBasicOptions, err := chartpath.BuildChartPathBasicOptions(repo, newApp.Spec.Chart) | ||
| if err != nil { | ||
| return nil, err | ||
| /* provide compatibility with online tke addon apps */ |
There was a problem hiding this comment.
107 到 123 之间对tke addon 的兼容不用合到master , @GaoXiaodong 再看下
There was a problem hiding this comment.
/* provide compatibility with online tke addon apps /
/ compatibility over, above code need to be deleted atfer the online addon apps are migrated */
这段注释中间的不要了，后面我们升级的时候刷下存量，辛苦 @leoryu 帮处理下
GaoXiaodong
reviewed
Mar 17, 2023
| return nil, err | ||
| } | ||
| chartPathBasicOptions.ExistedFile = destfile | ||
| //* provide compatibility with online tke addon apps */ |
There was a problem hiding this comment.
//* provide compatibility with online tke addon apps /
// compatibility over, above code need to be deleted atfer the online addon apps are migrated */
这两个注释间的也不要了，辛苦 @leoryu 帮处理下
leoryu
force-pushed
the
update-client-go
branch
from
6e2c891 to
b86e928
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
What type of PR is this?
What this PR does / why we need it:
Which issue(s) this PR fixes:
Fixes #
Special notes for your reviewer:
Does this PR introduce a user-facing change?:
Additional documentation e.g., KEPs (Kubernetes Enhancement Proposals), usage docs, etc.: