Skip to content

Commit

Permalink
aaaa
Browse files Browse the repository at this point in the history
  • Loading branch information
xdonggao committed Oct 25, 2021
1 parent 1274330 commit 879a9bc
Show file tree
Hide file tree
Showing 5 changed files with 33 additions and 33 deletions.
24 changes: 12 additions & 12 deletions pkg/application/controller/app/action/hooks.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,37 +38,37 @@ type Hooks interface {
platformClient platformversionedclient.PlatformV1Interface,
app *applicationv1.App,
repo appconfig.RepoConfiguration,
UpdateStatusFunc UpdateStatusFunc) error
updateStatusFunc UpdateStatusFunc) error
PostInstall(ctx context.Context,
applicationClient applicationversionedclient.ApplicationV1Interface,
platformClient platformversionedclient.PlatformV1Interface,
app *applicationv1.App,
repo appconfig.RepoConfiguration,
UpdateStatusFunc UpdateStatusFunc) error
updateStatusFunc UpdateStatusFunc) error
PreUpgrade(ctx context.Context,
applicationClient applicationversionedclient.ApplicationV1Interface,
platformClient platformversionedclient.PlatformV1Interface,
app *applicationv1.App,
repo appconfig.RepoConfiguration,
UpdateStatusFunc UpdateStatusFunc) error
updateStatusFunc UpdateStatusFunc) error
PostUpgrade(ctx context.Context,
applicationClient applicationversionedclient.ApplicationV1Interface,
platformClient platformversionedclient.PlatformV1Interface,
app *applicationv1.App,
repo appconfig.RepoConfiguration,
UpdateStatusFunc UpdateStatusFunc) error
updateStatusFunc UpdateStatusFunc) error
PreRollback(ctx context.Context,
applicationClient applicationversionedclient.ApplicationV1Interface,
platformClient platformversionedclient.PlatformV1Interface,
app *applicationv1.App,
repo appconfig.RepoConfiguration,
UpdateStatusFunc UpdateStatusFunc) error
updateStatusFunc UpdateStatusFunc) error
PostRollback(ctx context.Context,
applicationClient applicationversionedclient.ApplicationV1Interface,
platformClient platformversionedclient.PlatformV1Interface,
app *applicationv1.App,
repo appconfig.RepoConfiguration,
UpdateStatusFunc UpdateStatusFunc) error
updateStatusFunc UpdateStatusFunc) error
PreUninstall(ctx context.Context,
applicationClient applicationversionedclient.ApplicationV1Interface,
platformClient platformversionedclient.PlatformV1Interface,
Expand All @@ -88,7 +88,7 @@ func (EmptyHooks) PreInstall(ctx context.Context,
platformClient platformversionedclient.PlatformV1Interface,
app *applicationv1.App,
repo appconfig.RepoConfiguration,
UpdateStatusFunc UpdateStatusFunc) error {
updateStatusFunc UpdateStatusFunc) error {
return nil
}

Expand All @@ -97,7 +97,7 @@ func (EmptyHooks) PostInstall(ctx context.Context,
platformClient platformversionedclient.PlatformV1Interface,
app *applicationv1.App,
repo appconfig.RepoConfiguration,
UpdateStatusFunc UpdateStatusFunc) error {
updateStatusFunc UpdateStatusFunc) error {
return nil
}

Expand All @@ -106,7 +106,7 @@ func (EmptyHooks) PreUpgrade(ctx context.Context,
platformClient platformversionedclient.PlatformV1Interface,
app *applicationv1.App,
repo appconfig.RepoConfiguration,
UpdateStatusFunc UpdateStatusFunc) error {
updateStatusFunc UpdateStatusFunc) error {
return nil
}

Expand All @@ -115,7 +115,7 @@ func (EmptyHooks) PostUpgrade(ctx context.Context,
platformClient platformversionedclient.PlatformV1Interface,
app *applicationv1.App,
repo appconfig.RepoConfiguration,
UpdateStatusFunc UpdateStatusFunc) error {
updateStatusFunc UpdateStatusFunc) error {
return nil
}

Expand All @@ -124,7 +124,7 @@ func (EmptyHooks) PreRollback(ctx context.Context,
platformClient platformversionedclient.PlatformV1Interface,
app *applicationv1.App,
repo appconfig.RepoConfiguration,
UpdateStatusFunc UpdateStatusFunc) error {
updateStatusFunc UpdateStatusFunc) error {
return nil
}

Expand All @@ -133,7 +133,7 @@ func (EmptyHooks) PostRollback(ctx context.Context,
platformClient platformversionedclient.PlatformV1Interface,
app *applicationv1.App,
repo appconfig.RepoConfiguration,
UpdateStatusFunc UpdateStatusFunc) error {
updateStatusFunc UpdateStatusFunc) error {
return nil
}

Expand Down
12 changes: 6 additions & 6 deletions pkg/application/controller/app/action/install.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,17 +38,17 @@ func Install(ctx context.Context,
platformClient platformversionedclient.PlatformV1Interface,
app *applicationv1.App,
repo appconfig.RepoConfiguration,
UpdateStatusFunc UpdateStatusFunc) (*applicationv1.App, error) {
updateStatusFunc UpdateStatusFunc) (*applicationv1.App, error) {
hooks := getHooks(app)
err := hooks.PreInstall(ctx, applicationClient, platformClient, app, repo, UpdateStatusFunc)
err := hooks.PreInstall(ctx, applicationClient, platformClient, app, repo, updateStatusFunc)
if err != nil {
return nil, err
}
client, err := util.NewHelmClient(ctx, platformClient, app.Spec.TargetCluster, app.Spec.TargetNamespace)
if err != nil {
return nil, err
}
destfile, err := Pull(ctx, applicationClient, platformClient, app, repo, UpdateStatusFunc)
destfile, err := Pull(ctx, applicationClient, platformClient, app, repo, updateStatusFunc)
if err != nil {
return nil, err
}
Expand Down Expand Up @@ -76,7 +76,7 @@ func Install(ctx context.Context,
Values: values,
ChartPathOptions: chartPathBasicOptions,
})
if UpdateStatusFunc != nil {
if updateStatusFunc != nil {
newStatus := newApp.Status.DeepCopy()
var updateStatusErr error
if err != nil {
Expand All @@ -90,14 +90,14 @@ func Install(ctx context.Context,
newStatus.Reason = ""
newStatus.LastTransitionTime = metav1.Now()
}
newApp, updateStatusErr = UpdateStatusFunc(ctx, newApp, &newApp.Status, newStatus)
newApp, updateStatusErr = updateStatusFunc(ctx, newApp, &newApp.Status, newStatus)
if updateStatusErr != nil {
return newApp, updateStatusErr
}
}
if err != nil {
return newApp, err
}
err = hooks.PostInstall(ctx, applicationClient, platformClient, app, repo, UpdateStatusFunc)
err = hooks.PostInstall(ctx, applicationClient, platformClient, app, repo, updateStatusFunc)
return newApp, err
}
8 changes: 4 additions & 4 deletions pkg/application/controller/app/action/pull.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ func Pull(ctx context.Context,
platformClient platformversionedclient.PlatformV1Interface,
app *applicationv1.App,
repo appconfig.RepoConfiguration,
UpdateStatusFunc UpdateStatusFunc) (string, error) {
updateStatusFunc UpdateStatusFunc) (string, error) {
client, err := util.NewHelmClient(ctx, platformClient, app.Spec.TargetCluster, app.Spec.TargetNamespace)
if err != nil {
return "", err
Expand All @@ -50,21 +50,21 @@ func Pull(ctx context.Context,
destfile, err := client.Pull(&helmaction.PullOptions{
ChartPathOptions: chartPathBasicOptions,
})
if UpdateStatusFunc != nil {
if updateStatusFunc != nil {
newStatus := app.Status.DeepCopy()
if err != nil {
newStatus.Phase = applicationv1.AppPhaseChartFetchFailed
newStatus.Message = "fetch chart failed"
newStatus.Reason = err.Error()
newStatus.LastTransitionTime = metav1.Now()
UpdateStatusFunc(ctx, app, &app.Status, newStatus)
updateStatusFunc(ctx, app, &app.Status, newStatus)
return destfile, err
}
newStatus.Phase = applicationv1.AppPhaseChartFetched
newStatus.Message = ""
newStatus.Reason = ""
newStatus.LastTransitionTime = metav1.Now()
_, err := UpdateStatusFunc(ctx, app, &app.Status, newStatus)
_, err := updateStatusFunc(ctx, app, &app.Status, newStatus)
if err != nil {
return destfile, err
}
Expand Down
10 changes: 5 additions & 5 deletions pkg/application/controller/app/action/rollback.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@ func Rollback(ctx context.Context,
platformClient platformversionedclient.PlatformV1Interface,
app *applicationv1.App,
repo appconfig.RepoConfiguration,
UpdateStatusFunc UpdateStatusFunc) (*applicationv1.App, error) {
updateStatusFunc UpdateStatusFunc) (*applicationv1.App, error) {
hooks := getHooks(app)
err := hooks.PreRollback(ctx, applicationClient, platformClient, app, repo, UpdateStatusFunc)
err := hooks.PreRollback(ctx, applicationClient, platformClient, app, repo, updateStatusFunc)
if err != nil {
return nil, err
}
Expand All @@ -52,7 +52,7 @@ func Rollback(ctx context.Context,
ReleaseName: app.Spec.Name,
Revision: app.Status.RollbackRevision,
})
if UpdateStatusFunc != nil {
if updateStatusFunc != nil {
newStatus := app.Status.DeepCopy()
var updateStatusErr error
if err != nil {
Expand All @@ -67,14 +67,14 @@ func Rollback(ctx context.Context,
newStatus.LastTransitionTime = metav1.Now()
newStatus.RollbackRevision = 0 // clean revision
}
app, updateStatusErr = UpdateStatusFunc(ctx, app, &app.Status, newStatus)
app, updateStatusErr = updateStatusFunc(ctx, app, &app.Status, newStatus)
if updateStatusErr != nil {
return app, updateStatusErr
}
}
if err != nil {
return app, err
}
err = hooks.PostRollback(ctx, applicationClient, platformClient, app, repo, UpdateStatusFunc)
err = hooks.PostRollback(ctx, applicationClient, platformClient, app, repo, updateStatusFunc)
return app, err
}
12 changes: 6 additions & 6 deletions pkg/application/controller/app/action/upgrade.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,9 @@ func Upgrade(ctx context.Context,
platformClient platformversionedclient.PlatformV1Interface,
app *applicationv1.App,
repo appconfig.RepoConfiguration,
UpdateStatusFunc UpdateStatusFunc) (*applicationv1.App, error) {
updateStatusFunc UpdateStatusFunc) (*applicationv1.App, error) {
hooks := getHooks(app)
err := hooks.PreUpgrade(ctx, applicationClient, platformClient, app, repo, UpdateStatusFunc)
err := hooks.PreUpgrade(ctx, applicationClient, platformClient, app, repo, updateStatusFunc)
if err != nil {
return nil, err
}
Expand All @@ -49,7 +49,7 @@ func Upgrade(ctx context.Context,
return nil, err
}

destfile, err := Pull(ctx, applicationClient, platformClient, app, repo, UpdateStatusFunc)
destfile, err := Pull(ctx, applicationClient, platformClient, app, repo, updateStatusFunc)
if err != nil {
return nil, err
}
Expand Down Expand Up @@ -79,7 +79,7 @@ func Upgrade(ctx context.Context,
ChartPathOptions: chartPathBasicOptions,
})

if UpdateStatusFunc != nil {
if updateStatusFunc != nil {
newStatus := newApp.Status.DeepCopy()
var updateStatusErr error
if err != nil {
Expand All @@ -93,14 +93,14 @@ func Upgrade(ctx context.Context,
newStatus.Reason = ""
newStatus.LastTransitionTime = metav1.Now()
}
newApp, updateStatusErr = UpdateStatusFunc(ctx, newApp, &newApp.Status, newStatus)
newApp, updateStatusErr = updateStatusFunc(ctx, newApp, &newApp.Status, newStatus)
if updateStatusErr != nil {
return newApp, updateStatusErr
}
}
if err != nil {
return nil, err
}
err = hooks.PostUpgrade(ctx, applicationClient, platformClient, app, repo, UpdateStatusFunc)
err = hooks.PostUpgrade(ctx, applicationClient, platformClient, app, repo, updateStatusFunc)
return newApp, err
}

0 comments on commit 879a9bc

Please sign in to comment.