TheArchive/zitadel
1
0
Fork 0
mirror of https://github.com/zitadel/zitadel.git synced 2025-10-10 13:59:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: operator reconciling (#1478)

Browse Source 
* fix(operator): align backup and restore commands (#1465)

* fix: crd mode broke backup and restore commands

* fix: remove obscure gitops-per-operator flags

(cherry picked from commit 041cacc4af)

* fix: gitops backup and restore need a kubernetes client too (#1475)

(cherry picked from commit 50bc317d27)

Co-authored-by: Elio Bischof <eliobischof@gmail.com>
This commit is contained in:
Livio Amstutz
2021-03-25 16:39:19 +01:00
committed by GitHub
parent ae66e40ace
commit c9b3839f3d
10 changed files with 73 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
cmd/zitadelctl/cmds/takeoff.go
View File

@@ -2,7 +2,7 @@ package cmds
import (
"github.com/caos/orbos/pkg/kubernetes/cli"
"github.com/ghodss/yaml"
"gopkg.in/yaml.v3"
orbdb "github.com/caos/zitadel/operator/database/kinds/orb"
@@ -17,19 +17,13 @@ import (
func TakeoffCommand(getRv GetRootValues) *cobra.Command {
var (
gitOpsZitadel bool
gitOpsDatabase bool
cmd = &cobra.Command{
cmd = &cobra.Command{
Use: "takeoff",
Short: "Launch a ZITADEL operator on the orb",
Long: "Ensures a desired state of the resources on the orb",
}
)
flags := cmd.Flags()
flags.BoolVar(&gitOpsZitadel, "gitops-zitadel", false, "defines if the zitadel operator should run in gitops mode")
flags.BoolVar(&gitOpsDatabase, "gitops-database", false, "defines if the database operator should run in gitops mode")
cmd.RunE = func(cmd *cobra.Command, args []string) error {
rv, err := getRv()
if err != nil {
@@ -48,7 +42,7 @@ func TakeoffCommand(getRv GetRootValues) *cobra.Command {
orbConfig,
gitClient,
rv.Kubeconfig,
gitOpsZitadel || gitOpsDatabase,
rv.Gitops,
)
if err != nil {
return err
@@ -59,7 +53,7 @@ func TakeoffCommand(getRv GetRootValues) *cobra.Command {
return err
}
if gitOpsZitadel || gitOpsDatabase {
if rv.Gitops {
orbConfigBytes, err := yaml.Marshal(orbConfig)
if err != nil {
@@ -77,7 +71,7 @@ func TakeoffCommand(getRv GetRootValues) *cobra.Command {
gitClient,
k8sClient,
rv.Version,
rv.Gitops || gitOpsZitadel,
rv.Gitops,
); err != nil {
monitor.Error(err)
}
@@ -87,7 +81,7 @@ func TakeoffCommand(getRv GetRootValues) *cobra.Command {
gitClient,
k8sClient,
rv.Version,
rv.Gitops || gitOpsDatabase,
rv.Gitops,
); err != nil {
monitor.Error(err)
}
@@ -113,11 +107,10 @@ func deployOperator(monitor mntr.Monitor, gitClient *git.Client, k8sClient kuber
return err
}
spec := desired.Spec
spec.GitOps = gitops
// at takeoff the artifacts have to be applied
spec.SelfReconciling = true
if err := orbzit.Reconcile(monitor, spec)(k8sClient); err != nil {
if err := orbzit.Reconcile(monitor, spec, gitops)(k8sClient); err != nil {
return err
}
}
@@ -126,10 +119,9 @@ func deployOperator(monitor mntr.Monitor, gitClient *git.Client, k8sClient kuber
spec := &orbzit.Spec{
Version: version,
SelfReconciling: true,
GitOps: gitops,
}
if err := orbzit.Reconcile(monitor, spec)(k8sClient); err != nil {
if err := orbzit.Reconcile(monitor, spec, gitops)(k8sClient); err != nil {
return err
}
}
@@ -153,13 +145,14 @@ func deployDatabase(monitor mntr.Monitor, gitClient *git.Client, k8sClient kuber
return err
}
spec := desired.Spec
spec.GitOps = gitops
// at takeoff the artifacts have to be applied
spec.SelfReconciling = true
if err := orbdb.Reconcile(
monitor,
spec)(k8sClient); err != nil {
spec,
gitops,
)(k8sClient); err != nil {
return err
}
}
@@ -168,12 +161,13 @@ func deployDatabase(monitor mntr.Monitor, gitClient *git.Client, k8sClient kuber
spec := &orbdb.Spec{
Version: version,
SelfReconciling: true,
GitOps: gitops,
}
if err := orbdb.Reconcile(
monitor,
spec)(k8sClient); err != nil {
spec,
gitops,
)(k8sClient); err != nil {
return err
}
}