andwati/zitadel
1
0
Fork 0
mirror of https://github.com/andwati/zitadel.git synced 2026-11-14 18:05:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: enable running ZITADEL offline (#1894)

Browse Source 
* feat: enable running ZITADEL offline

* refactor: move operator image to common images

* test: remove empty test
This commit is contained in:
Elio Bischof
2021-06-25 08:56:22 +00:00
committed by GitHub
parent c6c60d1d2a
commit b2b53ae9e1
44 changed files with 408 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files
operator/database/kinds/backups/bucket/clean/adapt.go
+4 -4
View File
@@ -18,7 +18,6 @@ const (
certPath = "/cockroach/cockroach-certs"
secretPath = "/secrets/sa.json"
internalSecretName = "client-certs"
image = "ghcr.io/caos/zitadel-crbackup"
rootSecretName = "cockroachdb.client.root"
jobPrefix = "backup-"
jobSuffix = "-clean"
@@ -36,7 +35,7 @@ func AdaptFunc(
checkDBReady operator.EnsureFunc,
secretName string,
secretKey string,
version string,
image string,
) (
queryFunc operator.QueryFunc,
destroyFunc operator.DestroyFunc,
@@ -52,8 +51,9 @@ func AdaptFunc(
tolerations,
secretName,
secretKey,
version,
command)
command,
image,
)
destroyJ, err := job.AdaptFuncToDestroy(jobDef.Namespace, jobDef.Name)
if err != nil {
operator/database/kinds/backups/bucket/clean/adapt_test.go
+6 -6
View File
@@ -24,7 +24,7 @@ func TestBackup_Adapt1(t *testing.T) {
tolerations := []corev1.Toleration{
{Key: "testKey", Operator: "testOp"}}
backupName := "testName"
version := "testVersion"
image := "testImage"
secretKey := "testKey"
secretName := "testSecretName"
jobName := GetJobName(backupName)
@@ -42,10 +42,10 @@ func TestBackup_Adapt1(t *testing.T) {
tolerations,
secretName,
secretKey,
version,
getCommand(
databases,
),
image,
)
client.EXPECT().ApplyJob(jobDef).Times(1).Return(nil)
@@ -62,7 +62,7 @@ func TestBackup_Adapt1(t *testing.T) {
checkDBReady,
secretName,
secretKey,
version,
image,
)
assert.NoError(t, err)
@@ -82,7 +82,7 @@ func TestBackup_Adapt2(t *testing.T) {
tolerations := []corev1.Toleration{
{Key: "testKey2", Operator: "testOp2"}}
backupName := "testName2"
version := "testVersion2"
image := "testImage2"
secretKey := "testKey2"
secretName := "testSecretName2"
jobName := GetJobName(backupName)
@@ -100,10 +100,10 @@ func TestBackup_Adapt2(t *testing.T) {
tolerations,
secretName,
secretKey,
version,
getCommand(
databases,
),
image,
)
client.EXPECT().ApplyJob(jobDef).Times(1).Return(nil)
@@ -120,7 +120,7 @@ func TestBackup_Adapt2(t *testing.T) {
checkDBReady,
secretName,
secretKey,
version,
image,
)
assert.NoError(t, err)
operator/database/kinds/backups/bucket/clean/job.go
+2 -2
View File
@@ -15,8 +15,8 @@ func getJob(
tolerations []corev1.Toleration,
secretName string,
secretKey string,
version string,
command string,
image string,
) *batchv1.Job {
return &batchv1.Job{
@@ -33,7 +33,7 @@ func getJob(
RestartPolicy: corev1.RestartPolicyNever,
Containers: []corev1.Container{{
Name: nameLabels.Name(),
Image: image + ":" + version,
Image: image,
Command: []string{
"/bin/bash",
"-c",
operator/database/kinds/backups/bucket/clean/job_test.go
+8 -7
View File
@@ -1,25 +1,26 @@
package clean
import (
"testing"
"github.com/caos/orbos/pkg/labels"
"github.com/caos/zitadel/operator/helpers"
"github.com/stretchr/testify/assert"
batchv1 "k8s.io/api/batch/v1"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"testing"
)
func TestBackup_Job1(t *testing.T) {
nodeselector := map[string]string{"test": "test"}
tolerations := []corev1.Toleration{
{Key: "testKey", Operator: "testOp"}}
version := "testVersion"
command := "test"
secretKey := "testKey"
secretName := "testSecretName"
jobName := "testJob"
namespace := "testNs"
image := "testImage"
k8sLabels := map[string]string{
"app.kubernetes.io/component": "testComponent",
@@ -47,7 +48,7 @@ func TestBackup_Job1(t *testing.T) {
Tolerations: tolerations,
Containers: []corev1.Container{{
Name: jobName,
Image: image + ":" + version,
Image: image,
Command: []string{
"/bin/bash",
"-c",
@@ -84,19 +85,19 @@ func TestBackup_Job1(t *testing.T) {
},
}
assert.Equal(t, equals, getJob(namespace, nameLabels, nodeselector, tolerations, secretName, secretKey, version, command))
assert.Equal(t, equals, getJob(namespace, nameLabels, nodeselector, tolerations, secretName, secretKey, command, image))
}
func TestBackup_Job2(t *testing.T) {
nodeselector := map[string]string{"test2": "test2"}
tolerations := []corev1.Toleration{
{Key: "testKey2", Operator: "testOp2"}}
version := "testVersion2"
command := "test2"
secretKey := "testKey2"
secretName := "testSecretName2"
jobName := "testJob2"
namespace := "testNs2"
image := "testImage2"
k8sLabels := map[string]string{
"app.kubernetes.io/component": "testComponent2",
"app.kubernetes.io/managed-by": "testOp2",
@@ -123,7 +124,7 @@ func TestBackup_Job2(t *testing.T) {
Tolerations: tolerations,
Containers: []corev1.Container{{
Name: jobName,
Image: image + ":" + version,
Image: image,
Command: []string{
"/bin/bash",
"-c",
@@ -160,5 +161,5 @@ func TestBackup_Job2(t *testing.T) {
},
}
assert.Equal(t, equals, getJob(namespace, nameLabels, nodeselector, tolerations, secretName, secretKey, version, command))
assert.Equal(t, equals, getJob(namespace, nameLabels, nodeselector, tolerations, secretName, secretKey, command, image))
}