Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

kapp app-group deploy should order based on folder names #850

Merged
merged 11 commits into from
Nov 4, 2023
Merged

kapp app-group deploy should order based on folder names #850

Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
7fb09d8
kapp app-group deploy should order based on folder names #755
Oct 8, 2023
c78ece2
fix(#755) - removed map and used slice instead for sorting apps
Oct 31, 2023
168da49
feat/755 - removed unecessary printf
rjtch Oct 20, 2023
0240f7a
feat/755 - removed unecessary signoff
rjtch Oct 20, 2023
3e17c15
signoff error
rjtch Oct 20, 2023
31f5080
signoff error
rjtch Oct 20, 2023
78616af
tried to fix CDo
rjtch Oct 27, 2023
c4da6a2
signed-off last request
rjtch Oct 31, 2023
6d30856
signoff-last message and fixed unsigned commits
rjtch Oct 31, 2023
d830cd8
get back deleted changed
rjtch Nov 1, 2023
1dcf953
removed unnessary printf
rjtch Nov 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 11 additions & 9 deletions pkg/kapp/cmd/appgroup/deploy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,10 +96,12 @@ func (o *DeployOptions) Run() error {

// Delete apps that no longer are present in directories
for _, app := range existingAppsInGroup {
if _, found := updatedApps[app.Name()]; !found {
err := o.deleteApp(app.Name())
if err != nil {
return err
for _, v := range updatedApps {
if app.Name() == v.Name {
err := o.deleteApp(app.Name())
if err != nil {
return err
}
}
}
}
Expand All @@ -117,8 +119,9 @@ type appGroupApp struct {
Path string
}

func (o *DeployOptions) appsToUpdate() (map[string]appGroupApp, error) {
result := map[string]appGroupApp{}
func (o *DeployOptions) appsToUpdate() ([]appGroupApp, error) {
var applications []appGroupApp

dir := o.DeployFlags.Directory

fileInfos, err := os.ReadDir(dir)
Expand All @@ -134,10 +137,9 @@ func (o *DeployOptions) appsToUpdate() (map[string]appGroupApp, error) {
Name: fmt.Sprintf("%s-%s", o.AppGroupFlags.Name, fi.Name()),
Path: filepath.Join(dir, fi.Name()),
}
result[app.Name] = app
applications = append(applications, app)
}

return result, nil
return applications, nil
}

func (o *DeployOptions) deployApp(app appGroupApp) error {
Expand Down
Loading