Skip to content
This repository was archived by the owner on Mar 9, 2025. It is now read-only.

Bugfix: Deleting kustomization on app deletion #717

Merged
merged 2 commits into from
Nov 22, 2023
Merged

Bugfix: Deleting kustomization on app deletion #717

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f60e159
Deleting kustomization on app deletion
dzsak Nov 20, 2023
e8cc2fb
Refactor
dzsak Nov 21, 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
33 changes: 26 additions & 7 deletions pkg/dashboard/server/releases.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -567,14 +567,14 @@ func delete(w http.ResponseWriter, r *http.Request) {
}

store := r.Context().Value("store").(*store.Store)
repoName, repoPerEnv, err := gitopsRepoForEnv(store, env)
envFromStore, err := store.GetEnvironment(env)
if err != nil {
logrus.Error(err)
http.Error(w, http.StatusText(http.StatusBadRequest), http.StatusBadRequest)
return
}

repo, pathToCleanUp, err := gitopsRepoCache.InstanceForWriteWithHistory(repoName)
repo, pathToCleanUp, err := gitopsRepoCache.InstanceForWriteWithHistory(envFromStore.AppsRepo)
defer gitopsRepoCache.CleanupWrittenRepo(pathToCleanUp)
if err != nil {
logrus.Errorf("cannot get gitops repo for write: %s", err)
Expand All @@ -583,10 +583,29 @@ func delete(w http.ResponseWriter, r *http.Request) {
}

path := filepath.Join(env, app)
if repoPerEnv {
if envFromStore.RepoPerEnv {
path = app
}

if envFromStore.KustomizationPerApp {
kustomizationFilePath := filepath.Join(env, "flux", fmt.Sprintf("kustomization-%s.yaml", app))
if envFromStore.RepoPerEnv {
kustomizationFilePath = filepath.Join("flux", fmt.Sprintf("kustomization-%s.yaml", app))
}
worktree, err := repo.Worktree()
if err != nil {
logrus.Errorf("cannot get worktree: %s", err)
http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
return
}
_, err = worktree.Remove(kustomizationFilePath)
if err != nil {
logrus.Errorf("cannot remove files from the working tree: %s", err)
http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
return
}
}

err = nativeGit.DelDir(repo, path)
if err != nil {
logrus.Errorf("cannot delete release: %s", err)
Expand Down Expand Up @@ -620,12 +639,12 @@ func delete(w http.ResponseWriter, r *http.Request) {
head, _ := repo.Head()
tokenManager := ctx.Value("tokenManager").(customScm.NonImpersonatedTokenManager)
token, _, _ := tokenManager.Token()
owner, _ := scm.Split(repoName)
owner, _ := scm.Split(envFromStore.AppsRepo)
gitUser := ctx.Value("gitUser").(*model.User)

url := fmt.Sprintf("https://abc123:%s@github.com/%s.git", token, repoName)
url := fmt.Sprintf("https://abc123:%s@github.com/%s.git", token, envFromStore.AppsRepo)
if owner == "builtin" {
url = fmt.Sprintf("http://%s:%s@%s/%s", gitUser.Login, gitUser.Secret, config.GitHost, repoName)
url = fmt.Sprintf("http://%s:%s@%s/%s", gitUser.Login, gitUser.Secret, config.GitHost, envFromStore.AppsRepo)
}
err = nativeGit.NativePushWithToken(
url,
Expand All @@ -639,7 +658,7 @@ func delete(w http.ResponseWriter, r *http.Request) {
}
logrus.Infof("Pushing took %d", (time.Now().UnixNano()-t0)/1000/1000)

gitopsRepoCache.Invalidate(repoName)
gitopsRepoCache.Invalidate(envFromStore.AppsRepo)

w.WriteHeader(http.StatusOK)
w.Write([]byte("{}"))
Expand Down