mirror of
https://github.com/zitadel/zitadel.git
synced 2025-08-11 14:37:34 +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:
@@ -5,7 +5,6 @@ import (
|
||||
"github.com/caos/orbos/pkg/git"
|
||||
"github.com/caos/orbos/pkg/kubernetes"
|
||||
"github.com/caos/orbos/pkg/tree"
|
||||
"github.com/caos/zitadel/operator/api"
|
||||
orbdb "github.com/caos/zitadel/operator/database/kinds/orb"
|
||||
)
|
||||
|
||||
@@ -15,14 +14,14 @@ func InstantBackup(
|
||||
gitClient *git.Client,
|
||||
name string,
|
||||
) error {
|
||||
desired, err := api.ReadDatabaseYml(gitClient)
|
||||
desired, err := gitClient.ReadTree(git.DatabaseFile)
|
||||
if err != nil {
|
||||
monitor.Error(err)
|
||||
return err
|
||||
}
|
||||
current := &tree.Tree{}
|
||||
|
||||
query, _, _, _, _, err := orbdb.AdaptFunc(name, nil, false, "instantbackup")(monitor, desired, current)
|
||||
query, _, _, _, _, _, err := orbdb.AdaptFunc(name, nil, false, "instantbackup")(monitor, desired, current)
|
||||
if err != nil {
|
||||
monitor.Error(err)
|
||||
return err
|
||||
@@ -49,7 +48,7 @@ func ListBackups(
|
||||
[]string,
|
||||
error,
|
||||
) {
|
||||
desired, err := api.ReadDatabaseYml(gitClient)
|
||||
desired, err := gitClient.ReadTree(git.DatabaseFile)
|
||||
if err != nil {
|
||||
monitor.Error(err)
|
||||
return nil, err
|
||||
|
@@ -5,7 +5,6 @@ import (
|
||||
"github.com/caos/orbos/pkg/git"
|
||||
"github.com/caos/orbos/pkg/kubernetes"
|
||||
"github.com/caos/orbos/pkg/tree"
|
||||
"github.com/caos/zitadel/operator/api"
|
||||
"github.com/caos/zitadel/operator/database/kinds/databases/core"
|
||||
orbdb "github.com/caos/zitadel/operator/database/kinds/orb"
|
||||
)
|
||||
@@ -16,14 +15,14 @@ func Clear(
|
||||
gitClient *git.Client,
|
||||
databases []string,
|
||||
) error {
|
||||
desired, err := api.ReadDatabaseYml(gitClient)
|
||||
desired, err := gitClient.ReadTree(git.DatabaseFile)
|
||||
if err != nil {
|
||||
monitor.Error(err)
|
||||
return err
|
||||
}
|
||||
current := &tree.Tree{}
|
||||
|
||||
query, _, _, _, _, err := orbdb.AdaptFunc("", nil, false, "clean")(monitor, desired, current)
|
||||
query, _, _, _, _, _, err := orbdb.AdaptFunc("", nil, false, "clean")(monitor, desired, current)
|
||||
if err != nil {
|
||||
monitor.Error(err)
|
||||
return err
|
||||
|
@@ -5,7 +5,6 @@ import (
|
||||
"github.com/caos/orbos/pkg/git"
|
||||
"github.com/caos/orbos/pkg/kubernetes"
|
||||
"github.com/caos/orbos/pkg/tree"
|
||||
"github.com/caos/zitadel/operator/api"
|
||||
"github.com/caos/zitadel/operator/api/database"
|
||||
coredb "github.com/caos/zitadel/operator/database/kinds/databases/core"
|
||||
orbdb "github.com/caos/zitadel/operator/database/kinds/orb"
|
||||
@@ -28,7 +27,7 @@ func GitOpsGetConnectionInfo(
|
||||
k8sClient kubernetes.ClientInt,
|
||||
gitClient *git.Client,
|
||||
) (string, string, error) {
|
||||
desired, err := api.ReadDatabaseYml(gitClient)
|
||||
desired, err := gitClient.ReadTree(git.DatabaseFile)
|
||||
if err != nil {
|
||||
monitor.Error(err)
|
||||
return "", "", err
|
||||
@@ -44,7 +43,7 @@ func getConnectionInfo(
|
||||
) (string, string, error) {
|
||||
current := &tree.Tree{}
|
||||
|
||||
query, _, _, _, _, err := orbdb.AdaptFunc("", nil, false, "database")(monitor, desired, current)
|
||||
query, _, _, _, _, _, err := orbdb.AdaptFunc("", nil, false, "database")(monitor, desired, current)
|
||||
if err != nil {
|
||||
return "", "", err
|
||||
}
|
||||
|
@@ -5,7 +5,6 @@ import (
|
||||
"github.com/caos/orbos/pkg/git"
|
||||
"github.com/caos/orbos/pkg/kubernetes"
|
||||
"github.com/caos/orbos/pkg/tree"
|
||||
"github.com/caos/zitadel/operator/api"
|
||||
"github.com/caos/zitadel/operator/database/kinds/databases/core"
|
||||
orbdb "github.com/caos/zitadel/operator/database/kinds/orb"
|
||||
)
|
||||
@@ -17,14 +16,14 @@ func Restore(
|
||||
name string,
|
||||
databases []string,
|
||||
) error {
|
||||
desired, err := api.ReadDatabaseYml(gitClient)
|
||||
desired, err := gitClient.ReadTree(git.DatabaseFile)
|
||||
if err != nil {
|
||||
monitor.Error(err)
|
||||
return err
|
||||
}
|
||||
current := &tree.Tree{}
|
||||
|
||||
query, _, _, _, _, err := orbdb.AdaptFunc(name, nil, false, "restore")(monitor, desired, current)
|
||||
query, _, _, _, _, _, err := orbdb.AdaptFunc(name, nil, false, "restore")(monitor, desired, current)
|
||||
if err != nil {
|
||||
monitor.Error(err)
|
||||
return err
|
||||
|
@@ -5,7 +5,6 @@ import (
|
||||
"github.com/caos/orbos/pkg/git"
|
||||
"github.com/caos/orbos/pkg/kubernetes"
|
||||
"github.com/caos/orbos/pkg/tree"
|
||||
"github.com/caos/zitadel/operator/api"
|
||||
"github.com/caos/zitadel/operator/api/database"
|
||||
coredb "github.com/caos/zitadel/operator/database/kinds/databases/core"
|
||||
orbdb "github.com/caos/zitadel/operator/database/kinds/orb"
|
||||
@@ -29,7 +28,7 @@ func GitOpsListUsers(
|
||||
k8sClient kubernetes.ClientInt,
|
||||
gitClient *git.Client,
|
||||
) ([]string, error) {
|
||||
desired, err := api.ReadDatabaseYml(gitClient)
|
||||
desired, err := gitClient.ReadTree(git.DatabaseFile)
|
||||
if err != nil {
|
||||
monitor.Error(err)
|
||||
return nil, err
|
||||
@@ -45,7 +44,7 @@ func listUsers(
|
||||
) ([]string, error) {
|
||||
current := &tree.Tree{}
|
||||
|
||||
query, _, _, _, _, err := orbdb.AdaptFunc("", nil, false, "database")(monitor, desired, current)
|
||||
query, _, _, _, _, _, err := orbdb.AdaptFunc("", nil, false, "database")(monitor, desired, current)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
@@ -94,7 +93,7 @@ func GitOpsAddUser(
|
||||
k8sClient kubernetes.ClientInt,
|
||||
gitClient *git.Client,
|
||||
) error {
|
||||
desired, err := api.ReadDatabaseYml(gitClient)
|
||||
desired, err := gitClient.ReadTree(git.DatabaseFile)
|
||||
if err != nil {
|
||||
monitor.Error(err)
|
||||
return err
|
||||
@@ -110,7 +109,7 @@ func addUser(
|
||||
) error {
|
||||
current := &tree.Tree{}
|
||||
|
||||
query, _, _, _, _, err := orbdb.AdaptFunc("", nil, false, "database")(monitor, desired, current)
|
||||
query, _, _, _, _, _, err := orbdb.AdaptFunc("", nil, false, "database")(monitor, desired, current)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
@@ -142,7 +141,7 @@ func GitOpsDeleteUser(
|
||||
k8sClient kubernetes.ClientInt,
|
||||
gitClient *git.Client,
|
||||
) error {
|
||||
desired, err := api.ReadDatabaseYml(gitClient)
|
||||
desired, err := gitClient.ReadTree(git.DatabaseFile)
|
||||
if err != nil {
|
||||
monitor.Error(err)
|
||||
return err
|
||||
@@ -173,7 +172,7 @@ func deleteUser(
|
||||
) error {
|
||||
current := &tree.Tree{}
|
||||
|
||||
query, _, _, _, _, err := orbdb.AdaptFunc("", nil, false, "database")(monitor, desired, current)
|
||||
query, _, _, _, _, _, err := orbdb.AdaptFunc("", nil, false, "database")(monitor, desired, current)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
@@ -226,7 +226,7 @@ status:
|
||||
}
|
||||
|
||||
var (
|
||||
cmd = []string{"/zitadelctl", "operator"}
|
||||
cmd = []string{"/zitadelctl", "operator", "--kubeconfig", ""}
|
||||
volumes []core.Volume
|
||||
volumeMounts []core.VolumeMount
|
||||
)
|
||||
@@ -246,8 +246,6 @@ status:
|
||||
ReadOnly: true,
|
||||
MountPath: "/secrets",
|
||||
}}
|
||||
} else {
|
||||
cmd = append(cmd, "--kubeconfig", "")
|
||||
}
|
||||
|
||||
deployment := &apps.Deployment{
|
||||
@@ -526,7 +524,7 @@ status:
|
||||
}
|
||||
|
||||
var (
|
||||
cmd = []string{"/zitadelctl", "database"}
|
||||
cmd = []string{"/zitadelctl", "database", "--kubeconfig", ""}
|
||||
volumes []core.Volume
|
||||
volumeMounts []core.VolumeMount
|
||||
)
|
||||
@@ -546,8 +544,6 @@ status:
|
||||
ReadOnly: true,
|
||||
MountPath: "/secrets",
|
||||
}}
|
||||
} else {
|
||||
cmd = append(cmd, "--kubeconfig", "")
|
||||
}
|
||||
|
||||
deployment := &apps.Deployment{
|
||||
|
Reference in New Issue
Block a user