Merge branch 'master' into es-security

kubedb · Nov 16, 2023 · 5d0b8ab · 5d0b8ab
2 parents f2e1f92 + f5de4a2
commit 5d0b8ab
Show file tree

Hide file tree

Showing 18 changed files with 151 additions and 7 deletions.
diff --git a/apis/catalog/v1alpha1/elasticsearch_version_types.go b/apis/catalog/v1alpha1/elasticsearch_version_types.go
@@ -82,6 +82,8 @@ type ElasticsearchVersionSpec struct {
 	SecurityContext ElasticsearchSecurityContext `json:"securityContext"`
 	// update constraints
 	UpdateConstraints UpdateConstraints `json:"updateConstraints,omitempty"`
+	// +optional
+	GitSyncer GitSyncer `json:"gitSyncer,omitempty"`
 }
 
 // ElasticsearchVersionDatabase is the Elasticsearch Database image

diff --git a/apis/catalog/v1alpha1/etcd_version_types.go b/apis/catalog/v1alpha1/etcd_version_types.go
@@ -62,6 +62,8 @@ type EtcdVersionSpec struct {
 	// Stash defines backup and restore task definitions.
 	// +optional
 	Stash appcat.StashAddonSpec `json:"stash,omitempty"`
+	// +optional
+	GitSyncer GitSyncer `json:"gitSyncer,omitempty"`
 }
 
 // EtcdVersionDatabase is the Etcd Database image

diff --git a/apis/catalog/v1alpha1/mariadb_version_types.go b/apis/catalog/v1alpha1/mariadb_version_types.go
@@ -71,6 +71,8 @@ type MariaDBVersionSpec struct {
 	Stash appcat.StashAddonSpec `json:"stash,omitempty"`
 	// update constraints
 	UpdateConstraints UpdateConstraints `json:"updateConstraints,omitempty"`
+	// +optional
+	GitSyncer GitSyncer `json:"gitSyncer,omitempty"`
 }
 
 // MariaDBVersionDatabase is the mariadb image

diff --git a/apis/catalog/v1alpha1/mongodb_version_types.go b/apis/catalog/v1alpha1/mongodb_version_types.go
@@ -73,6 +73,8 @@ type MongoDBVersionSpec struct {
 	Stash appcat.StashAddonSpec `json:"stash,omitempty"`
 	// update constraints
 	UpdateConstraints UpdateConstraints `json:"updateConstraints,omitempty"`
+	// +optional
+	GitSyncer GitSyncer `json:"gitSyncer,omitempty"`
 }
 
 // MongoDBVersionDatabase is the MongoDB Database image

diff --git a/apis/catalog/v1alpha1/openapi_generated.go b/apis/catalog/v1alpha1/openapi_generated.go
diff --git a/apis/catalog/v1alpha1/perconaxtradb_version_types.go b/apis/catalog/v1alpha1/perconaxtradb_version_types.go
@@ -71,6 +71,8 @@ type PerconaXtraDBVersionSpec struct {
 	Stash appcat.StashAddonSpec `json:"stash,omitempty"`
 	// update constraints
 	UpdateConstraints UpdateConstraints `json:"updateConstraints,omitempty"`
+	// +optional
+	GitSyncer GitSyncer `json:"gitSyncer,omitempty"`
 }
 
 // PerconaXtraDBVersionDatabase is the perconaxtradb image

diff --git a/apis/catalog/v1alpha1/postgres_version_types.go b/apis/catalog/v1alpha1/postgres_version_types.go
@@ -76,6 +76,8 @@ type PostgresVersionSpec struct {
 	SecurityContext PostgresSecurityContext `json:"securityContext"`
 	// update constraints
 	UpdateConstraints UpdateConstraints `json:"updateConstraints,omitempty"`
+	// +optional
+	GitSyncer GitSyncer `json:"gitSyncer,omitempty"`
 }
 
 // PostgresVersionInitContainer is the Postgres init container image

diff --git a/apis/catalog/v1alpha1/redis_version_types.go b/apis/catalog/v1alpha1/redis_version_types.go
@@ -70,6 +70,8 @@ type RedisVersionSpec struct {
 	Stash appcat.StashAddonSpec `json:"stash,omitempty"`
 	// update constraints
 	UpdateConstraints UpdateConstraints `json:"updateConstraints,omitempty"`
+	// +optional
+	GitSyncer GitSyncer `json:"gitSyncer,omitempty"`
 }
 
 // RedisVersionInitContainer is the Redis init container image

diff --git a/apis/catalog/v1alpha1/zz_generated.deepcopy.go b/apis/catalog/v1alpha1/zz_generated.deepcopy.go
diff --git a/apis/kubedb/v1alpha2/constants.go b/apis/kubedb/v1alpha2/constants.go
@@ -691,3 +691,11 @@ var (
 		},
 	}
 )
+
+const (
+	InitFromGit          = "init-from-git"
+	InitFromGitMountPath = "/git"
+	GitSecretVolume      = "git-secret"
+	GitSecretMountPath   = "/etc/git-secret"
+	GitSyncContainerName = "git-sync"
+)
diff --git a/crds/catalog.kubedb.com_elasticsearchversions.yaml b/crds/catalog.kubedb.com_elasticsearchversions.yaml
@@ -93,6 +93,13 @@ spec:
                 required:
                 - image
                 type: object
+              gitSyncer:
+                properties:
+                  image:
+                    type: string
+                required:
+                - image
+                type: object
               initContainer:
                 properties:
                   image:

diff --git a/crds/catalog.kubedb.com_etcdversions.yaml b/crds/catalog.kubedb.com_etcdversions.yaml
@@ -61,6 +61,13 @@ spec:
                 required:
                 - image
                 type: object
+              gitSyncer:
+                properties:
+                  image:
+                    type: string
+                required:
+                - image
+                type: object
               stash:
                 properties:
                   addon:

diff --git a/crds/catalog.kubedb.com_mariadbversions.yaml b/crds/catalog.kubedb.com_mariadbversions.yaml
@@ -68,6 +68,13 @@ spec:
                 required:
                 - image
                 type: object
+              gitSyncer:
+                properties:
+                  image:
+                    type: string
+                required:
+                - image
+                type: object
               initContainer:
                 properties:
                   image:

diff --git a/crds/catalog.kubedb.com_mongodbversions.yaml b/crds/catalog.kubedb.com_mongodbversions.yaml
@@ -71,6 +71,13 @@ spec:
                 required:
                 - image
                 type: object
+              gitSyncer:
+                properties:
+                  image:
+                    type: string
+                required:
+                - image
+                type: object
               initContainer:
                 properties:
                   image:

diff --git a/crds/catalog.kubedb.com_perconaxtradbversions.yaml b/crds/catalog.kubedb.com_perconaxtradbversions.yaml
@@ -68,6 +68,13 @@ spec:
                 required:
                 - image
                 type: object
+              gitSyncer:
+                properties:
+                  image:
+                    type: string
+                required:
+                - image
+                type: object
               initContainer:
                 properties:
                   image:

diff --git a/crds/catalog.kubedb.com_postgresversions.yaml b/crds/catalog.kubedb.com_postgresversions.yaml
@@ -81,6 +81,13 @@ spec:
                 required:
                 - image
                 type: object
+              gitSyncer:
+                properties:
+                  image:
+                    type: string
+                required:
+                - image
+                type: object
               initContainer:
                 properties:
                   image:

diff --git a/crds/catalog.kubedb.com_redisversions.yaml b/crds/catalog.kubedb.com_redisversions.yaml
@@ -68,6 +68,13 @@ spec:
                 required:
                 - image
                 type: object
+              gitSyncer:
+                properties:
+                  image:
+                    type: string
+                required:
+                - image
+                type: object
               initContainer:
                 properties:
                   image: