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

wip: Add support for secrets

Browse Source
This commit is contained in:
Nikolai Rodionov
2023-10-11 14:14:20 +02:00
parent 38307db832
commit 8df74873d5
20 changed files with 561 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

138
internal/providers/flux.go
View File

@ -5,6 +5,7 @@ import (
"fmt"
"io"
"os"
"os/exec"
"path/filepath"
"git.badhouseplants.net/allanger/shoebill/internal/config/release"
@ -13,20 +14,22 @@ import (
"git.badhouseplants.net/allanger/shoebill/internal/utils/githelper"
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"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"sigs.k8s.io/yaml"
)
type Flux struct {
path string
gh githelper.Githelper
path string
sopsBin string
gh githelper.Githelper
}
func FluxProvider(path string, gh githelper.Githelper) Provider {
func FluxProvider(path, sopsBin string, gh githelper.Githelper) Provider {
return &Flux{
path: path,
gh: gh,
path: path,
sopsBin: sopsBin,
gh: gh,
}
}
@ -99,6 +102,9 @@ func (f *Flux) SyncState(diff diff.Diff) error {
if err := SyncValues(release, srcPath); err != nil {
return err
}
if err := SyncSecrets(release, srcPath, f.path, f.sopsBin); err != nil {
return err
}
manifest, err := GenerateRelease(release)
if err != nil {
return err
@ -127,6 +133,11 @@ func (f *Flux) SyncState(diff diff.Diff) error {
for _, release := range diff.UpdatedReleases {
SyncValues(release, srcPath)
if err := SyncSecrets(release, srcPath, f.path, f.sopsBin); err != nil {
return err
}
manifest, err := GenerateRelease(release)
if err != nil {
return err
@ -181,7 +192,7 @@ func GenerateRepository(repo *repository.Repository) ([]byte, error) {
},
ObjectMeta: v1.ObjectMeta{
Name: repo.Name,
Namespace: "flux-namespace",
Namespace: "flux-system",
},
Spec: helmrepo_v1beta2.HelmRepositorySpec{
URL: repo.URL,
@ -200,7 +211,7 @@ func GenerateRelease(release *release.Release) ([]byte, error) {
},
ObjectMeta: v1.ObjectMeta{
Name: release.Release,
Namespace: "flux-namespace",
Namespace: "flux-system",
},
Spec: release_v2beta1.HelmReleaseSpec{
Chart: release_v2beta1.HelmChartTemplate{
@ -210,7 +221,7 @@ func GenerateRelease(release *release.Release) ([]byte, error) {
SourceRef: release_v2beta1.CrossNamespaceObjectReference{
Kind: helmrepo_v1beta2.HelmRepositoryKind,
Name: release.RepositoryObj.Name,
Namespace: "flux-namespace",
Namespace: "flux-system",
},
},
},
@ -220,8 +231,27 @@ func GenerateRelease(release *release.Release) ([]byte, error) {
CreateNamespace: true,
},
TargetNamespace: "release-namespace",
ValuesFrom: []release_v2beta1.ValuesReference{},
},
}
for _, v := range release.Values {
filename := fmt.Sprintf("%s-%s", release.Release, filepath.Base(v))
fluxRelease.Spec.ValuesFrom = append(fluxRelease.Spec.ValuesFrom, release_v2beta1.ValuesReference{
Kind: "ConfigMap",
Name: filename,
ValuesKey: filename,
})
}
for _, v := range release.Secrets {
filename := fmt.Sprintf("%s-%s", release.Release, filepath.Base(v))
fluxRelease.Spec.ValuesFrom = append(fluxRelease.Spec.ValuesFrom, release_v2beta1.ValuesReference{
Kind: "Secret",
Name: filename,
ValuesKey: filename,
})
}
return yaml.Marshal(&fluxRelease)
}
@ -242,7 +272,8 @@ func SyncValues(release *release.Release, path string) error {
var dstValues *os.File
var srcValues *os.File
var err error
srcValues, err = os.Open(valueFile)
valueData, err := os.ReadFile(valueFile)
if err != nil {
return err
}
@ -262,6 +293,10 @@ func SyncValues(release *release.Release, path string) error {
} else {
return err
}
if err := os.WriteFile(destFileName, valueData, os.ModeExclusive); err != nil {
return nil
}
_, err = io.Copy(dstValues, srcValues)
if err != nil {
return err
@ -269,3 +304,86 @@ func SyncValues(release *release.Release, path string) error {
}
return nil
}
func SyncSecrets(release *release.Release, destPath, path, sopsBin string) error {
secretsPath := fmt.Sprintf("%s/%s", destPath, "secrets")
// Prepare a dir for secrets
if _, err := os.Stat(secretsPath); errors.Is(err, os.ErrNotExist) {
err := os.Mkdir(secretsPath, os.ModePerm)
if err != nil {
return err
}
} else if err != nil {
return err
}
for srcPath, data := range release.UnencryptedSecrets {
destFileName := fmt.Sprintf("%s/%s-%s", secretsPath, release.Release, filepath.Base(srcPath))
var dstSecrets *os.File
var err error
if _, err = os.Stat(destFileName); err == nil {
dstSecrets, err = os.Open(destFileName)
if err != nil {
return err
}
defer dstSecrets.Close()
} else if errors.Is(err, os.ErrNotExist) {
dstSecrets, err = os.Create(destFileName)
if err != nil {
return nil
}
defer dstSecrets.Close()
} else {
return err
}
filename := fmt.Sprintf("%s-%s", release.Release, filepath.Base(srcPath))
k8sSecretObj := corev1.Secret{
TypeMeta: v1.TypeMeta{
Kind: "Secret",
APIVersion: "v1",
},
ObjectMeta: v1.ObjectMeta{
Name: filename,
Namespace: "flux-system",
Labels: map[string]string{
"shoebill-release": release.Release,
"shoebill-chart": release.Chart,
},
},
Data: map[string][]byte{
filename: data,
},
}
secretFile, err := yaml.Marshal(k8sSecretObj)
if err != nil {
return err
}
if err := os.WriteFile(destFileName, secretFile, os.ModeExclusive); err != nil {
return nil
}
if err != nil {
return err
}
// I have to use the sops binary here, because they do not provide a go package that can be used for encryption :(
sopsConfPath := fmt.Sprintf("%s/.sops.yaml", path)
cmd := exec.Command(sopsBin, "--encrypt", "--in-place", "--config", sopsConfPath, destFileName)
stderr, err := cmd.StderrPipe()
if err != nil {
return err
}
if err := cmd.Start(); err != nil {
return err
}
errMsg, _ := io.ReadAll(stderr)
if err := cmd.Wait(); err != nil {
err := fmt.Errorf("%s - %s", err, errMsg)
return err
}
}
return nil
}

4
internal/providers/types.go
View File

@ -11,10 +11,10 @@ type Provider interface {
SyncState(diff diff.Diff) error
}
func NewProvider(provider, path string, gh githelper.Githelper) (Provider, error) {
func NewProvider(provider, path, sopsBin string, gh githelper.Githelper) (Provider, error) {
switch provider {
case "flux":
return FluxProvider(path, gh), nil
return FluxProvider(path, sopsBin, gh), nil
default:
return nil, fmt.Errorf("provider is not supported: %s", provider)
}