fix(application): use other path as chart cache path #2317
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
add upgradePolicy api
GaoXiaodong
force-pushed
the
feature/tke-app-upgrade
branch
from
9d12ab9
to
c6534b9
Compare
cumirror
reviewed
Apr 25, 2024
| @@ -63,7 +64,7 @@ func BuildChartPathBasicOptions(repo config.RepoConfiguration, appChart v1.Chart | |||
| opt.Password = repo.AdminPassword | |||
| } | |||
|
|
|||
| opt.ChartRepo = appChart.TenantID + "/" + appChart.ChartGroupName | |||
| opt.ChartRepo = appChart.TenantID + "/" + app.Spec.TargetCluster + "-" + app.Spec.TargetNamespace + "/" + appChart.ChartGroupName | |||
There was a problem hiding this comment.
这里使用 appChart.ChartName 是否更好。ChartGroupName 都是local
There was a problem hiding this comment.
后面解压缩的时候，会用chart的名字做为文件夹的名字的
| @@ -50,12 +51,6 @@ func FullfillChartInfo(appChart application.Chart, cg registryv1.ChartGroup) (ap | |||
| } | |||
|
|
|||
| // BuildChartPathBasicOptions will judge chartgroup type and return well-structured ChartPathOptions | |||
| func BuildChartPathBasicOptions(repo config.RepoConfiguration, appChart application.Chart) (opt helmaction.ChartPathOptions, err error) { | |||
| var v1Chart = &v1.Chart{} | |||
There was a problem hiding this comment.
去掉了，这部分就是为了构建后面的path，用不到了
| @@ -339,22 +339,14 @@ func (rs *REST) getChart(ctx context.Context, app *application.App, cg *registry | |||
| } | |||
|
|
|||
| func (rs *REST) dryRun(ctx context.Context, app *application.App) (*release.Release, error) { | |||
| chartGroup, err := rs.getChartGroup(ctx, app) | |||
There was a problem hiding this comment.
不要了，这部分转化就是为了构建后面的path，用不到了
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.: