From 0f9250557c822b1d54355c406162cc8a80cee4ca Mon Sep 17 00:00:00 2001 From: Tamal Saha Date: Sat, 6 Jan 2024 21:07:01 -0800 Subject: [PATCH] Use common feature gates across charts (#770) Signed-off-by: Tamal Saha --- .../v1alpha1/kubedb_catalog_types.go | 29 +- .../kubedb_kubestash_catalog_types.go | 7 +- apis/installer/v1alpha1/kubedb_types.go | 9 + .../v1alpha1/zz_generated.deepcopy.go | 73 +- catalog/kubedb/fmt/main.go | 55 +- catalog/kubedb/fmt/templates/dbver.yaml | 28 +- catalog/kubedb/fmt/templates/psp.yaml | 11 +- catalog/kubestash/fmt/main.go | 36 +- .../fmt/templates/{object.yaml => app.yaml} | 1 - catalog/kubestash/fmt/templates/db.yaml | 15 + catalog/kubestash/fmt/templates/lib.go | 7 +- charts/kubedb-catalog/README.md | 34 +- ...ecated-elasticsearch-1.2.2-opensearch.yaml | 9 +- ...ecated-elasticsearch-1.3.2-opensearch.yaml | 9 +- ...recated-elasticsearch-5.6-searchguard.yaml | 11 +- ...eprecated-elasticsearch-5.6.16-kubedb.yaml | 9 +- ...cated-elasticsearch-5.6.4-searchguard.yaml | 11 +- ...recated-elasticsearch-6.2-searchguard.yaml | 11 +- ...cated-elasticsearch-6.2.4-searchguard.yaml | 11 +- ...recated-elasticsearch-6.3-searchguard.yaml | 11 +- ...cated-elasticsearch-6.3.0-searchguard.yaml | 11 +- ...recated-elasticsearch-6.4-searchguard.yaml | 9 +- ...cated-elasticsearch-6.4.0-searchguard.yaml | 9 +- ...cated-elasticsearch-6.5.3-searchguard.yaml | 11 +- ...ated-elasticsearch-6.8.0-elasticstack.yaml | 11 +- ...cated-elasticsearch-6.8.1-searchguard.yaml | 11 +- ...ted-elasticsearch-6.8.10-elasticstack.yaml | 11 +- ...ted-elasticsearch-6.8.16-elasticstack.yaml | 9 +- ...ted-elasticsearch-6.8.22-elasticstack.yaml | 9 +- ...ated-elasticsearch-7.0.1-elasticstack.yaml | 11 +- ...ecated-elasticsearch-7.0.1-opendistro.yaml | 11 +- ...cated-elasticsearch-7.0.1-searchguard.yaml | 11 +- ...ated-elasticsearch-7.1.1-elasticstack.yaml | 11 +- ...ecated-elasticsearch-7.1.1-opendistro.yaml | 11 +- ...cated-elasticsearch-7.1.1-searchguard.yaml | 11 +- ...cated-elasticsearch-7.10.0-opendistro.yaml | 9 +- ...cated-elasticsearch-7.10.2-opendistro.yaml | 9 +- ...ated-elasticsearch-7.10.2-searchguard.yaml | 9 +- ...ted-elasticsearch-7.12.0-elasticstack.yaml | 11 +- ...eprecated-elasticsearch-7.12.0-kubedb.yaml | 9 +- ...ted-elasticsearch-7.13.2-elasticstack.yaml | 9 +- ...eprecated-elasticsearch-7.13.2-kubedb.yaml | 9 +- ...ted-elasticsearch-7.14.0-elasticstack.yaml | 9 +- ...eprecated-elasticsearch-7.14.0-kubedb.yaml | 9 +- ...ated-elasticsearch-7.14.2-searchguard.yaml | 9 +- ...ted-elasticsearch-7.16.2-elasticstack.yaml | 9 +- ...eprecated-elasticsearch-7.16.2-kubedb.yaml | 9 +- ...ed-elasticsearch-7.17.10-elasticstack.yaml | 9 +- ...ted-elasticsearch-7.17.3-elasticstack.yaml | 9 +- ...ated-elasticsearch-7.2.0-elasticstack.yaml | 11 +- ...ated-elasticsearch-7.2.1-elasticstack.yaml | 11 +- ...ecated-elasticsearch-7.2.1-opendistro.yaml | 11 +- ...ated-elasticsearch-7.3.2-elasticstack.yaml | 15 +- ...ecated-elasticsearch-7.3.2-opendistro.yaml | 11 +- ...cated-elasticsearch-7.3.2-searchguard.yaml | 9 +- ...ated-elasticsearch-7.4.2-elasticstack.yaml | 11 +- ...ecated-elasticsearch-7.4.2-opendistro.yaml | 11 +- ...ated-elasticsearch-7.5.2-elasticstack.yaml | 11 +- ...cated-elasticsearch-7.5.2-searchguard.yaml | 11 +- ...ecated-elasticsearch-7.6.1-opendistro.yaml | 15 +- ...ated-elasticsearch-7.6.2-elasticstack.yaml | 11 +- ...ecated-elasticsearch-7.7.0-opendistro.yaml | 11 +- ...ated-elasticsearch-7.7.1-elasticstack.yaml | 11 +- ...ated-elasticsearch-7.8.0-elasticstack.yaml | 11 +- ...ecated-elasticsearch-7.8.0-opendistro.yaml | 11 +- ...cated-elasticsearch-7.8.1-searchguard.yaml | 9 +- ...ated-elasticsearch-7.9.1-elasticstack.yaml | 13 +- ...deprecated-elasticsearch-7.9.1-kubedb.yaml | 9 +- ...ecated-elasticsearch-7.9.1-opendistro.yaml | 11 +- ...ated-elasticsearch-8.2.0-elasticstack.yaml | 9 +- ...deprecated-elasticsearch-8.2.0-kubedb.yaml | 9 +- ...ated-elasticsearch-8.5.2-elasticstack.yaml | 9 +- ...ated-elasticsearch-8.8.0-elasticstack.yaml | 9 +- .../elasticsearch-1.1.0-opensearch.yaml | 8 +- .../elasticsearch-1.2.4-opensearch.yaml | 8 +- .../elasticsearch-1.3.13-opensearch.yaml | 8 +- .../elasticsearch-2.0.1-opensearch.yaml | 8 +- .../elasticsearch-2.11.1-opensearch.yaml | 8 +- .../elasticsearch-2.5.0-opensearch.yaml | 8 +- .../elasticsearch-2.8.0-opensearch.yaml | 8 +- .../elasticsearch-6.8.23-elasticstack.yaml | 8 +- .../elasticsearch-7.13.4-elasticstack.yaml | 8 +- .../elasticsearch-7.14.2-elasticstack.yaml | 8 +- .../elasticsearch-7.16.3-elasticstack.yaml | 8 +- .../elasticsearch-7.17.15-elasticstack.yaml | 8 +- .../elasticsearch-7.9.3-searchguard.yaml | 8 +- .../elasticsearch-8.11.1-elasticstack.yaml | 8 +- .../elasticsearch-8.2.3-elasticstack.yaml | 8 +- .../elasticsearch-8.5.3-elasticstack.yaml | 8 +- .../elasticsearch-8.6.2-elasticstack.yaml | 8 +- .../elasticsearch-8.8.2-elasticstack.yaml | 8 +- .../elasticsearch/elasticsearch-psp.yaml | 7 +- .../templates/kafka/kafka-3.3.0.yaml | 8 +- .../templates/kafka/kafka-3.3.2.yaml | 8 +- .../templates/kafka/kafka-3.4.0.yaml | 8 +- .../templates/kafka/kafka-3.4.1.yaml | 8 +- .../templates/kafka/kafka-3.5.1.yaml | 8 +- .../templates/kafka/kafka-3.6.0.yaml | 8 +- .../templates/kafka/kafka-psp.yaml | 7 +- .../mariadb/deprecated-mariadb-10.10.2.yaml | 9 +- .../mariadb/deprecated-mariadb-10.11.2.yaml | 9 +- .../mariadb/deprecated-mariadb-10.4.17.yaml | 9 +- .../mariadb/deprecated-mariadb-10.4.31.yaml | 9 +- .../mariadb/deprecated-mariadb-10.5.8.yaml | 9 +- .../mariadb/deprecated-mariadb-10.6.4.yaml | 9 +- .../templates/mariadb/mariadb-10.10.7.yaml | 8 +- .../templates/mariadb/mariadb-10.11.6.yaml | 8 +- .../templates/mariadb/mariadb-10.4.32.yaml | 8 +- .../templates/mariadb/mariadb-10.5.23.yaml | 8 +- .../templates/mariadb/mariadb-10.6.16.yaml | 8 +- .../templates/mariadb/mariadb-11.0.4.yaml | 8 +- .../templates/mariadb/mariadb-11.1.3.yaml | 8 +- .../templates/mariadb/mariadb-11.2.2.yaml | 8 +- .../templates/mariadb/mariadb-psp.yaml | 7 +- .../memcached/deprecated-memcached-1.5.4.yaml | 11 +- .../memcached/deprecated-memcached-1.5.yaml | 11 +- .../templates/memcached/memcached-1.5.22.yaml | 8 +- .../templates/memcached/memcached-1.6.22.yaml | 8 +- .../templates/memcached/memcached-psp.yaml | 7 +- .../deprecated-mongodb-3.4-official.yaml | 15 +- .../deprecated-mongodb-3.4.17-official.yaml | 11 +- .../deprecated-mongodb-3.4.22-official.yaml | 15 +- .../deprecated-mongodb-3.6-official.yaml | 15 +- .../deprecated-mongodb-3.6.13-official.yaml | 15 +- .../deprecated-mongodb-3.6.18-percona.yaml | 9 +- .../deprecated-mongodb-3.6.8-official.yaml | 11 +- .../deprecated-mongodb-4.0.10-percona.yaml | 9 +- .../deprecated-mongodb-4.0.11-official.yaml | 15 +- .../deprecated-mongodb-4.0.3-official.yaml | 11 +- .../deprecated-mongodb-4.0.5-official.yaml | 19 +- .../deprecated-mongodb-4.1.13-official.yaml | 15 +- .../deprecated-mongodb-4.1.4-official.yaml | 11 +- .../deprecated-mongodb-4.1.7-official.yaml | 15 +- .../deprecated-mongodb-4.2.3-official.yaml | 11 +- .../deprecated-mongodb-4.4.6-official.yaml | 9 +- .../deprecated-mongodb-5.0.15-official.yaml | 9 +- .../deprecated-mongodb-5.0.2-official.yaml | 9 +- .../deprecated-mongodb-5.0.3-official.yaml | 9 +- .../deprecated-mongodb-6.0.5-official.yaml | 9 +- .../mongodb/mongodb-4.2.24-official.yaml | 8 +- .../mongodb/mongodb-4.2.7-percona.yaml | 8 +- .../mongodb/mongodb-4.4.10-percona.yaml | 8 +- .../mongodb/mongodb-4.4.26-official.yaml | 8 +- .../mongodb/mongodb-5.0.23-official.yaml | 8 +- .../mongodb/mongodb-6.0.12-official.yaml | 8 +- .../templates/mongodb/mongodb-psp.yaml | 7 +- .../mysql/deprecated-mysql-5-official.yaml | 11 +- .../mysql/deprecated-mysql-5.7-official.yaml | 11 +- .../deprecated-mysql-5.7.25-official.yaml | 19 +- .../deprecated-mysql-5.7.29-official.yaml | 15 +- .../deprecated-mysql-5.7.31-official.yaml | 13 +- .../deprecated-mysql-5.7.33-official.yaml | 11 +- .../deprecated-mysql-5.7.35-official.yaml | 11 +- .../deprecated-mysql-5.7.36-official.yaml | 9 +- .../deprecated-mysql-5.7.41-official.yaml | 9 +- .../mysql/deprecated-mysql-8-official.yaml | 11 +- .../mysql/deprecated-mysql-8.0-official.yaml | 9 +- .../deprecated-mysql-8.0.14-official.yaml | 17 +- .../deprecated-mysql-8.0.17-official.yaml | 9 +- .../deprecated-mysql-8.0.20-official.yaml | 15 +- .../deprecated-mysql-8.0.21-official.yaml | 13 +- .../deprecated-mysql-8.0.23-official.yaml | 11 +- .../deprecated-mysql-8.0.26-official.yaml | 9 +- .../mysql/deprecated-mysql-8.0.27-mysql.yaml | 9 +- .../deprecated-mysql-8.0.27-official.yaml | 9 +- .../deprecated-mysql-8.0.29-official.yaml | 9 +- .../deprecated-mysql-8.0.3-official.yaml | 19 +- .../deprecated-mysql-8.0.31-official.yaml | 9 +- .../deprecated-mysql-8.0.32-official.yaml | 9 +- .../mysql/mysql-5.7.44-official.yaml | 8 +- .../templates/mysql/mysql-8.0.31-mysql.yaml | 8 +- .../mysql/mysql-8.0.35-official.yaml | 8 +- .../templates/mysql/mysql-8.1.0-official.yaml | 8 +- .../templates/mysql/mysql-8.2.0-official.yaml | 8 +- .../templates/mysql/mysql-psp.yaml | 7 +- .../deprecated-perconaxtradb-5.7.yaml | 11 +- .../perconaxtradb/perconaxtradb-8.0.26.yaml | 8 +- .../perconaxtradb/perconaxtradb-8.0.28.yaml | 8 +- .../perconaxtradb/perconaxtradb-8.0.31.yaml | 8 +- .../perconaxtradb/perconaxtradb-psp.yaml | 7 +- .../templates/pgbouncer/pgbouncer-1.17.0.yaml | 8 +- .../templates/pgbouncer/pgbouncer-1.18.0.yaml | 8 +- .../deprecated-postgres-10.16-official.yaml | 11 +- .../deprecated-postgres-10.19-official.yaml | 11 +- .../deprecated-postgres-10.2-official.yaml | 19 +- .../deprecated-postgres-10.20-official.yaml | 11 +- .../deprecated-postgres-10.6-official.yaml | 15 +- .../deprecated-postgres-11.1-official.yaml | 15 +- .../deprecated-postgres-11.11-official.yaml | 11 +- .../deprecated-postgres-11.14-official.yaml | 11 +- .../deprecated-postgres-11.15-official.yaml | 11 +- .../deprecated-postgres-11.19-official.yaml | 11 +- .../deprecated-postgres-11.2-official.yaml | 11 +- .../deprecated-postgres-11.20-official.yaml | 11 +- .../deprecated-postgres-12.10-official.yaml | 11 +- .../deprecated-postgres-12.13-official.yaml | 11 +- .../deprecated-postgres-12.14-official.yaml | 11 +- .../deprecated-postgres-12.15-official.yaml | 11 +- .../deprecated-postgres-12.6-official.yaml | 11 +- .../deprecated-postgres-12.9-official.yaml | 11 +- .../deprecated-postgres-13.10-official.yaml | 11 +- .../deprecated-postgres-13.11-official.yaml | 11 +- .../deprecated-postgres-13.2-official.yaml | 11 +- .../deprecated-postgres-13.5-official.yaml | 11 +- .../deprecated-postgres-13.6-official.yaml | 11 +- .../deprecated-postgres-13.9-official.yaml | 11 +- .../deprecated-postgres-14.1-official.yaml | 11 +- .../deprecated-postgres-14.2-official.yaml | 11 +- .../deprecated-postgres-14.6-official.yaml | 11 +- .../deprecated-postgres-14.7-official.yaml | 11 +- .../deprecated-postgres-14.8-official.yaml | 11 +- .../deprecated-postgres-15.1-official.yaml | 11 +- .../deprecated-postgres-15.2-official.yaml | 11 +- .../deprecated-postgres-15.3-official.yaml | 11 +- .../deprecated-postgres-9.6-official.yaml | 19 +- .../deprecated-postgres-9.6.21-official.yaml | 11 +- .../deprecated-postgres-9.6.24-official.yaml | 11 +- .../deprecated-postgres-9.6.7-official.yaml | 19 +- .../postgres/postgres-10.23-official.yaml | 11 +- .../postgres/postgres-11.11-timescaledb.yaml | 8 +- .../postgres/postgres-11.14-postgis.yaml | 8 +- .../postgres/postgres-11.22-official.yaml | 11 +- .../postgres/postgres-12.17-official.yaml | 11 +- .../postgres/postgres-12.6-timescaledb.yaml | 8 +- .../postgres/postgres-12.9-postgis.yaml | 8 +- .../postgres/postgres-13.13-official.yaml | 11 +- .../postgres/postgres-13.2-timescaledb.yaml | 8 +- .../postgres/postgres-13.5-postgis.yaml | 8 +- .../postgres/postgres-14.1-postgis.yaml | 8 +- .../postgres/postgres-14.1-timescaledb.yaml | 8 +- .../postgres/postgres-14.10-official.yaml | 11 +- .../postgres/postgres-15.5-official.yaml | 11 +- .../postgres/postgres-16.1-official.yaml | 11 +- .../templates/postgres/postgres-psp.yaml | 7 +- .../proxysql/deprecated-proxysql-2.0.4.yaml | 9 +- .../proxysql/deprecated-proxysql-2.3.2.yaml | 9 +- .../proxysql/proxysql-2.3.2-centos.yaml | 8 +- .../proxysql/proxysql-2.3.2-debian.yaml | 8 +- .../proxysql/proxysql-2.4.4-centos.yaml | 8 +- .../proxysql/proxysql-2.4.4-debian.yaml | 8 +- .../templates/proxysql/proxysql-psp.yaml | 7 +- .../redis/deprecated-redis-4.0.6.yaml | 13 +- .../templates/redis/deprecated-redis-4.0.yaml | 13 +- .../templates/redis/deprecated-redis-4.yaml | 11 +- .../redis/deprecated-redis-5.0.3.yaml | 11 +- .../templates/redis/deprecated-redis-5.0.yaml | 11 +- .../redis/deprecated-redis-6.0.18.yaml | 9 +- .../redis/deprecated-redis-6.0.6.yaml | 9 +- .../redis/deprecated-redis-6.2.11.yaml | 9 +- .../redis/deprecated-redis-6.2.5.yaml | 9 +- .../redis/deprecated-redis-6.2.7.yaml | 9 +- .../redis/deprecated-redis-6.2.8.yaml | 9 +- .../redis/deprecated-redis-7.0.10.yaml | 9 +- .../redis/deprecated-redis-7.0.4.yaml | 9 +- .../redis/deprecated-redis-7.0.5.yaml | 9 +- .../redis/deprecated-redis-7.0.6.yaml | 9 +- .../redis/deprecated-redis-7.0.9.yaml | 9 +- .../redis/deprecated-redis-7.2.0.yaml | 9 +- .../templates/redis/redis-4.0.11.yaml | 8 +- .../templates/redis/redis-5.0.14.yaml | 8 +- .../templates/redis/redis-6.0.20.yaml | 8 +- .../templates/redis/redis-6.2.14.yaml | 8 +- .../templates/redis/redis-7.0.14.yaml | 8 +- .../templates/redis/redis-7.2.3.yaml | 8 +- .../templates/redis/redis-psp.yaml | 7 +- .../values.openapiv3_schema.yaml | 31 +- charts/kubedb-catalog/values.yaml | 47 +- charts/kubedb-crd-manager/templates/job.yaml | 7 +- charts/kubedb-kubestash-catalog/README.md | 74 +- .../elasticsearch/elasticsearch-addon.yaml | 8 +- .../elasticsearch/elasticsearch-backup.yaml | 8 +- .../elasticsearch/elasticsearch-restore.yaml | 8 +- .../kubedbmanifest/kubedbmanifest-backup.yaml | 1 - .../kubedbmanifest-restore.yaml | 1 - .../templates/mongodb/mongodb-addon.yaml | 8 +- .../templates/mongodb/mongodb-backup.yaml | 8 +- .../mongodb/mongodb-csi-snapshotter.yaml | 8 +- .../templates/mongodb/mongodb-restore.yaml | 8 +- .../templates/mysql/mysql-addon.yaml | 8 +- .../templates/mysql/mysql-backup.yaml | 8 +- .../mysql/mysql-csi-snapshotter.yaml | 8 +- .../templates/mysql/mysql-restore.yaml | 8 +- .../opensearch/opensearch-addon.yaml | 8 +- .../opensearch/opensearch-backup.yaml | 8 +- .../opensearch/opensearch-restore.yaml | 8 +- .../templates/postgres/postgres-addon.yaml | 8 +- .../templates/postgres/postgres-backup.yaml | 8 +- .../postgres/postgres-csi-snapshotter.yaml | 8 +- .../templates/postgres/postgres-restore.yaml | 8 +- .../templates/redis/redis-addon.yaml | 8 +- .../templates/redis/redis-backup.yaml | 8 +- .../templates/redis/redis-restore.yaml | 8 +- .../values.openapiv3_schema.yaml | 23 +- charts/kubedb-kubestash-catalog/values.yaml | 36 +- charts/kubedb-one/README.md | 88 +- charts/kubedb-one/values.yaml | 33 +- charts/kubedb/README.md | 84 +- charts/kubedb/values.openapiv3_schema.yaml | 1531 +++++++++++++++-- charts/kubedb/values.yaml | 47 +- 299 files changed, 4011 insertions(+), 992 deletions(-) rename catalog/kubestash/fmt/templates/{object.yaml => app.yaml} (99%) create mode 100644 catalog/kubestash/fmt/templates/db.yaml diff --git a/apis/installer/v1alpha1/kubedb_catalog_types.go b/apis/installer/v1alpha1/kubedb_catalog_types.go index fcc301697..f5edcd8be 100644 --- a/apis/installer/v1alpha1/kubedb_catalog_types.go +++ b/apis/installer/v1alpha1/kubedb_catalog_types.go @@ -46,7 +46,7 @@ type KubedbCatalogSpec struct { FullnameOverride string `json:"fullnameOverride"` //+optional Proxies RegistryProxies `json:"proxies"` - Catalog Catalog `json:"catalog"` + FeatureGates map[string]bool `json:"featureGates"` Psp PSP `json:"psp"` SkipDeprecated bool `json:"skipDeprecated"` } @@ -69,33 +69,6 @@ type RegistryProxies struct { AppsCode string `json:"appscode"` } -type Catalog struct { - //+optional - Elasticsearch bool `json:"elasticsearch"` - //+optional - Etcd bool `json:"etcd"` - //+optional - Memcached bool `json:"memcached"` - //+optional - MongoDB bool `json:"mongodb"` - //+optional - Mysql bool `json:"mysql"` - //+optional - MariaDB bool `json:"mariadb"` - //+optional - Perconaxtradb bool `json:"perconaxtradb"` - //+optional - Pgbouncer bool `json:"pgbouncer"` - //+optional - Postgres bool `json:"postgres"` - //+optional - Proxysql bool `json:"proxysql"` - //+optional - Redis bool `json:"redis"` - //+optional - Kafka bool `json:"kafka"` -} - type PSP struct { Enabled bool `json:"enabled"` //+optional diff --git a/apis/installer/v1alpha1/kubedb_kubestash_catalog_types.go b/apis/installer/v1alpha1/kubedb_kubestash_catalog_types.go index 0c2736173..2fe203222 100644 --- a/apis/installer/v1alpha1/kubedb_kubestash_catalog_types.go +++ b/apis/installer/v1alpha1/kubedb_kubestash_catalog_types.go @@ -45,6 +45,7 @@ type KubedbKubestashCatalog struct { type KubedbKubestashCatalogSpec struct { //+optional Proxies RegistryProxies `json:"proxies"` + FeatureGates map[string]bool `json:"featureGates"` WaitTimeout int64 `json:"waitTimeout"` Elasticsearch StashElasticsearchSpec `json:"elasticsearch"` Opensearch StashOpensearchSpec `json:"opensearch"` @@ -57,7 +58,6 @@ type KubedbKubestashCatalogSpec struct { // StashElasticsearchSpec is the schema for Stash Elasticsearch values file type StashElasticsearchSpec struct { - Enabled bool `json:"enabled"` Backup ElasticsearchBackup `json:"backup"` Restore ElasticsearchRestore `json:"restore"` } @@ -74,7 +74,6 @@ type ElasticsearchRestore struct { // StashOpensearchSpec is the schema for Stash Opensearch values file type StashOpensearchSpec struct { - Enabled bool `json:"enabled"` Backup OpensearchBackup `json:"backup"` Restore OpensearchRestore `json:"restore"` } @@ -106,7 +105,6 @@ type KubeDumpBackup struct { // StashMongodbSpec is the schema for Stash MongoDB values file type StashMongodbSpec struct { - Enabled bool `json:"enabled"` MaxConcurrency int32 `json:"maxConcurrency"` Backup MongoDBBackup `json:"backup"` Restore MongoDBRestore `json:"restore"` @@ -124,7 +122,6 @@ type MongoDBRestore struct { // StashMysqlSpec is the schema for Stash MySQL values file type StashMysqlSpec struct { - Enabled bool `json:"enabled"` Backup MySQLBackup `json:"backup"` Restore MySQLRestore `json:"restore"` } @@ -141,7 +138,6 @@ type MySQLRestore struct { // StashRedisSpec is the schema for Stash Redis values file type StashRedisSpec struct { - Enabled bool `json:"enabled"` Backup RedisBackup `json:"backup"` Restore RedisRestore `json:"restore"` } @@ -158,7 +154,6 @@ type RedisRestore struct { // StashPostgresSpec is the schema for Stash Postgres values file type StashPostgresSpec struct { - Enabled bool `json:"enabled"` Backup PostgresBackup `json:"backup"` Restore PostgresRestore `json:"restore"` } diff --git a/apis/installer/v1alpha1/kubedb_types.go b/apis/installer/v1alpha1/kubedb_types.go index 92ac8ea0d..75428a9f2 100644 --- a/apis/installer/v1alpha1/kubedb_types.go +++ b/apis/installer/v1alpha1/kubedb_types.go @@ -43,6 +43,9 @@ type Kubedb struct { type KubedbSpec struct { Global GlobalValues `json:"global"` + //+optional + KubedbCrdManager KubedbCrdManagerValues `json:"kubedb-crd-manager"` + //+optional KubedbProvisioner KubedbProvisionerValues `json:"kubedb-provisioner"` @@ -71,6 +74,11 @@ type KubedbSpec struct { KubedbMetrics KubedbMetricsValues `json:"kubedb-metrics"` } +type KubedbCrdManagerValues struct { + Enabled *bool `json:"enabled"` + *KubedbCrdManagerSpec `json:",inline,omitempty"` +} + type KubedbProvisionerValues struct { Enabled *bool `json:"enabled"` *KubedbProvisionerSpec `json:",inline,omitempty"` @@ -123,6 +131,7 @@ type GlobalValues struct { InsecureRegistries []string `json:"insecureRegistries"` //+optional ImagePullSecrets []core.LocalObjectReference `json:"imagePullSecrets"` + FeatureGates map[string]bool `json:"featureGates"` Monitoring EASMonitoring `json:"monitoring"` } diff --git a/apis/installer/v1alpha1/zz_generated.deepcopy.go b/apis/installer/v1alpha1/zz_generated.deepcopy.go index 96fa4d92a..73ddfad5c 100644 --- a/apis/installer/v1alpha1/zz_generated.deepcopy.go +++ b/apis/installer/v1alpha1/zz_generated.deepcopy.go @@ -58,22 +58,6 @@ func (in *AzureProviderConfig) DeepCopy() *AzureProviderConfig { return out } -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *Catalog) DeepCopyInto(out *Catalog) { - *out = *in - return -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Catalog. -func (in *Catalog) DeepCopy() *Catalog { - if in == nil { - return nil - } - out := new(Catalog) - in.DeepCopyInto(out) - return out -} - // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *Container) DeepCopyInto(out *Container) { *out = *in @@ -225,6 +209,13 @@ func (in *GlobalValues) DeepCopyInto(out *GlobalValues) { *out = make([]v1.LocalObjectReference, len(*in)) copy(*out, *in) } + if in.FeatureGates != nil { + in, out := &in.FeatureGates, &out.FeatureGates + *out = make(map[string]bool, len(*in)) + for key, val := range *in { + (*out)[key] = val + } + } in.Monitoring.DeepCopyInto(&out.Monitoring) return } @@ -487,7 +478,7 @@ func (in *KubedbCatalog) DeepCopyInto(out *KubedbCatalog) { *out = *in out.TypeMeta = in.TypeMeta in.ObjectMeta.DeepCopyInto(&out.ObjectMeta) - out.Spec = in.Spec + in.Spec.DeepCopyInto(&out.Spec) return } @@ -546,7 +537,13 @@ func (in *KubedbCatalogList) DeepCopyObject() runtime.Object { func (in *KubedbCatalogSpec) DeepCopyInto(out *KubedbCatalogSpec) { *out = *in out.Proxies = in.Proxies - out.Catalog = in.Catalog + if in.FeatureGates != nil { + in, out := &in.FeatureGates, &out.FeatureGates + *out = make(map[string]bool, len(*in)) + for key, val := range *in { + (*out)[key] = val + } + } out.Psp = in.Psp return } @@ -572,7 +569,7 @@ func (in *KubedbCatalogValues) DeepCopyInto(out *KubedbCatalogValues) { if in.KubedbCatalogSpec != nil { in, out := &in.KubedbCatalogSpec, &out.KubedbCatalogSpec *out = new(KubedbCatalogSpec) - **out = **in + (*in).DeepCopyInto(*out) } return } @@ -714,6 +711,32 @@ func (in *KubedbCrdManagerSpec) DeepCopy() *KubedbCrdManagerSpec { return out } +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *KubedbCrdManagerValues) DeepCopyInto(out *KubedbCrdManagerValues) { + *out = *in + if in.Enabled != nil { + in, out := &in.Enabled, &out.Enabled + *out = new(bool) + **out = **in + } + if in.KubedbCrdManagerSpec != nil { + in, out := &in.KubedbCrdManagerSpec, &out.KubedbCrdManagerSpec + *out = new(KubedbCrdManagerSpec) + (*in).DeepCopyInto(*out) + } + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new KubedbCrdManagerValues. +func (in *KubedbCrdManagerValues) DeepCopy() *KubedbCrdManagerValues { + if in == nil { + return nil + } + out := new(KubedbCrdManagerValues) + in.DeepCopyInto(out) + return out +} + // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *KubedbDashboard) DeepCopyInto(out *KubedbDashboard) { *out = *in @@ -863,7 +886,7 @@ func (in *KubedbKubestashCatalog) DeepCopyInto(out *KubedbKubestashCatalog) { *out = *in out.TypeMeta = in.TypeMeta in.ObjectMeta.DeepCopyInto(&out.ObjectMeta) - out.Spec = in.Spec + in.Spec.DeepCopyInto(&out.Spec) return } @@ -922,6 +945,13 @@ func (in *KubedbKubestashCatalogList) DeepCopyObject() runtime.Object { func (in *KubedbKubestashCatalogSpec) DeepCopyInto(out *KubedbKubestashCatalogSpec) { *out = *in out.Proxies = in.Proxies + if in.FeatureGates != nil { + in, out := &in.FeatureGates, &out.FeatureGates + *out = make(map[string]bool, len(*in)) + for key, val := range *in { + (*out)[key] = val + } + } out.Elasticsearch = in.Elasticsearch out.Opensearch = in.Opensearch out.Kubedbmanifest = in.Kubedbmanifest @@ -948,7 +978,7 @@ func (in *KubedbKubestashCatalogValues) DeepCopyInto(out *KubedbKubestashCatalog if in.KubedbKubestashCatalogSpec != nil { in, out := &in.KubedbKubestashCatalogSpec, &out.KubedbKubestashCatalogSpec *out = new(KubedbKubestashCatalogSpec) - **out = **in + (*in).DeepCopyInto(*out) } return } @@ -1824,6 +1854,7 @@ func (in *KubedbSchemaManagerValues) DeepCopy() *KubedbSchemaManagerValues { func (in *KubedbSpec) DeepCopyInto(out *KubedbSpec) { *out = *in in.Global.DeepCopyInto(&out.Global) + in.KubedbCrdManager.DeepCopyInto(&out.KubedbCrdManager) in.KubedbProvisioner.DeepCopyInto(&out.KubedbProvisioner) in.KubedbCatalog.DeepCopyInto(&out.KubedbCatalog) in.KubedbKubestashCatalog.DeepCopyInto(&out.KubedbKubestashCatalog) diff --git a/catalog/kubedb/fmt/main.go b/catalog/kubedb/fmt/main.go index 8b23cea60..29b7d1fd3 100644 --- a/catalog/kubedb/fmt/main.go +++ b/catalog/kubedb/fmt/main.go @@ -484,9 +484,9 @@ func main() { { for k, v := range dbStore { dbKind := strings.TrimSuffix(k.Kind, "Version") - var buf bytes.Buffer - for i, obj := range v { + copies := make([]map[string]any, 0, len(v)) + for _, obj := range v { objCopy := obj.DeepCopy() spec, _, err := unstructured.NestedMap(objCopy.Object, "spec") @@ -538,23 +538,38 @@ func main() { templatizeRegistry("yqImage") templatizeRegistry("walg", "image") } - - if i > 0 { - buf.WriteString("\n---\n") - } - - data := map[string]interface{}{ - "key": strings.ToLower(dbKind), - "object": objCopy.Object, - } - funcMap := sprig.TxtFuncMap() - funcMap["toYaml"] = toYAML - funcMap["toJson"] = toJSON - tpl := template.Must(template.New("").Funcs(funcMap).Parse(templates.DBVersion)) - err = tpl.Execute(&buf, &data) - if err != nil { - panic(err) - } + copies = append(copies, objCopy.UnstructuredContent()) + + //if i > 0 { + // buf.WriteString("\n---\n") + //} + + //data := map[string]interface{}{ + // "kind": dbKind, + // "object": objCopy.Object, + //} + //funcMap := sprig.TxtFuncMap() + //funcMap["toYaml"] = toYAML + //funcMap["toJson"] = toJSON + //tpl := template.Must(template.New("").Funcs(funcMap).Parse(templates.DBVersion)) + //err = tpl.Execute(&buf, &data) + //if err != nil { + // panic(err) + //} + } + + data := map[string]interface{}{ + "kind": dbKind, + "objects": copies, + } + funcMap := sprig.TxtFuncMap() + funcMap["toYaml"] = toYAML + funcMap["toJson"] = toJSON + tpl := template.Must(template.New("").Funcs(funcMap).Parse(templates.DBVersion)) + var buf bytes.Buffer + err = tpl.Execute(&buf, &data) + if err != nil { + panic(err) } var filenameparts []string @@ -598,7 +613,7 @@ func main() { unstructured.RemoveNestedField(content, "spec", "allowPrivilegeEscalation") unstructured.RemoveNestedField(content, "spec", "privileged") data := map[string]interface{}{ - "key": strings.ToLower(dbKind), + "kind": dbKind, "object": content, } funcMap := sprig.TxtFuncMap() diff --git a/catalog/kubedb/fmt/templates/dbver.yaml b/catalog/kubedb/fmt/templates/dbver.yaml index f3389479e..c5bc2aa66 100644 --- a/catalog/kubedb/fmt/templates/dbver.yaml +++ b/catalog/kubedb/fmt/templates/dbver.yaml @@ -1,14 +1,26 @@ -{{ if .object.spec.deprecated }} -{{- "{{ if and .Values.catalog."}}{{ .key }}{{" (not .Values.skipDeprecated) }}" -}} -{{ else }} -{{- "{{ if .Values.catalog."}}{{ .key }}{{" }}" -}} +{{ "{{ $featureGates := .Values.featureGates }}" }} +{{ "{{- if .Values.global }}" }} +{{ " {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }}" }} +{{ "{{- end }}" }} + +{{ "{{ if $featureGates."}}{{ .kind }}{{" }}" }} +{{- range $idx, $object := .objects }} +{{ if gt $idx 0 }} +--- {{ end }} -apiVersion: {{ .object.apiVersion }} -kind: {{ .object.kind }} +{{- if $object.spec.deprecated }} +{{- "{{ if not .Values.skipDeprecated }}" -}} +{{- end }} +apiVersion: {{ $object.apiVersion }} +kind: {{ $object.kind }} metadata: - name: '{{ .object.metadata.name }}' + name: '{{ $object.metadata.name }}' labels: {{"{{- include \"kubedb-catalog.labels\" . | nindent 4 }}"}} spec: - {{- .object.spec | toYaml | nindent 2 }} + {{- $object.spec | toYaml | nindent 2 }} +{{- if $object.spec.deprecated }} +{{ "{{ end }}" }} +{{- end -}} +{{- end }} {{"{{ end }}"}} diff --git a/catalog/kubedb/fmt/templates/psp.yaml b/catalog/kubedb/fmt/templates/psp.yaml index a4ea371cb..745f7dd38 100644 --- a/catalog/kubedb/fmt/templates/psp.yaml +++ b/catalog/kubedb/fmt/templates/psp.yaml @@ -1,4 +1,9 @@ -{{"{{ if and .Values.psp.enabled (.Capabilities.APIVersions.Has \"policy/v1beta1/PodSecurityPolicy\") .Values.catalog."}}{{ .key }}{{" }}"}} +{{ "{{ $featureGates := .Values.featureGates }}" }} +{{ "{{- if .Values.global }}" }} +{{ " {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }}" }} +{{ "{{- end }}" }} + +{{"{{ if and .Values.psp.enabled (.Capabilities.APIVersions.Has \"policy/v1beta1/PodSecurityPolicy\") $featureGates."}}{{ .kind }}{{" }}"}} apiVersion: {{ .object.apiVersion }} kind: {{ .object.kind }} metadata: @@ -6,7 +11,7 @@ metadata: labels: {{"{{- include \"kubedb-catalog.labels\" . | nindent 4 }}"}} spec: - allowPrivilegeEscalation: {{"{{ .Values.psp."}}{{ .key }}{{".allowPrivilegeEscalation }}"}} - privileged: {{"{{ .Values.psp."}}{{ .key }}{{".privileged }}"}} + allowPrivilegeEscalation: {{"{{ .Values.psp."}}{{ .kind | lower }}{{".allowPrivilegeEscalation }}"}} + privileged: {{"{{ .Values.psp."}}{{ .kind | lower }}{{".privileged }}"}} {{- .object.spec | toYaml | nindent 2 }} {{"{{ end }}"}} diff --git a/catalog/kubestash/fmt/main.go b/catalog/kubestash/fmt/main.go index 13ada0eba..09ff22698 100644 --- a/catalog/kubestash/fmt/main.go +++ b/catalog/kubestash/fmt/main.go @@ -78,6 +78,32 @@ func CompareFullVersions(vi FullVersion, vj FullVersion) bool { return Compare(vi.CatalogName, vj.CatalogName) } +var appToKind = map[string]string{ + "cassandra": "Cassandra", + "clickHouse": "ClickHouse", + "druid": "Druid", + "elasticsearch": "Elasticsearch", + "opensearch": "Elasticsearch", + "etcd": "Etcd", + "ferretdb": "FerretDB", + "kafka": "Kafka", + "mariadb": "MariaDB", + "memcached": "Memcached", + "microsoftsqlserver": "MicrosoftSQLServer", + "mongodb": "MongoDB", + "mysql": "MySQL", + "perconaxtradb": "PerconaXtraDB", + "pgbouncer": "PgBouncer", + "pgpool": "PgPool", + "postgres": "Postgres", + "proxysql": "ProxySQL", + "rabbitmq": "RabbitMQ", + "redis": "Redis", + "singlestore": "SingleStore", + "solr": "Solr", + "zookeeper": "ZooKeeper", +} + func main() { dir, err := os.Getwd() if err != nil { @@ -263,14 +289,22 @@ func main() { if err != nil { panic(err) } + + tplText := templates.App data := map[string]interface{}{ "app": app, "object": obj.UnstructuredContent(), } + kind, isDB := appToKind[app] + if isDB { + data["kind"] = kind + tplText = templates.DB + } + funcMap := sprig.TxtFuncMap() funcMap["toYaml"] = toYAML funcMap["toJson"] = toJSON - tpl := template.Must(template.New("").Funcs(funcMap).Parse(templates.Object)) + tpl := template.Must(template.New("").Funcs(funcMap).Parse(tplText)) buf.Reset() err = tpl.Execute(&buf, &data) if err != nil { diff --git a/catalog/kubestash/fmt/templates/object.yaml b/catalog/kubestash/fmt/templates/app.yaml similarity index 99% rename from catalog/kubestash/fmt/templates/object.yaml rename to catalog/kubestash/fmt/templates/app.yaml index bb5a53bb0..7ff7c0d5b 100644 --- a/catalog/kubestash/fmt/templates/object.yaml +++ b/catalog/kubestash/fmt/templates/app.yaml @@ -8,4 +8,3 @@ metadata: spec: {{- .object.spec | toYaml | nindent 2 }} {{"{{ end }}"}} - diff --git a/catalog/kubestash/fmt/templates/db.yaml b/catalog/kubestash/fmt/templates/db.yaml new file mode 100644 index 000000000..d4a9afee9 --- /dev/null +++ b/catalog/kubestash/fmt/templates/db.yaml @@ -0,0 +1,15 @@ +{{ "{{ $featureGates := .Values.featureGates }}" }} +{{ "{{- if .Values.global }}" }} +{{ " {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }}" }} +{{ "{{- end }}" }} + +{{"{{ if $featureGates."}}{{ .kind }}{{" }}"}} +apiVersion: {{ .object.apiVersion }} +kind: {{ .object.kind }} +metadata: + name: '{{ .object.metadata.name }}' + labels: + {{"{{- include \"kubedb-kubestash-catalog.labels\" . | nindent 4 }}"}} +spec: + {{- .object.spec | toYaml | nindent 2 }} +{{"{{ end }}"}} diff --git a/catalog/kubestash/fmt/templates/lib.go b/catalog/kubestash/fmt/templates/lib.go index 8f921dfb3..ab5a7d918 100644 --- a/catalog/kubestash/fmt/templates/lib.go +++ b/catalog/kubestash/fmt/templates/lib.go @@ -20,5 +20,8 @@ import ( _ "embed" ) -//go:embed object.yaml -var Object string +//go:embed app.yaml +var App string + +//go:embed db.yaml +var DB string diff --git a/charts/kubedb-catalog/README.md b/charts/kubedb-catalog/README.md index 9c88b5bd0..457b7565d 100644 --- a/charts/kubedb-catalog/README.md +++ b/charts/kubedb-catalog/README.md @@ -54,18 +54,28 @@ The following table lists the configurable parameters of the `kubedb-catalog` ch | proxies.ghcr | | ghcr.io | | proxies.kubernetes | | registry.k8s.io | | proxies.appscode | | r.appscode.com | -| catalog.elasticsearch | If true, deploys Elasticsearch version catalog | true | -| catalog.etcd | If true, deploys Etcd version catalog | true | -| catalog.memcached | If true, deploys Memcached version catalog | true | -| catalog.mongodb | If true, deploys MongoDB version catalog | true | -| catalog.mysql | If true, deploys MySQL version catalog | true | -| catalog.mariadb | If true, deploys MariaDB version catalog | true | -| catalog.perconaxtradb | If true, deploys Percona XtraDB version catalog | true | -| catalog.pgbouncer | If true, deploys PgBouncer version catalog | true | -| catalog.postgres | If true, deploys PostgreSQL version catalog | true | -| catalog.proxysql | If true, deploys ProxySQL version catalog | true | -| catalog.redis | If true, deploys Redis version catalog | true | -| catalog.kafka | | true | +| featureGates.Cassandra | | false | +| featureGates.ClickHouse | | false | +| featureGates.Druid | | false | +| featureGates.Elasticsearch | | true | +| featureGates.Etcd | | false | +| featureGates.FerretDB | | false | +| featureGates.Kafka | | true | +| featureGates.MariaDB | | true | +| featureGates.Memcached | | true | +| featureGates.MicrosoftSQLServer | | false | +| featureGates.MongoDB | | true | +| featureGates.MySQL | | true | +| featureGates.PerconaXtraDB | | true | +| featureGates.PgBouncer | | true | +| featureGates.PgPool | | false | +| featureGates.Postgres | | true | +| featureGates.ProxySQL | | true | +| featureGates.RabbitMQ | | false | +| featureGates.Redis | | true | +| featureGates.SingleStore | | false | +| featureGates.Solr | | false | +| featureGates.ZooKeeper | | false | | psp.enabled | | true | | psp.elasticsearch.allowPrivilegeEscalation | | true | | psp.elasticsearch.privileged | | true | diff --git a/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-1.2.2-opensearch.yaml b/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-1.2.2-opensearch.yaml index 1074279fe..a97249077 100644 --- a/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-1.2.2-opensearch.yaml +++ b/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-1.2.2-opensearch.yaml @@ -1,4 +1,10 @@ -{{ if and .Values.catalog.elasticsearch (not .Values.skipDeprecated) }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Elasticsearch }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: ElasticsearchVersion metadata: @@ -39,3 +45,4 @@ spec: value: --match=^(?![.])(?!security-auditlog)(?!kubedb-system).+ version: 1.2.2 {{ end }} +{{ end }} diff --git a/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-1.3.2-opensearch.yaml b/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-1.3.2-opensearch.yaml index bb821faf0..c4f865b3e 100644 --- a/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-1.3.2-opensearch.yaml +++ b/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-1.3.2-opensearch.yaml @@ -1,4 +1,10 @@ -{{ if and .Values.catalog.elasticsearch (not .Values.skipDeprecated) }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Elasticsearch }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: ElasticsearchVersion metadata: @@ -39,3 +45,4 @@ spec: value: --match=^(?![.])(?!security-auditlog)(?!kubedb-system).+ version: 1.3.2 {{ end }} +{{ end }} diff --git a/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-5.6-searchguard.yaml b/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-5.6-searchguard.yaml index 6565f8057..0409aed72 100644 --- a/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-5.6-searchguard.yaml +++ b/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-5.6-searchguard.yaml @@ -1,4 +1,10 @@ -{{ if and .Values.catalog.elasticsearch (not .Values.skipDeprecated) }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Elasticsearch }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: ElasticsearchVersion metadata: @@ -22,7 +28,7 @@ spec: {{ end }} --- -{{ if and .Values.catalog.elasticsearch (not .Values.skipDeprecated) }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: ElasticsearchVersion metadata: @@ -44,3 +50,4 @@ spec: databasePolicyName: elasticsearch-db version: "5.6" {{ end }} +{{ end }} diff --git a/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-5.6.16-kubedb.yaml b/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-5.6.16-kubedb.yaml index ce2d3d0b3..91ab3d305 100644 --- a/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-5.6.16-kubedb.yaml +++ b/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-5.6.16-kubedb.yaml @@ -1,4 +1,10 @@ -{{ if and .Values.catalog.elasticsearch (not .Values.skipDeprecated) }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Elasticsearch }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: ElasticsearchVersion metadata: @@ -32,3 +38,4 @@ spec: name: elasticsearch-restore-5.6.4 version: 5.6.16 {{ end }} +{{ end }} diff --git a/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-5.6.4-searchguard.yaml b/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-5.6.4-searchguard.yaml index 7ff88a335..6bffadf01 100644 --- a/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-5.6.4-searchguard.yaml +++ b/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-5.6.4-searchguard.yaml @@ -1,4 +1,10 @@ -{{ if and .Values.catalog.elasticsearch (not .Values.skipDeprecated) }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Elasticsearch }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: ElasticsearchVersion metadata: @@ -22,7 +28,7 @@ spec: {{ end }} --- -{{ if and .Values.catalog.elasticsearch (not .Values.skipDeprecated) }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: ElasticsearchVersion metadata: @@ -44,3 +50,4 @@ spec: databasePolicyName: elasticsearch-db version: 5.6.4 {{ end }} +{{ end }} diff --git a/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-6.2-searchguard.yaml b/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-6.2-searchguard.yaml index bea2a3670..39b44b73c 100644 --- a/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-6.2-searchguard.yaml +++ b/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-6.2-searchguard.yaml @@ -1,4 +1,10 @@ -{{ if and .Values.catalog.elasticsearch (not .Values.skipDeprecated) }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Elasticsearch }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: ElasticsearchVersion metadata: @@ -22,7 +28,7 @@ spec: {{ end }} --- -{{ if and .Values.catalog.elasticsearch (not .Values.skipDeprecated) }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: ElasticsearchVersion metadata: @@ -44,3 +50,4 @@ spec: databasePolicyName: elasticsearch-db version: "6.2" {{ end }} +{{ end }} diff --git a/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-6.2.4-searchguard.yaml b/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-6.2.4-searchguard.yaml index ec52f41ea..06be80517 100644 --- a/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-6.2.4-searchguard.yaml +++ b/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-6.2.4-searchguard.yaml @@ -1,4 +1,10 @@ -{{ if and .Values.catalog.elasticsearch (not .Values.skipDeprecated) }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Elasticsearch }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: ElasticsearchVersion metadata: @@ -22,7 +28,7 @@ spec: {{ end }} --- -{{ if and .Values.catalog.elasticsearch (not .Values.skipDeprecated) }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: ElasticsearchVersion metadata: @@ -44,3 +50,4 @@ spec: databasePolicyName: elasticsearch-db version: 6.2.4 {{ end }} +{{ end }} diff --git a/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-6.3-searchguard.yaml b/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-6.3-searchguard.yaml index 528e1a428..b245895ee 100644 --- a/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-6.3-searchguard.yaml +++ b/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-6.3-searchguard.yaml @@ -1,4 +1,10 @@ -{{ if and .Values.catalog.elasticsearch (not .Values.skipDeprecated) }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Elasticsearch }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: ElasticsearchVersion metadata: @@ -22,7 +28,7 @@ spec: {{ end }} --- -{{ if and .Values.catalog.elasticsearch (not .Values.skipDeprecated) }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: ElasticsearchVersion metadata: @@ -44,3 +50,4 @@ spec: databasePolicyName: elasticsearch-db version: "6.3" {{ end }} +{{ end }} diff --git a/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-6.3.0-searchguard.yaml b/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-6.3.0-searchguard.yaml index 6c23a2ae2..7aab99485 100644 --- a/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-6.3.0-searchguard.yaml +++ b/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-6.3.0-searchguard.yaml @@ -1,4 +1,10 @@ -{{ if and .Values.catalog.elasticsearch (not .Values.skipDeprecated) }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Elasticsearch }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: ElasticsearchVersion metadata: @@ -22,7 +28,7 @@ spec: {{ end }} --- -{{ if and .Values.catalog.elasticsearch (not .Values.skipDeprecated) }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: ElasticsearchVersion metadata: @@ -44,3 +50,4 @@ spec: databasePolicyName: elasticsearch-db version: 6.3.0 {{ end }} +{{ end }} diff --git a/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-6.4-searchguard.yaml b/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-6.4-searchguard.yaml index 3e3d19c8a..81e899780 100644 --- a/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-6.4-searchguard.yaml +++ b/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-6.4-searchguard.yaml @@ -1,4 +1,10 @@ -{{ if and .Values.catalog.elasticsearch (not .Values.skipDeprecated) }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Elasticsearch }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: ElasticsearchVersion metadata: @@ -20,3 +26,4 @@ spec: databasePolicyName: elasticsearch-db version: "6.4" {{ end }} +{{ end }} diff --git a/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-6.4.0-searchguard.yaml b/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-6.4.0-searchguard.yaml index a72e4a39e..3ec8957e5 100644 --- a/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-6.4.0-searchguard.yaml +++ b/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-6.4.0-searchguard.yaml @@ -1,4 +1,10 @@ -{{ if and .Values.catalog.elasticsearch (not .Values.skipDeprecated) }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Elasticsearch }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: ElasticsearchVersion metadata: @@ -20,3 +26,4 @@ spec: databasePolicyName: elasticsearch-db version: 6.4.0 {{ end }} +{{ end }} diff --git a/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-6.5.3-searchguard.yaml b/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-6.5.3-searchguard.yaml index 1a62a99f5..825f71235 100644 --- a/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-6.5.3-searchguard.yaml +++ b/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-6.5.3-searchguard.yaml @@ -1,4 +1,10 @@ -{{ if and .Values.catalog.elasticsearch (not .Values.skipDeprecated) }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Elasticsearch }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: ElasticsearchVersion metadata: @@ -22,7 +28,7 @@ spec: {{ end }} --- -{{ if and .Values.catalog.elasticsearch (not .Values.skipDeprecated) }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: ElasticsearchVersion metadata: @@ -44,3 +50,4 @@ spec: databasePolicyName: elasticsearch-db version: 6.5.3 {{ end }} +{{ end }} diff --git a/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-6.8.0-elasticstack.yaml b/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-6.8.0-elasticstack.yaml index 37000bcf2..c2675d7ac 100644 --- a/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-6.8.0-elasticstack.yaml +++ b/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-6.8.0-elasticstack.yaml @@ -1,4 +1,10 @@ -{{ if and .Values.catalog.elasticsearch (not .Values.skipDeprecated) }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Elasticsearch }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: ElasticsearchVersion metadata: @@ -22,7 +28,7 @@ spec: {{ end }} --- -{{ if and .Values.catalog.elasticsearch (not .Values.skipDeprecated) }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: ElasticsearchVersion metadata: @@ -44,3 +50,4 @@ spec: databasePolicyName: elasticsearch-db version: 6.8.0 {{ end }} +{{ end }} diff --git a/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-6.8.1-searchguard.yaml b/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-6.8.1-searchguard.yaml index a767087c5..2fa7ef619 100644 --- a/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-6.8.1-searchguard.yaml +++ b/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-6.8.1-searchguard.yaml @@ -1,4 +1,10 @@ -{{ if and .Values.catalog.elasticsearch (not .Values.skipDeprecated) }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Elasticsearch }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: ElasticsearchVersion metadata: @@ -37,7 +43,7 @@ spec: {{ end }} --- -{{ if and .Values.catalog.elasticsearch (not .Values.skipDeprecated) }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: ElasticsearchVersion metadata: @@ -71,3 +77,4 @@ spec: value: --match=^(?!searchguard)([a-zA-Z0-9_-]+)(?!kubedb-system)$ version: 6.8.1 {{ end }} +{{ end }} diff --git a/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-6.8.10-elasticstack.yaml b/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-6.8.10-elasticstack.yaml index e3c7b2140..414845ac8 100644 --- a/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-6.8.10-elasticstack.yaml +++ b/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-6.8.10-elasticstack.yaml @@ -1,4 +1,10 @@ -{{ if and .Values.catalog.elasticsearch (not .Values.skipDeprecated) }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Elasticsearch }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: ElasticsearchVersion metadata: @@ -28,7 +34,7 @@ spec: {{ end }} --- -{{ if and .Values.catalog.elasticsearch (not .Values.skipDeprecated) }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: ElasticsearchVersion metadata: @@ -62,3 +68,4 @@ spec: - < 7.5.0 version: 6.8.10 {{ end }} +{{ end }} diff --git a/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-6.8.16-elasticstack.yaml b/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-6.8.16-elasticstack.yaml index 37893b60e..db3585db7 100644 --- a/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-6.8.16-elasticstack.yaml +++ b/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-6.8.16-elasticstack.yaml @@ -1,4 +1,10 @@ -{{ if and .Values.catalog.elasticsearch (not .Values.skipDeprecated) }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Elasticsearch }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: ElasticsearchVersion metadata: @@ -32,3 +38,4 @@ spec: - < 7.5.0 version: 6.8.16 {{ end }} +{{ end }} diff --git a/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-6.8.22-elasticstack.yaml b/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-6.8.22-elasticstack.yaml index 5115f0fe8..1f6c193fd 100644 --- a/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-6.8.22-elasticstack.yaml +++ b/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-6.8.22-elasticstack.yaml @@ -1,4 +1,10 @@ -{{ if and .Values.catalog.elasticsearch (not .Values.skipDeprecated) }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Elasticsearch }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: ElasticsearchVersion metadata: @@ -42,3 +48,4 @@ spec: - < 7.5.0 version: 6.8.22 {{ end }} +{{ end }} diff --git a/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-7.0.1-elasticstack.yaml b/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-7.0.1-elasticstack.yaml index 291536229..585417959 100644 --- a/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-7.0.1-elasticstack.yaml +++ b/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-7.0.1-elasticstack.yaml @@ -1,4 +1,10 @@ -{{ if and .Values.catalog.elasticsearch (not .Values.skipDeprecated) }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Elasticsearch }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: ElasticsearchVersion metadata: @@ -28,7 +34,7 @@ spec: {{ end }} --- -{{ if and .Values.catalog.elasticsearch (not .Values.skipDeprecated) }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: ElasticsearchVersion metadata: @@ -68,3 +74,4 @@ spec: - < 7.5.0 version: 7.0.1 {{ end }} +{{ end }} diff --git a/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-7.0.1-opendistro.yaml b/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-7.0.1-opendistro.yaml index a525791d7..53123ac53 100644 --- a/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-7.0.1-opendistro.yaml +++ b/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-7.0.1-opendistro.yaml @@ -1,4 +1,10 @@ -{{ if and .Values.catalog.elasticsearch (not .Values.skipDeprecated) }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Elasticsearch }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: ElasticsearchVersion metadata: @@ -37,7 +43,7 @@ spec: {{ end }} --- -{{ if and .Values.catalog.elasticsearch (not .Values.skipDeprecated) }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: ElasticsearchVersion metadata: @@ -71,3 +77,4 @@ spec: - < 7.5.0 version: 7.0.1 {{ end }} +{{ end }} diff --git a/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-7.0.1-searchguard.yaml b/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-7.0.1-searchguard.yaml index 331d6ac02..977806b4e 100644 --- a/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-7.0.1-searchguard.yaml +++ b/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-7.0.1-searchguard.yaml @@ -1,4 +1,10 @@ -{{ if and .Values.catalog.elasticsearch (not .Values.skipDeprecated) }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Elasticsearch }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: ElasticsearchVersion metadata: @@ -40,7 +46,7 @@ spec: {{ end }} --- -{{ if and .Values.catalog.elasticsearch (not .Values.skipDeprecated) }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: ElasticsearchVersion metadata: @@ -77,3 +83,4 @@ spec: - < 7.5.0 version: 7.0.1 {{ end }} +{{ end }} diff --git a/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-7.1.1-elasticstack.yaml b/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-7.1.1-elasticstack.yaml index ca5c2690a..49f96dc8f 100644 --- a/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-7.1.1-elasticstack.yaml +++ b/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-7.1.1-elasticstack.yaml @@ -1,4 +1,10 @@ -{{ if and .Values.catalog.elasticsearch (not .Values.skipDeprecated) }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Elasticsearch }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: ElasticsearchVersion metadata: @@ -31,7 +37,7 @@ spec: {{ end }} --- -{{ if and .Values.catalog.elasticsearch (not .Values.skipDeprecated) }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: ElasticsearchVersion metadata: @@ -71,3 +77,4 @@ spec: - < 7.6.0 version: 7.1.1 {{ end }} +{{ end }} diff --git a/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-7.1.1-opendistro.yaml b/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-7.1.1-opendistro.yaml index edf1926ff..389098b83 100644 --- a/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-7.1.1-opendistro.yaml +++ b/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-7.1.1-opendistro.yaml @@ -1,4 +1,10 @@ -{{ if and .Values.catalog.elasticsearch (not .Values.skipDeprecated) }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Elasticsearch }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: ElasticsearchVersion metadata: @@ -37,7 +43,7 @@ spec: {{ end }} --- -{{ if and .Values.catalog.elasticsearch (not .Values.skipDeprecated) }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: ElasticsearchVersion metadata: @@ -71,3 +77,4 @@ spec: - < 7.6.0 version: 7.1.1 {{ end }} +{{ end }} diff --git a/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-7.1.1-searchguard.yaml b/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-7.1.1-searchguard.yaml index b83d7a575..54ee437a9 100644 --- a/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-7.1.1-searchguard.yaml +++ b/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-7.1.1-searchguard.yaml @@ -1,4 +1,10 @@ -{{ if and .Values.catalog.elasticsearch (not .Values.skipDeprecated) }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Elasticsearch }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: ElasticsearchVersion metadata: @@ -40,7 +46,7 @@ spec: {{ end }} --- -{{ if and .Values.catalog.elasticsearch (not .Values.skipDeprecated) }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: ElasticsearchVersion metadata: @@ -74,3 +80,4 @@ spec: - < 7.6.0 version: 7.1.1 {{ end }} +{{ end }} diff --git a/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-7.10.0-opendistro.yaml b/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-7.10.0-opendistro.yaml index e6e05d274..d5f068e05 100644 --- a/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-7.10.0-opendistro.yaml +++ b/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-7.10.0-opendistro.yaml @@ -1,4 +1,10 @@ -{{ if and .Values.catalog.elasticsearch (not .Values.skipDeprecated) }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Elasticsearch }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: ElasticsearchVersion metadata: @@ -35,3 +41,4 @@ spec: - < 7.15.0 version: 7.10.0 {{ end }} +{{ end }} diff --git a/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-7.10.2-opendistro.yaml b/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-7.10.2-opendistro.yaml index 022de3897..4d869b1e8 100644 --- a/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-7.10.2-opendistro.yaml +++ b/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-7.10.2-opendistro.yaml @@ -1,4 +1,10 @@ -{{ if and .Values.catalog.elasticsearch (not .Values.skipDeprecated) }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Elasticsearch }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: ElasticsearchVersion metadata: @@ -35,3 +41,4 @@ spec: - < 7.15.0 version: 7.10.2 {{ end }} +{{ end }} diff --git a/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-7.10.2-searchguard.yaml b/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-7.10.2-searchguard.yaml index a067decfe..2622d78ed 100644 --- a/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-7.10.2-searchguard.yaml +++ b/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-7.10.2-searchguard.yaml @@ -1,4 +1,10 @@ -{{ if and .Values.catalog.elasticsearch (not .Values.skipDeprecated) }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Elasticsearch }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: ElasticsearchVersion metadata: @@ -38,3 +44,4 @@ spec: - < 7.15.0 version: 7.10.2 {{ end }} +{{ end }} diff --git a/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-7.12.0-elasticstack.yaml b/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-7.12.0-elasticstack.yaml index 4b7cbbff6..34a9724a1 100644 --- a/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-7.12.0-elasticstack.yaml +++ b/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-7.12.0-elasticstack.yaml @@ -1,4 +1,10 @@ -{{ if and .Values.catalog.elasticsearch (not .Values.skipDeprecated) }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Elasticsearch }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: ElasticsearchVersion metadata: @@ -38,7 +44,7 @@ spec: {{ end }} --- -{{ if and .Values.catalog.elasticsearch (not .Values.skipDeprecated) }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: ElasticsearchVersion metadata: @@ -78,3 +84,4 @@ spec: - < 7.15.0 version: 7.12.0 {{ end }} +{{ end }} diff --git a/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-7.12.0-kubedb.yaml b/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-7.12.0-kubedb.yaml index 0c96b475a..7ae6ad0d0 100644 --- a/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-7.12.0-kubedb.yaml +++ b/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-7.12.0-kubedb.yaml @@ -1,4 +1,10 @@ -{{ if and .Values.catalog.elasticsearch (not .Values.skipDeprecated) }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Elasticsearch }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: ElasticsearchVersion metadata: @@ -38,3 +44,4 @@ spec: - < 7.15.0 version: 7.12.0 {{ end }} +{{ end }} diff --git a/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-7.13.2-elasticstack.yaml b/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-7.13.2-elasticstack.yaml index 474c25e27..16a1e534a 100644 --- a/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-7.13.2-elasticstack.yaml +++ b/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-7.13.2-elasticstack.yaml @@ -1,4 +1,10 @@ -{{ if and .Values.catalog.elasticsearch (not .Values.skipDeprecated) }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Elasticsearch }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: ElasticsearchVersion metadata: @@ -42,3 +48,4 @@ spec: - < 7.15.0 version: 7.13.2 {{ end }} +{{ end }} diff --git a/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-7.13.2-kubedb.yaml b/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-7.13.2-kubedb.yaml index 49acdb1c0..9ca0f23be 100644 --- a/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-7.13.2-kubedb.yaml +++ b/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-7.13.2-kubedb.yaml @@ -1,4 +1,10 @@ -{{ if and .Values.catalog.elasticsearch (not .Values.skipDeprecated) }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Elasticsearch }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: ElasticsearchVersion metadata: @@ -38,3 +44,4 @@ spec: - < 7.15.0 version: 7.13.2 {{ end }} +{{ end }} diff --git a/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-7.14.0-elasticstack.yaml b/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-7.14.0-elasticstack.yaml index ef3d2e123..d96cfe91b 100644 --- a/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-7.14.0-elasticstack.yaml +++ b/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-7.14.0-elasticstack.yaml @@ -1,4 +1,10 @@ -{{ if and .Values.catalog.elasticsearch (not .Values.skipDeprecated) }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Elasticsearch }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: ElasticsearchVersion metadata: @@ -42,3 +48,4 @@ spec: - < 7.18.0 version: 7.14.0 {{ end }} +{{ end }} diff --git a/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-7.14.0-kubedb.yaml b/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-7.14.0-kubedb.yaml index 9acee6245..87f01fa43 100644 --- a/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-7.14.0-kubedb.yaml +++ b/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-7.14.0-kubedb.yaml @@ -1,4 +1,10 @@ -{{ if and .Values.catalog.elasticsearch (not .Values.skipDeprecated) }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Elasticsearch }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: ElasticsearchVersion metadata: @@ -38,3 +44,4 @@ spec: - < 7.18.0 version: 7.14.0 {{ end }} +{{ end }} diff --git a/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-7.14.2-searchguard.yaml b/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-7.14.2-searchguard.yaml index 564c9a397..3001ccd45 100644 --- a/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-7.14.2-searchguard.yaml +++ b/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-7.14.2-searchguard.yaml @@ -1,4 +1,10 @@ -{{ if and .Values.catalog.elasticsearch (not .Values.skipDeprecated) }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Elasticsearch }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: ElasticsearchVersion metadata: @@ -38,3 +44,4 @@ spec: - < 7.18.0 version: 7.14.2 {{ end }} +{{ end }} diff --git a/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-7.16.2-elasticstack.yaml b/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-7.16.2-elasticstack.yaml index ca6b1ede3..fe76dfe37 100644 --- a/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-7.16.2-elasticstack.yaml +++ b/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-7.16.2-elasticstack.yaml @@ -1,4 +1,10 @@ -{{ if and .Values.catalog.elasticsearch (not .Values.skipDeprecated) }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Elasticsearch }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: ElasticsearchVersion metadata: @@ -42,3 +48,4 @@ spec: - < 7.18.0 version: 7.16.2 {{ end }} +{{ end }} diff --git a/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-7.16.2-kubedb.yaml b/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-7.16.2-kubedb.yaml index 23953758b..d4fcbbf65 100644 --- a/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-7.16.2-kubedb.yaml +++ b/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-7.16.2-kubedb.yaml @@ -1,4 +1,10 @@ -{{ if and .Values.catalog.elasticsearch (not .Values.skipDeprecated) }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Elasticsearch }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: ElasticsearchVersion metadata: @@ -38,3 +44,4 @@ spec: - < 7.18.0 version: 7.16.2 {{ end }} +{{ end }} diff --git a/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-7.17.10-elasticstack.yaml b/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-7.17.10-elasticstack.yaml index c954a0601..996b34b97 100644 --- a/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-7.17.10-elasticstack.yaml +++ b/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-7.17.10-elasticstack.yaml @@ -1,4 +1,10 @@ -{{ if and .Values.catalog.elasticsearch (not .Values.skipDeprecated) }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Elasticsearch }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: ElasticsearchVersion metadata: @@ -39,3 +45,4 @@ spec: value: --match=^(?![.])(?!kubedb-system).+ version: 7.17.10 {{ end }} +{{ end }} diff --git a/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-7.17.3-elasticstack.yaml b/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-7.17.3-elasticstack.yaml index 4ab0e48f8..5f9c43766 100644 --- a/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-7.17.3-elasticstack.yaml +++ b/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-7.17.3-elasticstack.yaml @@ -1,4 +1,10 @@ -{{ if and .Values.catalog.elasticsearch (not .Values.skipDeprecated) }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Elasticsearch }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: ElasticsearchVersion metadata: @@ -39,3 +45,4 @@ spec: value: --match=^(?![.])(?!kubedb-system).+ version: 7.17.3 {{ end }} +{{ end }} diff --git a/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-7.2.0-elasticstack.yaml b/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-7.2.0-elasticstack.yaml index 1d526fc37..5fc9a16d9 100644 --- a/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-7.2.0-elasticstack.yaml +++ b/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-7.2.0-elasticstack.yaml @@ -1,4 +1,10 @@ -{{ if and .Values.catalog.elasticsearch (not .Values.skipDeprecated) }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Elasticsearch }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: ElasticsearchVersion metadata: @@ -22,7 +28,7 @@ spec: {{ end }} --- -{{ if and .Values.catalog.elasticsearch (not .Values.skipDeprecated) }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: ElasticsearchVersion metadata: @@ -44,3 +50,4 @@ spec: databasePolicyName: elasticsearch-db version: 7.2.0 {{ end }} +{{ end }} diff --git a/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-7.2.1-elasticstack.yaml b/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-7.2.1-elasticstack.yaml index d6591eb82..98ff11e63 100644 --- a/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-7.2.1-elasticstack.yaml +++ b/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-7.2.1-elasticstack.yaml @@ -1,4 +1,10 @@ -{{ if and .Values.catalog.elasticsearch (not .Values.skipDeprecated) }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Elasticsearch }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: ElasticsearchVersion metadata: @@ -31,7 +37,7 @@ spec: {{ end }} --- -{{ if and .Values.catalog.elasticsearch (not .Values.skipDeprecated) }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: ElasticsearchVersion metadata: @@ -71,3 +77,4 @@ spec: - < 7.6.0 version: 7.2.1 {{ end }} +{{ end }} diff --git a/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-7.2.1-opendistro.yaml b/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-7.2.1-opendistro.yaml index 81f1cd082..b426011db 100644 --- a/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-7.2.1-opendistro.yaml +++ b/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-7.2.1-opendistro.yaml @@ -1,4 +1,10 @@ -{{ if and .Values.catalog.elasticsearch (not .Values.skipDeprecated) }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Elasticsearch }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: ElasticsearchVersion metadata: @@ -37,7 +43,7 @@ spec: {{ end }} --- -{{ if and .Values.catalog.elasticsearch (not .Values.skipDeprecated) }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: ElasticsearchVersion metadata: @@ -71,3 +77,4 @@ spec: - < 7.6.0 version: 7.2.1 {{ end }} +{{ end }} diff --git a/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-7.3.2-elasticstack.yaml b/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-7.3.2-elasticstack.yaml index 8f7b0ff51..d0fb8c970 100644 --- a/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-7.3.2-elasticstack.yaml +++ b/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-7.3.2-elasticstack.yaml @@ -1,4 +1,10 @@ -{{ if and .Values.catalog.elasticsearch (not .Values.skipDeprecated) }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Elasticsearch }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: ElasticsearchVersion metadata: @@ -22,7 +28,7 @@ spec: {{ end }} --- -{{ if and .Values.catalog.elasticsearch (not .Values.skipDeprecated) }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: ElasticsearchVersion metadata: @@ -46,7 +52,7 @@ spec: {{ end }} --- -{{ if and .Values.catalog.elasticsearch (not .Values.skipDeprecated) }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: ElasticsearchVersion metadata: @@ -76,7 +82,7 @@ spec: {{ end }} --- -{{ if and .Values.catalog.elasticsearch (not .Values.skipDeprecated) }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: ElasticsearchVersion metadata: @@ -116,3 +122,4 @@ spec: - < 7.6.0 version: 7.3.2 {{ end }} +{{ end }} diff --git a/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-7.3.2-opendistro.yaml b/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-7.3.2-opendistro.yaml index 8eb0f2cda..599ae90ff 100644 --- a/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-7.3.2-opendistro.yaml +++ b/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-7.3.2-opendistro.yaml @@ -1,4 +1,10 @@ -{{ if and .Values.catalog.elasticsearch (not .Values.skipDeprecated) }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Elasticsearch }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: ElasticsearchVersion metadata: @@ -37,7 +43,7 @@ spec: {{ end }} --- -{{ if and .Values.catalog.elasticsearch (not .Values.skipDeprecated) }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: ElasticsearchVersion metadata: @@ -71,3 +77,4 @@ spec: - < 7.6.0 version: 7.3.2 {{ end }} +{{ end }} diff --git a/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-7.3.2-searchguard.yaml b/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-7.3.2-searchguard.yaml index c3103d5ed..54bf5a1ec 100644 --- a/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-7.3.2-searchguard.yaml +++ b/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-7.3.2-searchguard.yaml @@ -1,4 +1,10 @@ -{{ if and .Values.catalog.elasticsearch (not .Values.skipDeprecated) }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Elasticsearch }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: ElasticsearchVersion metadata: @@ -38,3 +44,4 @@ spec: - < 7.6.0 version: 7.3.2 {{ end }} +{{ end }} diff --git a/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-7.4.2-elasticstack.yaml b/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-7.4.2-elasticstack.yaml index 311e75d58..06936c392 100644 --- a/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-7.4.2-elasticstack.yaml +++ b/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-7.4.2-elasticstack.yaml @@ -1,4 +1,10 @@ -{{ if and .Values.catalog.elasticsearch (not .Values.skipDeprecated) }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Elasticsearch }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: ElasticsearchVersion metadata: @@ -31,7 +37,7 @@ spec: {{ end }} --- -{{ if and .Values.catalog.elasticsearch (not .Values.skipDeprecated) }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: ElasticsearchVersion metadata: @@ -71,3 +77,4 @@ spec: - < 7.6.0 version: 7.4.2 {{ end }} +{{ end }} diff --git a/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-7.4.2-opendistro.yaml b/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-7.4.2-opendistro.yaml index 09e6a95dc..38b199a33 100644 --- a/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-7.4.2-opendistro.yaml +++ b/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-7.4.2-opendistro.yaml @@ -1,4 +1,10 @@ -{{ if and .Values.catalog.elasticsearch (not .Values.skipDeprecated) }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Elasticsearch }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: ElasticsearchVersion metadata: @@ -37,7 +43,7 @@ spec: {{ end }} --- -{{ if and .Values.catalog.elasticsearch (not .Values.skipDeprecated) }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: ElasticsearchVersion metadata: @@ -71,3 +77,4 @@ spec: - < 7.6.0 version: 7.4.2 {{ end }} +{{ end }} diff --git a/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-7.5.2-elasticstack.yaml b/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-7.5.2-elasticstack.yaml index f335d04c9..d38456202 100644 --- a/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-7.5.2-elasticstack.yaml +++ b/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-7.5.2-elasticstack.yaml @@ -1,4 +1,10 @@ -{{ if and .Values.catalog.elasticsearch (not .Values.skipDeprecated) }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Elasticsearch }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: ElasticsearchVersion metadata: @@ -31,7 +37,7 @@ spec: {{ end }} --- -{{ if and .Values.catalog.elasticsearch (not .Values.skipDeprecated) }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: ElasticsearchVersion metadata: @@ -71,3 +77,4 @@ spec: - < 7.10.0 version: 7.5.2 {{ end }} +{{ end }} diff --git a/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-7.5.2-searchguard.yaml b/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-7.5.2-searchguard.yaml index 1fdb164e8..163fc23b6 100644 --- a/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-7.5.2-searchguard.yaml +++ b/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-7.5.2-searchguard.yaml @@ -1,4 +1,10 @@ -{{ if and .Values.catalog.elasticsearch (not .Values.skipDeprecated) }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Elasticsearch }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: ElasticsearchVersion metadata: @@ -34,7 +40,7 @@ spec: {{ end }} --- -{{ if and .Values.catalog.elasticsearch (not .Values.skipDeprecated) }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: ElasticsearchVersion metadata: @@ -74,3 +80,4 @@ spec: - < 7.10.0 version: 7.5.2 {{ end }} +{{ end }} diff --git a/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-7.6.1-opendistro.yaml b/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-7.6.1-opendistro.yaml index 556556bab..7aa674c11 100644 --- a/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-7.6.1-opendistro.yaml +++ b/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-7.6.1-opendistro.yaml @@ -1,4 +1,10 @@ -{{ if and .Values.catalog.elasticsearch (not .Values.skipDeprecated) }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Elasticsearch }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: ElasticsearchVersion metadata: @@ -37,7 +43,7 @@ spec: {{ end }} --- -{{ if and .Values.catalog.elasticsearch (not .Values.skipDeprecated) }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: ElasticsearchVersion metadata: @@ -73,7 +79,7 @@ spec: {{ end }} --- -{{ if and .Values.catalog.elasticsearch (not .Values.skipDeprecated) }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: ElasticsearchVersion metadata: @@ -109,7 +115,7 @@ spec: {{ end }} --- -{{ if and .Values.catalog.elasticsearch (not .Values.skipDeprecated) }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: ElasticsearchVersion metadata: @@ -143,3 +149,4 @@ spec: - < 7.10.0 version: 7.6.1 {{ end }} +{{ end }} diff --git a/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-7.6.2-elasticstack.yaml b/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-7.6.2-elasticstack.yaml index 7396fb50d..309944ff3 100644 --- a/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-7.6.2-elasticstack.yaml +++ b/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-7.6.2-elasticstack.yaml @@ -1,4 +1,10 @@ -{{ if and .Values.catalog.elasticsearch (not .Values.skipDeprecated) }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Elasticsearch }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: ElasticsearchVersion metadata: @@ -31,7 +37,7 @@ spec: {{ end }} --- -{{ if and .Values.catalog.elasticsearch (not .Values.skipDeprecated) }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: ElasticsearchVersion metadata: @@ -71,3 +77,4 @@ spec: - < 7.10.0 version: 7.6.2 {{ end }} +{{ end }} diff --git a/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-7.7.0-opendistro.yaml b/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-7.7.0-opendistro.yaml index 6b2f86f67..c933a783b 100644 --- a/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-7.7.0-opendistro.yaml +++ b/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-7.7.0-opendistro.yaml @@ -1,4 +1,10 @@ -{{ if and .Values.catalog.elasticsearch (not .Values.skipDeprecated) }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Elasticsearch }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: ElasticsearchVersion metadata: @@ -37,7 +43,7 @@ spec: {{ end }} --- -{{ if and .Values.catalog.elasticsearch (not .Values.skipDeprecated) }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: ElasticsearchVersion metadata: @@ -71,3 +77,4 @@ spec: - < 7.10.0 version: 7.7.0 {{ end }} +{{ end }} diff --git a/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-7.7.1-elasticstack.yaml b/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-7.7.1-elasticstack.yaml index 8dfa46612..700f3445a 100644 --- a/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-7.7.1-elasticstack.yaml +++ b/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-7.7.1-elasticstack.yaml @@ -1,4 +1,10 @@ -{{ if and .Values.catalog.elasticsearch (not .Values.skipDeprecated) }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Elasticsearch }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: ElasticsearchVersion metadata: @@ -31,7 +37,7 @@ spec: {{ end }} --- -{{ if and .Values.catalog.elasticsearch (not .Values.skipDeprecated) }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: ElasticsearchVersion metadata: @@ -71,3 +77,4 @@ spec: - < 7.10.0 version: 7.7.1 {{ end }} +{{ end }} diff --git a/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-7.8.0-elasticstack.yaml b/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-7.8.0-elasticstack.yaml index 523ff6561..458ccef98 100644 --- a/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-7.8.0-elasticstack.yaml +++ b/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-7.8.0-elasticstack.yaml @@ -1,4 +1,10 @@ -{{ if and .Values.catalog.elasticsearch (not .Values.skipDeprecated) }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Elasticsearch }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: ElasticsearchVersion metadata: @@ -31,7 +37,7 @@ spec: {{ end }} --- -{{ if and .Values.catalog.elasticsearch (not .Values.skipDeprecated) }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: ElasticsearchVersion metadata: @@ -71,3 +77,4 @@ spec: - < 7.10.0 version: 7.8.0 {{ end }} +{{ end }} diff --git a/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-7.8.0-opendistro.yaml b/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-7.8.0-opendistro.yaml index 5a7b1d1ab..32ce21d6c 100644 --- a/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-7.8.0-opendistro.yaml +++ b/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-7.8.0-opendistro.yaml @@ -1,4 +1,10 @@ -{{ if and .Values.catalog.elasticsearch (not .Values.skipDeprecated) }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Elasticsearch }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: ElasticsearchVersion metadata: @@ -37,7 +43,7 @@ spec: {{ end }} --- -{{ if and .Values.catalog.elasticsearch (not .Values.skipDeprecated) }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: ElasticsearchVersion metadata: @@ -71,3 +77,4 @@ spec: - < 7.10.0 version: 7.8.0 {{ end }} +{{ end }} diff --git a/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-7.8.1-searchguard.yaml b/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-7.8.1-searchguard.yaml index bbb1ba650..6e1facc8a 100644 --- a/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-7.8.1-searchguard.yaml +++ b/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-7.8.1-searchguard.yaml @@ -1,4 +1,10 @@ -{{ if and .Values.catalog.elasticsearch (not .Values.skipDeprecated) }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Elasticsearch }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: ElasticsearchVersion metadata: @@ -38,3 +44,4 @@ spec: - < 7.10.0 version: 7.8.1 {{ end }} +{{ end }} diff --git a/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-7.9.1-elasticstack.yaml b/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-7.9.1-elasticstack.yaml index 2b9e1acc3..91c94bf1e 100644 --- a/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-7.9.1-elasticstack.yaml +++ b/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-7.9.1-elasticstack.yaml @@ -1,4 +1,10 @@ -{{ if and .Values.catalog.elasticsearch (not .Values.skipDeprecated) }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Elasticsearch }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: ElasticsearchVersion metadata: @@ -31,7 +37,7 @@ spec: {{ end }} --- -{{ if and .Values.catalog.elasticsearch (not .Values.skipDeprecated) }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: ElasticsearchVersion metadata: @@ -71,7 +77,7 @@ spec: {{ end }} --- -{{ if and .Values.catalog.elasticsearch (not .Values.skipDeprecated) }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: ElasticsearchVersion metadata: @@ -108,3 +114,4 @@ spec: value: --match=^(?![.])(?!kubedb-system).+ version: 7.9.1 {{ end }} +{{ end }} diff --git a/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-7.9.1-kubedb.yaml b/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-7.9.1-kubedb.yaml index 6414796e2..7c11abfd6 100644 --- a/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-7.9.1-kubedb.yaml +++ b/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-7.9.1-kubedb.yaml @@ -1,4 +1,10 @@ -{{ if and .Values.catalog.elasticsearch (not .Values.skipDeprecated) }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Elasticsearch }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: ElasticsearchVersion metadata: @@ -38,3 +44,4 @@ spec: - < 7.15.0 version: 7.9.1 {{ end }} +{{ end }} diff --git a/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-7.9.1-opendistro.yaml b/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-7.9.1-opendistro.yaml index 42993d98c..e8c443f3d 100644 --- a/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-7.9.1-opendistro.yaml +++ b/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-7.9.1-opendistro.yaml @@ -1,4 +1,10 @@ -{{ if and .Values.catalog.elasticsearch (not .Values.skipDeprecated) }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Elasticsearch }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: ElasticsearchVersion metadata: @@ -37,7 +43,7 @@ spec: {{ end }} --- -{{ if and .Values.catalog.elasticsearch (not .Values.skipDeprecated) }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: ElasticsearchVersion metadata: @@ -71,3 +77,4 @@ spec: - < 7.15.0 version: 7.9.1 {{ end }} +{{ end }} diff --git a/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-8.2.0-elasticstack.yaml b/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-8.2.0-elasticstack.yaml index ba8a3e358..33d8e7415 100644 --- a/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-8.2.0-elasticstack.yaml +++ b/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-8.2.0-elasticstack.yaml @@ -1,4 +1,10 @@ -{{ if and .Values.catalog.elasticsearch (not .Values.skipDeprecated) }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Elasticsearch }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: ElasticsearchVersion metadata: @@ -39,3 +45,4 @@ spec: value: --match=^(?![.])(?!apm-agent-configuration)(?!kubedb-system).+ version: 8.2.0 {{ end }} +{{ end }} diff --git a/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-8.2.0-kubedb.yaml b/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-8.2.0-kubedb.yaml index 433b97fd7..ed081507a 100644 --- a/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-8.2.0-kubedb.yaml +++ b/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-8.2.0-kubedb.yaml @@ -1,4 +1,10 @@ -{{ if and .Values.catalog.elasticsearch (not .Values.skipDeprecated) }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Elasticsearch }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: ElasticsearchVersion metadata: @@ -35,3 +41,4 @@ spec: value: --match=^(?![.])(?!apm-agent-configuration)(?!kubedb-system).+ version: 8.2.0 {{ end }} +{{ end }} diff --git a/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-8.5.2-elasticstack.yaml b/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-8.5.2-elasticstack.yaml index b87c32a83..ccfc193fa 100644 --- a/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-8.5.2-elasticstack.yaml +++ b/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-8.5.2-elasticstack.yaml @@ -1,4 +1,10 @@ -{{ if and .Values.catalog.elasticsearch (not .Values.skipDeprecated) }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Elasticsearch }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: ElasticsearchVersion metadata: @@ -39,3 +45,4 @@ spec: value: --match=^(?![.])(?!apm-agent-configuration)(?!kubedb-system).+ version: 8.5.2 {{ end }} +{{ end }} diff --git a/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-8.8.0-elasticstack.yaml b/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-8.8.0-elasticstack.yaml index 153b5ad40..d0c13d2c2 100644 --- a/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-8.8.0-elasticstack.yaml +++ b/charts/kubedb-catalog/templates/elasticsearch/deprecated-elasticsearch-8.8.0-elasticstack.yaml @@ -1,4 +1,10 @@ -{{ if and .Values.catalog.elasticsearch (not .Values.skipDeprecated) }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Elasticsearch }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: ElasticsearchVersion metadata: @@ -39,3 +45,4 @@ spec: value: --match=^(?![.])(?!apm-agent-configuration)(?!kubedb-system).+ version: 8.8.0 {{ end }} +{{ end }} diff --git a/charts/kubedb-catalog/templates/elasticsearch/elasticsearch-1.1.0-opensearch.yaml b/charts/kubedb-catalog/templates/elasticsearch/elasticsearch-1.1.0-opensearch.yaml index 283375f5b..c70f7a0fa 100644 --- a/charts/kubedb-catalog/templates/elasticsearch/elasticsearch-1.1.0-opensearch.yaml +++ b/charts/kubedb-catalog/templates/elasticsearch/elasticsearch-1.1.0-opensearch.yaml @@ -1,4 +1,10 @@ -{{ if .Values.catalog.elasticsearch }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Elasticsearch }} + apiVersion: catalog.kubedb.com/v1alpha1 kind: ElasticsearchVersion metadata: diff --git a/charts/kubedb-catalog/templates/elasticsearch/elasticsearch-1.2.4-opensearch.yaml b/charts/kubedb-catalog/templates/elasticsearch/elasticsearch-1.2.4-opensearch.yaml index 39de30ef5..ae94172eb 100644 --- a/charts/kubedb-catalog/templates/elasticsearch/elasticsearch-1.2.4-opensearch.yaml +++ b/charts/kubedb-catalog/templates/elasticsearch/elasticsearch-1.2.4-opensearch.yaml @@ -1,4 +1,10 @@ -{{ if .Values.catalog.elasticsearch }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Elasticsearch }} + apiVersion: catalog.kubedb.com/v1alpha1 kind: ElasticsearchVersion metadata: diff --git a/charts/kubedb-catalog/templates/elasticsearch/elasticsearch-1.3.13-opensearch.yaml b/charts/kubedb-catalog/templates/elasticsearch/elasticsearch-1.3.13-opensearch.yaml index d7b4ffe5a..c3efee816 100644 --- a/charts/kubedb-catalog/templates/elasticsearch/elasticsearch-1.3.13-opensearch.yaml +++ b/charts/kubedb-catalog/templates/elasticsearch/elasticsearch-1.3.13-opensearch.yaml @@ -1,4 +1,10 @@ -{{ if .Values.catalog.elasticsearch }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Elasticsearch }} + apiVersion: catalog.kubedb.com/v1alpha1 kind: ElasticsearchVersion metadata: diff --git a/charts/kubedb-catalog/templates/elasticsearch/elasticsearch-2.0.1-opensearch.yaml b/charts/kubedb-catalog/templates/elasticsearch/elasticsearch-2.0.1-opensearch.yaml index 3e555fda9..4943d7f59 100644 --- a/charts/kubedb-catalog/templates/elasticsearch/elasticsearch-2.0.1-opensearch.yaml +++ b/charts/kubedb-catalog/templates/elasticsearch/elasticsearch-2.0.1-opensearch.yaml @@ -1,4 +1,10 @@ -{{ if .Values.catalog.elasticsearch }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Elasticsearch }} + apiVersion: catalog.kubedb.com/v1alpha1 kind: ElasticsearchVersion metadata: diff --git a/charts/kubedb-catalog/templates/elasticsearch/elasticsearch-2.11.1-opensearch.yaml b/charts/kubedb-catalog/templates/elasticsearch/elasticsearch-2.11.1-opensearch.yaml index 4432df000..b23d6a27b 100644 --- a/charts/kubedb-catalog/templates/elasticsearch/elasticsearch-2.11.1-opensearch.yaml +++ b/charts/kubedb-catalog/templates/elasticsearch/elasticsearch-2.11.1-opensearch.yaml @@ -1,4 +1,10 @@ -{{ if .Values.catalog.elasticsearch }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Elasticsearch }} + apiVersion: catalog.kubedb.com/v1alpha1 kind: ElasticsearchVersion metadata: diff --git a/charts/kubedb-catalog/templates/elasticsearch/elasticsearch-2.5.0-opensearch.yaml b/charts/kubedb-catalog/templates/elasticsearch/elasticsearch-2.5.0-opensearch.yaml index ff84710c1..ace1f6492 100644 --- a/charts/kubedb-catalog/templates/elasticsearch/elasticsearch-2.5.0-opensearch.yaml +++ b/charts/kubedb-catalog/templates/elasticsearch/elasticsearch-2.5.0-opensearch.yaml @@ -1,4 +1,10 @@ -{{ if .Values.catalog.elasticsearch }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Elasticsearch }} + apiVersion: catalog.kubedb.com/v1alpha1 kind: ElasticsearchVersion metadata: diff --git a/charts/kubedb-catalog/templates/elasticsearch/elasticsearch-2.8.0-opensearch.yaml b/charts/kubedb-catalog/templates/elasticsearch/elasticsearch-2.8.0-opensearch.yaml index 6f6dd4ba8..2c80c753b 100644 --- a/charts/kubedb-catalog/templates/elasticsearch/elasticsearch-2.8.0-opensearch.yaml +++ b/charts/kubedb-catalog/templates/elasticsearch/elasticsearch-2.8.0-opensearch.yaml @@ -1,4 +1,10 @@ -{{ if .Values.catalog.elasticsearch }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Elasticsearch }} + apiVersion: catalog.kubedb.com/v1alpha1 kind: ElasticsearchVersion metadata: diff --git a/charts/kubedb-catalog/templates/elasticsearch/elasticsearch-6.8.23-elasticstack.yaml b/charts/kubedb-catalog/templates/elasticsearch/elasticsearch-6.8.23-elasticstack.yaml index 13beef5dd..e6d27a3dc 100644 --- a/charts/kubedb-catalog/templates/elasticsearch/elasticsearch-6.8.23-elasticstack.yaml +++ b/charts/kubedb-catalog/templates/elasticsearch/elasticsearch-6.8.23-elasticstack.yaml @@ -1,4 +1,10 @@ -{{ if .Values.catalog.elasticsearch }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Elasticsearch }} + apiVersion: catalog.kubedb.com/v1alpha1 kind: ElasticsearchVersion metadata: diff --git a/charts/kubedb-catalog/templates/elasticsearch/elasticsearch-7.13.4-elasticstack.yaml b/charts/kubedb-catalog/templates/elasticsearch/elasticsearch-7.13.4-elasticstack.yaml index ef5a85b25..e44dec83a 100644 --- a/charts/kubedb-catalog/templates/elasticsearch/elasticsearch-7.13.4-elasticstack.yaml +++ b/charts/kubedb-catalog/templates/elasticsearch/elasticsearch-7.13.4-elasticstack.yaml @@ -1,4 +1,10 @@ -{{ if .Values.catalog.elasticsearch }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Elasticsearch }} + apiVersion: catalog.kubedb.com/v1alpha1 kind: ElasticsearchVersion metadata: diff --git a/charts/kubedb-catalog/templates/elasticsearch/elasticsearch-7.14.2-elasticstack.yaml b/charts/kubedb-catalog/templates/elasticsearch/elasticsearch-7.14.2-elasticstack.yaml index f139d6362..dd725f40d 100644 --- a/charts/kubedb-catalog/templates/elasticsearch/elasticsearch-7.14.2-elasticstack.yaml +++ b/charts/kubedb-catalog/templates/elasticsearch/elasticsearch-7.14.2-elasticstack.yaml @@ -1,4 +1,10 @@ -{{ if .Values.catalog.elasticsearch }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Elasticsearch }} + apiVersion: catalog.kubedb.com/v1alpha1 kind: ElasticsearchVersion metadata: diff --git a/charts/kubedb-catalog/templates/elasticsearch/elasticsearch-7.16.3-elasticstack.yaml b/charts/kubedb-catalog/templates/elasticsearch/elasticsearch-7.16.3-elasticstack.yaml index a7f5be173..bfa8dac51 100644 --- a/charts/kubedb-catalog/templates/elasticsearch/elasticsearch-7.16.3-elasticstack.yaml +++ b/charts/kubedb-catalog/templates/elasticsearch/elasticsearch-7.16.3-elasticstack.yaml @@ -1,4 +1,10 @@ -{{ if .Values.catalog.elasticsearch }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Elasticsearch }} + apiVersion: catalog.kubedb.com/v1alpha1 kind: ElasticsearchVersion metadata: diff --git a/charts/kubedb-catalog/templates/elasticsearch/elasticsearch-7.17.15-elasticstack.yaml b/charts/kubedb-catalog/templates/elasticsearch/elasticsearch-7.17.15-elasticstack.yaml index 9bbd6b012..ea4bff327 100644 --- a/charts/kubedb-catalog/templates/elasticsearch/elasticsearch-7.17.15-elasticstack.yaml +++ b/charts/kubedb-catalog/templates/elasticsearch/elasticsearch-7.17.15-elasticstack.yaml @@ -1,4 +1,10 @@ -{{ if .Values.catalog.elasticsearch }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Elasticsearch }} + apiVersion: catalog.kubedb.com/v1alpha1 kind: ElasticsearchVersion metadata: diff --git a/charts/kubedb-catalog/templates/elasticsearch/elasticsearch-7.9.3-searchguard.yaml b/charts/kubedb-catalog/templates/elasticsearch/elasticsearch-7.9.3-searchguard.yaml index b1e5cc22b..488314117 100644 --- a/charts/kubedb-catalog/templates/elasticsearch/elasticsearch-7.9.3-searchguard.yaml +++ b/charts/kubedb-catalog/templates/elasticsearch/elasticsearch-7.9.3-searchguard.yaml @@ -1,4 +1,10 @@ -{{ if .Values.catalog.elasticsearch }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Elasticsearch }} + apiVersion: catalog.kubedb.com/v1alpha1 kind: ElasticsearchVersion metadata: diff --git a/charts/kubedb-catalog/templates/elasticsearch/elasticsearch-8.11.1-elasticstack.yaml b/charts/kubedb-catalog/templates/elasticsearch/elasticsearch-8.11.1-elasticstack.yaml index c34b5651d..762a62130 100644 --- a/charts/kubedb-catalog/templates/elasticsearch/elasticsearch-8.11.1-elasticstack.yaml +++ b/charts/kubedb-catalog/templates/elasticsearch/elasticsearch-8.11.1-elasticstack.yaml @@ -1,4 +1,10 @@ -{{ if .Values.catalog.elasticsearch }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Elasticsearch }} + apiVersion: catalog.kubedb.com/v1alpha1 kind: ElasticsearchVersion metadata: diff --git a/charts/kubedb-catalog/templates/elasticsearch/elasticsearch-8.2.3-elasticstack.yaml b/charts/kubedb-catalog/templates/elasticsearch/elasticsearch-8.2.3-elasticstack.yaml index d07d34c8e..14a844cb4 100644 --- a/charts/kubedb-catalog/templates/elasticsearch/elasticsearch-8.2.3-elasticstack.yaml +++ b/charts/kubedb-catalog/templates/elasticsearch/elasticsearch-8.2.3-elasticstack.yaml @@ -1,4 +1,10 @@ -{{ if .Values.catalog.elasticsearch }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Elasticsearch }} + apiVersion: catalog.kubedb.com/v1alpha1 kind: ElasticsearchVersion metadata: diff --git a/charts/kubedb-catalog/templates/elasticsearch/elasticsearch-8.5.3-elasticstack.yaml b/charts/kubedb-catalog/templates/elasticsearch/elasticsearch-8.5.3-elasticstack.yaml index d20fb2a7b..9fe8a847a 100644 --- a/charts/kubedb-catalog/templates/elasticsearch/elasticsearch-8.5.3-elasticstack.yaml +++ b/charts/kubedb-catalog/templates/elasticsearch/elasticsearch-8.5.3-elasticstack.yaml @@ -1,4 +1,10 @@ -{{ if .Values.catalog.elasticsearch }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Elasticsearch }} + apiVersion: catalog.kubedb.com/v1alpha1 kind: ElasticsearchVersion metadata: diff --git a/charts/kubedb-catalog/templates/elasticsearch/elasticsearch-8.6.2-elasticstack.yaml b/charts/kubedb-catalog/templates/elasticsearch/elasticsearch-8.6.2-elasticstack.yaml index 203275178..47aab90cf 100644 --- a/charts/kubedb-catalog/templates/elasticsearch/elasticsearch-8.6.2-elasticstack.yaml +++ b/charts/kubedb-catalog/templates/elasticsearch/elasticsearch-8.6.2-elasticstack.yaml @@ -1,4 +1,10 @@ -{{ if .Values.catalog.elasticsearch }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Elasticsearch }} + apiVersion: catalog.kubedb.com/v1alpha1 kind: ElasticsearchVersion metadata: diff --git a/charts/kubedb-catalog/templates/elasticsearch/elasticsearch-8.8.2-elasticstack.yaml b/charts/kubedb-catalog/templates/elasticsearch/elasticsearch-8.8.2-elasticstack.yaml index 893787594..b0a9d70d7 100644 --- a/charts/kubedb-catalog/templates/elasticsearch/elasticsearch-8.8.2-elasticstack.yaml +++ b/charts/kubedb-catalog/templates/elasticsearch/elasticsearch-8.8.2-elasticstack.yaml @@ -1,4 +1,10 @@ -{{ if .Values.catalog.elasticsearch }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Elasticsearch }} + apiVersion: catalog.kubedb.com/v1alpha1 kind: ElasticsearchVersion metadata: diff --git a/charts/kubedb-catalog/templates/elasticsearch/elasticsearch-psp.yaml b/charts/kubedb-catalog/templates/elasticsearch/elasticsearch-psp.yaml index 262f02f31..29732124a 100644 --- a/charts/kubedb-catalog/templates/elasticsearch/elasticsearch-psp.yaml +++ b/charts/kubedb-catalog/templates/elasticsearch/elasticsearch-psp.yaml @@ -1,4 +1,9 @@ -{{ if and .Values.psp.enabled (.Capabilities.APIVersions.Has "policy/v1beta1/PodSecurityPolicy") .Values.catalog.elasticsearch }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if and .Values.psp.enabled (.Capabilities.APIVersions.Has "policy/v1beta1/PodSecurityPolicy") $featureGates.Elasticsearch }} apiVersion: policy/v1beta1 kind: PodSecurityPolicy metadata: diff --git a/charts/kubedb-catalog/templates/kafka/kafka-3.3.0.yaml b/charts/kubedb-catalog/templates/kafka/kafka-3.3.0.yaml index d6a6ee071..95b6d8a32 100644 --- a/charts/kubedb-catalog/templates/kafka/kafka-3.3.0.yaml +++ b/charts/kubedb-catalog/templates/kafka/kafka-3.3.0.yaml @@ -1,4 +1,10 @@ -{{ if .Values.catalog.kafka }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Kafka }} + apiVersion: catalog.kubedb.com/v1alpha1 kind: KafkaVersion metadata: diff --git a/charts/kubedb-catalog/templates/kafka/kafka-3.3.2.yaml b/charts/kubedb-catalog/templates/kafka/kafka-3.3.2.yaml index d4f6bab5e..9a74a75e0 100644 --- a/charts/kubedb-catalog/templates/kafka/kafka-3.3.2.yaml +++ b/charts/kubedb-catalog/templates/kafka/kafka-3.3.2.yaml @@ -1,4 +1,10 @@ -{{ if .Values.catalog.kafka }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Kafka }} + apiVersion: catalog.kubedb.com/v1alpha1 kind: KafkaVersion metadata: diff --git a/charts/kubedb-catalog/templates/kafka/kafka-3.4.0.yaml b/charts/kubedb-catalog/templates/kafka/kafka-3.4.0.yaml index 8f93a66d1..d089e322c 100644 --- a/charts/kubedb-catalog/templates/kafka/kafka-3.4.0.yaml +++ b/charts/kubedb-catalog/templates/kafka/kafka-3.4.0.yaml @@ -1,4 +1,10 @@ -{{ if .Values.catalog.kafka }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Kafka }} + apiVersion: catalog.kubedb.com/v1alpha1 kind: KafkaVersion metadata: diff --git a/charts/kubedb-catalog/templates/kafka/kafka-3.4.1.yaml b/charts/kubedb-catalog/templates/kafka/kafka-3.4.1.yaml index 402642cd0..c81ff39c9 100644 --- a/charts/kubedb-catalog/templates/kafka/kafka-3.4.1.yaml +++ b/charts/kubedb-catalog/templates/kafka/kafka-3.4.1.yaml @@ -1,4 +1,10 @@ -{{ if .Values.catalog.kafka }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Kafka }} + apiVersion: catalog.kubedb.com/v1alpha1 kind: KafkaVersion metadata: diff --git a/charts/kubedb-catalog/templates/kafka/kafka-3.5.1.yaml b/charts/kubedb-catalog/templates/kafka/kafka-3.5.1.yaml index df918ba08..fdc4d8556 100644 --- a/charts/kubedb-catalog/templates/kafka/kafka-3.5.1.yaml +++ b/charts/kubedb-catalog/templates/kafka/kafka-3.5.1.yaml @@ -1,4 +1,10 @@ -{{ if .Values.catalog.kafka }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Kafka }} + apiVersion: catalog.kubedb.com/v1alpha1 kind: KafkaVersion metadata: diff --git a/charts/kubedb-catalog/templates/kafka/kafka-3.6.0.yaml b/charts/kubedb-catalog/templates/kafka/kafka-3.6.0.yaml index 23faea80f..ab71f8d0b 100644 --- a/charts/kubedb-catalog/templates/kafka/kafka-3.6.0.yaml +++ b/charts/kubedb-catalog/templates/kafka/kafka-3.6.0.yaml @@ -1,4 +1,10 @@ -{{ if .Values.catalog.kafka }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Kafka }} + apiVersion: catalog.kubedb.com/v1alpha1 kind: KafkaVersion metadata: diff --git a/charts/kubedb-catalog/templates/kafka/kafka-psp.yaml b/charts/kubedb-catalog/templates/kafka/kafka-psp.yaml index 397fa4090..782f2a597 100644 --- a/charts/kubedb-catalog/templates/kafka/kafka-psp.yaml +++ b/charts/kubedb-catalog/templates/kafka/kafka-psp.yaml @@ -1,4 +1,9 @@ -{{ if and .Values.psp.enabled (.Capabilities.APIVersions.Has "policy/v1beta1/PodSecurityPolicy") .Values.catalog.kafka }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if and .Values.psp.enabled (.Capabilities.APIVersions.Has "policy/v1beta1/PodSecurityPolicy") $featureGates.Kafka }} apiVersion: policy/v1beta1 kind: PodSecurityPolicy metadata: diff --git a/charts/kubedb-catalog/templates/mariadb/deprecated-mariadb-10.10.2.yaml b/charts/kubedb-catalog/templates/mariadb/deprecated-mariadb-10.10.2.yaml index 33e367485..9194955e3 100644 --- a/charts/kubedb-catalog/templates/mariadb/deprecated-mariadb-10.10.2.yaml +++ b/charts/kubedb-catalog/templates/mariadb/deprecated-mariadb-10.10.2.yaml @@ -1,4 +1,10 @@ -{{ if and .Values.catalog.mariadb (not .Values.skipDeprecated) }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.MariaDB }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: MariaDBVersion metadata: @@ -27,3 +33,4 @@ spec: name: mariadb-restore-10.5.8 version: 10.10.2 {{ end }} +{{ end }} diff --git a/charts/kubedb-catalog/templates/mariadb/deprecated-mariadb-10.11.2.yaml b/charts/kubedb-catalog/templates/mariadb/deprecated-mariadb-10.11.2.yaml index 7abbcef24..00ba5fea9 100644 --- a/charts/kubedb-catalog/templates/mariadb/deprecated-mariadb-10.11.2.yaml +++ b/charts/kubedb-catalog/templates/mariadb/deprecated-mariadb-10.11.2.yaml @@ -1,4 +1,10 @@ -{{ if and .Values.catalog.mariadb (not .Values.skipDeprecated) }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.MariaDB }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: MariaDBVersion metadata: @@ -27,3 +33,4 @@ spec: name: mariadb-restore-10.5.8 version: 10.11.2 {{ end }} +{{ end }} diff --git a/charts/kubedb-catalog/templates/mariadb/deprecated-mariadb-10.4.17.yaml b/charts/kubedb-catalog/templates/mariadb/deprecated-mariadb-10.4.17.yaml index 609b3a944..e0605d060 100644 --- a/charts/kubedb-catalog/templates/mariadb/deprecated-mariadb-10.4.17.yaml +++ b/charts/kubedb-catalog/templates/mariadb/deprecated-mariadb-10.4.17.yaml @@ -1,4 +1,10 @@ -{{ if and .Values.catalog.mariadb (not .Values.skipDeprecated) }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.MariaDB }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: MariaDBVersion metadata: @@ -25,3 +31,4 @@ spec: name: mariadb-restore-10.5.8 version: 10.4.17 {{ end }} +{{ end }} diff --git a/charts/kubedb-catalog/templates/mariadb/deprecated-mariadb-10.4.31.yaml b/charts/kubedb-catalog/templates/mariadb/deprecated-mariadb-10.4.31.yaml index c7e576819..2f7628a32 100644 --- a/charts/kubedb-catalog/templates/mariadb/deprecated-mariadb-10.4.31.yaml +++ b/charts/kubedb-catalog/templates/mariadb/deprecated-mariadb-10.4.31.yaml @@ -1,4 +1,10 @@ -{{ if and .Values.catalog.mariadb (not .Values.skipDeprecated) }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.MariaDB }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: MariaDBVersion metadata: @@ -27,3 +33,4 @@ spec: name: mariadb-restore-10.5.8 version: 10.4.31 {{ end }} +{{ end }} diff --git a/charts/kubedb-catalog/templates/mariadb/deprecated-mariadb-10.5.8.yaml b/charts/kubedb-catalog/templates/mariadb/deprecated-mariadb-10.5.8.yaml index 5935d4711..b58ecfe23 100644 --- a/charts/kubedb-catalog/templates/mariadb/deprecated-mariadb-10.5.8.yaml +++ b/charts/kubedb-catalog/templates/mariadb/deprecated-mariadb-10.5.8.yaml @@ -1,4 +1,10 @@ -{{ if and .Values.catalog.mariadb (not .Values.skipDeprecated) }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.MariaDB }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: MariaDBVersion metadata: @@ -25,3 +31,4 @@ spec: name: mariadb-restore-10.5.8 version: 10.5.8 {{ end }} +{{ end }} diff --git a/charts/kubedb-catalog/templates/mariadb/deprecated-mariadb-10.6.4.yaml b/charts/kubedb-catalog/templates/mariadb/deprecated-mariadb-10.6.4.yaml index 1313021f8..6da40d28c 100644 --- a/charts/kubedb-catalog/templates/mariadb/deprecated-mariadb-10.6.4.yaml +++ b/charts/kubedb-catalog/templates/mariadb/deprecated-mariadb-10.6.4.yaml @@ -1,4 +1,10 @@ -{{ if and .Values.catalog.mariadb (not .Values.skipDeprecated) }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.MariaDB }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: MariaDBVersion metadata: @@ -27,3 +33,4 @@ spec: name: mariadb-restore-10.5.8 version: 10.6.4 {{ end }} +{{ end }} diff --git a/charts/kubedb-catalog/templates/mariadb/mariadb-10.10.7.yaml b/charts/kubedb-catalog/templates/mariadb/mariadb-10.10.7.yaml index e73130c0f..3d56d1bb2 100644 --- a/charts/kubedb-catalog/templates/mariadb/mariadb-10.10.7.yaml +++ b/charts/kubedb-catalog/templates/mariadb/mariadb-10.10.7.yaml @@ -1,4 +1,10 @@ -{{ if .Values.catalog.mariadb }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.MariaDB }} + apiVersion: catalog.kubedb.com/v1alpha1 kind: MariaDBVersion metadata: diff --git a/charts/kubedb-catalog/templates/mariadb/mariadb-10.11.6.yaml b/charts/kubedb-catalog/templates/mariadb/mariadb-10.11.6.yaml index 3ae0905e0..d08ec7832 100644 --- a/charts/kubedb-catalog/templates/mariadb/mariadb-10.11.6.yaml +++ b/charts/kubedb-catalog/templates/mariadb/mariadb-10.11.6.yaml @@ -1,4 +1,10 @@ -{{ if .Values.catalog.mariadb }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.MariaDB }} + apiVersion: catalog.kubedb.com/v1alpha1 kind: MariaDBVersion metadata: diff --git a/charts/kubedb-catalog/templates/mariadb/mariadb-10.4.32.yaml b/charts/kubedb-catalog/templates/mariadb/mariadb-10.4.32.yaml index ef9efbecc..36159a89e 100644 --- a/charts/kubedb-catalog/templates/mariadb/mariadb-10.4.32.yaml +++ b/charts/kubedb-catalog/templates/mariadb/mariadb-10.4.32.yaml @@ -1,4 +1,10 @@ -{{ if .Values.catalog.mariadb }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.MariaDB }} + apiVersion: catalog.kubedb.com/v1alpha1 kind: MariaDBVersion metadata: diff --git a/charts/kubedb-catalog/templates/mariadb/mariadb-10.5.23.yaml b/charts/kubedb-catalog/templates/mariadb/mariadb-10.5.23.yaml index b0525aec8..43251903c 100644 --- a/charts/kubedb-catalog/templates/mariadb/mariadb-10.5.23.yaml +++ b/charts/kubedb-catalog/templates/mariadb/mariadb-10.5.23.yaml @@ -1,4 +1,10 @@ -{{ if .Values.catalog.mariadb }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.MariaDB }} + apiVersion: catalog.kubedb.com/v1alpha1 kind: MariaDBVersion metadata: diff --git a/charts/kubedb-catalog/templates/mariadb/mariadb-10.6.16.yaml b/charts/kubedb-catalog/templates/mariadb/mariadb-10.6.16.yaml index 474c332b3..f7f5f2664 100644 --- a/charts/kubedb-catalog/templates/mariadb/mariadb-10.6.16.yaml +++ b/charts/kubedb-catalog/templates/mariadb/mariadb-10.6.16.yaml @@ -1,4 +1,10 @@ -{{ if .Values.catalog.mariadb }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.MariaDB }} + apiVersion: catalog.kubedb.com/v1alpha1 kind: MariaDBVersion metadata: diff --git a/charts/kubedb-catalog/templates/mariadb/mariadb-11.0.4.yaml b/charts/kubedb-catalog/templates/mariadb/mariadb-11.0.4.yaml index dba664e5e..d60767742 100644 --- a/charts/kubedb-catalog/templates/mariadb/mariadb-11.0.4.yaml +++ b/charts/kubedb-catalog/templates/mariadb/mariadb-11.0.4.yaml @@ -1,4 +1,10 @@ -{{ if .Values.catalog.mariadb }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.MariaDB }} + apiVersion: catalog.kubedb.com/v1alpha1 kind: MariaDBVersion metadata: diff --git a/charts/kubedb-catalog/templates/mariadb/mariadb-11.1.3.yaml b/charts/kubedb-catalog/templates/mariadb/mariadb-11.1.3.yaml index cbb75519c..bc35aad8e 100644 --- a/charts/kubedb-catalog/templates/mariadb/mariadb-11.1.3.yaml +++ b/charts/kubedb-catalog/templates/mariadb/mariadb-11.1.3.yaml @@ -1,4 +1,10 @@ -{{ if .Values.catalog.mariadb }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.MariaDB }} + apiVersion: catalog.kubedb.com/v1alpha1 kind: MariaDBVersion metadata: diff --git a/charts/kubedb-catalog/templates/mariadb/mariadb-11.2.2.yaml b/charts/kubedb-catalog/templates/mariadb/mariadb-11.2.2.yaml index 1c7b80512..52442fac4 100644 --- a/charts/kubedb-catalog/templates/mariadb/mariadb-11.2.2.yaml +++ b/charts/kubedb-catalog/templates/mariadb/mariadb-11.2.2.yaml @@ -1,4 +1,10 @@ -{{ if .Values.catalog.mariadb }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.MariaDB }} + apiVersion: catalog.kubedb.com/v1alpha1 kind: MariaDBVersion metadata: diff --git a/charts/kubedb-catalog/templates/mariadb/mariadb-psp.yaml b/charts/kubedb-catalog/templates/mariadb/mariadb-psp.yaml index c7428a386..c3dfa9992 100644 --- a/charts/kubedb-catalog/templates/mariadb/mariadb-psp.yaml +++ b/charts/kubedb-catalog/templates/mariadb/mariadb-psp.yaml @@ -1,4 +1,9 @@ -{{ if and .Values.psp.enabled (.Capabilities.APIVersions.Has "policy/v1beta1/PodSecurityPolicy") .Values.catalog.mariadb }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if and .Values.psp.enabled (.Capabilities.APIVersions.Has "policy/v1beta1/PodSecurityPolicy") $featureGates.MariaDB }} apiVersion: policy/v1beta1 kind: PodSecurityPolicy metadata: diff --git a/charts/kubedb-catalog/templates/memcached/deprecated-memcached-1.5.4.yaml b/charts/kubedb-catalog/templates/memcached/deprecated-memcached-1.5.4.yaml index 85527402e..d585b524a 100644 --- a/charts/kubedb-catalog/templates/memcached/deprecated-memcached-1.5.4.yaml +++ b/charts/kubedb-catalog/templates/memcached/deprecated-memcached-1.5.4.yaml @@ -1,4 +1,10 @@ -{{ if and .Values.catalog.memcached (not .Values.skipDeprecated) }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Memcached }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: MemcachedVersion metadata: @@ -17,7 +23,7 @@ spec: {{ end }} --- -{{ if and .Values.catalog.memcached (not .Values.skipDeprecated) }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: MemcachedVersion metadata: @@ -36,3 +42,4 @@ spec: runAsUser: 999 version: 1.5.4 {{ end }} +{{ end }} diff --git a/charts/kubedb-catalog/templates/memcached/deprecated-memcached-1.5.yaml b/charts/kubedb-catalog/templates/memcached/deprecated-memcached-1.5.yaml index fdc1213e5..20221024b 100644 --- a/charts/kubedb-catalog/templates/memcached/deprecated-memcached-1.5.yaml +++ b/charts/kubedb-catalog/templates/memcached/deprecated-memcached-1.5.yaml @@ -1,4 +1,10 @@ -{{ if and .Values.catalog.memcached (not .Values.skipDeprecated) }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Memcached }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: MemcachedVersion metadata: @@ -17,7 +23,7 @@ spec: {{ end }} --- -{{ if and .Values.catalog.memcached (not .Values.skipDeprecated) }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: MemcachedVersion metadata: @@ -34,3 +40,4 @@ spec: databasePolicyName: memcached-db version: "1.5" {{ end }} +{{ end }} diff --git a/charts/kubedb-catalog/templates/memcached/memcached-1.5.22.yaml b/charts/kubedb-catalog/templates/memcached/memcached-1.5.22.yaml index 143c4c7c4..5e311c6e7 100644 --- a/charts/kubedb-catalog/templates/memcached/memcached-1.5.22.yaml +++ b/charts/kubedb-catalog/templates/memcached/memcached-1.5.22.yaml @@ -1,4 +1,10 @@ -{{ if .Values.catalog.memcached }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Memcached }} + apiVersion: catalog.kubedb.com/v1alpha1 kind: MemcachedVersion metadata: diff --git a/charts/kubedb-catalog/templates/memcached/memcached-1.6.22.yaml b/charts/kubedb-catalog/templates/memcached/memcached-1.6.22.yaml index 5957b48e7..6b6cc3804 100644 --- a/charts/kubedb-catalog/templates/memcached/memcached-1.6.22.yaml +++ b/charts/kubedb-catalog/templates/memcached/memcached-1.6.22.yaml @@ -1,4 +1,10 @@ -{{ if .Values.catalog.memcached }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Memcached }} + apiVersion: catalog.kubedb.com/v1alpha1 kind: MemcachedVersion metadata: diff --git a/charts/kubedb-catalog/templates/memcached/memcached-psp.yaml b/charts/kubedb-catalog/templates/memcached/memcached-psp.yaml index aa1505ce5..24d5042d6 100644 --- a/charts/kubedb-catalog/templates/memcached/memcached-psp.yaml +++ b/charts/kubedb-catalog/templates/memcached/memcached-psp.yaml @@ -1,4 +1,9 @@ -{{ if and .Values.psp.enabled (.Capabilities.APIVersions.Has "policy/v1beta1/PodSecurityPolicy") .Values.catalog.memcached }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if and .Values.psp.enabled (.Capabilities.APIVersions.Has "policy/v1beta1/PodSecurityPolicy") $featureGates.Memcached }} apiVersion: policy/v1beta1 kind: PodSecurityPolicy metadata: diff --git a/charts/kubedb-catalog/templates/mongodb/deprecated-mongodb-3.4-official.yaml b/charts/kubedb-catalog/templates/mongodb/deprecated-mongodb-3.4-official.yaml index 2e84ebf33..8bdbbb175 100644 --- a/charts/kubedb-catalog/templates/mongodb/deprecated-mongodb-3.4-official.yaml +++ b/charts/kubedb-catalog/templates/mongodb/deprecated-mongodb-3.4-official.yaml @@ -1,4 +1,10 @@ -{{ if and .Values.catalog.mongodb (not .Values.skipDeprecated) }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.MongoDB }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: MongoDBVersion metadata: @@ -24,7 +30,7 @@ spec: {{ end }} --- -{{ if and .Values.catalog.mongodb (not .Values.skipDeprecated) }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: MongoDBVersion metadata: @@ -50,7 +56,7 @@ spec: {{ end }} --- -{{ if and .Values.catalog.mongodb (not .Values.skipDeprecated) }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: MongoDBVersion metadata: @@ -76,7 +82,7 @@ spec: {{ end }} --- -{{ if and .Values.catalog.mongodb (not .Values.skipDeprecated) }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: MongoDBVersion metadata: @@ -100,3 +106,4 @@ spec: image: '{{ include "image.ghcr" (merge (dict "_repo" "kubedb/replication-mode-detector") $) }}:v0.27.0' version: "3.4" {{ end }} +{{ end }} diff --git a/charts/kubedb-catalog/templates/mongodb/deprecated-mongodb-3.4.17-official.yaml b/charts/kubedb-catalog/templates/mongodb/deprecated-mongodb-3.4.17-official.yaml index 97f7c0c32..374ccad75 100644 --- a/charts/kubedb-catalog/templates/mongodb/deprecated-mongodb-3.4.17-official.yaml +++ b/charts/kubedb-catalog/templates/mongodb/deprecated-mongodb-3.4.17-official.yaml @@ -1,4 +1,10 @@ -{{ if and .Values.catalog.mongodb (not .Values.skipDeprecated) }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.MongoDB }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: MongoDBVersion metadata: @@ -24,7 +30,7 @@ spec: {{ end }} --- -{{ if and .Values.catalog.mongodb (not .Values.skipDeprecated) }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: MongoDBVersion metadata: @@ -71,3 +77,4 @@ spec: - '>= 3.6.0, < 3.7.0' version: 3.4.17 {{ end }} +{{ end }} diff --git a/charts/kubedb-catalog/templates/mongodb/deprecated-mongodb-3.4.22-official.yaml b/charts/kubedb-catalog/templates/mongodb/deprecated-mongodb-3.4.22-official.yaml index 5e0646153..18670a184 100644 --- a/charts/kubedb-catalog/templates/mongodb/deprecated-mongodb-3.4.22-official.yaml +++ b/charts/kubedb-catalog/templates/mongodb/deprecated-mongodb-3.4.22-official.yaml @@ -1,4 +1,10 @@ -{{ if and .Values.catalog.mongodb (not .Values.skipDeprecated) }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.MongoDB }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: MongoDBVersion metadata: @@ -24,7 +30,7 @@ spec: {{ end }} --- -{{ if and .Values.catalog.mongodb (not .Values.skipDeprecated) }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: MongoDBVersion metadata: @@ -50,7 +56,7 @@ spec: {{ end }} --- -{{ if and .Values.catalog.mongodb (not .Values.skipDeprecated) }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: MongoDBVersion metadata: @@ -76,7 +82,7 @@ spec: {{ end }} --- -{{ if and .Values.catalog.mongodb (not .Values.skipDeprecated) }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: MongoDBVersion metadata: @@ -123,3 +129,4 @@ spec: - '>= 3.6.0, < 3.7.0' version: 3.4.22 {{ end }} +{{ end }} diff --git a/charts/kubedb-catalog/templates/mongodb/deprecated-mongodb-3.6-official.yaml b/charts/kubedb-catalog/templates/mongodb/deprecated-mongodb-3.6-official.yaml index b938dd1e6..f29615db8 100644 --- a/charts/kubedb-catalog/templates/mongodb/deprecated-mongodb-3.6-official.yaml +++ b/charts/kubedb-catalog/templates/mongodb/deprecated-mongodb-3.6-official.yaml @@ -1,4 +1,10 @@ -{{ if and .Values.catalog.mongodb (not .Values.skipDeprecated) }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.MongoDB }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: MongoDBVersion metadata: @@ -24,7 +30,7 @@ spec: {{ end }} --- -{{ if and .Values.catalog.mongodb (not .Values.skipDeprecated) }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: MongoDBVersion metadata: @@ -50,7 +56,7 @@ spec: {{ end }} --- -{{ if and .Values.catalog.mongodb (not .Values.skipDeprecated) }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: MongoDBVersion metadata: @@ -76,7 +82,7 @@ spec: {{ end }} --- -{{ if and .Values.catalog.mongodb (not .Values.skipDeprecated) }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: MongoDBVersion metadata: @@ -100,3 +106,4 @@ spec: image: '{{ include "image.ghcr" (merge (dict "_repo" "kubedb/replication-mode-detector") $) }}:v0.27.0' version: "3.6" {{ end }} +{{ end }} diff --git a/charts/kubedb-catalog/templates/mongodb/deprecated-mongodb-3.6.13-official.yaml b/charts/kubedb-catalog/templates/mongodb/deprecated-mongodb-3.6.13-official.yaml index 77a28d75f..ef47725ae 100644 --- a/charts/kubedb-catalog/templates/mongodb/deprecated-mongodb-3.6.13-official.yaml +++ b/charts/kubedb-catalog/templates/mongodb/deprecated-mongodb-3.6.13-official.yaml @@ -1,4 +1,10 @@ -{{ if and .Values.catalog.mongodb (not .Values.skipDeprecated) }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.MongoDB }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: MongoDBVersion metadata: @@ -24,7 +30,7 @@ spec: {{ end }} --- -{{ if and .Values.catalog.mongodb (not .Values.skipDeprecated) }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: MongoDBVersion metadata: @@ -50,7 +56,7 @@ spec: {{ end }} --- -{{ if and .Values.catalog.mongodb (not .Values.skipDeprecated) }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: MongoDBVersion metadata: @@ -76,7 +82,7 @@ spec: {{ end }} --- -{{ if and .Values.catalog.mongodb (not .Values.skipDeprecated) }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: MongoDBVersion metadata: @@ -123,3 +129,4 @@ spec: - '>= 4.0.0, < 4.1.0' version: 3.6.13 {{ end }} +{{ end }} diff --git a/charts/kubedb-catalog/templates/mongodb/deprecated-mongodb-3.6.18-percona.yaml b/charts/kubedb-catalog/templates/mongodb/deprecated-mongodb-3.6.18-percona.yaml index 8a63345ae..b4de935fc 100644 --- a/charts/kubedb-catalog/templates/mongodb/deprecated-mongodb-3.6.18-percona.yaml +++ b/charts/kubedb-catalog/templates/mongodb/deprecated-mongodb-3.6.18-percona.yaml @@ -1,4 +1,10 @@ -{{ if and .Values.catalog.mongodb (not .Values.skipDeprecated) }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.MongoDB }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: MongoDBVersion metadata: @@ -45,3 +51,4 @@ spec: - '>= 4.0.0, < 4.1.0' version: 3.6.18 {{ end }} +{{ end }} diff --git a/charts/kubedb-catalog/templates/mongodb/deprecated-mongodb-3.6.8-official.yaml b/charts/kubedb-catalog/templates/mongodb/deprecated-mongodb-3.6.8-official.yaml index abe2c1eb3..8f6f0119c 100644 --- a/charts/kubedb-catalog/templates/mongodb/deprecated-mongodb-3.6.8-official.yaml +++ b/charts/kubedb-catalog/templates/mongodb/deprecated-mongodb-3.6.8-official.yaml @@ -1,4 +1,10 @@ -{{ if and .Values.catalog.mongodb (not .Values.skipDeprecated) }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.MongoDB }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: MongoDBVersion metadata: @@ -24,7 +30,7 @@ spec: {{ end }} --- -{{ if and .Values.catalog.mongodb (not .Values.skipDeprecated) }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: MongoDBVersion metadata: @@ -71,3 +77,4 @@ spec: - '>= 4.0.0, < 4.1.0' version: 3.6.8 {{ end }} +{{ end }} diff --git a/charts/kubedb-catalog/templates/mongodb/deprecated-mongodb-4.0.10-percona.yaml b/charts/kubedb-catalog/templates/mongodb/deprecated-mongodb-4.0.10-percona.yaml index 5a50c3e17..7a27abbd6 100644 --- a/charts/kubedb-catalog/templates/mongodb/deprecated-mongodb-4.0.10-percona.yaml +++ b/charts/kubedb-catalog/templates/mongodb/deprecated-mongodb-4.0.10-percona.yaml @@ -1,4 +1,10 @@ -{{ if and .Values.catalog.mongodb (not .Values.skipDeprecated) }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.MongoDB }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: MongoDBVersion metadata: @@ -33,3 +39,4 @@ spec: - '>= 4.1.0, < 4.3.0' version: 4.0.10 {{ end }} +{{ end }} diff --git a/charts/kubedb-catalog/templates/mongodb/deprecated-mongodb-4.0.11-official.yaml b/charts/kubedb-catalog/templates/mongodb/deprecated-mongodb-4.0.11-official.yaml index 875096b2c..1284b65b0 100644 --- a/charts/kubedb-catalog/templates/mongodb/deprecated-mongodb-4.0.11-official.yaml +++ b/charts/kubedb-catalog/templates/mongodb/deprecated-mongodb-4.0.11-official.yaml @@ -1,4 +1,10 @@ -{{ if and .Values.catalog.mongodb (not .Values.skipDeprecated) }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.MongoDB }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: MongoDBVersion metadata: @@ -24,7 +30,7 @@ spec: {{ end }} --- -{{ if and .Values.catalog.mongodb (not .Values.skipDeprecated) }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: MongoDBVersion metadata: @@ -50,7 +56,7 @@ spec: {{ end }} --- -{{ if and .Values.catalog.mongodb (not .Values.skipDeprecated) }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: MongoDBVersion metadata: @@ -76,7 +82,7 @@ spec: {{ end }} --- -{{ if and .Values.catalog.mongodb (not .Values.skipDeprecated) }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: MongoDBVersion metadata: @@ -123,3 +129,4 @@ spec: - '>= 4.1.0, < 4.3.0' version: 4.0.11 {{ end }} +{{ end }} diff --git a/charts/kubedb-catalog/templates/mongodb/deprecated-mongodb-4.0.3-official.yaml b/charts/kubedb-catalog/templates/mongodb/deprecated-mongodb-4.0.3-official.yaml index 20ed8c8e5..559c1a255 100644 --- a/charts/kubedb-catalog/templates/mongodb/deprecated-mongodb-4.0.3-official.yaml +++ b/charts/kubedb-catalog/templates/mongodb/deprecated-mongodb-4.0.3-official.yaml @@ -1,4 +1,10 @@ -{{ if and .Values.catalog.mongodb (not .Values.skipDeprecated) }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.MongoDB }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: MongoDBVersion metadata: @@ -24,7 +30,7 @@ spec: {{ end }} --- -{{ if and .Values.catalog.mongodb (not .Values.skipDeprecated) }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: MongoDBVersion metadata: @@ -71,3 +77,4 @@ spec: - '>= 4.1.0, < 4.3.0' version: 4.0.3 {{ end }} +{{ end }} diff --git a/charts/kubedb-catalog/templates/mongodb/deprecated-mongodb-4.0.5-official.yaml b/charts/kubedb-catalog/templates/mongodb/deprecated-mongodb-4.0.5-official.yaml index e1d8cb932..4446a278c 100644 --- a/charts/kubedb-catalog/templates/mongodb/deprecated-mongodb-4.0.5-official.yaml +++ b/charts/kubedb-catalog/templates/mongodb/deprecated-mongodb-4.0.5-official.yaml @@ -1,4 +1,10 @@ -{{ if and .Values.catalog.mongodb (not .Values.skipDeprecated) }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.MongoDB }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: MongoDBVersion metadata: @@ -24,7 +30,7 @@ spec: {{ end }} --- -{{ if and .Values.catalog.mongodb (not .Values.skipDeprecated) }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: MongoDBVersion metadata: @@ -50,7 +56,7 @@ spec: {{ end }} --- -{{ if and .Values.catalog.mongodb (not .Values.skipDeprecated) }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: MongoDBVersion metadata: @@ -76,7 +82,7 @@ spec: {{ end }} --- -{{ if and .Values.catalog.mongodb (not .Values.skipDeprecated) }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: MongoDBVersion metadata: @@ -102,7 +108,7 @@ spec: {{ end }} --- -{{ if and .Values.catalog.mongodb (not .Values.skipDeprecated) }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: MongoDBVersion metadata: @@ -128,7 +134,7 @@ spec: {{ end }} --- -{{ if and .Values.catalog.mongodb (not .Values.skipDeprecated) }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: MongoDBVersion metadata: @@ -175,3 +181,4 @@ spec: - '>= 4.1.0, < 4.3.0' version: 4.0.5 {{ end }} +{{ end }} diff --git a/charts/kubedb-catalog/templates/mongodb/deprecated-mongodb-4.1.13-official.yaml b/charts/kubedb-catalog/templates/mongodb/deprecated-mongodb-4.1.13-official.yaml index b39e68009..450c196ed 100644 --- a/charts/kubedb-catalog/templates/mongodb/deprecated-mongodb-4.1.13-official.yaml +++ b/charts/kubedb-catalog/templates/mongodb/deprecated-mongodb-4.1.13-official.yaml @@ -1,4 +1,10 @@ -{{ if and .Values.catalog.mongodb (not .Values.skipDeprecated) }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.MongoDB }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: MongoDBVersion metadata: @@ -24,7 +30,7 @@ spec: {{ end }} --- -{{ if and .Values.catalog.mongodb (not .Values.skipDeprecated) }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: MongoDBVersion metadata: @@ -50,7 +56,7 @@ spec: {{ end }} --- -{{ if and .Values.catalog.mongodb (not .Values.skipDeprecated) }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: MongoDBVersion metadata: @@ -76,7 +82,7 @@ spec: {{ end }} --- -{{ if and .Values.catalog.mongodb (not .Values.skipDeprecated) }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: MongoDBVersion metadata: @@ -123,3 +129,4 @@ spec: - '>= 4.2.0, < 4.3.0' version: 4.1.13 {{ end }} +{{ end }} diff --git a/charts/kubedb-catalog/templates/mongodb/deprecated-mongodb-4.1.4-official.yaml b/charts/kubedb-catalog/templates/mongodb/deprecated-mongodb-4.1.4-official.yaml index 50df71326..47808cc7c 100644 --- a/charts/kubedb-catalog/templates/mongodb/deprecated-mongodb-4.1.4-official.yaml +++ b/charts/kubedb-catalog/templates/mongodb/deprecated-mongodb-4.1.4-official.yaml @@ -1,4 +1,10 @@ -{{ if and .Values.catalog.mongodb (not .Values.skipDeprecated) }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.MongoDB }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: MongoDBVersion metadata: @@ -24,7 +30,7 @@ spec: {{ end }} --- -{{ if and .Values.catalog.mongodb (not .Values.skipDeprecated) }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: MongoDBVersion metadata: @@ -71,3 +77,4 @@ spec: - '>= 4.2.0, < 4.3.0' version: 4.1.4 {{ end }} +{{ end }} diff --git a/charts/kubedb-catalog/templates/mongodb/deprecated-mongodb-4.1.7-official.yaml b/charts/kubedb-catalog/templates/mongodb/deprecated-mongodb-4.1.7-official.yaml index 0fde59af2..96b7e929d 100644 --- a/charts/kubedb-catalog/templates/mongodb/deprecated-mongodb-4.1.7-official.yaml +++ b/charts/kubedb-catalog/templates/mongodb/deprecated-mongodb-4.1.7-official.yaml @@ -1,4 +1,10 @@ -{{ if and .Values.catalog.mongodb (not .Values.skipDeprecated) }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.MongoDB }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: MongoDBVersion metadata: @@ -24,7 +30,7 @@ spec: {{ end }} --- -{{ if and .Values.catalog.mongodb (not .Values.skipDeprecated) }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: MongoDBVersion metadata: @@ -50,7 +56,7 @@ spec: {{ end }} --- -{{ if and .Values.catalog.mongodb (not .Values.skipDeprecated) }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: MongoDBVersion metadata: @@ -76,7 +82,7 @@ spec: {{ end }} --- -{{ if and .Values.catalog.mongodb (not .Values.skipDeprecated) }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: MongoDBVersion metadata: @@ -123,3 +129,4 @@ spec: - '>= 4.2.0, < 4.3.0' version: 4.1.7 {{ end }} +{{ end }} diff --git a/charts/kubedb-catalog/templates/mongodb/deprecated-mongodb-4.2.3-official.yaml b/charts/kubedb-catalog/templates/mongodb/deprecated-mongodb-4.2.3-official.yaml index b1f318577..b6ec89868 100644 --- a/charts/kubedb-catalog/templates/mongodb/deprecated-mongodb-4.2.3-official.yaml +++ b/charts/kubedb-catalog/templates/mongodb/deprecated-mongodb-4.2.3-official.yaml @@ -1,4 +1,10 @@ -{{ if and .Values.catalog.mongodb (not .Values.skipDeprecated) }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.MongoDB }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: MongoDBVersion metadata: @@ -24,7 +30,7 @@ spec: {{ end }} --- -{{ if and .Values.catalog.mongodb (not .Values.skipDeprecated) }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: MongoDBVersion metadata: @@ -71,3 +77,4 @@ spec: - '>= 4.4.0, < 5.0.0' version: 4.2.3 {{ end }} +{{ end }} diff --git a/charts/kubedb-catalog/templates/mongodb/deprecated-mongodb-4.4.6-official.yaml b/charts/kubedb-catalog/templates/mongodb/deprecated-mongodb-4.4.6-official.yaml index 620afac0e..c9bce0ab9 100644 --- a/charts/kubedb-catalog/templates/mongodb/deprecated-mongodb-4.4.6-official.yaml +++ b/charts/kubedb-catalog/templates/mongodb/deprecated-mongodb-4.4.6-official.yaml @@ -1,4 +1,10 @@ -{{ if and .Values.catalog.mongodb (not .Values.skipDeprecated) }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.MongoDB }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: MongoDBVersion metadata: @@ -45,3 +51,4 @@ spec: - '>= 5.0.0' version: 4.4.6 {{ end }} +{{ end }} diff --git a/charts/kubedb-catalog/templates/mongodb/deprecated-mongodb-5.0.15-official.yaml b/charts/kubedb-catalog/templates/mongodb/deprecated-mongodb-5.0.15-official.yaml index cc84db461..8511b09e2 100644 --- a/charts/kubedb-catalog/templates/mongodb/deprecated-mongodb-5.0.15-official.yaml +++ b/charts/kubedb-catalog/templates/mongodb/deprecated-mongodb-5.0.15-official.yaml @@ -1,4 +1,10 @@ -{{ if and .Values.catalog.mongodb (not .Values.skipDeprecated) }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.MongoDB }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: MongoDBVersion metadata: @@ -42,3 +48,4 @@ spec: name: mongodb-restore-5.0.15 version: 5.0.15 {{ end }} +{{ end }} diff --git a/charts/kubedb-catalog/templates/mongodb/deprecated-mongodb-5.0.2-official.yaml b/charts/kubedb-catalog/templates/mongodb/deprecated-mongodb-5.0.2-official.yaml index 7eec570d0..fe578881f 100644 --- a/charts/kubedb-catalog/templates/mongodb/deprecated-mongodb-5.0.2-official.yaml +++ b/charts/kubedb-catalog/templates/mongodb/deprecated-mongodb-5.0.2-official.yaml @@ -1,4 +1,10 @@ -{{ if and .Values.catalog.mongodb (not .Values.skipDeprecated) }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.MongoDB }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: MongoDBVersion metadata: @@ -42,3 +48,4 @@ spec: name: mongodb-restore-5.0.3 version: 5.0.2 {{ end }} +{{ end }} diff --git a/charts/kubedb-catalog/templates/mongodb/deprecated-mongodb-5.0.3-official.yaml b/charts/kubedb-catalog/templates/mongodb/deprecated-mongodb-5.0.3-official.yaml index 80480deb8..dac57f69c 100644 --- a/charts/kubedb-catalog/templates/mongodb/deprecated-mongodb-5.0.3-official.yaml +++ b/charts/kubedb-catalog/templates/mongodb/deprecated-mongodb-5.0.3-official.yaml @@ -1,4 +1,10 @@ -{{ if and .Values.catalog.mongodb (not .Values.skipDeprecated) }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.MongoDB }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: MongoDBVersion metadata: @@ -42,3 +48,4 @@ spec: name: mongodb-restore-5.0.3 version: 5.0.3 {{ end }} +{{ end }} diff --git a/charts/kubedb-catalog/templates/mongodb/deprecated-mongodb-6.0.5-official.yaml b/charts/kubedb-catalog/templates/mongodb/deprecated-mongodb-6.0.5-official.yaml index 10feaffb9..58c4961d3 100644 --- a/charts/kubedb-catalog/templates/mongodb/deprecated-mongodb-6.0.5-official.yaml +++ b/charts/kubedb-catalog/templates/mongodb/deprecated-mongodb-6.0.5-official.yaml @@ -1,4 +1,10 @@ -{{ if and .Values.catalog.mongodb (not .Values.skipDeprecated) }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.MongoDB }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: MongoDBVersion metadata: @@ -42,3 +48,4 @@ spec: name: mongodb-restore-6.0.5 version: 6.0.5 {{ end }} +{{ end }} diff --git a/charts/kubedb-catalog/templates/mongodb/mongodb-4.2.24-official.yaml b/charts/kubedb-catalog/templates/mongodb/mongodb-4.2.24-official.yaml index a749d64ec..78898cedf 100644 --- a/charts/kubedb-catalog/templates/mongodb/mongodb-4.2.24-official.yaml +++ b/charts/kubedb-catalog/templates/mongodb/mongodb-4.2.24-official.yaml @@ -1,4 +1,10 @@ -{{ if .Values.catalog.mongodb }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.MongoDB }} + apiVersion: catalog.kubedb.com/v1alpha1 kind: MongoDBVersion metadata: diff --git a/charts/kubedb-catalog/templates/mongodb/mongodb-4.2.7-percona.yaml b/charts/kubedb-catalog/templates/mongodb/mongodb-4.2.7-percona.yaml index 0abe58256..e52e64ff7 100644 --- a/charts/kubedb-catalog/templates/mongodb/mongodb-4.2.7-percona.yaml +++ b/charts/kubedb-catalog/templates/mongodb/mongodb-4.2.7-percona.yaml @@ -1,4 +1,10 @@ -{{ if .Values.catalog.mongodb }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.MongoDB }} + apiVersion: catalog.kubedb.com/v1alpha1 kind: MongoDBVersion metadata: diff --git a/charts/kubedb-catalog/templates/mongodb/mongodb-4.4.10-percona.yaml b/charts/kubedb-catalog/templates/mongodb/mongodb-4.4.10-percona.yaml index afbf48aec..dada8b59c 100644 --- a/charts/kubedb-catalog/templates/mongodb/mongodb-4.4.10-percona.yaml +++ b/charts/kubedb-catalog/templates/mongodb/mongodb-4.4.10-percona.yaml @@ -1,4 +1,10 @@ -{{ if .Values.catalog.mongodb }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.MongoDB }} + apiVersion: catalog.kubedb.com/v1alpha1 kind: MongoDBVersion metadata: diff --git a/charts/kubedb-catalog/templates/mongodb/mongodb-4.4.26-official.yaml b/charts/kubedb-catalog/templates/mongodb/mongodb-4.4.26-official.yaml index 61d3ffc4a..6f169d81a 100644 --- a/charts/kubedb-catalog/templates/mongodb/mongodb-4.4.26-official.yaml +++ b/charts/kubedb-catalog/templates/mongodb/mongodb-4.4.26-official.yaml @@ -1,4 +1,10 @@ -{{ if .Values.catalog.mongodb }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.MongoDB }} + apiVersion: catalog.kubedb.com/v1alpha1 kind: MongoDBVersion metadata: diff --git a/charts/kubedb-catalog/templates/mongodb/mongodb-5.0.23-official.yaml b/charts/kubedb-catalog/templates/mongodb/mongodb-5.0.23-official.yaml index ee9c0c93e..4ee18ad61 100644 --- a/charts/kubedb-catalog/templates/mongodb/mongodb-5.0.23-official.yaml +++ b/charts/kubedb-catalog/templates/mongodb/mongodb-5.0.23-official.yaml @@ -1,4 +1,10 @@ -{{ if .Values.catalog.mongodb }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.MongoDB }} + apiVersion: catalog.kubedb.com/v1alpha1 kind: MongoDBVersion metadata: diff --git a/charts/kubedb-catalog/templates/mongodb/mongodb-6.0.12-official.yaml b/charts/kubedb-catalog/templates/mongodb/mongodb-6.0.12-official.yaml index c3f729f59..8f66fad13 100644 --- a/charts/kubedb-catalog/templates/mongodb/mongodb-6.0.12-official.yaml +++ b/charts/kubedb-catalog/templates/mongodb/mongodb-6.0.12-official.yaml @@ -1,4 +1,10 @@ -{{ if .Values.catalog.mongodb }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.MongoDB }} + apiVersion: catalog.kubedb.com/v1alpha1 kind: MongoDBVersion metadata: diff --git a/charts/kubedb-catalog/templates/mongodb/mongodb-psp.yaml b/charts/kubedb-catalog/templates/mongodb/mongodb-psp.yaml index 4df532a21..26e397518 100644 --- a/charts/kubedb-catalog/templates/mongodb/mongodb-psp.yaml +++ b/charts/kubedb-catalog/templates/mongodb/mongodb-psp.yaml @@ -1,4 +1,9 @@ -{{ if and .Values.psp.enabled (.Capabilities.APIVersions.Has "policy/v1beta1/PodSecurityPolicy") .Values.catalog.mongodb }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if and .Values.psp.enabled (.Capabilities.APIVersions.Has "policy/v1beta1/PodSecurityPolicy") $featureGates.MongoDB }} apiVersion: policy/v1beta1 kind: PodSecurityPolicy metadata: diff --git a/charts/kubedb-catalog/templates/mysql/deprecated-mysql-5-official.yaml b/charts/kubedb-catalog/templates/mysql/deprecated-mysql-5-official.yaml index 7410f4fc0..93b360bb5 100644 --- a/charts/kubedb-catalog/templates/mysql/deprecated-mysql-5-official.yaml +++ b/charts/kubedb-catalog/templates/mysql/deprecated-mysql-5-official.yaml @@ -1,4 +1,10 @@ -{{ if and .Values.catalog.mysql (not .Values.skipDeprecated) }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.MySQL }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: MySQLVersion metadata: @@ -30,7 +36,7 @@ spec: {{ end }} --- -{{ if and .Values.catalog.mysql (not .Values.skipDeprecated) }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: MySQLVersion metadata: @@ -60,3 +66,4 @@ spec: - < 5.7.35 version: "5" {{ end }} +{{ end }} diff --git a/charts/kubedb-catalog/templates/mysql/deprecated-mysql-5.7-official.yaml b/charts/kubedb-catalog/templates/mysql/deprecated-mysql-5.7-official.yaml index 538d77fe0..eb13e0f55 100644 --- a/charts/kubedb-catalog/templates/mysql/deprecated-mysql-5.7-official.yaml +++ b/charts/kubedb-catalog/templates/mysql/deprecated-mysql-5.7-official.yaml @@ -1,4 +1,10 @@ -{{ if and .Values.catalog.mysql (not .Values.skipDeprecated) }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.MySQL }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: MySQLVersion metadata: @@ -30,7 +36,7 @@ spec: {{ end }} --- -{{ if and .Values.catalog.mysql (not .Values.skipDeprecated) }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: MySQLVersion metadata: @@ -60,3 +66,4 @@ spec: - < 5.7.35 version: "5.7" {{ end }} +{{ end }} diff --git a/charts/kubedb-catalog/templates/mysql/deprecated-mysql-5.7.25-official.yaml b/charts/kubedb-catalog/templates/mysql/deprecated-mysql-5.7.25-official.yaml index 996638670..96e843f68 100644 --- a/charts/kubedb-catalog/templates/mysql/deprecated-mysql-5.7.25-official.yaml +++ b/charts/kubedb-catalog/templates/mysql/deprecated-mysql-5.7.25-official.yaml @@ -1,4 +1,10 @@ -{{ if and .Values.catalog.mysql (not .Values.skipDeprecated) }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.MySQL }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: MySQLVersion metadata: @@ -30,7 +36,7 @@ spec: {{ end }} --- -{{ if and .Values.catalog.mysql (not .Values.skipDeprecated) }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: MySQLVersion metadata: @@ -60,7 +66,7 @@ spec: {{ end }} --- -{{ if and .Values.catalog.mysql (not .Values.skipDeprecated) }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: MySQLVersion metadata: @@ -90,7 +96,7 @@ spec: {{ end }} --- -{{ if and .Values.catalog.mysql (not .Values.skipDeprecated) }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: MySQLVersion metadata: @@ -120,7 +126,7 @@ spec: {{ end }} --- -{{ if and .Values.catalog.mysql (not .Values.skipDeprecated) }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: MySQLVersion metadata: @@ -156,7 +162,7 @@ spec: {{ end }} --- -{{ if and .Values.catalog.mysql (not .Values.skipDeprecated) }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: MySQLVersion metadata: @@ -190,3 +196,4 @@ spec: - < 5.7.25 version: 5.7.25 {{ end }} +{{ end }} diff --git a/charts/kubedb-catalog/templates/mysql/deprecated-mysql-5.7.29-official.yaml b/charts/kubedb-catalog/templates/mysql/deprecated-mysql-5.7.29-official.yaml index 3a1987437..1c613616e 100644 --- a/charts/kubedb-catalog/templates/mysql/deprecated-mysql-5.7.29-official.yaml +++ b/charts/kubedb-catalog/templates/mysql/deprecated-mysql-5.7.29-official.yaml @@ -1,4 +1,10 @@ -{{ if and .Values.catalog.mysql (not .Values.skipDeprecated) }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.MySQL }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: MySQLVersion metadata: @@ -30,7 +36,7 @@ spec: {{ end }} --- -{{ if and .Values.catalog.mysql (not .Values.skipDeprecated) }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: MySQLVersion metadata: @@ -62,7 +68,7 @@ spec: {{ end }} --- -{{ if and .Values.catalog.mysql (not .Values.skipDeprecated) }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: MySQLVersion metadata: @@ -100,7 +106,7 @@ spec: {{ end }} --- -{{ if and .Values.catalog.mysql (not .Values.skipDeprecated) }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: MySQLVersion metadata: @@ -136,3 +142,4 @@ spec: - < 5.7.29 version: 5.7.29 {{ end }} +{{ end }} diff --git a/charts/kubedb-catalog/templates/mysql/deprecated-mysql-5.7.31-official.yaml b/charts/kubedb-catalog/templates/mysql/deprecated-mysql-5.7.31-official.yaml index 454eecaf3..f27dd1add 100644 --- a/charts/kubedb-catalog/templates/mysql/deprecated-mysql-5.7.31-official.yaml +++ b/charts/kubedb-catalog/templates/mysql/deprecated-mysql-5.7.31-official.yaml @@ -1,4 +1,10 @@ -{{ if and .Values.catalog.mysql (not .Values.skipDeprecated) }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.MySQL }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: MySQLVersion metadata: @@ -30,7 +36,7 @@ spec: {{ end }} --- -{{ if and .Values.catalog.mysql (not .Values.skipDeprecated) }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: MySQLVersion metadata: @@ -68,7 +74,7 @@ spec: {{ end }} --- -{{ if and .Values.catalog.mysql (not .Values.skipDeprecated) }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: MySQLVersion metadata: @@ -104,3 +110,4 @@ spec: - < 5.7.31 version: 5.7.31 {{ end }} +{{ end }} diff --git a/charts/kubedb-catalog/templates/mysql/deprecated-mysql-5.7.33-official.yaml b/charts/kubedb-catalog/templates/mysql/deprecated-mysql-5.7.33-official.yaml index 1b7699935..36a69ead4 100644 --- a/charts/kubedb-catalog/templates/mysql/deprecated-mysql-5.7.33-official.yaml +++ b/charts/kubedb-catalog/templates/mysql/deprecated-mysql-5.7.33-official.yaml @@ -1,4 +1,10 @@ -{{ if and .Values.catalog.mysql (not .Values.skipDeprecated) }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.MySQL }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: MySQLVersion metadata: @@ -36,7 +42,7 @@ spec: {{ end }} --- -{{ if and .Values.catalog.mysql (not .Values.skipDeprecated) }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: MySQLVersion metadata: @@ -72,3 +78,4 @@ spec: - < 5.7.33 version: 5.7.33 {{ end }} +{{ end }} diff --git a/charts/kubedb-catalog/templates/mysql/deprecated-mysql-5.7.35-official.yaml b/charts/kubedb-catalog/templates/mysql/deprecated-mysql-5.7.35-official.yaml index 5fb86bfb5..6e41d66e3 100644 --- a/charts/kubedb-catalog/templates/mysql/deprecated-mysql-5.7.35-official.yaml +++ b/charts/kubedb-catalog/templates/mysql/deprecated-mysql-5.7.35-official.yaml @@ -1,4 +1,10 @@ -{{ if and .Values.catalog.mysql (not .Values.skipDeprecated) }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.MySQL }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: MySQLVersion metadata: @@ -36,7 +42,7 @@ spec: {{ end }} --- -{{ if and .Values.catalog.mysql (not .Values.skipDeprecated) }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: MySQLVersion metadata: @@ -74,3 +80,4 @@ spec: - < 5.7.35 version: 5.7.35 {{ end }} +{{ end }} diff --git a/charts/kubedb-catalog/templates/mysql/deprecated-mysql-5.7.36-official.yaml b/charts/kubedb-catalog/templates/mysql/deprecated-mysql-5.7.36-official.yaml index f3f22c7be..862f0e4e3 100644 --- a/charts/kubedb-catalog/templates/mysql/deprecated-mysql-5.7.36-official.yaml +++ b/charts/kubedb-catalog/templates/mysql/deprecated-mysql-5.7.36-official.yaml @@ -1,4 +1,10 @@ -{{ if and .Values.catalog.mysql (not .Values.skipDeprecated) }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.MySQL }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: MySQLVersion metadata: @@ -36,3 +42,4 @@ spec: - < 5.7.36 version: 5.7.36 {{ end }} +{{ end }} diff --git a/charts/kubedb-catalog/templates/mysql/deprecated-mysql-5.7.41-official.yaml b/charts/kubedb-catalog/templates/mysql/deprecated-mysql-5.7.41-official.yaml index 4321ecf1a..16442f8d2 100644 --- a/charts/kubedb-catalog/templates/mysql/deprecated-mysql-5.7.41-official.yaml +++ b/charts/kubedb-catalog/templates/mysql/deprecated-mysql-5.7.41-official.yaml @@ -1,4 +1,10 @@ -{{ if and .Values.catalog.mysql (not .Values.skipDeprecated) }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.MySQL }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: MySQLVersion metadata: @@ -38,3 +44,4 @@ spec: - < 5.7.41 version: 5.7.41 {{ end }} +{{ end }} diff --git a/charts/kubedb-catalog/templates/mysql/deprecated-mysql-8-official.yaml b/charts/kubedb-catalog/templates/mysql/deprecated-mysql-8-official.yaml index d541b2bbe..4f17d7edf 100644 --- a/charts/kubedb-catalog/templates/mysql/deprecated-mysql-8-official.yaml +++ b/charts/kubedb-catalog/templates/mysql/deprecated-mysql-8-official.yaml @@ -1,4 +1,10 @@ -{{ if and .Values.catalog.mysql (not .Values.skipDeprecated) }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.MySQL }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: MySQLVersion metadata: @@ -30,7 +36,7 @@ spec: {{ end }} --- -{{ if and .Values.catalog.mysql (not .Values.skipDeprecated) }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: MySQLVersion metadata: @@ -60,3 +66,4 @@ spec: - < 8.0.17 version: "8" {{ end }} +{{ end }} diff --git a/charts/kubedb-catalog/templates/mysql/deprecated-mysql-8.0-official.yaml b/charts/kubedb-catalog/templates/mysql/deprecated-mysql-8.0-official.yaml index 7b43f8a88..7d82c8661 100644 --- a/charts/kubedb-catalog/templates/mysql/deprecated-mysql-8.0-official.yaml +++ b/charts/kubedb-catalog/templates/mysql/deprecated-mysql-8.0-official.yaml @@ -1,4 +1,10 @@ -{{ if and .Values.catalog.mysql (not .Values.skipDeprecated) }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.MySQL }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: MySQLVersion metadata: @@ -28,3 +34,4 @@ spec: - < 8.0.17 version: "8.0" {{ end }} +{{ end }} diff --git a/charts/kubedb-catalog/templates/mysql/deprecated-mysql-8.0.14-official.yaml b/charts/kubedb-catalog/templates/mysql/deprecated-mysql-8.0.14-official.yaml index 9acdbc33d..27d6c63ba 100644 --- a/charts/kubedb-catalog/templates/mysql/deprecated-mysql-8.0.14-official.yaml +++ b/charts/kubedb-catalog/templates/mysql/deprecated-mysql-8.0.14-official.yaml @@ -1,4 +1,10 @@ -{{ if and .Values.catalog.mysql (not .Values.skipDeprecated) }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.MySQL }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: MySQLVersion metadata: @@ -30,7 +36,7 @@ spec: {{ end }} --- -{{ if and .Values.catalog.mysql (not .Values.skipDeprecated) }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: MySQLVersion metadata: @@ -62,7 +68,7 @@ spec: {{ end }} --- -{{ if and .Values.catalog.mysql (not .Values.skipDeprecated) }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: MySQLVersion metadata: @@ -94,7 +100,7 @@ spec: {{ end }} --- -{{ if and .Values.catalog.mysql (not .Values.skipDeprecated) }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: MySQLVersion metadata: @@ -132,7 +138,7 @@ spec: {{ end }} --- -{{ if and .Values.catalog.mysql (not .Values.skipDeprecated) }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: MySQLVersion metadata: @@ -168,3 +174,4 @@ spec: - < 8.0.14 version: 8.0.14 {{ end }} +{{ end }} diff --git a/charts/kubedb-catalog/templates/mysql/deprecated-mysql-8.0.17-official.yaml b/charts/kubedb-catalog/templates/mysql/deprecated-mysql-8.0.17-official.yaml index 079c19a73..5c91debe5 100644 --- a/charts/kubedb-catalog/templates/mysql/deprecated-mysql-8.0.17-official.yaml +++ b/charts/kubedb-catalog/templates/mysql/deprecated-mysql-8.0.17-official.yaml @@ -1,4 +1,10 @@ -{{ if and .Values.catalog.mysql (not .Values.skipDeprecated) }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.MySQL }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: MySQLVersion metadata: @@ -36,3 +42,4 @@ spec: - < 8.0.17 version: 8.0.17 {{ end }} +{{ end }} diff --git a/charts/kubedb-catalog/templates/mysql/deprecated-mysql-8.0.20-official.yaml b/charts/kubedb-catalog/templates/mysql/deprecated-mysql-8.0.20-official.yaml index 831772892..4ae81820a 100644 --- a/charts/kubedb-catalog/templates/mysql/deprecated-mysql-8.0.20-official.yaml +++ b/charts/kubedb-catalog/templates/mysql/deprecated-mysql-8.0.20-official.yaml @@ -1,4 +1,10 @@ -{{ if and .Values.catalog.mysql (not .Values.skipDeprecated) }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.MySQL }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: MySQLVersion metadata: @@ -30,7 +36,7 @@ spec: {{ end }} --- -{{ if and .Values.catalog.mysql (not .Values.skipDeprecated) }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: MySQLVersion metadata: @@ -62,7 +68,7 @@ spec: {{ end }} --- -{{ if and .Values.catalog.mysql (not .Values.skipDeprecated) }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: MySQLVersion metadata: @@ -100,7 +106,7 @@ spec: {{ end }} --- -{{ if and .Values.catalog.mysql (not .Values.skipDeprecated) }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: MySQLVersion metadata: @@ -136,3 +142,4 @@ spec: - < 8.0.20 version: 8.0.20 {{ end }} +{{ end }} diff --git a/charts/kubedb-catalog/templates/mysql/deprecated-mysql-8.0.21-official.yaml b/charts/kubedb-catalog/templates/mysql/deprecated-mysql-8.0.21-official.yaml index 650c2e85d..65cf09913 100644 --- a/charts/kubedb-catalog/templates/mysql/deprecated-mysql-8.0.21-official.yaml +++ b/charts/kubedb-catalog/templates/mysql/deprecated-mysql-8.0.21-official.yaml @@ -1,4 +1,10 @@ -{{ if and .Values.catalog.mysql (not .Values.skipDeprecated) }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.MySQL }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: MySQLVersion metadata: @@ -30,7 +36,7 @@ spec: {{ end }} --- -{{ if and .Values.catalog.mysql (not .Values.skipDeprecated) }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: MySQLVersion metadata: @@ -68,7 +74,7 @@ spec: {{ end }} --- -{{ if and .Values.catalog.mysql (not .Values.skipDeprecated) }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: MySQLVersion metadata: @@ -104,3 +110,4 @@ spec: - < 8.0.21 version: 8.0.21 {{ end }} +{{ end }} diff --git a/charts/kubedb-catalog/templates/mysql/deprecated-mysql-8.0.23-official.yaml b/charts/kubedb-catalog/templates/mysql/deprecated-mysql-8.0.23-official.yaml index 6e07d3752..2654c9ce7 100644 --- a/charts/kubedb-catalog/templates/mysql/deprecated-mysql-8.0.23-official.yaml +++ b/charts/kubedb-catalog/templates/mysql/deprecated-mysql-8.0.23-official.yaml @@ -1,4 +1,10 @@ -{{ if and .Values.catalog.mysql (not .Values.skipDeprecated) }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.MySQL }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: MySQLVersion metadata: @@ -36,7 +42,7 @@ spec: {{ end }} --- -{{ if and .Values.catalog.mysql (not .Values.skipDeprecated) }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: MySQLVersion metadata: @@ -72,3 +78,4 @@ spec: - < 8.0.23 version: 8.0.23 {{ end }} +{{ end }} diff --git a/charts/kubedb-catalog/templates/mysql/deprecated-mysql-8.0.26-official.yaml b/charts/kubedb-catalog/templates/mysql/deprecated-mysql-8.0.26-official.yaml index 9291e7462..be027dc03 100644 --- a/charts/kubedb-catalog/templates/mysql/deprecated-mysql-8.0.26-official.yaml +++ b/charts/kubedb-catalog/templates/mysql/deprecated-mysql-8.0.26-official.yaml @@ -1,4 +1,10 @@ -{{ if and .Values.catalog.mysql (not .Values.skipDeprecated) }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.MySQL }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: MySQLVersion metadata: @@ -34,3 +40,4 @@ spec: - < 8.0.26 version: 8.0.26 {{ end }} +{{ end }} diff --git a/charts/kubedb-catalog/templates/mysql/deprecated-mysql-8.0.27-mysql.yaml b/charts/kubedb-catalog/templates/mysql/deprecated-mysql-8.0.27-mysql.yaml index 3c44643fd..8dce4dc98 100644 --- a/charts/kubedb-catalog/templates/mysql/deprecated-mysql-8.0.27-mysql.yaml +++ b/charts/kubedb-catalog/templates/mysql/deprecated-mysql-8.0.27-mysql.yaml @@ -1,4 +1,10 @@ -{{ if and .Values.catalog.mysql (not .Values.skipDeprecated) }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.MySQL }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: MySQLVersion metadata: @@ -40,3 +46,4 @@ spec: - < 8.0.27 version: 8.0.27 {{ end }} +{{ end }} diff --git a/charts/kubedb-catalog/templates/mysql/deprecated-mysql-8.0.27-official.yaml b/charts/kubedb-catalog/templates/mysql/deprecated-mysql-8.0.27-official.yaml index 831a24992..367882a03 100644 --- a/charts/kubedb-catalog/templates/mysql/deprecated-mysql-8.0.27-official.yaml +++ b/charts/kubedb-catalog/templates/mysql/deprecated-mysql-8.0.27-official.yaml @@ -1,4 +1,10 @@ -{{ if and .Values.catalog.mysql (not .Values.skipDeprecated) }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.MySQL }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: MySQLVersion metadata: @@ -36,3 +42,4 @@ spec: - < 8.0.27 version: 8.0.27 {{ end }} +{{ end }} diff --git a/charts/kubedb-catalog/templates/mysql/deprecated-mysql-8.0.29-official.yaml b/charts/kubedb-catalog/templates/mysql/deprecated-mysql-8.0.29-official.yaml index ba4d7dc17..c129fccd8 100644 --- a/charts/kubedb-catalog/templates/mysql/deprecated-mysql-8.0.29-official.yaml +++ b/charts/kubedb-catalog/templates/mysql/deprecated-mysql-8.0.29-official.yaml @@ -1,4 +1,10 @@ -{{ if and .Values.catalog.mysql (not .Values.skipDeprecated) }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.MySQL }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: MySQLVersion metadata: @@ -36,3 +42,4 @@ spec: - < 8.0.29 version: 8.0.29 {{ end }} +{{ end }} diff --git a/charts/kubedb-catalog/templates/mysql/deprecated-mysql-8.0.3-official.yaml b/charts/kubedb-catalog/templates/mysql/deprecated-mysql-8.0.3-official.yaml index 8e8b823bf..be46b064d 100644 --- a/charts/kubedb-catalog/templates/mysql/deprecated-mysql-8.0.3-official.yaml +++ b/charts/kubedb-catalog/templates/mysql/deprecated-mysql-8.0.3-official.yaml @@ -1,4 +1,10 @@ -{{ if and .Values.catalog.mysql (not .Values.skipDeprecated) }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.MySQL }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: MySQLVersion metadata: @@ -30,7 +36,7 @@ spec: {{ end }} --- -{{ if and .Values.catalog.mysql (not .Values.skipDeprecated) }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: MySQLVersion metadata: @@ -62,7 +68,7 @@ spec: {{ end }} --- -{{ if and .Values.catalog.mysql (not .Values.skipDeprecated) }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: MySQLVersion metadata: @@ -94,7 +100,7 @@ spec: {{ end }} --- -{{ if and .Values.catalog.mysql (not .Values.skipDeprecated) }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: MySQLVersion metadata: @@ -132,7 +138,7 @@ spec: {{ end }} --- -{{ if and .Values.catalog.mysql (not .Values.skipDeprecated) }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: MySQLVersion metadata: @@ -170,7 +176,7 @@ spec: {{ end }} --- -{{ if and .Values.catalog.mysql (not .Values.skipDeprecated) }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: MySQLVersion metadata: @@ -208,3 +214,4 @@ spec: - 8.0.3 version: 8.0.3 {{ end }} +{{ end }} diff --git a/charts/kubedb-catalog/templates/mysql/deprecated-mysql-8.0.31-official.yaml b/charts/kubedb-catalog/templates/mysql/deprecated-mysql-8.0.31-official.yaml index 37a2a510f..303115f5f 100644 --- a/charts/kubedb-catalog/templates/mysql/deprecated-mysql-8.0.31-official.yaml +++ b/charts/kubedb-catalog/templates/mysql/deprecated-mysql-8.0.31-official.yaml @@ -1,4 +1,10 @@ -{{ if and .Values.catalog.mysql (not .Values.skipDeprecated) }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.MySQL }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: MySQLVersion metadata: @@ -38,3 +44,4 @@ spec: - < 8.0.31 version: 8.0.31 {{ end }} +{{ end }} diff --git a/charts/kubedb-catalog/templates/mysql/deprecated-mysql-8.0.32-official.yaml b/charts/kubedb-catalog/templates/mysql/deprecated-mysql-8.0.32-official.yaml index 67b6eabb9..de98951a0 100644 --- a/charts/kubedb-catalog/templates/mysql/deprecated-mysql-8.0.32-official.yaml +++ b/charts/kubedb-catalog/templates/mysql/deprecated-mysql-8.0.32-official.yaml @@ -1,4 +1,10 @@ -{{ if and .Values.catalog.mysql (not .Values.skipDeprecated) }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.MySQL }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: MySQLVersion metadata: @@ -38,3 +44,4 @@ spec: - < 8.0.32 version: 8.0.32 {{ end }} +{{ end }} diff --git a/charts/kubedb-catalog/templates/mysql/mysql-5.7.44-official.yaml b/charts/kubedb-catalog/templates/mysql/mysql-5.7.44-official.yaml index c034ad006..7537caa7c 100644 --- a/charts/kubedb-catalog/templates/mysql/mysql-5.7.44-official.yaml +++ b/charts/kubedb-catalog/templates/mysql/mysql-5.7.44-official.yaml @@ -1,4 +1,10 @@ -{{ if .Values.catalog.mysql }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.MySQL }} + apiVersion: catalog.kubedb.com/v1alpha1 kind: MySQLVersion metadata: diff --git a/charts/kubedb-catalog/templates/mysql/mysql-8.0.31-mysql.yaml b/charts/kubedb-catalog/templates/mysql/mysql-8.0.31-mysql.yaml index 9142452df..67361328a 100644 --- a/charts/kubedb-catalog/templates/mysql/mysql-8.0.31-mysql.yaml +++ b/charts/kubedb-catalog/templates/mysql/mysql-8.0.31-mysql.yaml @@ -1,4 +1,10 @@ -{{ if .Values.catalog.mysql }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.MySQL }} + apiVersion: catalog.kubedb.com/v1alpha1 kind: MySQLVersion metadata: diff --git a/charts/kubedb-catalog/templates/mysql/mysql-8.0.35-official.yaml b/charts/kubedb-catalog/templates/mysql/mysql-8.0.35-official.yaml index 6e888890d..1d41b0537 100644 --- a/charts/kubedb-catalog/templates/mysql/mysql-8.0.35-official.yaml +++ b/charts/kubedb-catalog/templates/mysql/mysql-8.0.35-official.yaml @@ -1,4 +1,10 @@ -{{ if .Values.catalog.mysql }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.MySQL }} + apiVersion: catalog.kubedb.com/v1alpha1 kind: MySQLVersion metadata: diff --git a/charts/kubedb-catalog/templates/mysql/mysql-8.1.0-official.yaml b/charts/kubedb-catalog/templates/mysql/mysql-8.1.0-official.yaml index 00183bef0..e675e7c53 100644 --- a/charts/kubedb-catalog/templates/mysql/mysql-8.1.0-official.yaml +++ b/charts/kubedb-catalog/templates/mysql/mysql-8.1.0-official.yaml @@ -1,4 +1,10 @@ -{{ if .Values.catalog.mysql }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.MySQL }} + apiVersion: catalog.kubedb.com/v1alpha1 kind: MySQLVersion metadata: diff --git a/charts/kubedb-catalog/templates/mysql/mysql-8.2.0-official.yaml b/charts/kubedb-catalog/templates/mysql/mysql-8.2.0-official.yaml index 37a9a24a8..4ac928a82 100644 --- a/charts/kubedb-catalog/templates/mysql/mysql-8.2.0-official.yaml +++ b/charts/kubedb-catalog/templates/mysql/mysql-8.2.0-official.yaml @@ -1,4 +1,10 @@ -{{ if .Values.catalog.mysql }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.MySQL }} + apiVersion: catalog.kubedb.com/v1alpha1 kind: MySQLVersion metadata: diff --git a/charts/kubedb-catalog/templates/mysql/mysql-psp.yaml b/charts/kubedb-catalog/templates/mysql/mysql-psp.yaml index 24ac62056..559e2f9d4 100644 --- a/charts/kubedb-catalog/templates/mysql/mysql-psp.yaml +++ b/charts/kubedb-catalog/templates/mysql/mysql-psp.yaml @@ -1,4 +1,9 @@ -{{ if and .Values.psp.enabled (.Capabilities.APIVersions.Has "policy/v1beta1/PodSecurityPolicy") .Values.catalog.mysql }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if and .Values.psp.enabled (.Capabilities.APIVersions.Has "policy/v1beta1/PodSecurityPolicy") $featureGates.MySQL }} apiVersion: policy/v1beta1 kind: PodSecurityPolicy metadata: diff --git a/charts/kubedb-catalog/templates/perconaxtradb/deprecated-perconaxtradb-5.7.yaml b/charts/kubedb-catalog/templates/perconaxtradb/deprecated-perconaxtradb-5.7.yaml index d6638a717..a64d478c1 100644 --- a/charts/kubedb-catalog/templates/perconaxtradb/deprecated-perconaxtradb-5.7.yaml +++ b/charts/kubedb-catalog/templates/perconaxtradb/deprecated-perconaxtradb-5.7.yaml @@ -1,4 +1,10 @@ -{{ if and .Values.catalog.perconaxtradb (not .Values.skipDeprecated) }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.PerconaXtraDB }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: PerconaXtraDBVersion metadata: @@ -25,7 +31,7 @@ spec: {{ end }} --- -{{ if and .Values.catalog.perconaxtradb (not .Values.skipDeprecated) }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: PerconaXtraDBVersion metadata: @@ -50,3 +56,4 @@ spec: name: perconaxtradb-restore-5.7 version: "5.7" {{ end }} +{{ end }} diff --git a/charts/kubedb-catalog/templates/perconaxtradb/perconaxtradb-8.0.26.yaml b/charts/kubedb-catalog/templates/perconaxtradb/perconaxtradb-8.0.26.yaml index 1719401f3..8122adf49 100644 --- a/charts/kubedb-catalog/templates/perconaxtradb/perconaxtradb-8.0.26.yaml +++ b/charts/kubedb-catalog/templates/perconaxtradb/perconaxtradb-8.0.26.yaml @@ -1,4 +1,10 @@ -{{ if .Values.catalog.perconaxtradb }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.PerconaXtraDB }} + apiVersion: catalog.kubedb.com/v1alpha1 kind: PerconaXtraDBVersion metadata: diff --git a/charts/kubedb-catalog/templates/perconaxtradb/perconaxtradb-8.0.28.yaml b/charts/kubedb-catalog/templates/perconaxtradb/perconaxtradb-8.0.28.yaml index 3f7bf264c..8e23d5887 100644 --- a/charts/kubedb-catalog/templates/perconaxtradb/perconaxtradb-8.0.28.yaml +++ b/charts/kubedb-catalog/templates/perconaxtradb/perconaxtradb-8.0.28.yaml @@ -1,4 +1,10 @@ -{{ if .Values.catalog.perconaxtradb }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.PerconaXtraDB }} + apiVersion: catalog.kubedb.com/v1alpha1 kind: PerconaXtraDBVersion metadata: diff --git a/charts/kubedb-catalog/templates/perconaxtradb/perconaxtradb-8.0.31.yaml b/charts/kubedb-catalog/templates/perconaxtradb/perconaxtradb-8.0.31.yaml index 15548dd9e..bf3f19f99 100644 --- a/charts/kubedb-catalog/templates/perconaxtradb/perconaxtradb-8.0.31.yaml +++ b/charts/kubedb-catalog/templates/perconaxtradb/perconaxtradb-8.0.31.yaml @@ -1,4 +1,10 @@ -{{ if .Values.catalog.perconaxtradb }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.PerconaXtraDB }} + apiVersion: catalog.kubedb.com/v1alpha1 kind: PerconaXtraDBVersion metadata: diff --git a/charts/kubedb-catalog/templates/perconaxtradb/perconaxtradb-psp.yaml b/charts/kubedb-catalog/templates/perconaxtradb/perconaxtradb-psp.yaml index 615af9793..57f11a896 100644 --- a/charts/kubedb-catalog/templates/perconaxtradb/perconaxtradb-psp.yaml +++ b/charts/kubedb-catalog/templates/perconaxtradb/perconaxtradb-psp.yaml @@ -1,4 +1,9 @@ -{{ if and .Values.psp.enabled (.Capabilities.APIVersions.Has "policy/v1beta1/PodSecurityPolicy") .Values.catalog.perconaxtradb }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if and .Values.psp.enabled (.Capabilities.APIVersions.Has "policy/v1beta1/PodSecurityPolicy") $featureGates.PerconaXtraDB }} apiVersion: policy/v1beta1 kind: PodSecurityPolicy metadata: diff --git a/charts/kubedb-catalog/templates/pgbouncer/pgbouncer-1.17.0.yaml b/charts/kubedb-catalog/templates/pgbouncer/pgbouncer-1.17.0.yaml index c58a5e49c..bf0592db6 100644 --- a/charts/kubedb-catalog/templates/pgbouncer/pgbouncer-1.17.0.yaml +++ b/charts/kubedb-catalog/templates/pgbouncer/pgbouncer-1.17.0.yaml @@ -1,4 +1,10 @@ -{{ if .Values.catalog.pgbouncer }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.PgBouncer }} + apiVersion: catalog.kubedb.com/v1alpha1 kind: PgBouncerVersion metadata: diff --git a/charts/kubedb-catalog/templates/pgbouncer/pgbouncer-1.18.0.yaml b/charts/kubedb-catalog/templates/pgbouncer/pgbouncer-1.18.0.yaml index 0e2e7ee6c..14124d74b 100644 --- a/charts/kubedb-catalog/templates/pgbouncer/pgbouncer-1.18.0.yaml +++ b/charts/kubedb-catalog/templates/pgbouncer/pgbouncer-1.18.0.yaml @@ -1,4 +1,10 @@ -{{ if .Values.catalog.pgbouncer }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.PgBouncer }} + apiVersion: catalog.kubedb.com/v1alpha1 kind: PgBouncerVersion metadata: diff --git a/charts/kubedb-catalog/templates/postgres/deprecated-postgres-10.16-official.yaml b/charts/kubedb-catalog/templates/postgres/deprecated-postgres-10.16-official.yaml index 7ac46e652..59bcf2326 100644 --- a/charts/kubedb-catalog/templates/postgres/deprecated-postgres-10.16-official.yaml +++ b/charts/kubedb-catalog/templates/postgres/deprecated-postgres-10.16-official.yaml @@ -1,4 +1,10 @@ -{{ if and .Values.catalog.postgres (not .Values.skipDeprecated) }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Postgres }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: PostgresVersion metadata: @@ -35,7 +41,7 @@ spec: {{ end }} --- -{{ if and .Values.catalog.postgres (not .Values.skipDeprecated) }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: PostgresVersion metadata: @@ -71,3 +77,4 @@ spec: - "11.11" version: "10.16" {{ end }} +{{ end }} diff --git a/charts/kubedb-catalog/templates/postgres/deprecated-postgres-10.19-official.yaml b/charts/kubedb-catalog/templates/postgres/deprecated-postgres-10.19-official.yaml index a11eb34f4..73a1f60a9 100644 --- a/charts/kubedb-catalog/templates/postgres/deprecated-postgres-10.19-official.yaml +++ b/charts/kubedb-catalog/templates/postgres/deprecated-postgres-10.19-official.yaml @@ -1,4 +1,10 @@ -{{ if and .Values.catalog.postgres (not .Values.skipDeprecated) }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Postgres }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: PostgresVersion metadata: @@ -35,7 +41,7 @@ spec: {{ end }} --- -{{ if and .Values.catalog.postgres (not .Values.skipDeprecated) }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: PostgresVersion metadata: @@ -70,3 +76,4 @@ spec: - '>= 11.14, <= 14.1' version: "10.19" {{ end }} +{{ end }} diff --git a/charts/kubedb-catalog/templates/postgres/deprecated-postgres-10.2-official.yaml b/charts/kubedb-catalog/templates/postgres/deprecated-postgres-10.2-official.yaml index b8f548562..341383ae1 100644 --- a/charts/kubedb-catalog/templates/postgres/deprecated-postgres-10.2-official.yaml +++ b/charts/kubedb-catalog/templates/postgres/deprecated-postgres-10.2-official.yaml @@ -1,4 +1,10 @@ -{{ if and .Values.catalog.postgres (not .Values.skipDeprecated) }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Postgres }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: PostgresVersion metadata: @@ -18,7 +24,7 @@ spec: {{ end }} --- -{{ if and .Values.catalog.postgres (not .Values.skipDeprecated) }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: PostgresVersion metadata: @@ -38,7 +44,7 @@ spec: {{ end }} --- -{{ if and .Values.catalog.postgres (not .Values.skipDeprecated) }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: PostgresVersion metadata: @@ -64,7 +70,7 @@ spec: {{ end }} --- -{{ if and .Values.catalog.postgres (not .Values.skipDeprecated) }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: PostgresVersion metadata: @@ -90,7 +96,7 @@ spec: {{ end }} --- -{{ if and .Values.catalog.postgres (not .Values.skipDeprecated) }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: PostgresVersion metadata: @@ -116,7 +122,7 @@ spec: {{ end }} --- -{{ if and .Values.catalog.postgres (not .Values.skipDeprecated) }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: PostgresVersion metadata: @@ -140,3 +146,4 @@ spec: name: postgres-restore-10.14.0-v4 version: "10.2" {{ end }} +{{ end }} diff --git a/charts/kubedb-catalog/templates/postgres/deprecated-postgres-10.20-official.yaml b/charts/kubedb-catalog/templates/postgres/deprecated-postgres-10.20-official.yaml index b15352013..85d86fc9d 100644 --- a/charts/kubedb-catalog/templates/postgres/deprecated-postgres-10.20-official.yaml +++ b/charts/kubedb-catalog/templates/postgres/deprecated-postgres-10.20-official.yaml @@ -1,4 +1,10 @@ -{{ if and .Values.catalog.postgres (not .Values.skipDeprecated) }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Postgres }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: PostgresVersion metadata: @@ -35,7 +41,7 @@ spec: {{ end }} --- -{{ if and .Values.catalog.postgres (not .Values.skipDeprecated) }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: PostgresVersion metadata: @@ -70,3 +76,4 @@ spec: - '>= 11.14, <= 14.1' version: "10.20" {{ end }} +{{ end }} diff --git a/charts/kubedb-catalog/templates/postgres/deprecated-postgres-10.6-official.yaml b/charts/kubedb-catalog/templates/postgres/deprecated-postgres-10.6-official.yaml index 662c71854..73f3c3265 100644 --- a/charts/kubedb-catalog/templates/postgres/deprecated-postgres-10.6-official.yaml +++ b/charts/kubedb-catalog/templates/postgres/deprecated-postgres-10.6-official.yaml @@ -1,4 +1,10 @@ -{{ if and .Values.catalog.postgres (not .Values.skipDeprecated) }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Postgres }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: PostgresVersion metadata: @@ -24,7 +30,7 @@ spec: {{ end }} --- -{{ if and .Values.catalog.postgres (not .Values.skipDeprecated) }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: PostgresVersion metadata: @@ -50,7 +56,7 @@ spec: {{ end }} --- -{{ if and .Values.catalog.postgres (not .Values.skipDeprecated) }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: PostgresVersion metadata: @@ -76,7 +82,7 @@ spec: {{ end }} --- -{{ if and .Values.catalog.postgres (not .Values.skipDeprecated) }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: PostgresVersion metadata: @@ -100,3 +106,4 @@ spec: name: postgres-restore-10.14.0-v4 version: "10.6" {{ end }} +{{ end }} diff --git a/charts/kubedb-catalog/templates/postgres/deprecated-postgres-11.1-official.yaml b/charts/kubedb-catalog/templates/postgres/deprecated-postgres-11.1-official.yaml index 51822af40..a42751f0a 100644 --- a/charts/kubedb-catalog/templates/postgres/deprecated-postgres-11.1-official.yaml +++ b/charts/kubedb-catalog/templates/postgres/deprecated-postgres-11.1-official.yaml @@ -1,4 +1,10 @@ -{{ if and .Values.catalog.postgres (not .Values.skipDeprecated) }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Postgres }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: PostgresVersion metadata: @@ -24,7 +30,7 @@ spec: {{ end }} --- -{{ if and .Values.catalog.postgres (not .Values.skipDeprecated) }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: PostgresVersion metadata: @@ -50,7 +56,7 @@ spec: {{ end }} --- -{{ if and .Values.catalog.postgres (not .Values.skipDeprecated) }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: PostgresVersion metadata: @@ -76,7 +82,7 @@ spec: {{ end }} --- -{{ if and .Values.catalog.postgres (not .Values.skipDeprecated) }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: PostgresVersion metadata: @@ -100,3 +106,4 @@ spec: name: postgres-restore-11.9.0-v4 version: "11.1" {{ end }} +{{ end }} diff --git a/charts/kubedb-catalog/templates/postgres/deprecated-postgres-11.11-official.yaml b/charts/kubedb-catalog/templates/postgres/deprecated-postgres-11.11-official.yaml index d1ba12172..db54ab3d0 100644 --- a/charts/kubedb-catalog/templates/postgres/deprecated-postgres-11.11-official.yaml +++ b/charts/kubedb-catalog/templates/postgres/deprecated-postgres-11.11-official.yaml @@ -1,4 +1,10 @@ -{{ if and .Values.catalog.postgres (not .Values.skipDeprecated) }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Postgres }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: PostgresVersion metadata: @@ -47,7 +53,7 @@ spec: {{ end }} --- -{{ if and .Values.catalog.postgres (not .Values.skipDeprecated) }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: PostgresVersion metadata: @@ -94,3 +100,4 @@ spec: - "11.14" version: "11.11" {{ end }} +{{ end }} diff --git a/charts/kubedb-catalog/templates/postgres/deprecated-postgres-11.14-official.yaml b/charts/kubedb-catalog/templates/postgres/deprecated-postgres-11.14-official.yaml index 4b012f79a..61f851fda 100644 --- a/charts/kubedb-catalog/templates/postgres/deprecated-postgres-11.14-official.yaml +++ b/charts/kubedb-catalog/templates/postgres/deprecated-postgres-11.14-official.yaml @@ -1,4 +1,10 @@ -{{ if and .Values.catalog.postgres (not .Values.skipDeprecated) }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Postgres }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: PostgresVersion metadata: @@ -47,7 +53,7 @@ spec: {{ end }} --- -{{ if and .Values.catalog.postgres (not .Values.skipDeprecated) }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: PostgresVersion metadata: @@ -94,3 +100,4 @@ spec: - '>= 12.9, <= 14.1' version: "11.14" {{ end }} +{{ end }} diff --git a/charts/kubedb-catalog/templates/postgres/deprecated-postgres-11.15-official.yaml b/charts/kubedb-catalog/templates/postgres/deprecated-postgres-11.15-official.yaml index 69ee3f54d..dd6c391e7 100644 --- a/charts/kubedb-catalog/templates/postgres/deprecated-postgres-11.15-official.yaml +++ b/charts/kubedb-catalog/templates/postgres/deprecated-postgres-11.15-official.yaml @@ -1,4 +1,10 @@ -{{ if and .Values.catalog.postgres (not .Values.skipDeprecated) }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Postgres }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: PostgresVersion metadata: @@ -47,7 +53,7 @@ spec: {{ end }} --- -{{ if and .Values.catalog.postgres (not .Values.skipDeprecated) }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: PostgresVersion metadata: @@ -94,3 +100,4 @@ spec: - '>= 12.9, <= 14.1' version: "11.15" {{ end }} +{{ end }} diff --git a/charts/kubedb-catalog/templates/postgres/deprecated-postgres-11.19-official.yaml b/charts/kubedb-catalog/templates/postgres/deprecated-postgres-11.19-official.yaml index 64207d3e1..d0a4c7122 100644 --- a/charts/kubedb-catalog/templates/postgres/deprecated-postgres-11.19-official.yaml +++ b/charts/kubedb-catalog/templates/postgres/deprecated-postgres-11.19-official.yaml @@ -1,4 +1,10 @@ -{{ if and .Values.catalog.postgres (not .Values.skipDeprecated) }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Postgres }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: PostgresVersion metadata: @@ -47,7 +53,7 @@ spec: {{ end }} --- -{{ if and .Values.catalog.postgres (not .Values.skipDeprecated) }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: PostgresVersion metadata: @@ -94,3 +100,4 @@ spec: - '>= 12.9, <= 14.1' version: "11.19" {{ end }} +{{ end }} diff --git a/charts/kubedb-catalog/templates/postgres/deprecated-postgres-11.2-official.yaml b/charts/kubedb-catalog/templates/postgres/deprecated-postgres-11.2-official.yaml index f24506c2e..71745c4eb 100644 --- a/charts/kubedb-catalog/templates/postgres/deprecated-postgres-11.2-official.yaml +++ b/charts/kubedb-catalog/templates/postgres/deprecated-postgres-11.2-official.yaml @@ -1,4 +1,10 @@ -{{ if and .Values.catalog.postgres (not .Values.skipDeprecated) }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Postgres }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: PostgresVersion metadata: @@ -24,7 +30,7 @@ spec: {{ end }} --- -{{ if and .Values.catalog.postgres (not .Values.skipDeprecated) }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: PostgresVersion metadata: @@ -48,3 +54,4 @@ spec: name: postgres-restore-11.9.0-v4 version: "11.2" {{ end }} +{{ end }} diff --git a/charts/kubedb-catalog/templates/postgres/deprecated-postgres-11.20-official.yaml b/charts/kubedb-catalog/templates/postgres/deprecated-postgres-11.20-official.yaml index ca9ba4793..e9b740a58 100644 --- a/charts/kubedb-catalog/templates/postgres/deprecated-postgres-11.20-official.yaml +++ b/charts/kubedb-catalog/templates/postgres/deprecated-postgres-11.20-official.yaml @@ -1,4 +1,10 @@ -{{ if and .Values.catalog.postgres (not .Values.skipDeprecated) }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Postgres }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: PostgresVersion metadata: @@ -47,7 +53,7 @@ spec: {{ end }} --- -{{ if and .Values.catalog.postgres (not .Values.skipDeprecated) }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: PostgresVersion metadata: @@ -94,3 +100,4 @@ spec: - '>= 12.9, <= 14.1' version: "11.20" {{ end }} +{{ end }} diff --git a/charts/kubedb-catalog/templates/postgres/deprecated-postgres-12.10-official.yaml b/charts/kubedb-catalog/templates/postgres/deprecated-postgres-12.10-official.yaml index dfb6b752c..91d751e6c 100644 --- a/charts/kubedb-catalog/templates/postgres/deprecated-postgres-12.10-official.yaml +++ b/charts/kubedb-catalog/templates/postgres/deprecated-postgres-12.10-official.yaml @@ -1,4 +1,10 @@ -{{ if and .Values.catalog.postgres (not .Values.skipDeprecated) }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Postgres }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: PostgresVersion metadata: @@ -48,7 +54,7 @@ spec: {{ end }} --- -{{ if and .Values.catalog.postgres (not .Values.skipDeprecated) }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: PostgresVersion metadata: @@ -96,3 +102,4 @@ spec: - "14.1" version: "12.10" {{ end }} +{{ end }} diff --git a/charts/kubedb-catalog/templates/postgres/deprecated-postgres-12.13-official.yaml b/charts/kubedb-catalog/templates/postgres/deprecated-postgres-12.13-official.yaml index a93a9929f..8bec27da2 100644 --- a/charts/kubedb-catalog/templates/postgres/deprecated-postgres-12.13-official.yaml +++ b/charts/kubedb-catalog/templates/postgres/deprecated-postgres-12.13-official.yaml @@ -1,4 +1,10 @@ -{{ if and .Values.catalog.postgres (not .Values.skipDeprecated) }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Postgres }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: PostgresVersion metadata: @@ -48,7 +54,7 @@ spec: {{ end }} --- -{{ if and .Values.catalog.postgres (not .Values.skipDeprecated) }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: PostgresVersion metadata: @@ -96,3 +102,4 @@ spec: - "14.1" version: "12.13" {{ end }} +{{ end }} diff --git a/charts/kubedb-catalog/templates/postgres/deprecated-postgres-12.14-official.yaml b/charts/kubedb-catalog/templates/postgres/deprecated-postgres-12.14-official.yaml index 29fc1b32b..12a012767 100644 --- a/charts/kubedb-catalog/templates/postgres/deprecated-postgres-12.14-official.yaml +++ b/charts/kubedb-catalog/templates/postgres/deprecated-postgres-12.14-official.yaml @@ -1,4 +1,10 @@ -{{ if and .Values.catalog.postgres (not .Values.skipDeprecated) }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Postgres }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: PostgresVersion metadata: @@ -48,7 +54,7 @@ spec: {{ end }} --- -{{ if and .Values.catalog.postgres (not .Values.skipDeprecated) }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: PostgresVersion metadata: @@ -96,3 +102,4 @@ spec: - "14.1" version: "12.14" {{ end }} +{{ end }} diff --git a/charts/kubedb-catalog/templates/postgres/deprecated-postgres-12.15-official.yaml b/charts/kubedb-catalog/templates/postgres/deprecated-postgres-12.15-official.yaml index 15940657b..336a50aca 100644 --- a/charts/kubedb-catalog/templates/postgres/deprecated-postgres-12.15-official.yaml +++ b/charts/kubedb-catalog/templates/postgres/deprecated-postgres-12.15-official.yaml @@ -1,4 +1,10 @@ -{{ if and .Values.catalog.postgres (not .Values.skipDeprecated) }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Postgres }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: PostgresVersion metadata: @@ -48,7 +54,7 @@ spec: {{ end }} --- -{{ if and .Values.catalog.postgres (not .Values.skipDeprecated) }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: PostgresVersion metadata: @@ -96,3 +102,4 @@ spec: - "14.1" version: "12.15" {{ end }} +{{ end }} diff --git a/charts/kubedb-catalog/templates/postgres/deprecated-postgres-12.6-official.yaml b/charts/kubedb-catalog/templates/postgres/deprecated-postgres-12.6-official.yaml index 7d133e07c..88b087006 100644 --- a/charts/kubedb-catalog/templates/postgres/deprecated-postgres-12.6-official.yaml +++ b/charts/kubedb-catalog/templates/postgres/deprecated-postgres-12.6-official.yaml @@ -1,4 +1,10 @@ -{{ if and .Values.catalog.postgres (not .Values.skipDeprecated) }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Postgres }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: PostgresVersion metadata: @@ -48,7 +54,7 @@ spec: {{ end }} --- -{{ if and .Values.catalog.postgres (not .Values.skipDeprecated) }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: PostgresVersion metadata: @@ -96,3 +102,4 @@ spec: - "13.2" version: "12.6" {{ end }} +{{ end }} diff --git a/charts/kubedb-catalog/templates/postgres/deprecated-postgres-12.9-official.yaml b/charts/kubedb-catalog/templates/postgres/deprecated-postgres-12.9-official.yaml index d08ac7437..cb8c698af 100644 --- a/charts/kubedb-catalog/templates/postgres/deprecated-postgres-12.9-official.yaml +++ b/charts/kubedb-catalog/templates/postgres/deprecated-postgres-12.9-official.yaml @@ -1,4 +1,10 @@ -{{ if and .Values.catalog.postgres (not .Values.skipDeprecated) }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Postgres }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: PostgresVersion metadata: @@ -48,7 +54,7 @@ spec: {{ end }} --- -{{ if and .Values.catalog.postgres (not .Values.skipDeprecated) }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: PostgresVersion metadata: @@ -96,3 +102,4 @@ spec: - "14.1" version: "12.9" {{ end }} +{{ end }} diff --git a/charts/kubedb-catalog/templates/postgres/deprecated-postgres-13.10-official.yaml b/charts/kubedb-catalog/templates/postgres/deprecated-postgres-13.10-official.yaml index 706988f76..689d838fb 100644 --- a/charts/kubedb-catalog/templates/postgres/deprecated-postgres-13.10-official.yaml +++ b/charts/kubedb-catalog/templates/postgres/deprecated-postgres-13.10-official.yaml @@ -1,4 +1,10 @@ -{{ if and .Values.catalog.postgres (not .Values.skipDeprecated) }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Postgres }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: PostgresVersion metadata: @@ -47,7 +53,7 @@ spec: {{ end }} --- -{{ if and .Values.catalog.postgres (not .Values.skipDeprecated) }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: PostgresVersion metadata: @@ -94,3 +100,4 @@ spec: - "14.1" version: "13.10" {{ end }} +{{ end }} diff --git a/charts/kubedb-catalog/templates/postgres/deprecated-postgres-13.11-official.yaml b/charts/kubedb-catalog/templates/postgres/deprecated-postgres-13.11-official.yaml index 3507c9edb..09093e9a2 100644 --- a/charts/kubedb-catalog/templates/postgres/deprecated-postgres-13.11-official.yaml +++ b/charts/kubedb-catalog/templates/postgres/deprecated-postgres-13.11-official.yaml @@ -1,4 +1,10 @@ -{{ if and .Values.catalog.postgres (not .Values.skipDeprecated) }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Postgres }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: PostgresVersion metadata: @@ -47,7 +53,7 @@ spec: {{ end }} --- -{{ if and .Values.catalog.postgres (not .Values.skipDeprecated) }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: PostgresVersion metadata: @@ -94,3 +100,4 @@ spec: - "14.1" version: "13.11" {{ end }} +{{ end }} diff --git a/charts/kubedb-catalog/templates/postgres/deprecated-postgres-13.2-official.yaml b/charts/kubedb-catalog/templates/postgres/deprecated-postgres-13.2-official.yaml index 7f2509bbd..c9c26f1a2 100644 --- a/charts/kubedb-catalog/templates/postgres/deprecated-postgres-13.2-official.yaml +++ b/charts/kubedb-catalog/templates/postgres/deprecated-postgres-13.2-official.yaml @@ -1,4 +1,10 @@ -{{ if and .Values.catalog.postgres (not .Values.skipDeprecated) }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Postgres }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: PostgresVersion metadata: @@ -47,7 +53,7 @@ spec: {{ end }} --- -{{ if and .Values.catalog.postgres (not .Values.skipDeprecated) }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: PostgresVersion metadata: @@ -94,3 +100,4 @@ spec: - "13.5" version: "13.2" {{ end }} +{{ end }} diff --git a/charts/kubedb-catalog/templates/postgres/deprecated-postgres-13.5-official.yaml b/charts/kubedb-catalog/templates/postgres/deprecated-postgres-13.5-official.yaml index 8bd8d7188..c39094c67 100644 --- a/charts/kubedb-catalog/templates/postgres/deprecated-postgres-13.5-official.yaml +++ b/charts/kubedb-catalog/templates/postgres/deprecated-postgres-13.5-official.yaml @@ -1,4 +1,10 @@ -{{ if and .Values.catalog.postgres (not .Values.skipDeprecated) }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Postgres }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: PostgresVersion metadata: @@ -47,7 +53,7 @@ spec: {{ end }} --- -{{ if and .Values.catalog.postgres (not .Values.skipDeprecated) }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: PostgresVersion metadata: @@ -94,3 +100,4 @@ spec: - "14.1" version: "13.5" {{ end }} +{{ end }} diff --git a/charts/kubedb-catalog/templates/postgres/deprecated-postgres-13.6-official.yaml b/charts/kubedb-catalog/templates/postgres/deprecated-postgres-13.6-official.yaml index 5fb01914a..d1324c9f1 100644 --- a/charts/kubedb-catalog/templates/postgres/deprecated-postgres-13.6-official.yaml +++ b/charts/kubedb-catalog/templates/postgres/deprecated-postgres-13.6-official.yaml @@ -1,4 +1,10 @@ -{{ if and .Values.catalog.postgres (not .Values.skipDeprecated) }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Postgres }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: PostgresVersion metadata: @@ -47,7 +53,7 @@ spec: {{ end }} --- -{{ if and .Values.catalog.postgres (not .Values.skipDeprecated) }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: PostgresVersion metadata: @@ -94,3 +100,4 @@ spec: - "14.1" version: "13.6" {{ end }} +{{ end }} diff --git a/charts/kubedb-catalog/templates/postgres/deprecated-postgres-13.9-official.yaml b/charts/kubedb-catalog/templates/postgres/deprecated-postgres-13.9-official.yaml index f9a84d230..6195ea60f 100644 --- a/charts/kubedb-catalog/templates/postgres/deprecated-postgres-13.9-official.yaml +++ b/charts/kubedb-catalog/templates/postgres/deprecated-postgres-13.9-official.yaml @@ -1,4 +1,10 @@ -{{ if and .Values.catalog.postgres (not .Values.skipDeprecated) }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Postgres }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: PostgresVersion metadata: @@ -47,7 +53,7 @@ spec: {{ end }} --- -{{ if and .Values.catalog.postgres (not .Values.skipDeprecated) }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: PostgresVersion metadata: @@ -94,3 +100,4 @@ spec: - "14.1" version: "13.9" {{ end }} +{{ end }} diff --git a/charts/kubedb-catalog/templates/postgres/deprecated-postgres-14.1-official.yaml b/charts/kubedb-catalog/templates/postgres/deprecated-postgres-14.1-official.yaml index 20fab1972..94975c33f 100644 --- a/charts/kubedb-catalog/templates/postgres/deprecated-postgres-14.1-official.yaml +++ b/charts/kubedb-catalog/templates/postgres/deprecated-postgres-14.1-official.yaml @@ -1,4 +1,10 @@ -{{ if and .Values.catalog.postgres (not .Values.skipDeprecated) }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Postgres }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: PostgresVersion metadata: @@ -47,7 +53,7 @@ spec: {{ end }} --- -{{ if and .Values.catalog.postgres (not .Values.skipDeprecated) }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: PostgresVersion metadata: @@ -94,3 +100,4 @@ spec: - "14.2" version: "14.1" {{ end }} +{{ end }} diff --git a/charts/kubedb-catalog/templates/postgres/deprecated-postgres-14.2-official.yaml b/charts/kubedb-catalog/templates/postgres/deprecated-postgres-14.2-official.yaml index 7d6c68359..c2ea8fc40 100644 --- a/charts/kubedb-catalog/templates/postgres/deprecated-postgres-14.2-official.yaml +++ b/charts/kubedb-catalog/templates/postgres/deprecated-postgres-14.2-official.yaml @@ -1,4 +1,10 @@ -{{ if and .Values.catalog.postgres (not .Values.skipDeprecated) }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Postgres }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: PostgresVersion metadata: @@ -44,7 +50,7 @@ spec: {{ end }} --- -{{ if and .Values.catalog.postgres (not .Values.skipDeprecated) }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: PostgresVersion metadata: @@ -88,3 +94,4 @@ spec: name: postgres-restore-14.0 version: "14.2" {{ end }} +{{ end }} diff --git a/charts/kubedb-catalog/templates/postgres/deprecated-postgres-14.6-official.yaml b/charts/kubedb-catalog/templates/postgres/deprecated-postgres-14.6-official.yaml index b4478be11..f6c17dca0 100644 --- a/charts/kubedb-catalog/templates/postgres/deprecated-postgres-14.6-official.yaml +++ b/charts/kubedb-catalog/templates/postgres/deprecated-postgres-14.6-official.yaml @@ -1,4 +1,10 @@ -{{ if and .Values.catalog.postgres (not .Values.skipDeprecated) }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Postgres }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: PostgresVersion metadata: @@ -44,7 +50,7 @@ spec: {{ end }} --- -{{ if and .Values.catalog.postgres (not .Values.skipDeprecated) }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: PostgresVersion metadata: @@ -88,3 +94,4 @@ spec: name: postgres-restore-14.0 version: "14.6" {{ end }} +{{ end }} diff --git a/charts/kubedb-catalog/templates/postgres/deprecated-postgres-14.7-official.yaml b/charts/kubedb-catalog/templates/postgres/deprecated-postgres-14.7-official.yaml index 61f743cbe..40c66c41b 100644 --- a/charts/kubedb-catalog/templates/postgres/deprecated-postgres-14.7-official.yaml +++ b/charts/kubedb-catalog/templates/postgres/deprecated-postgres-14.7-official.yaml @@ -1,4 +1,10 @@ -{{ if and .Values.catalog.postgres (not .Values.skipDeprecated) }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Postgres }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: PostgresVersion metadata: @@ -44,7 +50,7 @@ spec: {{ end }} --- -{{ if and .Values.catalog.postgres (not .Values.skipDeprecated) }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: PostgresVersion metadata: @@ -88,3 +94,4 @@ spec: name: postgres-restore-14.0 version: "14.7" {{ end }} +{{ end }} diff --git a/charts/kubedb-catalog/templates/postgres/deprecated-postgres-14.8-official.yaml b/charts/kubedb-catalog/templates/postgres/deprecated-postgres-14.8-official.yaml index efb5ce2ff..4ec539bbf 100644 --- a/charts/kubedb-catalog/templates/postgres/deprecated-postgres-14.8-official.yaml +++ b/charts/kubedb-catalog/templates/postgres/deprecated-postgres-14.8-official.yaml @@ -1,4 +1,10 @@ -{{ if and .Values.catalog.postgres (not .Values.skipDeprecated) }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Postgres }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: PostgresVersion metadata: @@ -44,7 +50,7 @@ spec: {{ end }} --- -{{ if and .Values.catalog.postgres (not .Values.skipDeprecated) }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: PostgresVersion metadata: @@ -88,3 +94,4 @@ spec: name: postgres-restore-14.0 version: "14.8" {{ end }} +{{ end }} diff --git a/charts/kubedb-catalog/templates/postgres/deprecated-postgres-15.1-official.yaml b/charts/kubedb-catalog/templates/postgres/deprecated-postgres-15.1-official.yaml index 833232c4d..89da2ad03 100644 --- a/charts/kubedb-catalog/templates/postgres/deprecated-postgres-15.1-official.yaml +++ b/charts/kubedb-catalog/templates/postgres/deprecated-postgres-15.1-official.yaml @@ -1,4 +1,10 @@ -{{ if and .Values.catalog.postgres (not .Values.skipDeprecated) }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Postgres }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: PostgresVersion metadata: @@ -47,7 +53,7 @@ spec: {{ end }} --- -{{ if and .Values.catalog.postgres (not .Values.skipDeprecated) }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: PostgresVersion metadata: @@ -94,3 +100,4 @@ spec: - "14.2" version: "15.1" {{ end }} +{{ end }} diff --git a/charts/kubedb-catalog/templates/postgres/deprecated-postgres-15.2-official.yaml b/charts/kubedb-catalog/templates/postgres/deprecated-postgres-15.2-official.yaml index f88ff5b07..dd81ec204 100644 --- a/charts/kubedb-catalog/templates/postgres/deprecated-postgres-15.2-official.yaml +++ b/charts/kubedb-catalog/templates/postgres/deprecated-postgres-15.2-official.yaml @@ -1,4 +1,10 @@ -{{ if and .Values.catalog.postgres (not .Values.skipDeprecated) }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Postgres }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: PostgresVersion metadata: @@ -47,7 +53,7 @@ spec: {{ end }} --- -{{ if and .Values.catalog.postgres (not .Values.skipDeprecated) }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: PostgresVersion metadata: @@ -94,3 +100,4 @@ spec: - "14.2" version: "15.2" {{ end }} +{{ end }} diff --git a/charts/kubedb-catalog/templates/postgres/deprecated-postgres-15.3-official.yaml b/charts/kubedb-catalog/templates/postgres/deprecated-postgres-15.3-official.yaml index fb5f42176..0c037c7a8 100644 --- a/charts/kubedb-catalog/templates/postgres/deprecated-postgres-15.3-official.yaml +++ b/charts/kubedb-catalog/templates/postgres/deprecated-postgres-15.3-official.yaml @@ -1,4 +1,10 @@ -{{ if and .Values.catalog.postgres (not .Values.skipDeprecated) }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Postgres }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: PostgresVersion metadata: @@ -47,7 +53,7 @@ spec: {{ end }} --- -{{ if and .Values.catalog.postgres (not .Values.skipDeprecated) }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: PostgresVersion metadata: @@ -94,3 +100,4 @@ spec: - "14.2" version: "15.3" {{ end }} +{{ end }} diff --git a/charts/kubedb-catalog/templates/postgres/deprecated-postgres-9.6-official.yaml b/charts/kubedb-catalog/templates/postgres/deprecated-postgres-9.6-official.yaml index c2e57b072..f5b970006 100644 --- a/charts/kubedb-catalog/templates/postgres/deprecated-postgres-9.6-official.yaml +++ b/charts/kubedb-catalog/templates/postgres/deprecated-postgres-9.6-official.yaml @@ -1,4 +1,10 @@ -{{ if and .Values.catalog.postgres (not .Values.skipDeprecated) }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Postgres }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: PostgresVersion metadata: @@ -18,7 +24,7 @@ spec: {{ end }} --- -{{ if and .Values.catalog.postgres (not .Values.skipDeprecated) }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: PostgresVersion metadata: @@ -38,7 +44,7 @@ spec: {{ end }} --- -{{ if and .Values.catalog.postgres (not .Values.skipDeprecated) }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: PostgresVersion metadata: @@ -64,7 +70,7 @@ spec: {{ end }} --- -{{ if and .Values.catalog.postgres (not .Values.skipDeprecated) }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: PostgresVersion metadata: @@ -90,7 +96,7 @@ spec: {{ end }} --- -{{ if and .Values.catalog.postgres (not .Values.skipDeprecated) }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: PostgresVersion metadata: @@ -116,7 +122,7 @@ spec: {{ end }} --- -{{ if and .Values.catalog.postgres (not .Values.skipDeprecated) }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: PostgresVersion metadata: @@ -140,3 +146,4 @@ spec: name: postgres-restore-9.6.19-v4 version: "9.6" {{ end }} +{{ end }} diff --git a/charts/kubedb-catalog/templates/postgres/deprecated-postgres-9.6.21-official.yaml b/charts/kubedb-catalog/templates/postgres/deprecated-postgres-9.6.21-official.yaml index a613e718f..859dba457 100644 --- a/charts/kubedb-catalog/templates/postgres/deprecated-postgres-9.6.21-official.yaml +++ b/charts/kubedb-catalog/templates/postgres/deprecated-postgres-9.6.21-official.yaml @@ -1,4 +1,10 @@ -{{ if and .Values.catalog.postgres (not .Values.skipDeprecated) }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Postgres }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: PostgresVersion metadata: @@ -35,7 +41,7 @@ spec: {{ end }} --- -{{ if and .Values.catalog.postgres (not .Values.skipDeprecated) }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: PostgresVersion metadata: @@ -71,3 +77,4 @@ spec: - "13.2" version: 9.6.21 {{ end }} +{{ end }} diff --git a/charts/kubedb-catalog/templates/postgres/deprecated-postgres-9.6.24-official.yaml b/charts/kubedb-catalog/templates/postgres/deprecated-postgres-9.6.24-official.yaml index c099d2eb7..7e3b37b99 100644 --- a/charts/kubedb-catalog/templates/postgres/deprecated-postgres-9.6.24-official.yaml +++ b/charts/kubedb-catalog/templates/postgres/deprecated-postgres-9.6.24-official.yaml @@ -1,4 +1,10 @@ -{{ if and .Values.catalog.postgres (not .Values.skipDeprecated) }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Postgres }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: PostgresVersion metadata: @@ -35,7 +41,7 @@ spec: {{ end }} --- -{{ if and .Values.catalog.postgres (not .Values.skipDeprecated) }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: PostgresVersion metadata: @@ -70,3 +76,4 @@ spec: - '>= 10.19, <= 14.1' version: 9.6.24 {{ end }} +{{ end }} diff --git a/charts/kubedb-catalog/templates/postgres/deprecated-postgres-9.6.7-official.yaml b/charts/kubedb-catalog/templates/postgres/deprecated-postgres-9.6.7-official.yaml index 26eae4606..c351ba719 100644 --- a/charts/kubedb-catalog/templates/postgres/deprecated-postgres-9.6.7-official.yaml +++ b/charts/kubedb-catalog/templates/postgres/deprecated-postgres-9.6.7-official.yaml @@ -1,4 +1,10 @@ -{{ if and .Values.catalog.postgres (not .Values.skipDeprecated) }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Postgres }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: PostgresVersion metadata: @@ -18,7 +24,7 @@ spec: {{ end }} --- -{{ if and .Values.catalog.postgres (not .Values.skipDeprecated) }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: PostgresVersion metadata: @@ -38,7 +44,7 @@ spec: {{ end }} --- -{{ if and .Values.catalog.postgres (not .Values.skipDeprecated) }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: PostgresVersion metadata: @@ -64,7 +70,7 @@ spec: {{ end }} --- -{{ if and .Values.catalog.postgres (not .Values.skipDeprecated) }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: PostgresVersion metadata: @@ -90,7 +96,7 @@ spec: {{ end }} --- -{{ if and .Values.catalog.postgres (not .Values.skipDeprecated) }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: PostgresVersion metadata: @@ -116,7 +122,7 @@ spec: {{ end }} --- -{{ if and .Values.catalog.postgres (not .Values.skipDeprecated) }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: PostgresVersion metadata: @@ -140,3 +146,4 @@ spec: name: postgres-restore-9.6.19-v4 version: 9.6.7 {{ end }} +{{ end }} diff --git a/charts/kubedb-catalog/templates/postgres/postgres-10.23-official.yaml b/charts/kubedb-catalog/templates/postgres/postgres-10.23-official.yaml index c4b9c1d3c..358d80bc9 100644 --- a/charts/kubedb-catalog/templates/postgres/postgres-10.23-official.yaml +++ b/charts/kubedb-catalog/templates/postgres/postgres-10.23-official.yaml @@ -1,4 +1,10 @@ -{{ if .Values.catalog.postgres }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Postgres }} + apiVersion: catalog.kubedb.com/v1alpha1 kind: PostgresVersion metadata: @@ -31,10 +37,9 @@ spec: allowlist: - '>= 11.14, <= 14.1' version: "10.23" -{{ end }} --- -{{ if .Values.catalog.postgres }} + apiVersion: catalog.kubedb.com/v1alpha1 kind: PostgresVersion metadata: diff --git a/charts/kubedb-catalog/templates/postgres/postgres-11.11-timescaledb.yaml b/charts/kubedb-catalog/templates/postgres/postgres-11.11-timescaledb.yaml index dc5979d2a..c35323f92 100644 --- a/charts/kubedb-catalog/templates/postgres/postgres-11.11-timescaledb.yaml +++ b/charts/kubedb-catalog/templates/postgres/postgres-11.11-timescaledb.yaml @@ -1,4 +1,10 @@ -{{ if .Values.catalog.postgres }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Postgres }} + apiVersion: catalog.kubedb.com/v1alpha1 kind: PostgresVersion metadata: diff --git a/charts/kubedb-catalog/templates/postgres/postgres-11.14-postgis.yaml b/charts/kubedb-catalog/templates/postgres/postgres-11.14-postgis.yaml index 23aa7b723..e01054697 100644 --- a/charts/kubedb-catalog/templates/postgres/postgres-11.14-postgis.yaml +++ b/charts/kubedb-catalog/templates/postgres/postgres-11.14-postgis.yaml @@ -1,4 +1,10 @@ -{{ if .Values.catalog.postgres }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Postgres }} + apiVersion: catalog.kubedb.com/v1alpha1 kind: PostgresVersion metadata: diff --git a/charts/kubedb-catalog/templates/postgres/postgres-11.22-official.yaml b/charts/kubedb-catalog/templates/postgres/postgres-11.22-official.yaml index 466b5935a..7139ac7c6 100644 --- a/charts/kubedb-catalog/templates/postgres/postgres-11.22-official.yaml +++ b/charts/kubedb-catalog/templates/postgres/postgres-11.22-official.yaml @@ -1,4 +1,10 @@ -{{ if .Values.catalog.postgres }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Postgres }} + apiVersion: catalog.kubedb.com/v1alpha1 kind: PostgresVersion metadata: @@ -43,10 +49,9 @@ spec: allowlist: - '>= 12.9, <= 14.1' version: "11.22" -{{ end }} --- -{{ if .Values.catalog.postgres }} + apiVersion: catalog.kubedb.com/v1alpha1 kind: PostgresVersion metadata: diff --git a/charts/kubedb-catalog/templates/postgres/postgres-12.17-official.yaml b/charts/kubedb-catalog/templates/postgres/postgres-12.17-official.yaml index 9aa1834ec..657b0f53e 100644 --- a/charts/kubedb-catalog/templates/postgres/postgres-12.17-official.yaml +++ b/charts/kubedb-catalog/templates/postgres/postgres-12.17-official.yaml @@ -1,4 +1,10 @@ -{{ if .Values.catalog.postgres }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Postgres }} + apiVersion: catalog.kubedb.com/v1alpha1 kind: PostgresVersion metadata: @@ -44,10 +50,9 @@ spec: - "13.5" - "14.1" version: "12.17" -{{ end }} --- -{{ if .Values.catalog.postgres }} + apiVersion: catalog.kubedb.com/v1alpha1 kind: PostgresVersion metadata: diff --git a/charts/kubedb-catalog/templates/postgres/postgres-12.6-timescaledb.yaml b/charts/kubedb-catalog/templates/postgres/postgres-12.6-timescaledb.yaml index 90b8483f4..be78b9177 100644 --- a/charts/kubedb-catalog/templates/postgres/postgres-12.6-timescaledb.yaml +++ b/charts/kubedb-catalog/templates/postgres/postgres-12.6-timescaledb.yaml @@ -1,4 +1,10 @@ -{{ if .Values.catalog.postgres }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Postgres }} + apiVersion: catalog.kubedb.com/v1alpha1 kind: PostgresVersion metadata: diff --git a/charts/kubedb-catalog/templates/postgres/postgres-12.9-postgis.yaml b/charts/kubedb-catalog/templates/postgres/postgres-12.9-postgis.yaml index a16fd1d38..ec38c44dd 100644 --- a/charts/kubedb-catalog/templates/postgres/postgres-12.9-postgis.yaml +++ b/charts/kubedb-catalog/templates/postgres/postgres-12.9-postgis.yaml @@ -1,4 +1,10 @@ -{{ if .Values.catalog.postgres }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Postgres }} + apiVersion: catalog.kubedb.com/v1alpha1 kind: PostgresVersion metadata: diff --git a/charts/kubedb-catalog/templates/postgres/postgres-13.13-official.yaml b/charts/kubedb-catalog/templates/postgres/postgres-13.13-official.yaml index fb997ac05..08045905f 100644 --- a/charts/kubedb-catalog/templates/postgres/postgres-13.13-official.yaml +++ b/charts/kubedb-catalog/templates/postgres/postgres-13.13-official.yaml @@ -1,4 +1,10 @@ -{{ if .Values.catalog.postgres }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Postgres }} + apiVersion: catalog.kubedb.com/v1alpha1 kind: PostgresVersion metadata: @@ -43,10 +49,9 @@ spec: allowlist: - "14.1" version: "13.13" -{{ end }} --- -{{ if .Values.catalog.postgres }} + apiVersion: catalog.kubedb.com/v1alpha1 kind: PostgresVersion metadata: diff --git a/charts/kubedb-catalog/templates/postgres/postgres-13.2-timescaledb.yaml b/charts/kubedb-catalog/templates/postgres/postgres-13.2-timescaledb.yaml index 3a9a59043..380302886 100644 --- a/charts/kubedb-catalog/templates/postgres/postgres-13.2-timescaledb.yaml +++ b/charts/kubedb-catalog/templates/postgres/postgres-13.2-timescaledb.yaml @@ -1,4 +1,10 @@ -{{ if .Values.catalog.postgres }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Postgres }} + apiVersion: catalog.kubedb.com/v1alpha1 kind: PostgresVersion metadata: diff --git a/charts/kubedb-catalog/templates/postgres/postgres-13.5-postgis.yaml b/charts/kubedb-catalog/templates/postgres/postgres-13.5-postgis.yaml index b4977902b..a8b57337d 100644 --- a/charts/kubedb-catalog/templates/postgres/postgres-13.5-postgis.yaml +++ b/charts/kubedb-catalog/templates/postgres/postgres-13.5-postgis.yaml @@ -1,4 +1,10 @@ -{{ if .Values.catalog.postgres }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Postgres }} + apiVersion: catalog.kubedb.com/v1alpha1 kind: PostgresVersion metadata: diff --git a/charts/kubedb-catalog/templates/postgres/postgres-14.1-postgis.yaml b/charts/kubedb-catalog/templates/postgres/postgres-14.1-postgis.yaml index c2639edc1..7cab9d5a8 100644 --- a/charts/kubedb-catalog/templates/postgres/postgres-14.1-postgis.yaml +++ b/charts/kubedb-catalog/templates/postgres/postgres-14.1-postgis.yaml @@ -1,4 +1,10 @@ -{{ if .Values.catalog.postgres }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Postgres }} + apiVersion: catalog.kubedb.com/v1alpha1 kind: PostgresVersion metadata: diff --git a/charts/kubedb-catalog/templates/postgres/postgres-14.1-timescaledb.yaml b/charts/kubedb-catalog/templates/postgres/postgres-14.1-timescaledb.yaml index 5083de5e1..8e537e8ad 100644 --- a/charts/kubedb-catalog/templates/postgres/postgres-14.1-timescaledb.yaml +++ b/charts/kubedb-catalog/templates/postgres/postgres-14.1-timescaledb.yaml @@ -1,4 +1,10 @@ -{{ if .Values.catalog.postgres }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Postgres }} + apiVersion: catalog.kubedb.com/v1alpha1 kind: PostgresVersion metadata: diff --git a/charts/kubedb-catalog/templates/postgres/postgres-14.10-official.yaml b/charts/kubedb-catalog/templates/postgres/postgres-14.10-official.yaml index d7ddad85e..4c933395b 100644 --- a/charts/kubedb-catalog/templates/postgres/postgres-14.10-official.yaml +++ b/charts/kubedb-catalog/templates/postgres/postgres-14.10-official.yaml @@ -1,4 +1,10 @@ -{{ if .Values.catalog.postgres }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Postgres }} + apiVersion: catalog.kubedb.com/v1alpha1 kind: PostgresVersion metadata: @@ -40,10 +46,9 @@ spec: restoreTask: name: postgres-restore-14.0 version: "14.10" -{{ end }} --- -{{ if .Values.catalog.postgres }} + apiVersion: catalog.kubedb.com/v1alpha1 kind: PostgresVersion metadata: diff --git a/charts/kubedb-catalog/templates/postgres/postgres-15.5-official.yaml b/charts/kubedb-catalog/templates/postgres/postgres-15.5-official.yaml index 3a91bfdb2..994e2e2ce 100644 --- a/charts/kubedb-catalog/templates/postgres/postgres-15.5-official.yaml +++ b/charts/kubedb-catalog/templates/postgres/postgres-15.5-official.yaml @@ -1,4 +1,10 @@ -{{ if .Values.catalog.postgres }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Postgres }} + apiVersion: catalog.kubedb.com/v1alpha1 kind: PostgresVersion metadata: @@ -43,10 +49,9 @@ spec: allowlist: - "14.2" version: "15.5" -{{ end }} --- -{{ if .Values.catalog.postgres }} + apiVersion: catalog.kubedb.com/v1alpha1 kind: PostgresVersion metadata: diff --git a/charts/kubedb-catalog/templates/postgres/postgres-16.1-official.yaml b/charts/kubedb-catalog/templates/postgres/postgres-16.1-official.yaml index 2cbc24d3f..716a3290f 100644 --- a/charts/kubedb-catalog/templates/postgres/postgres-16.1-official.yaml +++ b/charts/kubedb-catalog/templates/postgres/postgres-16.1-official.yaml @@ -1,4 +1,10 @@ -{{ if .Values.catalog.postgres }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Postgres }} + apiVersion: catalog.kubedb.com/v1alpha1 kind: PostgresVersion metadata: @@ -43,10 +49,9 @@ spec: allowlist: - "16.1" version: "16.1" -{{ end }} --- -{{ if .Values.catalog.postgres }} + apiVersion: catalog.kubedb.com/v1alpha1 kind: PostgresVersion metadata: diff --git a/charts/kubedb-catalog/templates/postgres/postgres-psp.yaml b/charts/kubedb-catalog/templates/postgres/postgres-psp.yaml index 42840051e..16df161ef 100644 --- a/charts/kubedb-catalog/templates/postgres/postgres-psp.yaml +++ b/charts/kubedb-catalog/templates/postgres/postgres-psp.yaml @@ -1,4 +1,9 @@ -{{ if and .Values.psp.enabled (.Capabilities.APIVersions.Has "policy/v1beta1/PodSecurityPolicy") .Values.catalog.postgres }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if and .Values.psp.enabled (.Capabilities.APIVersions.Has "policy/v1beta1/PodSecurityPolicy") $featureGates.Postgres }} apiVersion: policy/v1beta1 kind: PodSecurityPolicy metadata: diff --git a/charts/kubedb-catalog/templates/proxysql/deprecated-proxysql-2.0.4.yaml b/charts/kubedb-catalog/templates/proxysql/deprecated-proxysql-2.0.4.yaml index 1297f90e4..07f512bd6 100644 --- a/charts/kubedb-catalog/templates/proxysql/deprecated-proxysql-2.0.4.yaml +++ b/charts/kubedb-catalog/templates/proxysql/deprecated-proxysql-2.0.4.yaml @@ -1,4 +1,10 @@ -{{ if and .Values.catalog.proxysql (not .Values.skipDeprecated) }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.ProxySQL }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: ProxySQLVersion metadata: @@ -15,3 +21,4 @@ spec: image: '{{ include "image.ghcr" (merge (dict "_repo" "kubedb/proxysql") $) }}:v2.0.4' version: 2.0.4 {{ end }} +{{ end }} diff --git a/charts/kubedb-catalog/templates/proxysql/deprecated-proxysql-2.3.2.yaml b/charts/kubedb-catalog/templates/proxysql/deprecated-proxysql-2.3.2.yaml index d6cdb9457..a6d7caec5 100644 --- a/charts/kubedb-catalog/templates/proxysql/deprecated-proxysql-2.3.2.yaml +++ b/charts/kubedb-catalog/templates/proxysql/deprecated-proxysql-2.3.2.yaml @@ -1,4 +1,10 @@ -{{ if and .Values.catalog.proxysql (not .Values.skipDeprecated) }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.ProxySQL }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: ProxySQLVersion metadata: @@ -15,3 +21,4 @@ spec: image: '{{ include "image.ghcr" (merge (dict "_repo" "kubedb/proxysql") $) }}:2.3.2-debian' version: 2.3.2 {{ end }} +{{ end }} diff --git a/charts/kubedb-catalog/templates/proxysql/proxysql-2.3.2-centos.yaml b/charts/kubedb-catalog/templates/proxysql/proxysql-2.3.2-centos.yaml index d5519220f..1e802232a 100644 --- a/charts/kubedb-catalog/templates/proxysql/proxysql-2.3.2-centos.yaml +++ b/charts/kubedb-catalog/templates/proxysql/proxysql-2.3.2-centos.yaml @@ -1,4 +1,10 @@ -{{ if .Values.catalog.proxysql }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.ProxySQL }} + apiVersion: catalog.kubedb.com/v1alpha1 kind: ProxySQLVersion metadata: diff --git a/charts/kubedb-catalog/templates/proxysql/proxysql-2.3.2-debian.yaml b/charts/kubedb-catalog/templates/proxysql/proxysql-2.3.2-debian.yaml index 231607b37..3e1eb4459 100644 --- a/charts/kubedb-catalog/templates/proxysql/proxysql-2.3.2-debian.yaml +++ b/charts/kubedb-catalog/templates/proxysql/proxysql-2.3.2-debian.yaml @@ -1,4 +1,10 @@ -{{ if .Values.catalog.proxysql }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.ProxySQL }} + apiVersion: catalog.kubedb.com/v1alpha1 kind: ProxySQLVersion metadata: diff --git a/charts/kubedb-catalog/templates/proxysql/proxysql-2.4.4-centos.yaml b/charts/kubedb-catalog/templates/proxysql/proxysql-2.4.4-centos.yaml index 791e86e85..ac4fa7ce1 100644 --- a/charts/kubedb-catalog/templates/proxysql/proxysql-2.4.4-centos.yaml +++ b/charts/kubedb-catalog/templates/proxysql/proxysql-2.4.4-centos.yaml @@ -1,4 +1,10 @@ -{{ if .Values.catalog.proxysql }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.ProxySQL }} + apiVersion: catalog.kubedb.com/v1alpha1 kind: ProxySQLVersion metadata: diff --git a/charts/kubedb-catalog/templates/proxysql/proxysql-2.4.4-debian.yaml b/charts/kubedb-catalog/templates/proxysql/proxysql-2.4.4-debian.yaml index 869c80898..118494b52 100644 --- a/charts/kubedb-catalog/templates/proxysql/proxysql-2.4.4-debian.yaml +++ b/charts/kubedb-catalog/templates/proxysql/proxysql-2.4.4-debian.yaml @@ -1,4 +1,10 @@ -{{ if .Values.catalog.proxysql }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.ProxySQL }} + apiVersion: catalog.kubedb.com/v1alpha1 kind: ProxySQLVersion metadata: diff --git a/charts/kubedb-catalog/templates/proxysql/proxysql-psp.yaml b/charts/kubedb-catalog/templates/proxysql/proxysql-psp.yaml index dd38c9a39..8c715ca81 100644 --- a/charts/kubedb-catalog/templates/proxysql/proxysql-psp.yaml +++ b/charts/kubedb-catalog/templates/proxysql/proxysql-psp.yaml @@ -1,4 +1,9 @@ -{{ if and .Values.psp.enabled (.Capabilities.APIVersions.Has "policy/v1beta1/PodSecurityPolicy") .Values.catalog.proxysql }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if and .Values.psp.enabled (.Capabilities.APIVersions.Has "policy/v1beta1/PodSecurityPolicy") $featureGates.ProxySQL }} apiVersion: policy/v1beta1 kind: PodSecurityPolicy metadata: diff --git a/charts/kubedb-catalog/templates/redis/deprecated-redis-4.0.6.yaml b/charts/kubedb-catalog/templates/redis/deprecated-redis-4.0.6.yaml index adfb4bb5e..efb153763 100644 --- a/charts/kubedb-catalog/templates/redis/deprecated-redis-4.0.6.yaml +++ b/charts/kubedb-catalog/templates/redis/deprecated-redis-4.0.6.yaml @@ -1,4 +1,10 @@ -{{ if and .Values.catalog.redis (not .Values.skipDeprecated) }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Redis }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: RedisVersion metadata: @@ -21,7 +27,7 @@ spec: {{ end }} --- -{{ if and .Values.catalog.redis (not .Values.skipDeprecated) }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: RedisVersion metadata: @@ -44,7 +50,7 @@ spec: {{ end }} --- -{{ if and .Values.catalog.redis (not .Values.skipDeprecated) }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: RedisVersion metadata: @@ -67,3 +73,4 @@ spec: runAsUser: 999 version: 4.0.6 {{ end }} +{{ end }} diff --git a/charts/kubedb-catalog/templates/redis/deprecated-redis-4.0.yaml b/charts/kubedb-catalog/templates/redis/deprecated-redis-4.0.yaml index 08e0bc6e1..38f5e65e9 100644 --- a/charts/kubedb-catalog/templates/redis/deprecated-redis-4.0.yaml +++ b/charts/kubedb-catalog/templates/redis/deprecated-redis-4.0.yaml @@ -1,4 +1,10 @@ -{{ if and .Values.catalog.redis (not .Values.skipDeprecated) }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Redis }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: RedisVersion metadata: @@ -21,7 +27,7 @@ spec: {{ end }} --- -{{ if and .Values.catalog.redis (not .Values.skipDeprecated) }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: RedisVersion metadata: @@ -44,7 +50,7 @@ spec: {{ end }} --- -{{ if and .Values.catalog.redis (not .Values.skipDeprecated) }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: RedisVersion metadata: @@ -65,3 +71,4 @@ spec: databasePolicyName: redis-db version: "4.0" {{ end }} +{{ end }} diff --git a/charts/kubedb-catalog/templates/redis/deprecated-redis-4.yaml b/charts/kubedb-catalog/templates/redis/deprecated-redis-4.yaml index 161361f20..5680d0b96 100644 --- a/charts/kubedb-catalog/templates/redis/deprecated-redis-4.yaml +++ b/charts/kubedb-catalog/templates/redis/deprecated-redis-4.yaml @@ -1,4 +1,10 @@ -{{ if and .Values.catalog.redis (not .Values.skipDeprecated) }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Redis }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: RedisVersion metadata: @@ -21,7 +27,7 @@ spec: {{ end }} --- -{{ if and .Values.catalog.redis (not .Values.skipDeprecated) }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: RedisVersion metadata: @@ -42,3 +48,4 @@ spec: databasePolicyName: redis-db version: "4" {{ end }} +{{ end }} diff --git a/charts/kubedb-catalog/templates/redis/deprecated-redis-5.0.3.yaml b/charts/kubedb-catalog/templates/redis/deprecated-redis-5.0.3.yaml index 0bcbb171c..cea141d97 100644 --- a/charts/kubedb-catalog/templates/redis/deprecated-redis-5.0.3.yaml +++ b/charts/kubedb-catalog/templates/redis/deprecated-redis-5.0.3.yaml @@ -1,4 +1,10 @@ -{{ if and .Values.catalog.redis (not .Values.skipDeprecated) }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Redis }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: RedisVersion metadata: @@ -27,7 +33,7 @@ spec: {{ end }} --- -{{ if and .Values.catalog.redis (not .Values.skipDeprecated) }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: RedisVersion metadata: @@ -56,3 +62,4 @@ spec: name: redis-restore-5.0.13 version: 5.0.3 {{ end }} +{{ end }} diff --git a/charts/kubedb-catalog/templates/redis/deprecated-redis-5.0.yaml b/charts/kubedb-catalog/templates/redis/deprecated-redis-5.0.yaml index a91f2c536..2186ca2a4 100644 --- a/charts/kubedb-catalog/templates/redis/deprecated-redis-5.0.yaml +++ b/charts/kubedb-catalog/templates/redis/deprecated-redis-5.0.yaml @@ -1,4 +1,10 @@ -{{ if and .Values.catalog.redis (not .Values.skipDeprecated) }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Redis }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: RedisVersion metadata: @@ -27,7 +33,7 @@ spec: {{ end }} --- -{{ if and .Values.catalog.redis (not .Values.skipDeprecated) }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: RedisVersion metadata: @@ -54,3 +60,4 @@ spec: name: redis-restore-5.0.13 version: "5.0" {{ end }} +{{ end }} diff --git a/charts/kubedb-catalog/templates/redis/deprecated-redis-6.0.18.yaml b/charts/kubedb-catalog/templates/redis/deprecated-redis-6.0.18.yaml index 88b00bc14..69eb5fb99 100644 --- a/charts/kubedb-catalog/templates/redis/deprecated-redis-6.0.18.yaml +++ b/charts/kubedb-catalog/templates/redis/deprecated-redis-6.0.18.yaml @@ -1,4 +1,10 @@ -{{ if and .Values.catalog.redis (not .Values.skipDeprecated) }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Redis }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: RedisVersion metadata: @@ -27,3 +33,4 @@ spec: name: redis-restore-6.2.5 version: 6.0.18 {{ end }} +{{ end }} diff --git a/charts/kubedb-catalog/templates/redis/deprecated-redis-6.0.6.yaml b/charts/kubedb-catalog/templates/redis/deprecated-redis-6.0.6.yaml index 0e220dc68..95314b32d 100644 --- a/charts/kubedb-catalog/templates/redis/deprecated-redis-6.0.6.yaml +++ b/charts/kubedb-catalog/templates/redis/deprecated-redis-6.0.6.yaml @@ -1,4 +1,10 @@ -{{ if and .Values.catalog.redis (not .Values.skipDeprecated) }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Redis }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: RedisVersion metadata: @@ -27,3 +33,4 @@ spec: name: redis-restore-6.2.5 version: 6.0.6 {{ end }} +{{ end }} diff --git a/charts/kubedb-catalog/templates/redis/deprecated-redis-6.2.11.yaml b/charts/kubedb-catalog/templates/redis/deprecated-redis-6.2.11.yaml index 6452df95a..945e7b5a1 100644 --- a/charts/kubedb-catalog/templates/redis/deprecated-redis-6.2.11.yaml +++ b/charts/kubedb-catalog/templates/redis/deprecated-redis-6.2.11.yaml @@ -1,4 +1,10 @@ -{{ if and .Values.catalog.redis (not .Values.skipDeprecated) }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Redis }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: RedisVersion metadata: @@ -27,3 +33,4 @@ spec: name: redis-restore-6.2.5 version: 6.2.11 {{ end }} +{{ end }} diff --git a/charts/kubedb-catalog/templates/redis/deprecated-redis-6.2.5.yaml b/charts/kubedb-catalog/templates/redis/deprecated-redis-6.2.5.yaml index 44a679ec3..0c049da9c 100644 --- a/charts/kubedb-catalog/templates/redis/deprecated-redis-6.2.5.yaml +++ b/charts/kubedb-catalog/templates/redis/deprecated-redis-6.2.5.yaml @@ -1,4 +1,10 @@ -{{ if and .Values.catalog.redis (not .Values.skipDeprecated) }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Redis }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: RedisVersion metadata: @@ -27,3 +33,4 @@ spec: name: redis-restore-6.2.5 version: 6.2.5 {{ end }} +{{ end }} diff --git a/charts/kubedb-catalog/templates/redis/deprecated-redis-6.2.7.yaml b/charts/kubedb-catalog/templates/redis/deprecated-redis-6.2.7.yaml index 83449cbf7..c291111c2 100644 --- a/charts/kubedb-catalog/templates/redis/deprecated-redis-6.2.7.yaml +++ b/charts/kubedb-catalog/templates/redis/deprecated-redis-6.2.7.yaml @@ -1,4 +1,10 @@ -{{ if and .Values.catalog.redis (not .Values.skipDeprecated) }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Redis }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: RedisVersion metadata: @@ -27,3 +33,4 @@ spec: name: redis-restore-6.2.5 version: 6.2.7 {{ end }} +{{ end }} diff --git a/charts/kubedb-catalog/templates/redis/deprecated-redis-6.2.8.yaml b/charts/kubedb-catalog/templates/redis/deprecated-redis-6.2.8.yaml index 605e6b970..7ddf59928 100644 --- a/charts/kubedb-catalog/templates/redis/deprecated-redis-6.2.8.yaml +++ b/charts/kubedb-catalog/templates/redis/deprecated-redis-6.2.8.yaml @@ -1,4 +1,10 @@ -{{ if and .Values.catalog.redis (not .Values.skipDeprecated) }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Redis }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: RedisVersion metadata: @@ -27,3 +33,4 @@ spec: name: redis-restore-6.2.5 version: 6.2.8 {{ end }} +{{ end }} diff --git a/charts/kubedb-catalog/templates/redis/deprecated-redis-7.0.10.yaml b/charts/kubedb-catalog/templates/redis/deprecated-redis-7.0.10.yaml index 3cb9d3ab3..a967056dc 100644 --- a/charts/kubedb-catalog/templates/redis/deprecated-redis-7.0.10.yaml +++ b/charts/kubedb-catalog/templates/redis/deprecated-redis-7.0.10.yaml @@ -1,4 +1,10 @@ -{{ if and .Values.catalog.redis (not .Values.skipDeprecated) }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Redis }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: RedisVersion metadata: @@ -27,3 +33,4 @@ spec: name: redis-restore-7.0.5 version: 7.0.10 {{ end }} +{{ end }} diff --git a/charts/kubedb-catalog/templates/redis/deprecated-redis-7.0.4.yaml b/charts/kubedb-catalog/templates/redis/deprecated-redis-7.0.4.yaml index 30e2c40ea..e312fdda1 100644 --- a/charts/kubedb-catalog/templates/redis/deprecated-redis-7.0.4.yaml +++ b/charts/kubedb-catalog/templates/redis/deprecated-redis-7.0.4.yaml @@ -1,4 +1,10 @@ -{{ if and .Values.catalog.redis (not .Values.skipDeprecated) }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Redis }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: RedisVersion metadata: @@ -27,3 +33,4 @@ spec: name: redis-restore-7.0.5 version: 7.0.4 {{ end }} +{{ end }} diff --git a/charts/kubedb-catalog/templates/redis/deprecated-redis-7.0.5.yaml b/charts/kubedb-catalog/templates/redis/deprecated-redis-7.0.5.yaml index 813713bec..fbbf827d7 100644 --- a/charts/kubedb-catalog/templates/redis/deprecated-redis-7.0.5.yaml +++ b/charts/kubedb-catalog/templates/redis/deprecated-redis-7.0.5.yaml @@ -1,4 +1,10 @@ -{{ if and .Values.catalog.redis (not .Values.skipDeprecated) }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Redis }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: RedisVersion metadata: @@ -27,3 +33,4 @@ spec: name: redis-restore-7.0.5 version: 7.0.5 {{ end }} +{{ end }} diff --git a/charts/kubedb-catalog/templates/redis/deprecated-redis-7.0.6.yaml b/charts/kubedb-catalog/templates/redis/deprecated-redis-7.0.6.yaml index 40f3655ad..e0d899e6b 100644 --- a/charts/kubedb-catalog/templates/redis/deprecated-redis-7.0.6.yaml +++ b/charts/kubedb-catalog/templates/redis/deprecated-redis-7.0.6.yaml @@ -1,4 +1,10 @@ -{{ if and .Values.catalog.redis (not .Values.skipDeprecated) }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Redis }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: RedisVersion metadata: @@ -27,3 +33,4 @@ spec: name: redis-restore-7.0.5 version: 7.0.6 {{ end }} +{{ end }} diff --git a/charts/kubedb-catalog/templates/redis/deprecated-redis-7.0.9.yaml b/charts/kubedb-catalog/templates/redis/deprecated-redis-7.0.9.yaml index d5eb0656e..13c5bd74e 100644 --- a/charts/kubedb-catalog/templates/redis/deprecated-redis-7.0.9.yaml +++ b/charts/kubedb-catalog/templates/redis/deprecated-redis-7.0.9.yaml @@ -1,4 +1,10 @@ -{{ if and .Values.catalog.redis (not .Values.skipDeprecated) }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Redis }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: RedisVersion metadata: @@ -27,3 +33,4 @@ spec: name: redis-restore-7.0.5 version: 7.0.9 {{ end }} +{{ end }} diff --git a/charts/kubedb-catalog/templates/redis/deprecated-redis-7.2.0.yaml b/charts/kubedb-catalog/templates/redis/deprecated-redis-7.2.0.yaml index bb52430d7..b2b83b378 100644 --- a/charts/kubedb-catalog/templates/redis/deprecated-redis-7.2.0.yaml +++ b/charts/kubedb-catalog/templates/redis/deprecated-redis-7.2.0.yaml @@ -1,4 +1,10 @@ -{{ if and .Values.catalog.redis (not .Values.skipDeprecated) }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Redis }} +{{ if not .Values.skipDeprecated }} apiVersion: catalog.kubedb.com/v1alpha1 kind: RedisVersion metadata: @@ -27,3 +33,4 @@ spec: name: redis-restore-7.0.5 version: 7.2.0 {{ end }} +{{ end }} diff --git a/charts/kubedb-catalog/templates/redis/redis-4.0.11.yaml b/charts/kubedb-catalog/templates/redis/redis-4.0.11.yaml index 38de83e34..a1a0a596a 100644 --- a/charts/kubedb-catalog/templates/redis/redis-4.0.11.yaml +++ b/charts/kubedb-catalog/templates/redis/redis-4.0.11.yaml @@ -1,4 +1,10 @@ -{{ if .Values.catalog.redis }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Redis }} + apiVersion: catalog.kubedb.com/v1alpha1 kind: RedisVersion metadata: diff --git a/charts/kubedb-catalog/templates/redis/redis-5.0.14.yaml b/charts/kubedb-catalog/templates/redis/redis-5.0.14.yaml index cee33e403..7211b54af 100644 --- a/charts/kubedb-catalog/templates/redis/redis-5.0.14.yaml +++ b/charts/kubedb-catalog/templates/redis/redis-5.0.14.yaml @@ -1,4 +1,10 @@ -{{ if .Values.catalog.redis }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Redis }} + apiVersion: catalog.kubedb.com/v1alpha1 kind: RedisVersion metadata: diff --git a/charts/kubedb-catalog/templates/redis/redis-6.0.20.yaml b/charts/kubedb-catalog/templates/redis/redis-6.0.20.yaml index 90df5fc66..4594e732b 100644 --- a/charts/kubedb-catalog/templates/redis/redis-6.0.20.yaml +++ b/charts/kubedb-catalog/templates/redis/redis-6.0.20.yaml @@ -1,4 +1,10 @@ -{{ if .Values.catalog.redis }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Redis }} + apiVersion: catalog.kubedb.com/v1alpha1 kind: RedisVersion metadata: diff --git a/charts/kubedb-catalog/templates/redis/redis-6.2.14.yaml b/charts/kubedb-catalog/templates/redis/redis-6.2.14.yaml index cc0b7cce2..65a1c6de2 100644 --- a/charts/kubedb-catalog/templates/redis/redis-6.2.14.yaml +++ b/charts/kubedb-catalog/templates/redis/redis-6.2.14.yaml @@ -1,4 +1,10 @@ -{{ if .Values.catalog.redis }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Redis }} + apiVersion: catalog.kubedb.com/v1alpha1 kind: RedisVersion metadata: diff --git a/charts/kubedb-catalog/templates/redis/redis-7.0.14.yaml b/charts/kubedb-catalog/templates/redis/redis-7.0.14.yaml index d8357074a..e1d893f8b 100644 --- a/charts/kubedb-catalog/templates/redis/redis-7.0.14.yaml +++ b/charts/kubedb-catalog/templates/redis/redis-7.0.14.yaml @@ -1,4 +1,10 @@ -{{ if .Values.catalog.redis }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Redis }} + apiVersion: catalog.kubedb.com/v1alpha1 kind: RedisVersion metadata: diff --git a/charts/kubedb-catalog/templates/redis/redis-7.2.3.yaml b/charts/kubedb-catalog/templates/redis/redis-7.2.3.yaml index 9f06ffdc6..49d18bc9c 100644 --- a/charts/kubedb-catalog/templates/redis/redis-7.2.3.yaml +++ b/charts/kubedb-catalog/templates/redis/redis-7.2.3.yaml @@ -1,4 +1,10 @@ -{{ if .Values.catalog.redis }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Redis }} + apiVersion: catalog.kubedb.com/v1alpha1 kind: RedisVersion metadata: diff --git a/charts/kubedb-catalog/templates/redis/redis-psp.yaml b/charts/kubedb-catalog/templates/redis/redis-psp.yaml index 0ed083cab..cb4ca222f 100644 --- a/charts/kubedb-catalog/templates/redis/redis-psp.yaml +++ b/charts/kubedb-catalog/templates/redis/redis-psp.yaml @@ -1,4 +1,9 @@ -{{ if and .Values.psp.enabled (.Capabilities.APIVersions.Has "policy/v1beta1/PodSecurityPolicy") .Values.catalog.redis }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if and .Values.psp.enabled (.Capabilities.APIVersions.Has "policy/v1beta1/PodSecurityPolicy") $featureGates.Redis }} apiVersion: policy/v1beta1 kind: PodSecurityPolicy metadata: diff --git a/charts/kubedb-catalog/values.openapiv3_schema.yaml b/charts/kubedb-catalog/values.openapiv3_schema.yaml index bb673d896..c2e4fdd68 100644 --- a/charts/kubedb-catalog/values.openapiv3_schema.yaml +++ b/charts/kubedb-catalog/values.openapiv3_schema.yaml @@ -1,30 +1,7 @@ properties: - catalog: - properties: - elasticsearch: - type: boolean - etcd: - type: boolean - kafka: - type: boolean - mariadb: - type: boolean - memcached: - type: boolean - mongodb: - type: boolean - mysql: - type: boolean - perconaxtradb: - type: boolean - pgbouncer: - type: boolean - postgres: - type: boolean - proxysql: - type: boolean - redis: - type: boolean + featureGates: + additionalProperties: + type: boolean type: object fullnameOverride: type: string @@ -159,7 +136,7 @@ properties: skipDeprecated: type: boolean required: -- catalog +- featureGates - psp - skipDeprecated type: object diff --git a/charts/kubedb-catalog/values.yaml b/charts/kubedb-catalog/values.yaml index 095ff14db..8f4ec4263 100644 --- a/charts/kubedb-catalog/values.yaml +++ b/charts/kubedb-catalog/values.yaml @@ -22,30 +22,29 @@ proxies: # kubernetes: harbor.appscode.ninja/k8s # appscode: harbor.appscode.ninja/ac -catalog: - # If true, deploys Elasticsearch version catalog - elasticsearch: true - # If true, deploys Etcd version catalog - etcd: true - # If true, deploys Memcached version catalog - memcached: true - # If true, deploys MongoDB version catalog - mongodb: true - # If true, deploys MySQL version catalog - mysql: true - # If true, deploys MariaDB version catalog - mariadb: true - # If true, deploys Percona XtraDB version catalog - perconaxtradb: true - # If true, deploys PgBouncer version catalog - pgbouncer: true - # If true, deploys PostgreSQL version catalog - postgres: true - # If true, deploys ProxySQL version catalog - proxysql: true - # If true, deploys Redis version catalog - redis: true - kafka: true +featureGates: + Cassandra: false + ClickHouse: false + Druid: false + Elasticsearch: true + Etcd: false + FerretDB: false + Kafka: true + MariaDB: true + Memcached: true + MicrosoftSQLServer: false + MongoDB: true + MySQL: true + PerconaXtraDB: true + PgBouncer: true + PgPool: false + Postgres: true + ProxySQL: true + RabbitMQ: false + Redis: true + SingleStore: false + Solr: false + ZooKeeper: false psp: enabled: true diff --git a/charts/kubedb-crd-manager/templates/job.yaml b/charts/kubedb-crd-manager/templates/job.yaml index cbb3d9157..f46de2043 100644 --- a/charts/kubedb-crd-manager/templates/job.yaml +++ b/charts/kubedb-crd-manager/templates/job.yaml @@ -1,3 +1,8 @@ +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + apiVersion: batch/v1 kind: Job metadata: @@ -27,7 +32,7 @@ spec: imagePullPolicy: {{ .Values.imagePullPolicy }} args: - run - {{- range $db, $enable := .Values.featureGates }} + {{- range $db, $enable := $featureGates }} - --feature-gates={{ $db }}={{ $enable }} {{- end }} resources: diff --git a/charts/kubedb-kubestash-catalog/README.md b/charts/kubedb-kubestash-catalog/README.md index 1160ca04c..3646f2fff 100644 --- a/charts/kubedb-kubestash-catalog/README.md +++ b/charts/kubedb-kubestash-catalog/README.md @@ -45,35 +45,51 @@ The command removes all the Kubernetes components associated with the chart and The following table lists the configurable parameters of the `kubedb-kubestash-catalog` chart and their default values. -| Parameter | Description | Default | -|----------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|------------------------------| -| proxies.dockerHub | | "" | -| proxies.dockerLibrary | | "" | -| proxies.ghcr | | ghcr.io | -| proxies.kubernetes | | registry.k8s.io | -| proxies.appscode | | r.appscode.com | -| waitTimeout | registryFQDN: harbor.appscode.ninja proxies: dockerHub: harbor.appscode.ninja/dockerhub dockerLibrary: "" ghcr: harbor.appscode.ninja/ghcr kubernetes: harbor.appscode.ninja/k8s appscode: harbor.appscode.ninja/ac proxies: ghcr: harbor.appscode.ninja/ghcr Number of seconds to wait for the database to be ready before backup/restore process. | 300 | -| elasticsearch.enabled | If true, deploys Elasticsearch addon | true | -| elasticsearch.backup.args | Arguments to pass to `multielasticdump` command during backup process | "" | -| elasticsearch.restore.args | Arguments to pass to `multielasticdump` command during restore process | "" | -| opensearch.enabled | If true, deploys Opensearch addon | true | -| opensearch.backup.args | Arguments to pass to `multielasticdump` command during backup process | "" | -| opensearch.restore.args | Arguments to pass to `multielasticdump` command during restore process | "" | -| kubedbmanifest.enabled | If true, deploys KubeDBManifest addon | true | -| mongodb.enabled | If true, deploys MongoDB addon | true | -| mongodb.maxConcurrency | Maximum concurrency to perform backup or restore tasks | 3 | -| mongodb.backup.args | Arguments to pass to `mongodump` command during backup process | "" | -| mongodb.restore.args | Arguments to pass to `mongorestore` command during restore process | "" | -| postgres.enabled | If true, deploys PostgreSQL addon | true | -| postgres.backup.cmd | Postgres dump command, can either be: pg_dumpall or pg_dump | "pg_dumpall" | -| postgres.backup.args | Arguments to pass to `backup.cmd` command during backup process | "" | -| postgres.restore.args | Arguments to pass to `psql` command during restore process | "" | -| mysql.enabled | If true, deploys MySQL addon | true | -| mysql.backup.args | Arguments to pass to `mysqldump` command during bakcup process | "" | -| mysql.restore.args | Arguments to pass to `mysql` command during restore process | "" | -| redis.enabled | If true, deploys Redis addon | true | -| redis.backup.args | Arguments to pass to `redis-dump` command during bakcup process | "" | -| redis.restore.args | Arguments to pass to `redis` command during restore process | "" | +| Parameter | Description | Default | +|---------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|------------------------------| +| proxies.dockerHub | | "" | +| proxies.dockerLibrary | | "" | +| proxies.ghcr | | ghcr.io | +| proxies.kubernetes | | registry.k8s.io | +| proxies.appscode | | r.appscode.com | +| waitTimeout | registryFQDN: harbor.appscode.ninja proxies: dockerHub: harbor.appscode.ninja/dockerhub dockerLibrary: "" ghcr: harbor.appscode.ninja/ghcr kubernetes: harbor.appscode.ninja/k8s appscode: harbor.appscode.ninja/ac proxies: ghcr: harbor.appscode.ninja/ghcr Number of seconds to wait for the database to be ready before backup/restore process. | 300 | +| featureGates.Cassandra | | false | +| featureGates.ClickHouse | | false | +| featureGates.Druid | | false | +| featureGates.Elasticsearch | | true | +| featureGates.Etcd | | false | +| featureGates.FerretDB | | false | +| featureGates.Kafka | | true | +| featureGates.MariaDB | | true | +| featureGates.Memcached | | true | +| featureGates.MicrosoftSQLServer | | false | +| featureGates.MongoDB | | true | +| featureGates.MySQL | | true | +| featureGates.PerconaXtraDB | | true | +| featureGates.PgBouncer | | true | +| featureGates.PgPool | | false | +| featureGates.Postgres | | true | +| featureGates.ProxySQL | | true | +| featureGates.RabbitMQ | | false | +| featureGates.Redis | | true | +| featureGates.SingleStore | | false | +| featureGates.Solr | | false | +| featureGates.ZooKeeper | | false | +| elasticsearch.backup.args | Arguments to pass to `multielasticdump` command during backup process | "" | +| elasticsearch.restore.args | Arguments to pass to `multielasticdump` command during restore process | "" | +| opensearch.backup.args | Arguments to pass to `multielasticdump` command during backup process | "" | +| opensearch.restore.args | Arguments to pass to `multielasticdump` command during restore process | "" | +| kubedbmanifest.enabled | If true, deploys KubeDBManifest addon | true | +| mongodb.maxConcurrency | Maximum concurrency to perform backup or restore tasks | 3 | +| mongodb.backup.args | Arguments to pass to `mongodump` command during backup process | "" | +| mongodb.restore.args | Arguments to pass to `mongorestore` command during restore process | "" | +| postgres.backup.cmd | Postgres dump command, can either be: pg_dumpall or pg_dump | "pg_dumpall" | +| postgres.backup.args | Arguments to pass to `backup.cmd` command during backup process | "" | +| postgres.restore.args | Arguments to pass to `psql` command during restore process | "" | +| mysql.backup.args | Arguments to pass to `mysqldump` command during bakcup process | "" | +| mysql.restore.args | Arguments to pass to `mysql` command during restore process | "" | +| redis.backup.args | Arguments to pass to `redis-dump` command during bakcup process | "" | +| redis.restore.args | Arguments to pass to `redis` command during restore process | "" | Specify each parameter using the `--set key=value[,key=value]` argument to `helm upgrade -i`. For example: diff --git a/charts/kubedb-kubestash-catalog/templates/elasticsearch/elasticsearch-addon.yaml b/charts/kubedb-kubestash-catalog/templates/elasticsearch/elasticsearch-addon.yaml index d97f32f76..ab21808ce 100644 --- a/charts/kubedb-kubestash-catalog/templates/elasticsearch/elasticsearch-addon.yaml +++ b/charts/kubedb-kubestash-catalog/templates/elasticsearch/elasticsearch-addon.yaml @@ -1,4 +1,9 @@ -{{ if .Values.elasticsearch.enabled }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Elasticsearch }} apiVersion: addons.kubestash.com/v1alpha1 kind: Addon metadata: @@ -81,4 +86,3 @@ spec: emptyDir: {} usage: Holds temporary files and restic cache. {{ end }} - diff --git a/charts/kubedb-kubestash-catalog/templates/elasticsearch/elasticsearch-backup.yaml b/charts/kubedb-kubestash-catalog/templates/elasticsearch/elasticsearch-backup.yaml index 705776ac2..98a3b658b 100644 --- a/charts/kubedb-kubestash-catalog/templates/elasticsearch/elasticsearch-backup.yaml +++ b/charts/kubedb-kubestash-catalog/templates/elasticsearch/elasticsearch-backup.yaml @@ -1,4 +1,9 @@ -{{ if .Values.elasticsearch.enabled }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Elasticsearch }} apiVersion: addons.kubestash.com/v1alpha1 kind: Function metadata: @@ -17,4 +22,3 @@ spec: - --interim-data-dir=${interimDataDir:=} image: '{{ include "image.ghcr" (merge (dict "_repo" "kubedb/elasticsearch-restic-plugin") $) }}:v0.3.0' {{ end }} - diff --git a/charts/kubedb-kubestash-catalog/templates/elasticsearch/elasticsearch-restore.yaml b/charts/kubedb-kubestash-catalog/templates/elasticsearch/elasticsearch-restore.yaml index 3513a10d3..1250b7da3 100644 --- a/charts/kubedb-kubestash-catalog/templates/elasticsearch/elasticsearch-restore.yaml +++ b/charts/kubedb-kubestash-catalog/templates/elasticsearch/elasticsearch-restore.yaml @@ -1,4 +1,9 @@ -{{ if .Values.elasticsearch.enabled }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Elasticsearch }} apiVersion: addons.kubestash.com/v1alpha1 kind: Function metadata: @@ -18,4 +23,3 @@ spec: - --interim-data-dir=${interimDataDir:=} image: '{{ include "image.ghcr" (merge (dict "_repo" "kubedb/elasticsearch-restic-plugin") $) }}:v0.3.0' {{ end }} - diff --git a/charts/kubedb-kubestash-catalog/templates/kubedbmanifest/kubedbmanifest-backup.yaml b/charts/kubedb-kubestash-catalog/templates/kubedbmanifest/kubedbmanifest-backup.yaml index 66addccce..a1eb339ab 100644 --- a/charts/kubedb-kubestash-catalog/templates/kubedbmanifest/kubedbmanifest-backup.yaml +++ b/charts/kubedb-kubestash-catalog/templates/kubedbmanifest/kubedbmanifest-backup.yaml @@ -14,4 +14,3 @@ spec: - --scratch-dir=${scratchDir:=} image: '{{ include "image.ghcr" (merge (dict "_repo" "kubedb/kubedb-manifest-plugin") $) }}:v0.3.0' {{ end }} - diff --git a/charts/kubedb-kubestash-catalog/templates/kubedbmanifest/kubedbmanifest-restore.yaml b/charts/kubedb-kubestash-catalog/templates/kubedbmanifest/kubedbmanifest-restore.yaml index 6675cc2c5..194ef6699 100644 --- a/charts/kubedb-kubestash-catalog/templates/kubedbmanifest/kubedbmanifest-restore.yaml +++ b/charts/kubedb-kubestash-catalog/templates/kubedbmanifest/kubedbmanifest-restore.yaml @@ -15,4 +15,3 @@ spec: - --scratch-dir=${scratchDir:=} image: '{{ include "image.ghcr" (merge (dict "_repo" "kubedb/kubedb-manifest-plugin") $) }}:v0.3.0' {{ end }} - diff --git a/charts/kubedb-kubestash-catalog/templates/mongodb/mongodb-addon.yaml b/charts/kubedb-kubestash-catalog/templates/mongodb/mongodb-addon.yaml index ab4ad095f..2325b62cb 100644 --- a/charts/kubedb-kubestash-catalog/templates/mongodb/mongodb-addon.yaml +++ b/charts/kubedb-kubestash-catalog/templates/mongodb/mongodb-addon.yaml @@ -1,4 +1,9 @@ -{{ if .Values.mongodb.enabled }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.MongoDB }} apiVersion: addons.kubestash.com/v1alpha1 kind: Addon metadata: @@ -112,4 +117,3 @@ spec: emptyDir: {} usage: Holds temporary files and restic cache. {{ end }} - diff --git a/charts/kubedb-kubestash-catalog/templates/mongodb/mongodb-backup.yaml b/charts/kubedb-kubestash-catalog/templates/mongodb/mongodb-backup.yaml index d65a4deb5..2b2f7dde1 100644 --- a/charts/kubedb-kubestash-catalog/templates/mongodb/mongodb-backup.yaml +++ b/charts/kubedb-kubestash-catalog/templates/mongodb/mongodb-backup.yaml @@ -1,4 +1,9 @@ -{{ if .Values.mongodb.enabled }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.MongoDB }} apiVersion: addons.kubestash.com/v1alpha1 kind: Function metadata: @@ -19,4 +24,3 @@ spec: - --db-version=${dbVersion:=} image: '{{ include "image.ghcr" (merge (dict "_repo" "kubedb/mongodb-restic-plugin") $) }}:v0.3.0_${DB_VERSION}' {{ end }} - diff --git a/charts/kubedb-kubestash-catalog/templates/mongodb/mongodb-csi-snapshotter.yaml b/charts/kubedb-kubestash-catalog/templates/mongodb/mongodb-csi-snapshotter.yaml index cb7c9db60..57924ffad 100644 --- a/charts/kubedb-kubestash-catalog/templates/mongodb/mongodb-csi-snapshotter.yaml +++ b/charts/kubedb-kubestash-catalog/templates/mongodb/mongodb-csi-snapshotter.yaml @@ -1,4 +1,9 @@ -{{ if .Values.mongodb.enabled }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.MongoDB }} apiVersion: addons.kubestash.com/v1alpha1 kind: Function metadata: @@ -13,4 +18,3 @@ spec: - --backupsession=${backupSession:=} image: '{{ include "image.ghcr" (merge (dict "_repo" "kubedb/mongodb-csi-snapshotter-plugin") $) }}:v0.1.0' {{ end }} - diff --git a/charts/kubedb-kubestash-catalog/templates/mongodb/mongodb-restore.yaml b/charts/kubedb-kubestash-catalog/templates/mongodb/mongodb-restore.yaml index 3674b6b21..1c61b8375 100644 --- a/charts/kubedb-kubestash-catalog/templates/mongodb/mongodb-restore.yaml +++ b/charts/kubedb-kubestash-catalog/templates/mongodb/mongodb-restore.yaml @@ -1,4 +1,9 @@ -{{ if .Values.mongodb.enabled }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.MongoDB }} apiVersion: addons.kubestash.com/v1alpha1 kind: Function metadata: @@ -20,4 +25,3 @@ spec: - --db-version=${dbVersion:=} image: '{{ include "image.ghcr" (merge (dict "_repo" "kubedb/mongodb-restic-plugin") $) }}:v0.3.0_${DB_VERSION}' {{ end }} - diff --git a/charts/kubedb-kubestash-catalog/templates/mysql/mysql-addon.yaml b/charts/kubedb-kubestash-catalog/templates/mysql/mysql-addon.yaml index 280627272..33b8f2e22 100644 --- a/charts/kubedb-kubestash-catalog/templates/mysql/mysql-addon.yaml +++ b/charts/kubedb-kubestash-catalog/templates/mysql/mysql-addon.yaml @@ -1,4 +1,9 @@ -{{ if .Values.mysql.enabled }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.MySQL }} apiVersion: addons.kubestash.com/v1alpha1 kind: Addon metadata: @@ -115,4 +120,3 @@ spec: emptyDir: {} usage: Holds temporary files and restic cache. {{ end }} - diff --git a/charts/kubedb-kubestash-catalog/templates/mysql/mysql-backup.yaml b/charts/kubedb-kubestash-catalog/templates/mysql/mysql-backup.yaml index 750d93be4..6ef02e73c 100644 --- a/charts/kubedb-kubestash-catalog/templates/mysql/mysql-backup.yaml +++ b/charts/kubedb-kubestash-catalog/templates/mysql/mysql-backup.yaml @@ -1,4 +1,9 @@ -{{ if .Values.mysql.enabled }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.MySQL }} apiVersion: addons.kubestash.com/v1alpha1 kind: Function metadata: @@ -18,4 +23,3 @@ spec: - --databases=${databases:=} image: '{{ include "image.ghcr" (merge (dict "_repo" "kubedb/mysql-restic-plugin") $) }}:v0.3.0_${DB_VERSION}' {{ end }} - diff --git a/charts/kubedb-kubestash-catalog/templates/mysql/mysql-csi-snapshotter.yaml b/charts/kubedb-kubestash-catalog/templates/mysql/mysql-csi-snapshotter.yaml index 82824a8c4..d09149bb9 100644 --- a/charts/kubedb-kubestash-catalog/templates/mysql/mysql-csi-snapshotter.yaml +++ b/charts/kubedb-kubestash-catalog/templates/mysql/mysql-csi-snapshotter.yaml @@ -1,4 +1,9 @@ -{{ if .Values.mysql.enabled }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.MySQL }} apiVersion: addons.kubestash.com/v1alpha1 kind: Function metadata: @@ -13,4 +18,3 @@ spec: - --backupsession=${backupSession:=} image: '{{ include "image.ghcr" (merge (dict "_repo" "kubedb/mysql-csi-snapshotter-plugin") $) }}:v0.1.0' {{ end }} - diff --git a/charts/kubedb-kubestash-catalog/templates/mysql/mysql-restore.yaml b/charts/kubedb-kubestash-catalog/templates/mysql/mysql-restore.yaml index a9beb5114..d67b37c3d 100644 --- a/charts/kubedb-kubestash-catalog/templates/mysql/mysql-restore.yaml +++ b/charts/kubedb-kubestash-catalog/templates/mysql/mysql-restore.yaml @@ -1,4 +1,9 @@ -{{ if .Values.mysql.enabled }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.MySQL }} apiVersion: addons.kubestash.com/v1alpha1 kind: Function metadata: @@ -18,4 +23,3 @@ spec: - --db-version=${dbVersion:=} image: '{{ include "image.ghcr" (merge (dict "_repo" "kubedb/mysql-restic-plugin") $) }}:v0.3.0_${DB_VERSION}' {{ end }} - diff --git a/charts/kubedb-kubestash-catalog/templates/opensearch/opensearch-addon.yaml b/charts/kubedb-kubestash-catalog/templates/opensearch/opensearch-addon.yaml index f85a900e0..45e85ad33 100644 --- a/charts/kubedb-kubestash-catalog/templates/opensearch/opensearch-addon.yaml +++ b/charts/kubedb-kubestash-catalog/templates/opensearch/opensearch-addon.yaml @@ -1,4 +1,9 @@ -{{ if .Values.opensearch.enabled }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Elasticsearch }} apiVersion: addons.kubestash.com/v1alpha1 kind: Addon metadata: @@ -81,4 +86,3 @@ spec: emptyDir: {} usage: Holds temporary files and restic cache. {{ end }} - diff --git a/charts/kubedb-kubestash-catalog/templates/opensearch/opensearch-backup.yaml b/charts/kubedb-kubestash-catalog/templates/opensearch/opensearch-backup.yaml index d36ee63ff..39e02efb7 100644 --- a/charts/kubedb-kubestash-catalog/templates/opensearch/opensearch-backup.yaml +++ b/charts/kubedb-kubestash-catalog/templates/opensearch/opensearch-backup.yaml @@ -1,4 +1,9 @@ -{{ if .Values.opensearch.enabled }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Elasticsearch }} apiVersion: addons.kubestash.com/v1alpha1 kind: Function metadata: @@ -17,4 +22,3 @@ spec: - --interim-data-dir=${interimDataDir:=} image: '{{ include "image.ghcr" (merge (dict "_repo" "kubedb/elasticsearch-restic-plugin") $) }}:v0.3.0' {{ end }} - diff --git a/charts/kubedb-kubestash-catalog/templates/opensearch/opensearch-restore.yaml b/charts/kubedb-kubestash-catalog/templates/opensearch/opensearch-restore.yaml index a00e00d18..1dfbaab45 100644 --- a/charts/kubedb-kubestash-catalog/templates/opensearch/opensearch-restore.yaml +++ b/charts/kubedb-kubestash-catalog/templates/opensearch/opensearch-restore.yaml @@ -1,4 +1,9 @@ -{{ if .Values.opensearch.enabled }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Elasticsearch }} apiVersion: addons.kubestash.com/v1alpha1 kind: Function metadata: @@ -18,4 +23,3 @@ spec: - --interim-data-dir=${interimDataDir:=} image: '{{ include "image.ghcr" (merge (dict "_repo" "kubedb/elasticsearch-restic-plugin") $) }}:v0.3.0' {{ end }} - diff --git a/charts/kubedb-kubestash-catalog/templates/postgres/postgres-addon.yaml b/charts/kubedb-kubestash-catalog/templates/postgres/postgres-addon.yaml index 7fdca5cd0..0e4c5d8b7 100644 --- a/charts/kubedb-kubestash-catalog/templates/postgres/postgres-addon.yaml +++ b/charts/kubedb-kubestash-catalog/templates/postgres/postgres-addon.yaml @@ -1,4 +1,9 @@ -{{ if .Values.postgres.enabled }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Postgres }} apiVersion: addons.kubestash.com/v1alpha1 kind: Addon metadata: @@ -124,4 +129,3 @@ spec: emptyDir: {} usage: Holds temporary files and restic cache. {{ end }} - diff --git a/charts/kubedb-kubestash-catalog/templates/postgres/postgres-backup.yaml b/charts/kubedb-kubestash-catalog/templates/postgres/postgres-backup.yaml index b3858f81f..6456d6c43 100644 --- a/charts/kubedb-kubestash-catalog/templates/postgres/postgres-backup.yaml +++ b/charts/kubedb-kubestash-catalog/templates/postgres/postgres-backup.yaml @@ -1,4 +1,9 @@ -{{ if .Values.postgres.enabled }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Postgres }} apiVersion: addons.kubestash.com/v1alpha1 kind: Function metadata: @@ -18,4 +23,3 @@ spec: - --user=${user:=} image: '{{ include "image.ghcr" (merge (dict "_repo" "kubedb/postgres-restic-plugin") $) }}:v0.3.0' {{ end }} - diff --git a/charts/kubedb-kubestash-catalog/templates/postgres/postgres-csi-snapshotter.yaml b/charts/kubedb-kubestash-catalog/templates/postgres/postgres-csi-snapshotter.yaml index 402000a99..f64c239e6 100644 --- a/charts/kubedb-kubestash-catalog/templates/postgres/postgres-csi-snapshotter.yaml +++ b/charts/kubedb-kubestash-catalog/templates/postgres/postgres-csi-snapshotter.yaml @@ -1,4 +1,9 @@ -{{ if .Values.postgres.enabled }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Postgres }} apiVersion: addons.kubestash.com/v1alpha1 kind: Function metadata: @@ -13,4 +18,3 @@ spec: - --backupsession=${backupSession:=} image: '{{ include "image.ghcr" (merge (dict "_repo" "kubedb/postgres-csi-snapshotter-plugin") $) }}:v0.1.0' {{ end }} - diff --git a/charts/kubedb-kubestash-catalog/templates/postgres/postgres-restore.yaml b/charts/kubedb-kubestash-catalog/templates/postgres/postgres-restore.yaml index 08925cde6..043ca731e 100644 --- a/charts/kubedb-kubestash-catalog/templates/postgres/postgres-restore.yaml +++ b/charts/kubedb-kubestash-catalog/templates/postgres/postgres-restore.yaml @@ -1,4 +1,9 @@ -{{ if .Values.postgres.enabled }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Postgres }} apiVersion: addons.kubestash.com/v1alpha1 kind: Function metadata: @@ -18,4 +23,3 @@ spec: - --user=${user:=} image: '{{ include "image.ghcr" (merge (dict "_repo" "kubedb/postgres-restic-plugin") $) }}:v0.3.0' {{ end }} - diff --git a/charts/kubedb-kubestash-catalog/templates/redis/redis-addon.yaml b/charts/kubedb-kubestash-catalog/templates/redis/redis-addon.yaml index 00c4f965c..639c64f49 100644 --- a/charts/kubedb-kubestash-catalog/templates/redis/redis-addon.yaml +++ b/charts/kubedb-kubestash-catalog/templates/redis/redis-addon.yaml @@ -1,4 +1,9 @@ -{{ if .Values.redis.enabled }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Redis }} apiVersion: addons.kubestash.com/v1alpha1 kind: Addon metadata: @@ -59,4 +64,3 @@ spec: emptyDir: {} usage: Holds temporary files and restic cache. {{ end }} - diff --git a/charts/kubedb-kubestash-catalog/templates/redis/redis-backup.yaml b/charts/kubedb-kubestash-catalog/templates/redis/redis-backup.yaml index 04e328fbf..0652c5061 100644 --- a/charts/kubedb-kubestash-catalog/templates/redis/redis-backup.yaml +++ b/charts/kubedb-kubestash-catalog/templates/redis/redis-backup.yaml @@ -1,4 +1,9 @@ -{{ if .Values.redis.enabled }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Redis }} apiVersion: addons.kubestash.com/v1alpha1 kind: Function metadata: @@ -16,4 +21,3 @@ spec: - --redis-args=${args:={{ .Values.redis.args }}} image: '{{ include "image.ghcr" (merge (dict "_repo" "kubedb/redis-restic-plugin") $) }}:v0.3.0' {{ end }} - diff --git a/charts/kubedb-kubestash-catalog/templates/redis/redis-restore.yaml b/charts/kubedb-kubestash-catalog/templates/redis/redis-restore.yaml index e12f346ff..f4f625bfa 100644 --- a/charts/kubedb-kubestash-catalog/templates/redis/redis-restore.yaml +++ b/charts/kubedb-kubestash-catalog/templates/redis/redis-restore.yaml @@ -1,4 +1,9 @@ -{{ if .Values.redis.enabled }} +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Redis }} apiVersion: addons.kubestash.com/v1alpha1 kind: Function metadata: @@ -17,4 +22,3 @@ spec: - --redis-args=${args:={{ .Values.redis.args }}} image: '{{ include "image.ghcr" (merge (dict "_repo" "kubedb/redis-restic-plugin") $) }}:v0.3.0' {{ end }} - diff --git a/charts/kubedb-kubestash-catalog/values.openapiv3_schema.yaml b/charts/kubedb-kubestash-catalog/values.openapiv3_schema.yaml index bb01bea61..cb1c08d0b 100644 --- a/charts/kubedb-kubestash-catalog/values.openapiv3_schema.yaml +++ b/charts/kubedb-kubestash-catalog/values.openapiv3_schema.yaml @@ -8,8 +8,6 @@ properties: args: type: string type: object - enabled: - type: boolean restore: properties: args: @@ -17,9 +15,12 @@ properties: type: object required: - backup - - enabled - restore type: object + featureGates: + additionalProperties: + type: boolean + type: object kubedbmanifest: properties: enabled: @@ -35,8 +36,6 @@ properties: args: type: string type: object - enabled: - type: boolean maxConcurrency: format: int32 type: integer @@ -47,7 +46,6 @@ properties: type: object required: - backup - - enabled - maxConcurrency - restore type: object @@ -59,8 +57,6 @@ properties: args: type: string type: object - enabled: - type: boolean restore: properties: args: @@ -68,7 +64,6 @@ properties: type: object required: - backup - - enabled - restore type: object opensearch: @@ -79,8 +74,6 @@ properties: args: type: string type: object - enabled: - type: boolean restore: properties: args: @@ -88,7 +81,6 @@ properties: type: object required: - backup - - enabled - restore type: object postgres: @@ -101,8 +93,6 @@ properties: cmd: type: string type: object - enabled: - type: boolean restore: properties: args: @@ -110,7 +100,6 @@ properties: type: object required: - backup - - enabled - restore type: object proxies: @@ -139,8 +128,6 @@ properties: args: type: string type: object - enabled: - type: boolean restore: properties: args: @@ -148,7 +135,6 @@ properties: type: object required: - backup - - enabled - restore type: object waitTimeout: @@ -156,6 +142,7 @@ properties: type: integer required: - elasticsearch +- featureGates - kubedbmanifest - mongodb - mysql diff --git a/charts/kubedb-kubestash-catalog/values.yaml b/charts/kubedb-kubestash-catalog/values.yaml index 6d5322fd0..29d06006d 100644 --- a/charts/kubedb-kubestash-catalog/values.yaml +++ b/charts/kubedb-kubestash-catalog/values.yaml @@ -21,9 +21,31 @@ proxies: # Number of seconds to wait for the database to be ready before backup/restore process. waitTimeout: 300 +featureGates: + Cassandra: false + ClickHouse: false + Druid: false + Elasticsearch: true + Etcd: false + FerretDB: false + Kafka: true + MariaDB: true + Memcached: true + MicrosoftSQLServer: false + MongoDB: true + MySQL: true + PerconaXtraDB: true + PgBouncer: true + PgPool: false + Postgres: true + ProxySQL: true + RabbitMQ: false + Redis: true + SingleStore: false + Solr: false + ZooKeeper: false + elasticsearch: - # If true, deploys Elasticsearch addon - enabled: true # optional argument to send multielasticdump backup: # Arguments to pass to `multielasticdump` command during backup process @@ -32,8 +54,6 @@ elasticsearch: # Arguments to pass to `multielasticdump` command during restore process args: "" opensearch: - # If true, deploys Opensearch addon - enabled: true # optional argument to send multielasticdump backup: # Arguments to pass to `multielasticdump` command during backup process @@ -45,8 +65,6 @@ kubedbmanifest: # If true, deploys KubeDBManifest addon enabled: true mongodb: - # If true, deploys MongoDB addon - enabled: true # Maximum concurrency to perform backup or restore tasks maxConcurrency: 3 # optional argument to send mongodump or mongorestore command @@ -57,8 +75,6 @@ mongodb: # Arguments to pass to `mongorestore` command during restore process args: "" postgres: - # If true, deploys PostgreSQL addon - enabled: true backup: # Postgres dump command, can either be: pg_dumpall or pg_dump cmd: "pg_dumpall" @@ -68,8 +84,6 @@ postgres: # Arguments to pass to `psql` command during restore process args: "" mysql: - # If true, deploys MySQL addon - enabled: true # optional argument to send mysqldump or mysql command backup: # Arguments to pass to `mysqldump` command during bakcup process @@ -78,8 +92,6 @@ mysql: # Arguments to pass to `mysql` command during restore process args: "" redis: - # If true, deploys Redis addon - enabled: true # optional argument to send redis-dump or redis command backup: # Arguments to pass to `redis-dump` command during bakcup process diff --git a/charts/kubedb-one/README.md b/charts/kubedb-one/README.md index 7c2dcb40b..bea8efce6 100644 --- a/charts/kubedb-one/README.md +++ b/charts/kubedb-one/README.md @@ -45,50 +45,50 @@ The command removes all the Kubernetes components associated with the chart and The following table lists the configurable parameters of the `kubedb-one` chart and their default values. -| Parameter | Description | Default | -|----------------------------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|--------------------| -| global.license | License for the product. Get a license by following the steps from [here](https://kubedb.com/docs/latest/setup/install/enterprise#get-a-trial-license).
Example:
`helm install appscode/kubedb \`
`--set-file global.license=/path/to/license/file`
`or`
`helm install appscode/kubedb \`
`--set global.license=` | "" | -| global.licenseSecretName | Name of Secret with the license as key.txt key | "" | -| global.registry | Docker registry used to pull KubeDB related images | "" | -| global.registryFQDN | Docker registry fqdn used to pull KubeDB related images. Set this to use docker registry hosted at ${registryFQDN}/${registry}/${image} | "" | -| global.insecureRegistries | Specify an array of insecure registries.
Example:
`helm template charts/kubedb-ops-manager \`
`--set global.insecureRegistries[0]=hub.company.com \`
`--set global.insecureRegistries[1]=reg.example.com` | [] | -| global.imagePullSecrets | Specify an array of imagePullSecrets. Secrets must be manually created in the namespace.
Example:
`helm template charts/kubedb \`
`--set global.imagePullSecrets[0].name=sec0 \`
`--set global.imagePullSecrets[1].name=sec1` | [] | -| global.monitoring.agent | Name of monitoring agent (one of "prometheus.io", "prometheus.io/operator", "prometheus.io/builtin") | "" | -| global.monitoring.serviceMonitor.labels | Specify the labels for ServiceMonitor. Prometheus crd will select ServiceMonitor using these labels. Only usable when monitoring agent is `prometheus.io/operator`. | {} | -| kubedb-crd-manager.enabled | If enabled, installs the kubedb-crd-manager chart | true | -| kubedb-crd-manager.featureGates.Cassandra | | false | -| kubedb-crd-manager.featureGates.ClickHouse | | false | -| kubedb-crd-manager.featureGates.Druid | | false | -| kubedb-crd-manager.featureGates.Elasticsearch | | true | -| kubedb-crd-manager.featureGates.Etcd | | false | -| kubedb-crd-manager.featureGates.FerretDB | | false | -| kubedb-crd-manager.featureGates.Kafka | | true | -| kubedb-crd-manager.featureGates.MariaDB | | true | -| kubedb-crd-manager.featureGates.Memcached | | false | -| kubedb-crd-manager.featureGates.MicrosoftSQLServer | | false | -| kubedb-crd-manager.featureGates.MongoDB | | true | -| kubedb-crd-manager.featureGates.MySQL | | true | -| kubedb-crd-manager.featureGates.PerconaXtraDB | | false | -| kubedb-crd-manager.featureGates.PgBouncer | | false | -| kubedb-crd-manager.featureGates.PgPool | | false | -| kubedb-crd-manager.featureGates.Postgres | | true | -| kubedb-crd-manager.featureGates.ProxySQL | | false | -| kubedb-crd-manager.featureGates.RabbitMQ | | false | -| kubedb-crd-manager.featureGates.Redis | | true | -| kubedb-crd-manager.featureGates.SingleStore | | false | -| kubedb-crd-manager.featureGates.Solr | | false | -| kubedb-crd-manager.featureGates.ZooKeeper | | false | -| kubedb-provisioner.enabled | If enabled, installs the kubedb-provisioner chart | true | -| kubedb-webhook-server.enabled | If enabled, installs the kubedb-webhook-server chart | true | -| kubedb-ops-manager.enabled | If enabled, installs the kubedb-ops-manager chart | true | -| kubedb-autoscaler.enabled | If enabled, installs the kubedb-autoscaler chart | true | -| kubedb-dashboard.enabled | If enabled, installs the kubedb-dashboard chart | true | -| kubedb-schema-manager.enabled | If enabled, installs the kubedb-schema-manager chart | true | -| kubedb-metrics.enabled | If enabled, installs the kubedb-metrics chart | true | -| stash-enterprise.enabled | If enabled, installs the stash-enterprise chart | true | -| stash-catalog.enabled | If enabled, installs the stash-catalog chart | true | -| stash-metrics.enabled | If enabled, installs the stash-metrics chart | true | -| kubedb-catalog.enabled | If enabled, installs the kubedb-catalog chart | true | +| Parameter | Description | Default | +|-----------------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|--------------------| +| global.license | License for the product. Get a license by following the steps from [here](https://kubedb.com/docs/latest/setup/install/enterprise#get-a-trial-license).
Example:
`helm install appscode/kubedb \`
`--set-file global.license=/path/to/license/file`
`or`
`helm install appscode/kubedb \`
`--set global.license=` | "" | +| global.licenseSecretName | Name of Secret with the license as key.txt key | "" | +| global.registry | Docker registry used to pull KubeDB related images | "" | +| global.registryFQDN | Docker registry fqdn used to pull KubeDB related images. Set this to use docker registry hosted at ${registryFQDN}/${registry}/${image} | "" | +| global.insecureRegistries | Specify an array of insecure registries.
Example:
`helm template charts/kubedb-ops-manager \`
`--set global.insecureRegistries[0]=hub.company.com \`
`--set global.insecureRegistries[1]=reg.example.com` | [] | +| global.imagePullSecrets | Specify an array of imagePullSecrets. Secrets must be manually created in the namespace.
Example:
`helm template charts/kubedb \`
`--set global.imagePullSecrets[0].name=sec0 \`
`--set global.imagePullSecrets[1].name=sec1` | [] | +| global.featureGates.Cassandra | | false | +| global.featureGates.ClickHouse | | false | +| global.featureGates.Druid | | false | +| global.featureGates.Elasticsearch | | true | +| global.featureGates.Etcd | | false | +| global.featureGates.FerretDB | | false | +| global.featureGates.Kafka | | true | +| global.featureGates.MariaDB | | true | +| global.featureGates.Memcached | | true | +| global.featureGates.MicrosoftSQLServer | | false | +| global.featureGates.MongoDB | | true | +| global.featureGates.MySQL | | true | +| global.featureGates.PerconaXtraDB | | true | +| global.featureGates.PgBouncer | | true | +| global.featureGates.PgPool | | false | +| global.featureGates.Postgres | | true | +| global.featureGates.ProxySQL | | true | +| global.featureGates.RabbitMQ | | false | +| global.featureGates.Redis | | true | +| global.featureGates.SingleStore | | false | +| global.featureGates.Solr | | false | +| global.featureGates.ZooKeeper | | false | +| global.monitoring.agent | Name of monitoring agent (one of "prometheus.io", "prometheus.io/operator", "prometheus.io/builtin") | "" | +| global.monitoring.serviceMonitor.labels | Specify the labels for ServiceMonitor. Prometheus crd will select ServiceMonitor using these labels. Only usable when monitoring agent is `prometheus.io/operator`. | {} | +| kubedb-crd-manager.enabled | If enabled, installs the kubedb-crd-manager chart | true | +| kubedb-provisioner.enabled | If enabled, installs the kubedb-provisioner chart | true | +| kubedb-webhook-server.enabled | If enabled, installs the kubedb-webhook-server chart | true | +| kubedb-ops-manager.enabled | If enabled, installs the kubedb-ops-manager chart | true | +| kubedb-autoscaler.enabled | If enabled, installs the kubedb-autoscaler chart | true | +| kubedb-dashboard.enabled | If enabled, installs the kubedb-dashboard chart | true | +| kubedb-schema-manager.enabled | If enabled, installs the kubedb-schema-manager chart | true | +| kubedb-metrics.enabled | If enabled, installs the kubedb-metrics chart | true | +| stash-enterprise.enabled | If enabled, installs the stash-enterprise chart | true | +| stash-catalog.enabled | If enabled, installs the stash-catalog chart | true | +| stash-metrics.enabled | If enabled, installs the stash-metrics chart | true | +| kubedb-catalog.enabled | If enabled, installs the kubedb-catalog chart | true | Specify each parameter using the `--set key=value[,key=value]` argument to `helm upgrade -i`. For example: diff --git a/charts/kubedb-one/values.yaml b/charts/kubedb-one/values.yaml index 6fee1ffdb..1d42d97af 100644 --- a/charts/kubedb-one/values.yaml +++ b/charts/kubedb-one/values.yaml @@ -40,18 +40,6 @@ global: # --set global.imagePullSecrets[1].name=sec1 imagePullSecrets: [] - monitoring: - # Name of monitoring agent (one of "prometheus.io", "prometheus.io/operator", "prometheus.io/builtin") - agent: "" - serviceMonitor: - # Specify the labels for ServiceMonitor. - # Prometheus crd will select ServiceMonitor using these labels. - # Only usable when monitoring agent is `prometheus.io/operator`. - labels: {} - -kubedb-crd-manager: - # If enabled, installs the kubedb-crd-manager chart - enabled: true featureGates: Cassandra: false ClickHouse: false @@ -61,20 +49,33 @@ kubedb-crd-manager: FerretDB: false Kafka: true MariaDB: true - Memcached: false + Memcached: true MicrosoftSQLServer: false MongoDB: true MySQL: true - PerconaXtraDB: false - PgBouncer: false + PerconaXtraDB: true + PgBouncer: true PgPool: false Postgres: true - ProxySQL: false + ProxySQL: true RabbitMQ: false Redis: true SingleStore: false Solr: false ZooKeeper: false + + monitoring: + # Name of monitoring agent (one of "prometheus.io", "prometheus.io/operator", "prometheus.io/builtin") + agent: "" + serviceMonitor: + # Specify the labels for ServiceMonitor. + # Prometheus crd will select ServiceMonitor using these labels. + # Only usable when monitoring agent is `prometheus.io/operator`. + labels: {} + +kubedb-crd-manager: + # If enabled, installs the kubedb-crd-manager chart + enabled: true kubedb-provisioner: # If enabled, installs the kubedb-provisioner chart enabled: true diff --git a/charts/kubedb/README.md b/charts/kubedb/README.md index 508bcfa5d..4766c1443 100644 --- a/charts/kubedb/README.md +++ b/charts/kubedb/README.md @@ -45,48 +45,48 @@ The command removes all the Kubernetes components associated with the chart and The following table lists the configurable parameters of the `kubedb` chart and their default values. -| Parameter | Description | Default | -|----------------------------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|------------------------------------------------------------| -| global.license | License for the product. Get a license by following the steps from [here](https://kubedb.com/docs/latest/setup/install/enterprise#get-a-trial-license).
Example:
`helm install appscode/kubedb \`
`--set-file global.license=/path/to/license/file`
`or`
`helm install appscode/kubedb \`
`--set global.license=` | "" | -| global.licenseSecretName | Name of Secret with the license as key.txt key | "" | -| global.registry | Docker registry used to pull KubeDB related images | "" | -| global.registryFQDN | Docker registry fqdn used to pull KubeDB related images. Set this to use docker registry hosted at ${registryFQDN}/${registry}/${image} | "" | -| global.insecureRegistries | Specify an array of insecure registries.
Example:
`helm template charts/kubedb-ops-manager \`
`--set global.insecureRegistries[0]=hub.company.com \`
`--set global.insecureRegistries[1]=reg.example.com` | [] | -| global.imagePullSecrets | Specify an array of imagePullSecrets. Secrets must be manually created in the namespace.
Example:
`helm template charts/kubedb \`
`--set global.imagePullSecrets[0].name=sec0 \`
`--set global.imagePullSecrets[1].name=sec1` | [] | -| global.monitoring.agent | Name of monitoring agent (one of "prometheus.io", "prometheus.io/operator", "prometheus.io/builtin") | "" | -| global.monitoring.serviceMonitor.labels | Specify the labels for ServiceMonitor. Prometheus crd will select ServiceMonitor using these labels. Only usable when monitoring agent is `prometheus.io/operator`. | {"monitoring.appscode.com/prometheus":"auto"} | -| kubedb-crd-manager.enabled | If enabled, installs the kubedb-crd-manager chart | true | -| kubedb-crd-manager.featureGates.Cassandra | | false | -| kubedb-crd-manager.featureGates.ClickHouse | | false | -| kubedb-crd-manager.featureGates.Druid | | false | -| kubedb-crd-manager.featureGates.Elasticsearch | | true | -| kubedb-crd-manager.featureGates.Etcd | | false | -| kubedb-crd-manager.featureGates.FerretDB | | false | -| kubedb-crd-manager.featureGates.Kafka | | true | -| kubedb-crd-manager.featureGates.MariaDB | | true | -| kubedb-crd-manager.featureGates.Memcached | | false | -| kubedb-crd-manager.featureGates.MicrosoftSQLServer | | false | -| kubedb-crd-manager.featureGates.MongoDB | | true | -| kubedb-crd-manager.featureGates.MySQL | | true | -| kubedb-crd-manager.featureGates.PerconaXtraDB | | false | -| kubedb-crd-manager.featureGates.PgBouncer | | false | -| kubedb-crd-manager.featureGates.PgPool | | false | -| kubedb-crd-manager.featureGates.Postgres | | true | -| kubedb-crd-manager.featureGates.ProxySQL | | false | -| kubedb-crd-manager.featureGates.RabbitMQ | | false | -| kubedb-crd-manager.featureGates.Redis | | true | -| kubedb-crd-manager.featureGates.SingleStore | | false | -| kubedb-crd-manager.featureGates.Solr | | false | -| kubedb-crd-manager.featureGates.ZooKeeper | | false | -| kubedb-provisioner.enabled | If enabled, installs the kubedb-provisioner chart | true | -| kubedb-webhook-server.enabled | If enabled, installs the kubedb-webhook-server chart | true | -| kubedb-ops-manager.enabled | If enabled, installs the kubedb-ops-manager chart | true | -| kubedb-autoscaler.enabled | If enabled, installs the kubedb-autoscaler chart | true | -| kubedb-dashboard.enabled | If enabled, installs the kubedb-dashboard chart | true | -| kubedb-schema-manager.enabled | If enabled, installs the kubedb-schema-manager chart | false | -| kubedb-metrics.enabled | If enabled, installs the kubedb-metrics chart | false | -| kubedb-catalog.enabled | If enabled, installs the kubedb-catalog chart | true | -| kubedb-kubestash-catalog.enabled | If enabled, installs the kubedb-kubestash-catalog chart | false | +| Parameter | Description | Default | +|-----------------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|------------------------------------------------------------| +| global.license | License for the product. Get a license by following the steps from [here](https://kubedb.com/docs/latest/setup/install/enterprise#get-a-trial-license).
Example:
`helm install appscode/kubedb \`
`--set-file global.license=/path/to/license/file`
`or`
`helm install appscode/kubedb \`
`--set global.license=` | "" | +| global.licenseSecretName | Name of Secret with the license as key.txt key | "" | +| global.registry | Docker registry used to pull KubeDB related images | "" | +| global.registryFQDN | Docker registry fqdn used to pull KubeDB related images. Set this to use docker registry hosted at ${registryFQDN}/${registry}/${image} | "" | +| global.insecureRegistries | Specify an array of insecure registries.
Example:
`helm template charts/kubedb-ops-manager \`
`--set global.insecureRegistries[0]=hub.company.com \`
`--set global.insecureRegistries[1]=reg.example.com` | [] | +| global.imagePullSecrets | Specify an array of imagePullSecrets. Secrets must be manually created in the namespace.
Example:
`helm template charts/kubedb \`
`--set global.imagePullSecrets[0].name=sec0 \`
`--set global.imagePullSecrets[1].name=sec1` | [] | +| global.featureGates.Cassandra | | false | +| global.featureGates.ClickHouse | | false | +| global.featureGates.Druid | | false | +| global.featureGates.Elasticsearch | | true | +| global.featureGates.Etcd | | false | +| global.featureGates.FerretDB | | false | +| global.featureGates.Kafka | | true | +| global.featureGates.MariaDB | | true | +| global.featureGates.Memcached | | true | +| global.featureGates.MicrosoftSQLServer | | false | +| global.featureGates.MongoDB | | true | +| global.featureGates.MySQL | | true | +| global.featureGates.PerconaXtraDB | | true | +| global.featureGates.PgBouncer | | true | +| global.featureGates.PgPool | | false | +| global.featureGates.Postgres | | true | +| global.featureGates.ProxySQL | | true | +| global.featureGates.RabbitMQ | | false | +| global.featureGates.Redis | | true | +| global.featureGates.SingleStore | | false | +| global.featureGates.Solr | | false | +| global.featureGates.ZooKeeper | | false | +| global.monitoring.agent | Name of monitoring agent (one of "prometheus.io", "prometheus.io/operator", "prometheus.io/builtin") | "" | +| global.monitoring.serviceMonitor.labels | Specify the labels for ServiceMonitor. Prometheus crd will select ServiceMonitor using these labels. Only usable when monitoring agent is `prometheus.io/operator`. | {"monitoring.appscode.com/prometheus":"auto"} | +| kubedb-crd-manager.enabled | If enabled, installs the kubedb-crd-manager chart | true | +| kubedb-provisioner.enabled | If enabled, installs the kubedb-provisioner chart | false | +| kubedb-webhook-server.enabled | If enabled, installs the kubedb-webhook-server chart | false | +| kubedb-ops-manager.enabled | If enabled, installs the kubedb-ops-manager chart | false | +| kubedb-autoscaler.enabled | If enabled, installs the kubedb-autoscaler chart | false | +| kubedb-dashboard.enabled | If enabled, installs the kubedb-dashboard chart | false | +| kubedb-schema-manager.enabled | If enabled, installs the kubedb-schema-manager chart | false | +| kubedb-metrics.enabled | If enabled, installs the kubedb-metrics chart | false | +| kubedb-catalog.enabled | If enabled, installs the kubedb-catalog chart | false | +| kubedb-kubestash-catalog.enabled | If enabled, installs the kubedb-kubestash-catalog chart | false | Specify each parameter using the `--set key=value[,key=value]` argument to `helm upgrade -i`. For example: diff --git a/charts/kubedb/values.openapiv3_schema.yaml b/charts/kubedb/values.openapiv3_schema.yaml index ca527184c..de4467690 100644 --- a/charts/kubedb/values.openapiv3_schema.yaml +++ b/charts/kubedb/values.openapiv3_schema.yaml @@ -1,6 +1,10 @@ properties: global: properties: + featureGates: + additionalProperties: + type: boolean + type: object imagePullSecrets: items: description: LocalObjectReference contains enough information to let you @@ -45,6 +49,7 @@ properties: registryFQDN: type: string required: + - featureGates - insecureRegistries - license - licenseSecretName @@ -1359,35 +1364,12 @@ properties: type: object kubedb-catalog: properties: - catalog: - properties: - elasticsearch: - type: boolean - etcd: - type: boolean - kafka: - type: boolean - mariadb: - type: boolean - memcached: - type: boolean - mongodb: - type: boolean - mysql: - type: boolean - perconaxtradb: - type: boolean - pgbouncer: - type: boolean - postgres: - type: boolean - proxysql: - type: boolean - redis: - type: boolean - type: object enabled: type: boolean + featureGates: + additionalProperties: + type: boolean + type: object fullnameOverride: type: string nameOverride: @@ -1521,12 +1503,12 @@ properties: skipDeprecated: type: boolean required: - - catalog - enabled + - featureGates - psp - skipDeprecated type: object - kubedb-dashboard: + kubedb-crd-manager: properties: affinity: description: If specified, the pod's scheduling constraints @@ -2297,162 +2279,1362 @@ properties: type: array type: object type: object - annotations: + enabled: + type: boolean + featureGates: additionalProperties: - type: string + type: boolean type: object - apiserver: + fullnameOverride: + type: string + image: properties: - healthcheck: - properties: - enabled: - type: boolean - probePort: - type: integer - required: - - probePort - type: object - useKubeapiserverFqdnForAks: - type: boolean + registry: + type: string + repository: + type: string + tag: + type: string required: - - healthcheck - - useKubeapiserverFqdnForAks + - registry + - repository + - tag type: object - criticalAddon: - type: boolean - enabled: - type: boolean - enforceTerminationPolicy: - type: boolean - fullnameOverride: - type: string imagePullPolicy: type: string imagePullSecrets: items: - description: LocalObjectReference contains enough information to let you - locate the referenced object inside the same namespace. - properties: - name: - description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names - TODO: Add other useful fields. apiVersion, kind, uid?' - type: string - type: object - x-kubernetes-map-type: atomic + type: string type: array - license: - type: string - licenseSecretName: - type: string - logLevel: - format: int32 - type: integer - monitoring: - properties: - agent: - enum: - - prometheus.io - - prometheus.io/operator - - prometheus.io/builtin - type: string - bindPort: - type: integer - serviceMonitor: - properties: - labels: - additionalProperties: - type: string - type: object - type: object - required: - - agent - - bindPort - - serviceMonitor - type: object nameOverride: type: string nodeSelector: additionalProperties: type: string type: object - operator: + podAnnotations: + additionalProperties: + type: string + type: object + podSecurityContext: + description: 'PodSecurityContext holds pod-level security attributes and common + container settings. Optional: Defaults to empty. See type description for + default values of each field.' properties: - registry: - type: string - repository: + fsGroup: + description: "A special supplemental group that applies to all containers\ + \ in a pod. Some volume types allow the Kubelet to change the ownership\ + \ of that volume to be owned by the pod: \n 1. The owning GID will be\ + \ the FSGroup 2. The setgid bit is set (new files created in the volume\ + \ will be owned by FSGroup) 3. The permission bits are OR'd with rw-rw----\ + \ \n If unset, the Kubelet will not modify the ownership and permissions\ + \ of any volume. Note that this field cannot be set when spec.os.name\ + \ is windows." + format: int64 + type: integer + fsGroupChangePolicy: + description: 'fsGroupChangePolicy defines behavior of changing ownership + and permission of the volume before being exposed inside Pod. This field + will only apply to volume types which support fsGroup based ownership(and + permissions). It will have no effect on ephemeral volume types such + as: secret, configmaps and emptydir. Valid values are "OnRootMismatch" + and "Always". If not specified, "Always" is used. Note that this field + cannot be set when spec.os.name is windows.' type: string - resources: - description: Compute Resources required by the sidecar container. + runAsGroup: + description: The GID to run the entrypoint of the container process. Uses + runtime default if unset. May also be set in SecurityContext. If set + in both SecurityContext and PodSecurityContext, the value specified + in SecurityContext takes precedence for that container. Note that this + field cannot be set when spec.os.name is windows. + format: int64 + type: integer + runAsNonRoot: + description: Indicates that the container must run as a non-root user. + If true, the Kubelet will validate the image at runtime to ensure that + it does not run as UID 0 (root) and fail to start the container if it + does. If unset or false, no such validation will be performed. May also + be set in SecurityContext. If set in both SecurityContext and PodSecurityContext, + the value specified in SecurityContext takes precedence. + type: boolean + runAsUser: + description: The UID to run the entrypoint of the container process. Defaults + to user specified in image metadata if unspecified. May also be set + in SecurityContext. If set in both SecurityContext and PodSecurityContext, + the value specified in SecurityContext takes precedence for that container. + Note that this field cannot be set when spec.os.name is windows. + format: int64 + type: integer + seLinuxOptions: + description: The SELinux context to be applied to all containers. If unspecified, + the container runtime will allocate a random SELinux context for each + container. May also be set in SecurityContext. If set in both SecurityContext + and PodSecurityContext, the value specified in SecurityContext takes + precedence for that container. Note that this field cannot be set when + spec.os.name is windows. properties: - limits: - additionalProperties: - anyOf: - - type: integer - - type: string - pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ - x-kubernetes-int-or-string: true - description: 'Limits describes the maximum amount of compute resources - allowed. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/' - type: object - requests: - additionalProperties: - anyOf: - - type: integer - - type: string - pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ - x-kubernetes-int-or-string: true - description: 'Requests describes the minimum amount of compute resources - required. If Requests is omitted for a container, it defaults to - Limits if that is explicitly specified, otherwise to an implementation-defined - value. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/' - type: object + level: + description: Level is SELinux level label that applies to the container. + type: string + role: + description: Role is a SELinux role label that applies to the container. + type: string + type: + description: Type is a SELinux type label that applies to the container. + type: string + user: + description: User is a SELinux user label that applies to the container. + type: string type: object - securityContext: - description: Security options the pod should run with. + seccompProfile: + description: The seccomp options to use by the containers in this pod. + Note that this field cannot be set when spec.os.name is windows. properties: - allowPrivilegeEscalation: - description: 'AllowPrivilegeEscalation controls whether a process - can gain more privileges than its parent process. This bool directly - controls if the no_new_privs flag will be set on the container process. - AllowPrivilegeEscalation is true always when the container is: 1) - run as Privileged 2) has CAP_SYS_ADMIN Note that this field cannot - be set when spec.os.name is windows.' - type: boolean - capabilities: - description: The capabilities to add/drop when running containers. - Defaults to the default set of capabilities granted by the container - runtime. Note that this field cannot be set when spec.os.name is - windows. - properties: - add: - description: Added capabilities - items: - description: Capability represent POSIX capabilities type - type: string - type: array - drop: - description: Removed capabilities - items: - description: Capability represent POSIX capabilities type - type: string - type: array - type: object - privileged: - description: Run container in privileged mode. Processes in privileged - containers are essentially equivalent to root on the host. Defaults - to false. Note that this field cannot be set when spec.os.name is - windows. - type: boolean - procMount: - description: procMount denotes the type of proc mount to use for the - containers. The default is DefaultProcMount which uses the container - runtime defaults for readonly paths and masked paths. This requires - the ProcMountType feature flag to be enabled. Note that this field - cannot be set when spec.os.name is windows. + localhostProfile: + description: localhostProfile indicates a profile defined in a file + on the node should be used. The profile must be preconfigured on + the node to work. Must be a descending path, relative to the kubelet's + configured seccomp profile location. Must only be set if type is + "Localhost". type: string - readOnlyRootFilesystem: - description: Whether this container has a read-only root filesystem. - Default is false. Note that this field cannot be set when spec.os.name + type: + description: "type indicates which kind of seccomp profile will be\ + \ applied. Valid options are: \n Localhost - a profile defined in\ + \ a file on the node should be used. RuntimeDefault - the container\ + \ runtime default profile should be used. Unconfined - no profile\ + \ should be applied." + type: string + required: + - type + type: object + supplementalGroups: + description: A list of groups applied to the first process run in each + container, in addition to the container's primary GID. If unspecified, + no groups will be added to any container. Note that this field cannot + be set when spec.os.name is windows. + items: + format: int64 + type: integer + type: array + sysctls: + description: Sysctls hold a list of namespaced sysctls used for the pod. + Pods with unsupported sysctls (by the container runtime) might fail + to launch. Note that this field cannot be set when spec.os.name is windows. + items: + description: Sysctl defines a kernel parameter to be set + properties: + name: + description: Name of a property to set + type: string + value: + description: Value of a property to set + type: string + required: + - name + - value + type: object + type: array + windowsOptions: + description: The Windows specific settings applied to all containers. + If unspecified, the options within a container's SecurityContext will + be used. If set in both SecurityContext and PodSecurityContext, the + value specified in SecurityContext takes precedence. Note that this + field cannot be set when spec.os.name is linux. + properties: + gmsaCredentialSpec: + description: GMSACredentialSpec is where the GMSA admission webhook + (https://github.com/kubernetes-sigs/windows-gmsa) inlines the contents + of the GMSA credential spec named by the GMSACredentialSpecName + field. + type: string + gmsaCredentialSpecName: + description: GMSACredentialSpecName is the name of the GMSA credential + spec to use. + type: string + hostProcess: + description: HostProcess determines if a container should be run as + a 'Host Process' container. This field is alpha-level and will only + be honored by components that enable the WindowsHostProcessContainers + feature flag. Setting this field without the feature flag will result + in errors when validating the Pod. All of a Pod's containers must + have the same effective HostProcess value (it is not allowed to + have a mix of HostProcess containers and non-HostProcess containers). In + addition, if HostProcess is true then HostNetwork must also be set + to true. + type: boolean + runAsUserName: + description: The UserName in Windows to run the entrypoint of the + container process. Defaults to the user specified in image metadata + if unspecified. May also be set in PodSecurityContext. If set in + both SecurityContext and PodSecurityContext, the value specified + in SecurityContext takes precedence. + type: string + type: object + type: object + registryFQDN: + type: string + resources: + description: ResourceRequirements describes the compute resource requirements. + properties: + limits: + additionalProperties: + anyOf: + - type: integer + - type: string + pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ + x-kubernetes-int-or-string: true + description: 'Limits describes the maximum amount of compute resources + allowed. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/' + type: object + requests: + additionalProperties: + anyOf: + - type: integer + - type: string + pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ + x-kubernetes-int-or-string: true + description: 'Requests describes the minimum amount of compute resources + required. If Requests is omitted for a container, it defaults to Limits + if that is explicitly specified, otherwise to an implementation-defined + value. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/' + type: object + type: object + securityContext: + description: SecurityContext holds security configuration that will be applied + to a container. Some fields are present in both SecurityContext and PodSecurityContext. When + both are set, the values in SecurityContext take precedence. + properties: + allowPrivilegeEscalation: + description: 'AllowPrivilegeEscalation controls whether a process can + gain more privileges than its parent process. This bool directly controls + if the no_new_privs flag will be set on the container process. AllowPrivilegeEscalation + is true always when the container is: 1) run as Privileged 2) has CAP_SYS_ADMIN + Note that this field cannot be set when spec.os.name is windows.' + type: boolean + capabilities: + description: The capabilities to add/drop when running containers. Defaults + to the default set of capabilities granted by the container runtime. + Note that this field cannot be set when spec.os.name is windows. + properties: + add: + description: Added capabilities + items: + description: Capability represent POSIX capabilities type + type: string + type: array + drop: + description: Removed capabilities + items: + description: Capability represent POSIX capabilities type + type: string + type: array + type: object + privileged: + description: Run container in privileged mode. Processes in privileged + containers are essentially equivalent to root on the host. Defaults + to false. Note that this field cannot be set when spec.os.name is windows. + type: boolean + procMount: + description: procMount denotes the type of proc mount to use for the containers. + The default is DefaultProcMount which uses the container runtime defaults + for readonly paths and masked paths. This requires the ProcMountType + feature flag to be enabled. Note that this field cannot be set when + spec.os.name is windows. + type: string + readOnlyRootFilesystem: + description: Whether this container has a read-only root filesystem. Default + is false. Note that this field cannot be set when spec.os.name is windows. + type: boolean + runAsGroup: + description: The GID to run the entrypoint of the container process. Uses + runtime default if unset. May also be set in PodSecurityContext. If + set in both SecurityContext and PodSecurityContext, the value specified + in SecurityContext takes precedence. Note that this field cannot be + set when spec.os.name is windows. + format: int64 + type: integer + runAsNonRoot: + description: Indicates that the container must run as a non-root user. + If true, the Kubelet will validate the image at runtime to ensure that + it does not run as UID 0 (root) and fail to start the container if it + does. If unset or false, no such validation will be performed. May also + be set in PodSecurityContext. If set in both SecurityContext and PodSecurityContext, + the value specified in SecurityContext takes precedence. + type: boolean + runAsUser: + description: The UID to run the entrypoint of the container process. Defaults + to user specified in image metadata if unspecified. May also be set + in PodSecurityContext. If set in both SecurityContext and PodSecurityContext, + the value specified in SecurityContext takes precedence. Note that this + field cannot be set when spec.os.name is windows. + format: int64 + type: integer + seLinuxOptions: + description: The SELinux context to be applied to the container. If unspecified, + the container runtime will allocate a random SELinux context for each + container. May also be set in PodSecurityContext. If set in both SecurityContext + and PodSecurityContext, the value specified in SecurityContext takes + precedence. Note that this field cannot be set when spec.os.name is + windows. + properties: + level: + description: Level is SELinux level label that applies to the container. + type: string + role: + description: Role is a SELinux role label that applies to the container. + type: string + type: + description: Type is a SELinux type label that applies to the container. + type: string + user: + description: User is a SELinux user label that applies to the container. + type: string + type: object + seccompProfile: + description: The seccomp options to use by this container. If seccomp + options are provided at both the pod & container level, the container + options override the pod options. Note that this field cannot be set + when spec.os.name is windows. + properties: + localhostProfile: + description: localhostProfile indicates a profile defined in a file + on the node should be used. The profile must be preconfigured on + the node to work. Must be a descending path, relative to the kubelet's + configured seccomp profile location. Must only be set if type is + "Localhost". + type: string + type: + description: "type indicates which kind of seccomp profile will be\ + \ applied. Valid options are: \n Localhost - a profile defined in\ + \ a file on the node should be used. RuntimeDefault - the container\ + \ runtime default profile should be used. Unconfined - no profile\ + \ should be applied." + type: string + required: + - type + type: object + windowsOptions: + description: The Windows specific settings applied to all containers. + If unspecified, the options from the PodSecurityContext will be used. + If set in both SecurityContext and PodSecurityContext, the value specified + in SecurityContext takes precedence. Note that this field cannot be + set when spec.os.name is linux. + properties: + gmsaCredentialSpec: + description: GMSACredentialSpec is where the GMSA admission webhook + (https://github.com/kubernetes-sigs/windows-gmsa) inlines the contents + of the GMSA credential spec named by the GMSACredentialSpecName + field. + type: string + gmsaCredentialSpecName: + description: GMSACredentialSpecName is the name of the GMSA credential + spec to use. + type: string + hostProcess: + description: HostProcess determines if a container should be run as + a 'Host Process' container. This field is alpha-level and will only + be honored by components that enable the WindowsHostProcessContainers + feature flag. Setting this field without the feature flag will result + in errors when validating the Pod. All of a Pod's containers must + have the same effective HostProcess value (it is not allowed to + have a mix of HostProcess containers and non-HostProcess containers). In + addition, if HostProcess is true then HostNetwork must also be set + to true. + type: boolean + runAsUserName: + description: The UserName in Windows to run the entrypoint of the + container process. Defaults to the user specified in image metadata + if unspecified. May also be set in PodSecurityContext. If set in + both SecurityContext and PodSecurityContext, the value specified + in SecurityContext takes precedence. + type: string + type: object + type: object + serviceAccount: + properties: + annotations: + additionalProperties: + type: string + type: object + create: + type: boolean + name: + type: string + required: + - create + type: object + tolerations: + description: If specified, the pod's tolerations. + items: + description: The pod this Toleration is attached to tolerates any taint + that matches the triple using the matching operator + . + properties: + effect: + description: Effect indicates the taint effect to match. Empty means + match all taint effects. When specified, allowed values are NoSchedule, + PreferNoSchedule and NoExecute. + type: string + key: + description: Key is the taint key that the toleration applies to. Empty + means match all taint keys. If the key is empty, operator must be + Exists; this combination means to match all values and all keys. + type: string + operator: + description: Operator represents a key's relationship to the value. + Valid operators are Exists and Equal. Defaults to Equal. Exists is + equivalent to wildcard for value, so that a pod can tolerate all taints + of a particular category. + type: string + tolerationSeconds: + description: TolerationSeconds represents the period of time the toleration + (which must be of effect NoExecute, otherwise this field is ignored) + tolerates the taint. By default, it is not set, which means tolerate + the taint forever (do not evict). Zero and negative values will be + treated as 0 (evict immediately) by the system. + format: int64 + type: integer + value: + description: Value is the taint value the toleration matches to. If + the operator is Exists, the value should be empty, otherwise just + a regular string. + type: string + type: object + type: array + required: + - enabled + - featureGates + - image + - imagePullPolicy + - serviceAccount + type: object + kubedb-dashboard: + properties: + affinity: + description: If specified, the pod's scheduling constraints + properties: + nodeAffinity: + description: Describes node affinity scheduling rules for the pod. + properties: + preferredDuringSchedulingIgnoredDuringExecution: + description: The scheduler will prefer to schedule pods to nodes that + satisfy the affinity expressions specified by this field, but it + may choose a node that violates one or more of the expressions. + The node that is most preferred is the one with the greatest sum + of weights, i.e. for each node that meets all of the scheduling + requirements (resource request, requiredDuringScheduling affinity + expressions, etc.), compute a sum by iterating through the elements + of this field and adding "weight" to the sum if the node matches + the corresponding matchExpressions; the node(s) with the highest + sum are the most preferred. + items: + description: An empty preferred scheduling term matches all objects + with implicit weight 0 (i.e. it's a no-op). A null preferred scheduling + term matches no objects (i.e. is also a no-op). + properties: + preference: + description: A node selector term, associated with the corresponding + weight. + properties: + matchExpressions: + description: A list of node selector requirements by node's + labels. + items: + description: A node selector requirement is a selector + that contains values, a key, and an operator that relates + the key and values. + properties: + key: + description: The label key that the selector applies + to. + type: string + operator: + description: Represents a key's relationship to a + set of values. Valid operators are In, NotIn, Exists, + DoesNotExist. Gt, and Lt. + type: string + values: + description: An array of string values. If the operator + is In or NotIn, the values array must be non-empty. + If the operator is Exists or DoesNotExist, the values + array must be empty. If the operator is Gt or Lt, + the values array must have a single element, which + will be interpreted as an integer. This array is + replaced during a strategic merge patch. + items: + type: string + type: array + required: + - key + - operator + type: object + type: array + matchFields: + description: A list of node selector requirements by node's + fields. + items: + description: A node selector requirement is a selector + that contains values, a key, and an operator that relates + the key and values. + properties: + key: + description: The label key that the selector applies + to. + type: string + operator: + description: Represents a key's relationship to a + set of values. Valid operators are In, NotIn, Exists, + DoesNotExist. Gt, and Lt. + type: string + values: + description: An array of string values. If the operator + is In or NotIn, the values array must be non-empty. + If the operator is Exists or DoesNotExist, the values + array must be empty. If the operator is Gt or Lt, + the values array must have a single element, which + will be interpreted as an integer. This array is + replaced during a strategic merge patch. + items: + type: string + type: array + required: + - key + - operator + type: object + type: array + type: object + x-kubernetes-map-type: atomic + weight: + description: Weight associated with matching the corresponding + nodeSelectorTerm, in the range 1-100. + format: int32 + type: integer + required: + - preference + - weight + type: object + type: array + requiredDuringSchedulingIgnoredDuringExecution: + description: If the affinity requirements specified by this field + are not met at scheduling time, the pod will not be scheduled onto + the node. If the affinity requirements specified by this field cease + to be met at some point during pod execution (e.g. due to an update), + the system may or may not try to eventually evict the pod from its + node. + properties: + nodeSelectorTerms: + description: Required. A list of node selector terms. The terms + are ORed. + items: + description: A null or empty node selector term matches no objects. + The requirements of them are ANDed. The TopologySelectorTerm + type implements a subset of the NodeSelectorTerm. + properties: + matchExpressions: + description: A list of node selector requirements by node's + labels. + items: + description: A node selector requirement is a selector + that contains values, a key, and an operator that relates + the key and values. + properties: + key: + description: The label key that the selector applies + to. + type: string + operator: + description: Represents a key's relationship to a + set of values. Valid operators are In, NotIn, Exists, + DoesNotExist. Gt, and Lt. + type: string + values: + description: An array of string values. If the operator + is In or NotIn, the values array must be non-empty. + If the operator is Exists or DoesNotExist, the values + array must be empty. If the operator is Gt or Lt, + the values array must have a single element, which + will be interpreted as an integer. This array is + replaced during a strategic merge patch. + items: + type: string + type: array + required: + - key + - operator + type: object + type: array + matchFields: + description: A list of node selector requirements by node's + fields. + items: + description: A node selector requirement is a selector + that contains values, a key, and an operator that relates + the key and values. + properties: + key: + description: The label key that the selector applies + to. + type: string + operator: + description: Represents a key's relationship to a + set of values. Valid operators are In, NotIn, Exists, + DoesNotExist. Gt, and Lt. + type: string + values: + description: An array of string values. If the operator + is In or NotIn, the values array must be non-empty. + If the operator is Exists or DoesNotExist, the values + array must be empty. If the operator is Gt or Lt, + the values array must have a single element, which + will be interpreted as an integer. This array is + replaced during a strategic merge patch. + items: + type: string + type: array + required: + - key + - operator + type: object + type: array + type: object + x-kubernetes-map-type: atomic + type: array + required: + - nodeSelectorTerms + type: object + x-kubernetes-map-type: atomic + type: object + podAffinity: + description: Describes pod affinity scheduling rules (e.g. co-locate this + pod in the same node, zone, etc. as some other pod(s)). + properties: + preferredDuringSchedulingIgnoredDuringExecution: + description: The scheduler will prefer to schedule pods to nodes that + satisfy the affinity expressions specified by this field, but it + may choose a node that violates one or more of the expressions. + The node that is most preferred is the one with the greatest sum + of weights, i.e. for each node that meets all of the scheduling + requirements (resource request, requiredDuringScheduling affinity + expressions, etc.), compute a sum by iterating through the elements + of this field and adding "weight" to the sum if the node has pods + which matches the corresponding podAffinityTerm; the node(s) with + the highest sum are the most preferred. + items: + description: The weights of all of the matched WeightedPodAffinityTerm + fields are added per-node to find the most preferred node(s) + properties: + podAffinityTerm: + description: Required. A pod affinity term, associated with + the corresponding weight. + properties: + labelSelector: + description: A label query over a set of resources, in this + case pods. + properties: + matchExpressions: + description: matchExpressions is a list of label selector + requirements. The requirements are ANDed. + items: + description: A label selector requirement is a selector + that contains values, a key, and an operator that + relates the key and values. + properties: + key: + description: key is the label key that the selector + applies to. + type: string + operator: + description: operator represents a key's relationship + to a set of values. Valid operators are In, + NotIn, Exists and DoesNotExist. + type: string + values: + description: values is an array of string values. + If the operator is In or NotIn, the values array + must be non-empty. If the operator is Exists + or DoesNotExist, the values array must be empty. + This array is replaced during a strategic merge + patch. + items: + type: string + type: array + required: + - key + - operator + type: object + type: array + matchLabels: + additionalProperties: + type: string + description: matchLabels is a map of {key,value} pairs. + A single {key,value} in the matchLabels map is equivalent + to an element of matchExpressions, whose key field + is "key", the operator is "In", and the values array + contains only "value". The requirements are ANDed. + type: object + type: object + x-kubernetes-map-type: atomic + namespaceSelector: + description: A label query over the set of namespaces that + the term applies to. The term is applied to the union + of the namespaces selected by this field and the ones + listed in the namespaces field. null selector and null + or empty namespaces list means "this pod's namespace". + An empty selector ({}) matches all namespaces. + properties: + matchExpressions: + description: matchExpressions is a list of label selector + requirements. The requirements are ANDed. + items: + description: A label selector requirement is a selector + that contains values, a key, and an operator that + relates the key and values. + properties: + key: + description: key is the label key that the selector + applies to. + type: string + operator: + description: operator represents a key's relationship + to a set of values. Valid operators are In, + NotIn, Exists and DoesNotExist. + type: string + values: + description: values is an array of string values. + If the operator is In or NotIn, the values array + must be non-empty. If the operator is Exists + or DoesNotExist, the values array must be empty. + This array is replaced during a strategic merge + patch. + items: + type: string + type: array + required: + - key + - operator + type: object + type: array + matchLabels: + additionalProperties: + type: string + description: matchLabels is a map of {key,value} pairs. + A single {key,value} in the matchLabels map is equivalent + to an element of matchExpressions, whose key field + is "key", the operator is "In", and the values array + contains only "value". The requirements are ANDed. + type: object + type: object + x-kubernetes-map-type: atomic + namespaces: + description: namespaces specifies a static list of namespace + names that the term applies to. The term is applied to + the union of the namespaces listed in this field and the + ones selected by namespaceSelector. null or empty namespaces + list and null namespaceSelector means "this pod's namespace". + items: + type: string + type: array + topologyKey: + description: This pod should be co-located (affinity) or + not co-located (anti-affinity) with the pods matching + the labelSelector in the specified namespaces, where co-located + is defined as running on a node whose value of the label + with key topologyKey matches that of any node on which + any of the selected pods is running. Empty topologyKey + is not allowed. + type: string + required: + - topologyKey + type: object + weight: + description: weight associated with matching the corresponding + podAffinityTerm, in the range 1-100. + format: int32 + type: integer + required: + - podAffinityTerm + - weight + type: object + type: array + requiredDuringSchedulingIgnoredDuringExecution: + description: If the affinity requirements specified by this field + are not met at scheduling time, the pod will not be scheduled onto + the node. If the affinity requirements specified by this field cease + to be met at some point during pod execution (e.g. due to a pod + label update), the system may or may not try to eventually evict + the pod from its node. When there are multiple elements, the lists + of nodes corresponding to each podAffinityTerm are intersected, + i.e. all terms must be satisfied. + items: + description: Defines a set of pods (namely those matching the labelSelector + relative to the given namespace(s)) that this pod should be co-located + (affinity) or not co-located (anti-affinity) with, where co-located + is defined as running on a node whose value of the label with + key matches that of any node on which a pod of the + set of pods is running + properties: + labelSelector: + description: A label query over a set of resources, in this + case pods. + properties: + matchExpressions: + description: matchExpressions is a list of label selector + requirements. The requirements are ANDed. + items: + description: A label selector requirement is a selector + that contains values, a key, and an operator that relates + the key and values. + properties: + key: + description: key is the label key that the selector + applies to. + type: string + operator: + description: operator represents a key's relationship + to a set of values. Valid operators are In, NotIn, + Exists and DoesNotExist. + type: string + values: + description: values is an array of string values. + If the operator is In or NotIn, the values array + must be non-empty. If the operator is Exists or + DoesNotExist, the values array must be empty. This + array is replaced during a strategic merge patch. + items: + type: string + type: array + required: + - key + - operator + type: object + type: array + matchLabels: + additionalProperties: + type: string + description: matchLabels is a map of {key,value} pairs. + A single {key,value} in the matchLabels map is equivalent + to an element of matchExpressions, whose key field is + "key", the operator is "In", and the values array contains + only "value". The requirements are ANDed. + type: object + type: object + x-kubernetes-map-type: atomic + namespaceSelector: + description: A label query over the set of namespaces that the + term applies to. The term is applied to the union of the namespaces + selected by this field and the ones listed in the namespaces + field. null selector and null or empty namespaces list means + "this pod's namespace". An empty selector ({}) matches all + namespaces. + properties: + matchExpressions: + description: matchExpressions is a list of label selector + requirements. The requirements are ANDed. + items: + description: A label selector requirement is a selector + that contains values, a key, and an operator that relates + the key and values. + properties: + key: + description: key is the label key that the selector + applies to. + type: string + operator: + description: operator represents a key's relationship + to a set of values. Valid operators are In, NotIn, + Exists and DoesNotExist. + type: string + values: + description: values is an array of string values. + If the operator is In or NotIn, the values array + must be non-empty. If the operator is Exists or + DoesNotExist, the values array must be empty. This + array is replaced during a strategic merge patch. + items: + type: string + type: array + required: + - key + - operator + type: object + type: array + matchLabels: + additionalProperties: + type: string + description: matchLabels is a map of {key,value} pairs. + A single {key,value} in the matchLabels map is equivalent + to an element of matchExpressions, whose key field is + "key", the operator is "In", and the values array contains + only "value". The requirements are ANDed. + type: object + type: object + x-kubernetes-map-type: atomic + namespaces: + description: namespaces specifies a static list of namespace + names that the term applies to. The term is applied to the + union of the namespaces listed in this field and the ones + selected by namespaceSelector. null or empty namespaces list + and null namespaceSelector means "this pod's namespace". + items: + type: string + type: array + topologyKey: + description: This pod should be co-located (affinity) or not + co-located (anti-affinity) with the pods matching the labelSelector + in the specified namespaces, where co-located is defined as + running on a node whose value of the label with key topologyKey + matches that of any node on which any of the selected pods + is running. Empty topologyKey is not allowed. + type: string + required: + - topologyKey + type: object + type: array + type: object + podAntiAffinity: + description: Describes pod anti-affinity scheduling rules (e.g. avoid + putting this pod in the same node, zone, etc. as some other pod(s)). + properties: + preferredDuringSchedulingIgnoredDuringExecution: + description: The scheduler will prefer to schedule pods to nodes that + satisfy the anti-affinity expressions specified by this field, but + it may choose a node that violates one or more of the expressions. + The node that is most preferred is the one with the greatest sum + of weights, i.e. for each node that meets all of the scheduling + requirements (resource request, requiredDuringScheduling anti-affinity + expressions, etc.), compute a sum by iterating through the elements + of this field and adding "weight" to the sum if the node has pods + which matches the corresponding podAffinityTerm; the node(s) with + the highest sum are the most preferred. + items: + description: The weights of all of the matched WeightedPodAffinityTerm + fields are added per-node to find the most preferred node(s) + properties: + podAffinityTerm: + description: Required. A pod affinity term, associated with + the corresponding weight. + properties: + labelSelector: + description: A label query over a set of resources, in this + case pods. + properties: + matchExpressions: + description: matchExpressions is a list of label selector + requirements. The requirements are ANDed. + items: + description: A label selector requirement is a selector + that contains values, a key, and an operator that + relates the key and values. + properties: + key: + description: key is the label key that the selector + applies to. + type: string + operator: + description: operator represents a key's relationship + to a set of values. Valid operators are In, + NotIn, Exists and DoesNotExist. + type: string + values: + description: values is an array of string values. + If the operator is In or NotIn, the values array + must be non-empty. If the operator is Exists + or DoesNotExist, the values array must be empty. + This array is replaced during a strategic merge + patch. + items: + type: string + type: array + required: + - key + - operator + type: object + type: array + matchLabels: + additionalProperties: + type: string + description: matchLabels is a map of {key,value} pairs. + A single {key,value} in the matchLabels map is equivalent + to an element of matchExpressions, whose key field + is "key", the operator is "In", and the values array + contains only "value". The requirements are ANDed. + type: object + type: object + x-kubernetes-map-type: atomic + namespaceSelector: + description: A label query over the set of namespaces that + the term applies to. The term is applied to the union + of the namespaces selected by this field and the ones + listed in the namespaces field. null selector and null + or empty namespaces list means "this pod's namespace". + An empty selector ({}) matches all namespaces. + properties: + matchExpressions: + description: matchExpressions is a list of label selector + requirements. The requirements are ANDed. + items: + description: A label selector requirement is a selector + that contains values, a key, and an operator that + relates the key and values. + properties: + key: + description: key is the label key that the selector + applies to. + type: string + operator: + description: operator represents a key's relationship + to a set of values. Valid operators are In, + NotIn, Exists and DoesNotExist. + type: string + values: + description: values is an array of string values. + If the operator is In or NotIn, the values array + must be non-empty. If the operator is Exists + or DoesNotExist, the values array must be empty. + This array is replaced during a strategic merge + patch. + items: + type: string + type: array + required: + - key + - operator + type: object + type: array + matchLabels: + additionalProperties: + type: string + description: matchLabels is a map of {key,value} pairs. + A single {key,value} in the matchLabels map is equivalent + to an element of matchExpressions, whose key field + is "key", the operator is "In", and the values array + contains only "value". The requirements are ANDed. + type: object + type: object + x-kubernetes-map-type: atomic + namespaces: + description: namespaces specifies a static list of namespace + names that the term applies to. The term is applied to + the union of the namespaces listed in this field and the + ones selected by namespaceSelector. null or empty namespaces + list and null namespaceSelector means "this pod's namespace". + items: + type: string + type: array + topologyKey: + description: This pod should be co-located (affinity) or + not co-located (anti-affinity) with the pods matching + the labelSelector in the specified namespaces, where co-located + is defined as running on a node whose value of the label + with key topologyKey matches that of any node on which + any of the selected pods is running. Empty topologyKey + is not allowed. + type: string + required: + - topologyKey + type: object + weight: + description: weight associated with matching the corresponding + podAffinityTerm, in the range 1-100. + format: int32 + type: integer + required: + - podAffinityTerm + - weight + type: object + type: array + requiredDuringSchedulingIgnoredDuringExecution: + description: If the anti-affinity requirements specified by this field + are not met at scheduling time, the pod will not be scheduled onto + the node. If the anti-affinity requirements specified by this field + cease to be met at some point during pod execution (e.g. due to + a pod label update), the system may or may not try to eventually + evict the pod from its node. When there are multiple elements, the + lists of nodes corresponding to each podAffinityTerm are intersected, + i.e. all terms must be satisfied. + items: + description: Defines a set of pods (namely those matching the labelSelector + relative to the given namespace(s)) that this pod should be co-located + (affinity) or not co-located (anti-affinity) with, where co-located + is defined as running on a node whose value of the label with + key matches that of any node on which a pod of the + set of pods is running + properties: + labelSelector: + description: A label query over a set of resources, in this + case pods. + properties: + matchExpressions: + description: matchExpressions is a list of label selector + requirements. The requirements are ANDed. + items: + description: A label selector requirement is a selector + that contains values, a key, and an operator that relates + the key and values. + properties: + key: + description: key is the label key that the selector + applies to. + type: string + operator: + description: operator represents a key's relationship + to a set of values. Valid operators are In, NotIn, + Exists and DoesNotExist. + type: string + values: + description: values is an array of string values. + If the operator is In or NotIn, the values array + must be non-empty. If the operator is Exists or + DoesNotExist, the values array must be empty. This + array is replaced during a strategic merge patch. + items: + type: string + type: array + required: + - key + - operator + type: object + type: array + matchLabels: + additionalProperties: + type: string + description: matchLabels is a map of {key,value} pairs. + A single {key,value} in the matchLabels map is equivalent + to an element of matchExpressions, whose key field is + "key", the operator is "In", and the values array contains + only "value". The requirements are ANDed. + type: object + type: object + x-kubernetes-map-type: atomic + namespaceSelector: + description: A label query over the set of namespaces that the + term applies to. The term is applied to the union of the namespaces + selected by this field and the ones listed in the namespaces + field. null selector and null or empty namespaces list means + "this pod's namespace". An empty selector ({}) matches all + namespaces. + properties: + matchExpressions: + description: matchExpressions is a list of label selector + requirements. The requirements are ANDed. + items: + description: A label selector requirement is a selector + that contains values, a key, and an operator that relates + the key and values. + properties: + key: + description: key is the label key that the selector + applies to. + type: string + operator: + description: operator represents a key's relationship + to a set of values. Valid operators are In, NotIn, + Exists and DoesNotExist. + type: string + values: + description: values is an array of string values. + If the operator is In or NotIn, the values array + must be non-empty. If the operator is Exists or + DoesNotExist, the values array must be empty. This + array is replaced during a strategic merge patch. + items: + type: string + type: array + required: + - key + - operator + type: object + type: array + matchLabels: + additionalProperties: + type: string + description: matchLabels is a map of {key,value} pairs. + A single {key,value} in the matchLabels map is equivalent + to an element of matchExpressions, whose key field is + "key", the operator is "In", and the values array contains + only "value". The requirements are ANDed. + type: object + type: object + x-kubernetes-map-type: atomic + namespaces: + description: namespaces specifies a static list of namespace + names that the term applies to. The term is applied to the + union of the namespaces listed in this field and the ones + selected by namespaceSelector. null or empty namespaces list + and null namespaceSelector means "this pod's namespace". + items: + type: string + type: array + topologyKey: + description: This pod should be co-located (affinity) or not + co-located (anti-affinity) with the pods matching the labelSelector + in the specified namespaces, where co-located is defined as + running on a node whose value of the label with key topologyKey + matches that of any node on which any of the selected pods + is running. Empty topologyKey is not allowed. + type: string + required: + - topologyKey + type: object + type: array + type: object + type: object + annotations: + additionalProperties: + type: string + type: object + apiserver: + properties: + healthcheck: + properties: + enabled: + type: boolean + probePort: + type: integer + required: + - probePort + type: object + useKubeapiserverFqdnForAks: + type: boolean + required: + - healthcheck + - useKubeapiserverFqdnForAks + type: object + criticalAddon: + type: boolean + enabled: + type: boolean + enforceTerminationPolicy: + type: boolean + fullnameOverride: + type: string + imagePullPolicy: + type: string + imagePullSecrets: + items: + description: LocalObjectReference contains enough information to let you + locate the referenced object inside the same namespace. + properties: + name: + description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names + TODO: Add other useful fields. apiVersion, kind, uid?' + type: string + type: object + x-kubernetes-map-type: atomic + type: array + license: + type: string + licenseSecretName: + type: string + logLevel: + format: int32 + type: integer + monitoring: + properties: + agent: + enum: + - prometheus.io + - prometheus.io/operator + - prometheus.io/builtin + type: string + bindPort: + type: integer + serviceMonitor: + properties: + labels: + additionalProperties: + type: string + type: object + type: object + required: + - agent + - bindPort + - serviceMonitor + type: object + nameOverride: + type: string + nodeSelector: + additionalProperties: + type: string + type: object + operator: + properties: + registry: + type: string + repository: + type: string + resources: + description: Compute Resources required by the sidecar container. + properties: + limits: + additionalProperties: + anyOf: + - type: integer + - type: string + pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ + x-kubernetes-int-or-string: true + description: 'Limits describes the maximum amount of compute resources + allowed. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/' + type: object + requests: + additionalProperties: + anyOf: + - type: integer + - type: string + pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ + x-kubernetes-int-or-string: true + description: 'Requests describes the minimum amount of compute resources + required. If Requests is omitted for a container, it defaults to + Limits if that is explicitly specified, otherwise to an implementation-defined + value. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/' + type: object + type: object + securityContext: + description: Security options the pod should run with. + properties: + allowPrivilegeEscalation: + description: 'AllowPrivilegeEscalation controls whether a process + can gain more privileges than its parent process. This bool directly + controls if the no_new_privs flag will be set on the container process. + AllowPrivilegeEscalation is true always when the container is: 1) + run as Privileged 2) has CAP_SYS_ADMIN Note that this field cannot + be set when spec.os.name is windows.' + type: boolean + capabilities: + description: The capabilities to add/drop when running containers. + Defaults to the default set of capabilities granted by the container + runtime. Note that this field cannot be set when spec.os.name is + windows. + properties: + add: + description: Added capabilities + items: + description: Capability represent POSIX capabilities type + type: string + type: array + drop: + description: Removed capabilities + items: + description: Capability represent POSIX capabilities type + type: string + type: array + type: object + privileged: + description: Run container in privileged mode. Processes in privileged + containers are essentially equivalent to root on the host. Defaults + to false. Note that this field cannot be set when spec.os.name is + windows. + type: boolean + procMount: + description: procMount denotes the type of proc mount to use for the + containers. The default is DefaultProcMount which uses the container + runtime defaults for readonly paths and masked paths. This requires + the ProcMountType feature flag to be enabled. Note that this field + cannot be set when spec.os.name is windows. + type: string + readOnlyRootFilesystem: + description: Whether this container has a read-only root filesystem. + Default is false. Note that this field cannot be set when spec.os.name is windows. type: boolean runAsGroup: @@ -2809,8 +3991,6 @@ properties: args: type: string type: object - enabled: - type: boolean restore: properties: args: @@ -2818,11 +3998,14 @@ properties: type: object required: - backup - - enabled - restore type: object enabled: type: boolean + featureGates: + additionalProperties: + type: boolean + type: object kubedbmanifest: properties: enabled: @@ -2838,8 +4021,6 @@ properties: args: type: string type: object - enabled: - type: boolean maxConcurrency: format: int32 type: integer @@ -2850,7 +4031,6 @@ properties: type: object required: - backup - - enabled - maxConcurrency - restore type: object @@ -2862,8 +4042,6 @@ properties: args: type: string type: object - enabled: - type: boolean restore: properties: args: @@ -2871,7 +4049,6 @@ properties: type: object required: - backup - - enabled - restore type: object opensearch: @@ -2883,8 +4060,6 @@ properties: args: type: string type: object - enabled: - type: boolean restore: properties: args: @@ -2892,7 +4067,6 @@ properties: type: object required: - backup - - enabled - restore type: object postgres: @@ -2905,8 +4079,6 @@ properties: cmd: type: string type: object - enabled: - type: boolean restore: properties: args: @@ -2914,7 +4086,6 @@ properties: type: object required: - backup - - enabled - restore type: object proxies: @@ -2943,8 +4114,6 @@ properties: args: type: string type: object - enabled: - type: boolean restore: properties: args: @@ -2952,7 +4121,6 @@ properties: type: object required: - backup - - enabled - restore type: object waitTimeout: @@ -2961,6 +4129,7 @@ properties: required: - elasticsearch - enabled + - featureGates - kubedbmanifest - mongodb - mysql diff --git a/charts/kubedb/values.yaml b/charts/kubedb/values.yaml index f1d9fa026..bab1bd7f3 100644 --- a/charts/kubedb/values.yaml +++ b/charts/kubedb/values.yaml @@ -40,19 +40,6 @@ global: # --set global.imagePullSecrets[1].name=sec1 imagePullSecrets: [] - monitoring: - # Name of monitoring agent (one of "prometheus.io", "prometheus.io/operator", "prometheus.io/builtin") - agent: "" - serviceMonitor: - # Specify the labels for ServiceMonitor. - # Prometheus crd will select ServiceMonitor using these labels. - # Only usable when monitoring agent is `prometheus.io/operator`. - labels: # +doc-gen:break - monitoring.appscode.com/prometheus: auto - -kubedb-crd-manager: - # If enabled, installs the kubedb-crd-manager chart - enabled: true featureGates: Cassandra: false ClickHouse: false @@ -62,35 +49,49 @@ kubedb-crd-manager: FerretDB: false Kafka: true MariaDB: true - Memcached: false + Memcached: true MicrosoftSQLServer: false MongoDB: true MySQL: true - PerconaXtraDB: false - PgBouncer: false + PerconaXtraDB: true + PgBouncer: true PgPool: false Postgres: true - ProxySQL: false + ProxySQL: true RabbitMQ: false Redis: true SingleStore: false Solr: false ZooKeeper: false + + monitoring: + # Name of monitoring agent (one of "prometheus.io", "prometheus.io/operator", "prometheus.io/builtin") + agent: "" + serviceMonitor: + # Specify the labels for ServiceMonitor. + # Prometheus crd will select ServiceMonitor using these labels. + # Only usable when monitoring agent is `prometheus.io/operator`. + labels: # +doc-gen:break + monitoring.appscode.com/prometheus: auto + +kubedb-crd-manager: + # If enabled, installs the kubedb-crd-manager chart + enabled: true kubedb-provisioner: # If enabled, installs the kubedb-provisioner chart - enabled: true + enabled: false kubedb-webhook-server: # If enabled, installs the kubedb-webhook-server chart - enabled: true + enabled: false kubedb-ops-manager: # If enabled, installs the kubedb-ops-manager chart - enabled: true + enabled: false kubedb-autoscaler: # If enabled, installs the kubedb-autoscaler chart - enabled: true + enabled: false kubedb-dashboard: # If enabled, installs the kubedb-dashboard chart - enabled: true + enabled: false kubedb-schema-manager: # If enabled, installs the kubedb-schema-manager chart enabled: false @@ -99,7 +100,7 @@ kubedb-metrics: enabled: false kubedb-catalog: # If enabled, installs the kubedb-catalog chart - enabled: true + enabled: false kubedb-kubestash-catalog: # If enabled, installs the kubedb-kubestash-catalog chart enabled: false