allanger/shoebill
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Activity

Update a bit

Browse Source
This commit is contained in:
Nikolai Rodionov
2024-01-19 10:00:23 +01:00
parent 018d26dd25
commit 64decebb87
3 changed files with 67 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
internal/providers/flux.go
View File

@ -7,13 +7,14 @@ import (
"os"
"os/exec"
"path/filepath"
"time"
"git.badhouseplants.net/allanger/shoebill/internal/utils/diff"
"git.badhouseplants.net/allanger/shoebill/internal/utils/githelper"
"git.badhouseplants.net/allanger/shoebill/pkg/lockfile"
"git.badhouseplants.net/allanger/shoebill/pkg/release"
"git.badhouseplants.net/allanger/shoebill/pkg/repository"
release_v2beta1 "github.com/fluxcd/helm-controller/api/v2beta2"
release_v2beta1 "github.com/fluxcd/helm-controller/api/v2beta1"
helmrepo_v1beta2 "github.com/fluxcd/source-controller/api/v1beta2"
"github.com/sirupsen/logrus"
corev1 "k8s.io/api/core/v1"
@ -216,6 +217,9 @@ func GenerateRepository(repo *repository.Repository) ([]byte, error) {
Spec: helmrepo_v1beta2.HelmRepositorySpec{
URL: repo.URL,
Type: repo.Kind,
Interval: v1.Duration{
Duration: time.Minute,
},
},
}
return yaml.Marshal(&fluxRepo)
@ -233,6 +237,9 @@ func GenerateRelease(release *release.Release) ([]byte, error) {
Namespace: "flux-system",
},
Spec: release_v2beta1.HelmReleaseSpec{
Interval: v1.Duration{
Duration: time.Minute,
},
Chart: release_v2beta1.HelmChartTemplate{
Spec: release_v2beta1.HelmChartTemplateSpec{
Chart: release.Chart,
@ -254,7 +261,7 @@ func GenerateRelease(release *release.Release) ([]byte, error) {
},
}
for _, v := range release.Values {
filename := fmt.Sprintf("%s-%s", release.Release, filepath.Base(v))
filename := fmt.Sprintf("%s-%s-%s", release.Namespace, release.Release, filepath.Base(v))
fluxRelease.Spec.ValuesFrom = append(fluxRelease.Spec.ValuesFrom, release_v2beta1.ValuesReference{
Kind: "ConfigMap",
Name: filename,
@ -263,7 +270,7 @@ func GenerateRelease(release *release.Release) ([]byte, error) {
}
for _, v := range release.Secrets {
filename := fmt.Sprintf("%s-%s", release.Release, filepath.Base(v))
filename := fmt.Sprintf("%s-%s-%s", release.Namespace, release.Release, filepath.Base(v))
fluxRelease.Spec.ValuesFrom = append(fluxRelease.Spec.ValuesFrom, release_v2beta1.ValuesReference{
Kind: "Secret",
Name: filename,