WIP: cleanup values

This commit is contained in:
Nikolai Rodionov 2023-10-11 15:37:26 +02:00
parent e04443922b
commit 6b4b170be1
No known key found for this signature in database
GPG Key ID: 906851F91B1DA3EF
2 changed files with 23 additions and 9 deletions

View File

@ -14,6 +14,7 @@ import (
"git.badhouseplants.net/allanger/shoebill/internal/utils/githelper" "git.badhouseplants.net/allanger/shoebill/internal/utils/githelper"
release_v2beta1 "github.com/fluxcd/helm-controller/api/v2beta1" release_v2beta1 "github.com/fluxcd/helm-controller/api/v2beta1"
helmrepo_v1beta2 "github.com/fluxcd/source-controller/api/v1beta2" helmrepo_v1beta2 "github.com/fluxcd/source-controller/api/v1beta2"
"github.com/sirupsen/logrus"
corev1 "k8s.io/api/core/v1" corev1 "k8s.io/api/core/v1"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"sigs.k8s.io/yaml" "sigs.k8s.io/yaml"
@ -37,19 +38,11 @@ func (f *Flux) SyncState(diff diff.Diff) error {
entity := "repository" entity := "repository"
srcPath := fmt.Sprintf("%s/src", f.path) srcPath := fmt.Sprintf("%s/src", f.path)
filePath := fmt.Sprintf("%s/%s-", srcPath, entity) filePath := fmt.Sprintf("%s/%s-", srcPath, entity)
if err := os.RemoveAll(srcPath); err != nil {
return err
}
if err := os.Mkdir(srcPath, os.ModePerm); err != nil {
return err
}
for _, repo := range diff.DeletedRepositories { for _, repo := range diff.DeletedRepositories {
if err := os.Remove(filePath + repo.Name + ".yaml"); err != nil { if err := os.Remove(filePath + repo.Name + ".yaml"); err != nil {
return err return err
} }
message := `chore(repository): Removed a repo: %s message := `chore(repository): Removed a repo: %s
A repo has been removed from the cluster: A repo has been removed from the cluster:
@ -173,7 +166,25 @@ func (f *Flux) SyncState(diff diff.Diff) error {
if err := os.Remove(filePath + release.Release + ".yaml"); err != nil { if err := os.Remove(filePath + release.Release + ".yaml"); err != nil {
return err return err
} }
files, err := filepath.Glob(fmt.Sprintf("%s/values/%s*", srcPath, release.Release))
if err != nil {
return err
}
for _, f := range files {
if err := os.Remove(f); err != nil {
return err
}
}
files, err = filepath.Glob(fmt.Sprintf("%s/secrets/%s*", srcPath, release.Release))
if err != nil {
return err
}
for _, f := range files {
if err := os.Remove(f); err != nil {
return err
}
}
message := `chore(release): Remove a release: %s message := `chore(release): Remove a release: %s
A release has been removed from the cluster: A release has been removed from the cluster:

View File

@ -46,7 +46,10 @@ func DiffReleases(src, dest release.Releases) (*Diff, error) {
} }
} }
} }
logrus.Info(rSrc.Release)
if !found { if !found {
logrus.Info(rSrc.Release)
// for i, entry := range lockFile { // for i, entry := range lockFile {
// if entry.Release == rSrc.Release { // if entry.Release == rSrc.Release {
// lockFile[i] = lockFile[len(lockFile)-1] // lockFile[i] = lockFile[len(lockFile)-1]