mirror of
https://github.com/zitadel/zitadel.git
synced 2025-12-01 14:25:05 +00:00
feat(operator): make running ZITADEL easy (#1562)
* docs: describe crd mode * docs: fix links * docs: fix commands and crdb resources * feat: add configure command * chore: use latest ORBOS * chore: use latest ORBOS * docs: start gitops docs * fix: compile * chore: fix build script path * chore: remove redundant prebuild * chore: add configure.go * docs: describe gitops mode * docs: point template links to main branch * docs: fix versions * feat: initialize empty keys * feat: reconfigure running ZITADEL * docs: describe crd mode * docs: fix links * docs: fix commands and crdb resources * feat: add configure command * chore: use latest ORBOS * chore: use latest ORBOS * docs: start gitops docs * fix: compile * chore: fix build script path * chore: remove redundant prebuild * chore: add configure.go * docs: describe gitops mode * docs: point template links to main branch * docs: fix versions * feat: initialize empty keys * feat: reconfigure running ZITADEL * test: fix * docs: keys are generated with configure * docs: remove keys from template * chore: pass compile time data * chore: use latest ORBOS * fix: when in-cluster, use in-cluster k8s client * fix: try in-cluster config if kubeconfig is empty * fix: reduce unneeded side effects for configure command * docs: boom version * chore: use latest ORBOS * chore: use latest ORBOS * initial commit * inital changes * commit WIP Information Architecture * commit a working state * add static assets and project * add org and fix img names * add plausible * remove img * change sidebar to easier mgmt * add openid oauth and domains * lint md * quickstarts * add auth flow * identity brokering * remove site * fix broken links * extend footer * extend readme * fix: styling * fix: zitadel logo on index * styling * border * fix: nav * fix: nav * fix: index * fix: corrected zitadelctl examples * fix: rename architecture to concepts * fix: introductions * fix: introductions * fix: introductions * docs: cli r/w secrets examples * docs: finish ZITADEL Enterprise Cloud * docs: mention ZITADEL Enterprise Cloud tier * docs: comment configuration options * docs: fix broken links * docs: move some introduction texts around * docs: twilio and email are mandatory * docs: download latest binaries Co-authored-by: Florian Forster <florian@caos.ch> Co-authored-by: fabi <fabienne.gerschwiler@gmail.com> Co-authored-by: Livio Amstutz <livio.a@gmail.com> Co-authored-by: Stefan Benz <stefan@caos.ch>
This commit is contained in:
@@ -17,7 +17,6 @@ import (
|
||||
"github.com/caos/orbos/pkg/orb"
|
||||
"github.com/caos/orbos/pkg/secret"
|
||||
"github.com/caos/orbos/pkg/tree"
|
||||
"github.com/caos/zitadel/operator/api"
|
||||
)
|
||||
|
||||
const (
|
||||
@@ -69,15 +68,14 @@ func getAllSecrets(
|
||||
monitor,
|
||||
printLogs,
|
||||
gitops,
|
||||
gitClient,
|
||||
git.ZitadelFile,
|
||||
allTrees,
|
||||
allSecrets,
|
||||
allExisting,
|
||||
zitadel,
|
||||
func() (bool, error) { return api.ExistsZitadelYml(gitClient) },
|
||||
func() (t *tree.Tree, err error) { return api.ReadZitadelYml(gitClient) },
|
||||
func() (t *tree.Tree, err error) { return crdzit.ReadCrd(k8sClient) },
|
||||
func(t *tree.Tree) (map[string]*secret.Secret, map[string]*secret.Existing, bool, error) {
|
||||
_, _, secrets, existing, migrate, err := orbzit.AdaptFunc(orb, "secret", nil, gitops, []string{})(monitor, t, &tree.Tree{})
|
||||
_, _, _, secrets, existing, migrate, err := orbzit.AdaptFunc(orb, "secret", nil, gitops, []string{})(monitor, t, &tree.Tree{})
|
||||
return secrets, existing, migrate, err
|
||||
},
|
||||
); err != nil {
|
||||
@@ -88,15 +86,14 @@ func getAllSecrets(
|
||||
monitor,
|
||||
printLogs,
|
||||
gitops,
|
||||
gitClient,
|
||||
git.DatabaseFile,
|
||||
allTrees,
|
||||
allSecrets,
|
||||
allExisting,
|
||||
database,
|
||||
func() (bool, error) { return api.ExistsDatabaseYml(gitClient) },
|
||||
func() (t *tree.Tree, err error) { return api.ReadDatabaseYml(gitClient) },
|
||||
func() (t *tree.Tree, err error) { return crddb.ReadCrd(k8sClient) },
|
||||
func(t *tree.Tree) (map[string]*secret.Secret, map[string]*secret.Existing, bool, error) {
|
||||
_, _, secrets, existing, migrate, err := orbdb.AdaptFunc("", nil, gitops, "database", "backup")(monitor, t, nil)
|
||||
_, _, _, secrets, existing, migrate, err := orbdb.AdaptFunc("", nil, gitops, "database", "backup")(monitor, t, nil)
|
||||
return secrets, existing, migrate, err
|
||||
},
|
||||
); err != nil {
|
||||
@@ -141,24 +138,17 @@ func push(
|
||||
) error {
|
||||
|
||||
var (
|
||||
pushGitFunc func(*tree.Tree) error
|
||||
applyCRDFunc func(*tree.Tree) error
|
||||
operator string
|
||||
desiredFile git.DesiredFile
|
||||
)
|
||||
|
||||
if strings.HasPrefix(path, zitadel) {
|
||||
operator = zitadel
|
||||
pushGitFunc = func(desired *tree.Tree) error {
|
||||
return api.PushZitadelDesiredFunc(gitClient, desired)(monitor)
|
||||
}
|
||||
desiredFile = git.ZitadelFile
|
||||
applyCRDFunc = func(t *tree.Tree) error {
|
||||
return crdzit.WriteCrd(k8sClient, t)
|
||||
}
|
||||
} else if strings.HasPrefix(path, database) {
|
||||
operator = database
|
||||
pushGitFunc = func(desired *tree.Tree) error {
|
||||
return api.PushDatabaseDesiredFunc(gitClient, desired)(monitor)
|
||||
}
|
||||
desiredFile = git.DatabaseFile
|
||||
applyCRDFunc = func(t *tree.Tree) error {
|
||||
return crddb.WriteCrd(k8sClient, t)
|
||||
}
|
||||
@@ -166,13 +156,13 @@ func push(
|
||||
return errors.New("operator unknown")
|
||||
}
|
||||
|
||||
desired, found := trees[operator]
|
||||
desired, found := trees[desiredFile.WOExtension()]
|
||||
if !found {
|
||||
return fmt.Errorf("desired state for %s not found", operator)
|
||||
return fmt.Errorf("desired state not found for %s", desiredFile.WOExtension())
|
||||
}
|
||||
|
||||
if gitops {
|
||||
return pushGitFunc(desired)
|
||||
return gitClient.PushDesiredFunc(desiredFile, desired)(monitor)
|
||||
}
|
||||
return applyCRDFunc(desired)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user