diff --git a/go.mod b/go.mod index 3ff7c10c7..6779f097d 100644 --- a/go.mod +++ b/go.mod @@ -27,8 +27,8 @@ require ( kmodules.xyz/client-go v0.34.3 kmodules.xyz/custom-resources v0.34.0 kmodules.xyz/monitoring-agent-api v0.34.1 - kubedb.dev/apimachinery v0.62.0 - kubedb.dev/db-client-go v0.17.0 + kubedb.dev/apimachinery v0.63.0 + kubedb.dev/db-client-go v0.18.0 kubeops.dev/petset v0.0.15 sigs.k8s.io/controller-runtime v0.22.4 sigs.k8s.io/yaml v1.6.0 @@ -173,7 +173,7 @@ require ( kubeops.dev/csi-driver-cacerts v0.5.0 // indirect kubeops.dev/operator-shard-manager v0.0.5 // indirect kubeops.dev/sidekick v0.0.12 // indirect - kubestash.dev/apimachinery v0.25.0 // indirect + kubestash.dev/apimachinery v0.26.0 // indirect open-cluster-management.io/api v1.2.0 // indirect sigs.k8s.io/gateway-api v1.4.0 // indirect sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 // indirect diff --git a/go.sum b/go.sum index fde70a9f9..e0f88c2a3 100644 --- a/go.sum +++ b/go.sum @@ -752,10 +752,10 @@ kmodules.xyz/prober v0.34.0 h1:ElZkZYCjLaytAA0M8EH42To7i9gh1IIX+d0qfaIohys= kmodules.xyz/prober v0.34.0/go.mod h1:rsu/fxxfNxY70GDbH6Ju8G66459hi7AhWSSBoiIp8ic= kmodules.xyz/resource-metadata v0.42.4 h1:nFVo+PKmwWdzVwk7U3VZuKBQj3tPo6fyY5BC7gE2OB8= kmodules.xyz/resource-metadata v0.42.4/go.mod h1:++18wSB28Wrw3ZxnOd8o8IVg7oMyWPwaPfuLw21QnPc= -kubedb.dev/apimachinery v0.62.0 h1:itdRIV6cQ9w8qbYFYyuJHSbmpNk2nR+MAiXTsMBca3g= -kubedb.dev/apimachinery v0.62.0/go.mod h1:O9Lo4Trr/HWs4OX/iLbGJEnD9pev0b6tcTPbjRCjh1A= -kubedb.dev/db-client-go v0.17.0 h1:wmdXM+3zp9hjyq8isCNhHtG4nbCJ7YFgxNtov32mhLk= -kubedb.dev/db-client-go v0.17.0/go.mod h1:3U2oKDZZyWtVjet4mqtPBPDEDsCdcurgQYN+lJzc4mU= +kubedb.dev/apimachinery v0.63.0 h1:YnHHiNJbpeTk7Y+WInG5NLuLfupF/RT1qTPRa6MONBo= +kubedb.dev/apimachinery v0.63.0/go.mod h1:l3qXJvsiSUEZZ9DIF539BADcUwVA4Nz2SGdOLTrtDRM= +kubedb.dev/db-client-go v0.18.0 h1:qfbIgGr38uRkUi25xvBSphyHicT868xwQ8R3OfrY7/k= +kubedb.dev/db-client-go v0.18.0/go.mod h1:gar21Okv36P1itwncjF7lpHcvyz+TVXq5H2wmhqUGzE= kubeops.dev/csi-driver-cacerts v0.5.0 h1:WaKfoIyh7rx9rNZ65wJ3GkzhECkOjxd9dcO0iEx3xKU= kubeops.dev/csi-driver-cacerts v0.5.0/go.mod h1:VNbwC3gTWfmdQCVxd8mkVx+n1+0F1lOA5X3usyZN1rk= kubeops.dev/operator-shard-manager v0.0.5 h1:i7VnyUfIa9u3RQhSTVWNsooXcgmrWWxJyI9gJ10onE8= @@ -764,8 +764,8 @@ kubeops.dev/petset v0.0.15 h1:iwTRFAp0RNw0A87sw2c97UZ6WIA9H/nhJBpDhXLa7fk= kubeops.dev/petset v0.0.15/go.mod h1:sw96WiXfzhpmKpXj4a5AdmEHs0Bx4QMhf+iW15zY4Gg= kubeops.dev/sidekick v0.0.12 h1:pmUjQLZDKxgREiM6z0PogLR1aDbgvkE9jRjbxG6dEt0= kubeops.dev/sidekick v0.0.12/go.mod h1:RU7QH3E8DOLw15rBYlOOJSyczuwAnVVtYyZjJb00UB8= -kubestash.dev/apimachinery v0.25.0 h1:EgseCFUAoNTi8b7SIPGYywe4CtJhApdMk8IZq01os0U= -kubestash.dev/apimachinery v0.25.0/go.mod h1:SM+G8sUhChP+zSfHvoh/S7P0CIcWvennWv770OFGfNk= +kubestash.dev/apimachinery v0.26.0 h1:kcPrsHVCh6vKrK/veAzjNODfv2GiOsUuSehuIBFnDAo= +kubestash.dev/apimachinery v0.26.0/go.mod h1:l82MTUNbJbQmjTWIVi3XW5miRt94Ut6YPbdi8BVxieo= open-cluster-management.io/api v1.2.0 h1:+yeQgJiErrur5S4s205UM37EcZ2XbC9pFSm0xgV5/hU= open-cluster-management.io/api v1.2.0/go.mod h1:YcmA6SpGEekIMxdoeVIIyOaBhMA6ImWRLXP4g8n8T+4= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= diff --git a/vendor/kubedb.dev/apimachinery/apis/catalog/v1alpha1/db2_version_types.go b/vendor/kubedb.dev/apimachinery/apis/catalog/v1alpha1/db2_version_types.go index b71058dbf..a4c6e692f 100644 --- a/vendor/kubedb.dev/apimachinery/apis/catalog/v1alpha1/db2_version_types.go +++ b/vendor/kubedb.dev/apimachinery/apis/catalog/v1alpha1/db2_version_types.go @@ -58,8 +58,10 @@ type DB2VersionSpec struct { // Database Image DB DB2VersionDatabase `json:"db"` + // Coordinator Image Coordinator DB2Coordinator `json:"coordinator"` + // Deprecated versions usable but regarded as obsolete and best avoided, typically due to having been superseded. // +optional Deprecated bool `json:"deprecated,omitempty"` diff --git a/vendor/kubedb.dev/apimachinery/apis/catalog/v1alpha1/druid_version_types.go b/vendor/kubedb.dev/apimachinery/apis/catalog/v1alpha1/druid_version_types.go index 114fdde59..9dac650ad 100644 --- a/vendor/kubedb.dev/apimachinery/apis/catalog/v1alpha1/druid_version_types.go +++ b/vendor/kubedb.dev/apimachinery/apis/catalog/v1alpha1/druid_version_types.go @@ -56,16 +56,21 @@ type DruidVersionSpec struct { // Database Image DB DruidVersionDatabase `json:"db"` + // Init Container Image InitContainer DruidInitContainer `json:"initContainer"` + // Deprecated versions usable but regarded as obsolete and best avoided, typically due to having been superseded. // +optional Deprecated bool `json:"deprecated,omitempty"` + // SecurityContext is for the additional security information for the Druid container // +optional SecurityContext SecurityContext `json:"securityContext"` + // +optional UI []ChartInfo `json:"ui,omitempty"` + // update constraints UpdateConstraints UpdateConstraints `json:"updateConstraints,omitempty"` } diff --git a/vendor/kubedb.dev/apimachinery/apis/catalog/v1alpha1/elasticsearch_version_types.go b/vendor/kubedb.dev/apimachinery/apis/catalog/v1alpha1/elasticsearch_version_types.go index 3012dc56b..01132743c 100644 --- a/vendor/kubedb.dev/apimachinery/apis/catalog/v1alpha1/elasticsearch_version_types.go +++ b/vendor/kubedb.dev/apimachinery/apis/catalog/v1alpha1/elasticsearch_version_types.go @@ -60,35 +60,45 @@ type ElasticsearchVersionSpec struct { // Distribution Distribution ElasticsearchDistro `json:"distribution,omitempty"` + // Authentication plugin used by Elasticsearch cluster AuthPlugin ElasticsearchAuthPlugin `json:"authPlugin"` + // Database Image DB ElasticsearchVersionDatabase `json:"db"` + // Dashboard Image // +optional Dashboard ElasticsearchDashboardVersionDatabase `json:"dashboard,omitempty"` + // Exporter Image Exporter ElasticsearchVersionExporter `json:"exporter"` + // Deprecated versions usable but regarded as obsolete and best avoided, typically due to having been superseded. // +optional Deprecated bool `json:"deprecated,omitempty"` + // Init container Image InitContainer ElasticsearchVersionInitContainer `json:"initContainer"` + // Init container Image // +optional DashboardInitContainer ElasticsearchVersionDashboardInitContainer `json:"dashboardInitContainer,omitempty"` + // PSP names PodSecurityPolicies ElasticsearchVersionPodSecurityPolicy `json:"podSecurityPolicies"` + // Stash defines backup and restore task definitions. // +optional Stash appcat.StashAddonSpec `json:"stash,omitempty"` + // SecurityContext is for the additional security information for the Elasticsearch container // +optional SecurityContext ElasticsearchSecurityContext `json:"securityContext"` + // update constraints UpdateConstraints UpdateConstraints `json:"updateConstraints,omitempty"` - // +optional - GitSyncer GitSyncer `json:"gitSyncer,omitempty"` + // +optional UI []ChartInfo `json:"ui,omitempty"` } diff --git a/vendor/kubedb.dev/apimachinery/apis/catalog/v1alpha1/kafka_version_types.go b/vendor/kubedb.dev/apimachinery/apis/catalog/v1alpha1/kafka_version_types.go index 73fe21100..98fd88f8f 100644 --- a/vendor/kubedb.dev/apimachinery/apis/catalog/v1alpha1/kafka_version_types.go +++ b/vendor/kubedb.dev/apimachinery/apis/catalog/v1alpha1/kafka_version_types.go @@ -18,7 +18,6 @@ package v1alpha1 import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - appcat "kmodules.xyz/custom-resources/apis/appcatalog/v1alpha1" ) const ( @@ -61,26 +60,31 @@ type KafkaVersionSpec struct { // From kafka version 4.0.0, we have introduced an init container to handle the database initialization. // +optional InitContainer KafkaInitContainer `json:"initContainer,omitempty"` + // Database Image DB KafkaVersionDatabase `json:"db"` + // Connect Image ConnectCluster ConnectClusterVersion `json:"connectCluster"` + // Deprecated versions usable but regarded as obsolete and best avoided, typically due to having been superseded. // +optional Deprecated bool `json:"deprecated,omitempty"` + // Database Image CruiseControl CruiseControlVersionDatabase `json:"cruiseControl"` + // PSP names // +optional PodSecurityPolicies KafkaVersionPodSecurityPolicy `json:"podSecurityPolicies"` - // Stash defines backup and restore task definitions. - // +optional - Stash appcat.StashAddonSpec `json:"stash,omitempty"` + // update constraints UpdateConstraints UpdateConstraints `json:"updateConstraints,omitempty"` + // SecurityContext is for the additional config for the DB container // +optional SecurityContext SecurityContext `json:"securityContext"` + // +optional UI []ChartInfo `json:"ui,omitempty"` } diff --git a/vendor/kubedb.dev/apimachinery/apis/catalog/v1alpha1/mssqlserver_version_types.go b/vendor/kubedb.dev/apimachinery/apis/catalog/v1alpha1/mssqlserver_version_types.go index 0aa5735cd..4bbe446ce 100644 --- a/vendor/kubedb.dev/apimachinery/apis/catalog/v1alpha1/mssqlserver_version_types.go +++ b/vendor/kubedb.dev/apimachinery/apis/catalog/v1alpha1/mssqlserver_version_types.go @@ -18,7 +18,6 @@ package v1alpha1 import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - appcat "kmodules.xyz/custom-resources/apis/appcatalog/v1alpha1" ) const ( @@ -57,25 +56,30 @@ type MSSQLServerVersionSpec struct { // Database Image DB MSSQLServerDatabase `json:"db"` + // Coordinator Image Coordinator MSSQLServerCoordinator `json:"coordinator"` + // Exporter Image Exporter MSSQLServerVersionExporter `json:"exporter"` + // Init container Image InitContainer MSSQLServerInitContainer `json:"initContainer"` + // Deprecated versions usable but regarded as obsolete and best avoided, typically due to having been superseded. // +optional Deprecated bool `json:"deprecated,omitempty"` - // Stash defines backup and restore task definitions. - // +optional - Stash appcat.StashAddonSpec `json:"stash,omitempty"` + // SecurityContext is for the additional config for the DB container // +optional SecurityContext SecurityContext `json:"securityContext"` + // update constraints UpdateConstraints UpdateConstraints `json:"updateConstraints,omitempty"` + // Archiver defines the walg & kube-stash-addon related specifications Archiver ArchiverSpec `json:"archiver,omitempty"` + // +optional UI []ChartInfo `json:"ui,omitempty"` } diff --git a/vendor/kubedb.dev/apimachinery/apis/catalog/v1alpha1/openapi_generated.go b/vendor/kubedb.dev/apimachinery/apis/catalog/v1alpha1/openapi_generated.go index b90f311c8..700be527e 100644 --- a/vendor/kubedb.dev/apimachinery/apis/catalog/v1alpha1/openapi_generated.go +++ b/vendor/kubedb.dev/apimachinery/apis/catalog/v1alpha1/openapi_generated.go @@ -35061,12 +35061,6 @@ func schema_apimachinery_apis_catalog_v1alpha1_ElasticsearchVersionSpec(ref comm Ref: ref("kubedb.dev/apimachinery/apis/catalog/v1alpha1.UpdateConstraints"), }, }, - "gitSyncer": { - SchemaProps: spec.SchemaProps{ - Default: map[string]interface{}{}, - Ref: ref("kubedb.dev/apimachinery/apis/catalog/v1alpha1.GitSyncer"), - }, - }, "ui": { SchemaProps: spec.SchemaProps{ Type: []string{"array"}, @@ -35085,7 +35079,7 @@ func schema_apimachinery_apis_catalog_v1alpha1_ElasticsearchVersionSpec(ref comm }, }, Dependencies: []string{ - "kmodules.xyz/custom-resources/apis/appcatalog/v1alpha1.StashAddonSpec", "kubedb.dev/apimachinery/apis/catalog/v1alpha1.ChartInfo", "kubedb.dev/apimachinery/apis/catalog/v1alpha1.ElasticsearchDashboardVersionDatabase", "kubedb.dev/apimachinery/apis/catalog/v1alpha1.ElasticsearchSecurityContext", "kubedb.dev/apimachinery/apis/catalog/v1alpha1.ElasticsearchVersionDashboardInitContainer", "kubedb.dev/apimachinery/apis/catalog/v1alpha1.ElasticsearchVersionDatabase", "kubedb.dev/apimachinery/apis/catalog/v1alpha1.ElasticsearchVersionExporter", "kubedb.dev/apimachinery/apis/catalog/v1alpha1.ElasticsearchVersionInitContainer", "kubedb.dev/apimachinery/apis/catalog/v1alpha1.ElasticsearchVersionPodSecurityPolicy", "kubedb.dev/apimachinery/apis/catalog/v1alpha1.GitSyncer", "kubedb.dev/apimachinery/apis/catalog/v1alpha1.UpdateConstraints"}, + "kmodules.xyz/custom-resources/apis/appcatalog/v1alpha1.StashAddonSpec", "kubedb.dev/apimachinery/apis/catalog/v1alpha1.ChartInfo", "kubedb.dev/apimachinery/apis/catalog/v1alpha1.ElasticsearchDashboardVersionDatabase", "kubedb.dev/apimachinery/apis/catalog/v1alpha1.ElasticsearchSecurityContext", "kubedb.dev/apimachinery/apis/catalog/v1alpha1.ElasticsearchVersionDashboardInitContainer", "kubedb.dev/apimachinery/apis/catalog/v1alpha1.ElasticsearchVersionDatabase", "kubedb.dev/apimachinery/apis/catalog/v1alpha1.ElasticsearchVersionExporter", "kubedb.dev/apimachinery/apis/catalog/v1alpha1.ElasticsearchVersionInitContainer", "kubedb.dev/apimachinery/apis/catalog/v1alpha1.ElasticsearchVersionPodSecurityPolicy", "kubedb.dev/apimachinery/apis/catalog/v1alpha1.UpdateConstraints"}, } } @@ -36592,13 +36586,6 @@ func schema_apimachinery_apis_catalog_v1alpha1_KafkaVersionSpec(ref common.Refer Ref: ref("kubedb.dev/apimachinery/apis/catalog/v1alpha1.KafkaVersionPodSecurityPolicy"), }, }, - "stash": { - SchemaProps: spec.SchemaProps{ - Description: "Stash defines backup and restore task definitions.", - Default: map[string]interface{}{}, - Ref: ref("kmodules.xyz/custom-resources/apis/appcatalog/v1alpha1.StashAddonSpec"), - }, - }, "updateConstraints": { SchemaProps: spec.SchemaProps{ Description: "update constraints", @@ -36631,7 +36618,7 @@ func schema_apimachinery_apis_catalog_v1alpha1_KafkaVersionSpec(ref common.Refer }, }, Dependencies: []string{ - "kmodules.xyz/custom-resources/apis/appcatalog/v1alpha1.StashAddonSpec", "kubedb.dev/apimachinery/apis/catalog/v1alpha1.ChartInfo", "kubedb.dev/apimachinery/apis/catalog/v1alpha1.ConnectClusterVersion", "kubedb.dev/apimachinery/apis/catalog/v1alpha1.CruiseControlVersionDatabase", "kubedb.dev/apimachinery/apis/catalog/v1alpha1.KafkaInitContainer", "kubedb.dev/apimachinery/apis/catalog/v1alpha1.KafkaVersionDatabase", "kubedb.dev/apimachinery/apis/catalog/v1alpha1.KafkaVersionPodSecurityPolicy", "kubedb.dev/apimachinery/apis/catalog/v1alpha1.SecurityContext", "kubedb.dev/apimachinery/apis/catalog/v1alpha1.UpdateConstraints"}, + "kubedb.dev/apimachinery/apis/catalog/v1alpha1.ChartInfo", "kubedb.dev/apimachinery/apis/catalog/v1alpha1.ConnectClusterVersion", "kubedb.dev/apimachinery/apis/catalog/v1alpha1.CruiseControlVersionDatabase", "kubedb.dev/apimachinery/apis/catalog/v1alpha1.KafkaInitContainer", "kubedb.dev/apimachinery/apis/catalog/v1alpha1.KafkaVersionDatabase", "kubedb.dev/apimachinery/apis/catalog/v1alpha1.KafkaVersionPodSecurityPolicy", "kubedb.dev/apimachinery/apis/catalog/v1alpha1.SecurityContext", "kubedb.dev/apimachinery/apis/catalog/v1alpha1.UpdateConstraints"}, } } @@ -36866,13 +36853,6 @@ func schema_apimachinery_apis_catalog_v1alpha1_MSSQLServerVersionSpec(ref common Format: "", }, }, - "stash": { - SchemaProps: spec.SchemaProps{ - Description: "Stash defines backup and restore task definitions.", - Default: map[string]interface{}{}, - Ref: ref("kmodules.xyz/custom-resources/apis/appcatalog/v1alpha1.StashAddonSpec"), - }, - }, "securityContext": { SchemaProps: spec.SchemaProps{ Description: "SecurityContext is for the additional config for the DB container", @@ -36912,7 +36892,7 @@ func schema_apimachinery_apis_catalog_v1alpha1_MSSQLServerVersionSpec(ref common }, }, Dependencies: []string{ - "kmodules.xyz/custom-resources/apis/appcatalog/v1alpha1.StashAddonSpec", "kubedb.dev/apimachinery/apis/catalog/v1alpha1.ArchiverSpec", "kubedb.dev/apimachinery/apis/catalog/v1alpha1.ChartInfo", "kubedb.dev/apimachinery/apis/catalog/v1alpha1.MSSQLServerCoordinator", "kubedb.dev/apimachinery/apis/catalog/v1alpha1.MSSQLServerDatabase", "kubedb.dev/apimachinery/apis/catalog/v1alpha1.MSSQLServerInitContainer", "kubedb.dev/apimachinery/apis/catalog/v1alpha1.MSSQLServerVersionExporter", "kubedb.dev/apimachinery/apis/catalog/v1alpha1.SecurityContext", "kubedb.dev/apimachinery/apis/catalog/v1alpha1.UpdateConstraints"}, + "kubedb.dev/apimachinery/apis/catalog/v1alpha1.ArchiverSpec", "kubedb.dev/apimachinery/apis/catalog/v1alpha1.ChartInfo", "kubedb.dev/apimachinery/apis/catalog/v1alpha1.MSSQLServerCoordinator", "kubedb.dev/apimachinery/apis/catalog/v1alpha1.MSSQLServerDatabase", "kubedb.dev/apimachinery/apis/catalog/v1alpha1.MSSQLServerInitContainer", "kubedb.dev/apimachinery/apis/catalog/v1alpha1.MSSQLServerVersionExporter", "kubedb.dev/apimachinery/apis/catalog/v1alpha1.SecurityContext", "kubedb.dev/apimachinery/apis/catalog/v1alpha1.UpdateConstraints"}, } } @@ -42462,20 +42442,6 @@ func schema_apimachinery_apis_catalog_v1alpha1_ZooKeeperVersionSpec(ref common.R Ref: ref("kubedb.dev/apimachinery/apis/catalog/v1alpha1.ZooKeeperVersionDatabase"), }, }, - "exporter": { - SchemaProps: spec.SchemaProps{ - Description: "Exporter Image", - Default: map[string]interface{}{}, - Ref: ref("kubedb.dev/apimachinery/apis/catalog/v1alpha1.ZooKeeperVersionExporter"), - }, - }, - "coordinator": { - SchemaProps: spec.SchemaProps{ - Description: "Coordinator Image", - Default: map[string]interface{}{}, - Ref: ref("kubedb.dev/apimachinery/apis/catalog/v1alpha1.ZooKeeperVersionCoordinator"), - }, - }, "deprecated": { SchemaProps: spec.SchemaProps{ Description: "Deprecated versions usable but regarded as obsolete and best avoided, typically due to having been superseded.", @@ -42490,13 +42456,6 @@ func schema_apimachinery_apis_catalog_v1alpha1_ZooKeeperVersionSpec(ref common.R Ref: ref("kubedb.dev/apimachinery/apis/catalog/v1alpha1.ZooKeeperVersionPodSecurityPolicy"), }, }, - "stash": { - SchemaProps: spec.SchemaProps{ - Description: "Stash defines backup and restore task definitions.", - Default: map[string]interface{}{}, - Ref: ref("kmodules.xyz/custom-resources/apis/appcatalog/v1alpha1.StashAddonSpec"), - }, - }, "updateConstraints": { SchemaProps: spec.SchemaProps{ Description: "update constraints", @@ -42511,17 +42470,11 @@ func schema_apimachinery_apis_catalog_v1alpha1_ZooKeeperVersionSpec(ref common.R Ref: ref("kubedb.dev/apimachinery/apis/catalog/v1alpha1.SecurityContext"), }, }, - "gitSyncer": { - SchemaProps: spec.SchemaProps{ - Default: map[string]interface{}{}, - Ref: ref("kubedb.dev/apimachinery/apis/catalog/v1alpha1.GitSyncer"), - }, - }, }, - Required: []string{"version", "db", "coordinator"}, + Required: []string{"version", "initContainer", "db"}, }, }, Dependencies: []string{ - "kmodules.xyz/custom-resources/apis/appcatalog/v1alpha1.StashAddonSpec", "kubedb.dev/apimachinery/apis/catalog/v1alpha1.GitSyncer", "kubedb.dev/apimachinery/apis/catalog/v1alpha1.SecurityContext", "kubedb.dev/apimachinery/apis/catalog/v1alpha1.UpdateConstraints", "kubedb.dev/apimachinery/apis/catalog/v1alpha1.ZooKeeperVersionCoordinator", "kubedb.dev/apimachinery/apis/catalog/v1alpha1.ZooKeeperVersionDatabase", "kubedb.dev/apimachinery/apis/catalog/v1alpha1.ZooKeeperVersionExporter", "kubedb.dev/apimachinery/apis/catalog/v1alpha1.ZooKeeperVersionInitContainer", "kubedb.dev/apimachinery/apis/catalog/v1alpha1.ZooKeeperVersionPodSecurityPolicy"}, + "kubedb.dev/apimachinery/apis/catalog/v1alpha1.SecurityContext", "kubedb.dev/apimachinery/apis/catalog/v1alpha1.UpdateConstraints", "kubedb.dev/apimachinery/apis/catalog/v1alpha1.ZooKeeperVersionDatabase", "kubedb.dev/apimachinery/apis/catalog/v1alpha1.ZooKeeperVersionInitContainer", "kubedb.dev/apimachinery/apis/catalog/v1alpha1.ZooKeeperVersionPodSecurityPolicy"}, } } diff --git a/vendor/kubedb.dev/apimachinery/apis/catalog/v1alpha1/proxysql_version_types.go b/vendor/kubedb.dev/apimachinery/apis/catalog/v1alpha1/proxysql_version_types.go index de22dd389..26cce6b6a 100644 --- a/vendor/kubedb.dev/apimachinery/apis/catalog/v1alpha1/proxysql_version_types.go +++ b/vendor/kubedb.dev/apimachinery/apis/catalog/v1alpha1/proxysql_version_types.go @@ -55,18 +55,24 @@ type ProxySQLVersionSpec struct { // Proxysql Image Proxysql ProxySQLVersionProxysql `json:"proxysql"` + // Exporter Image Exporter *ProxySQLVersionExporter `json:"exporter,omitempty"` + // Deprecated versions usable but regarded as obsolete and best avoided, typically due to having been superseded. // +optional Deprecated bool `json:"deprecated,omitempty"` + // PSP names PodSecurityPolicies ProxySQLVersionPodSecurityPolicy `json:"podSecurityPolicies"` + // update constraints UpdateConstraints UpdateConstraints `json:"updateConstraints,omitempty"` + // SecurityContext is for the additional config for the DB container // +optional SecurityContext SecurityContext `json:"securityContext"` + // +optional UI []ChartInfo `json:"ui,omitempty"` } diff --git a/vendor/kubedb.dev/apimachinery/apis/catalog/v1alpha1/zookeeper_version_types.go b/vendor/kubedb.dev/apimachinery/apis/catalog/v1alpha1/zookeeper_version_types.go index ad66f2ccd..263562c7f 100644 --- a/vendor/kubedb.dev/apimachinery/apis/catalog/v1alpha1/zookeeper_version_types.go +++ b/vendor/kubedb.dev/apimachinery/apis/catalog/v1alpha1/zookeeper_version_types.go @@ -18,7 +18,6 @@ package v1alpha1 import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - appcat "kmodules.xyz/custom-resources/apis/appcatalog/v1alpha1" ) const ( @@ -58,32 +57,26 @@ type ZooKeeperVersionSpec struct { EndOfLife bool `json:"endOfLife"` // init container image - // +optional - InitContainer ZooKeeperVersionInitContainer `json:"initContainer,omitempty"` + InitContainer ZooKeeperVersionInitContainer `json:"initContainer"` + // Database Image DB ZooKeeperVersionDatabase `json:"db"` - // Exporter Image - // +optional - Exporter ZooKeeperVersionExporter `json:"exporter"` - // Coordinator Image - Coordinator ZooKeeperVersionCoordinator `json:"coordinator"` + // Deprecated versions usable but regarded as obsolete and best avoided, typically due to having been superseded. // +optional Deprecated bool `json:"deprecated,omitempty"` + // PSP names // +optional PodSecurityPolicies ZooKeeperVersionPodSecurityPolicy `json:"podSecurityPolicies"` - // Stash defines backup and restore task definitions. - // +optional - Stash appcat.StashAddonSpec `json:"stash,omitempty"` + // update constraints // +optional UpdateConstraints UpdateConstraints `json:"updateConstraints,omitempty"` + // SecurityContext is for the additional config for the DB container // +optional SecurityContext SecurityContext `json:"securityContext"` - // +optional - GitSyncer GitSyncer `json:"gitSyncer,omitempty"` } // ZooKeeperVersionInitContainer is the ZooKeeper init container image diff --git a/vendor/kubedb.dev/apimachinery/apis/catalog/v1alpha1/zz_generated.deepcopy.go b/vendor/kubedb.dev/apimachinery/apis/catalog/v1alpha1/zz_generated.deepcopy.go index 32e2a7051..fdbf1569e 100644 --- a/vendor/kubedb.dev/apimachinery/apis/catalog/v1alpha1/zz_generated.deepcopy.go +++ b/vendor/kubedb.dev/apimachinery/apis/catalog/v1alpha1/zz_generated.deepcopy.go @@ -917,7 +917,6 @@ func (in *ElasticsearchVersionSpec) DeepCopyInto(out *ElasticsearchVersionSpec) in.Stash.DeepCopyInto(&out.Stash) in.SecurityContext.DeepCopyInto(&out.SecurityContext) in.UpdateConstraints.DeepCopyInto(&out.UpdateConstraints) - out.GitSyncer = in.GitSyncer if in.UI != nil { in, out := &in.UI, &out.UI *out = make([]ChartInfo, len(*in)) @@ -1814,7 +1813,6 @@ func (in *KafkaVersionSpec) DeepCopyInto(out *KafkaVersionSpec) { out.ConnectCluster = in.ConnectCluster out.CruiseControl = in.CruiseControl out.PodSecurityPolicies = in.PodSecurityPolicies - in.Stash.DeepCopyInto(&out.Stash) in.UpdateConstraints.DeepCopyInto(&out.UpdateConstraints) in.SecurityContext.DeepCopyInto(&out.SecurityContext) if in.UI != nil { @@ -1968,7 +1966,6 @@ func (in *MSSQLServerVersionSpec) DeepCopyInto(out *MSSQLServerVersionSpec) { out.Coordinator = in.Coordinator out.Exporter = in.Exporter out.InitContainer = in.InitContainer - in.Stash.DeepCopyInto(&out.Stash) in.SecurityContext.DeepCopyInto(&out.SecurityContext) in.UpdateConstraints.DeepCopyInto(&out.UpdateConstraints) out.Archiver = in.Archiver @@ -5182,13 +5179,9 @@ func (in *ZooKeeperVersionSpec) DeepCopyInto(out *ZooKeeperVersionSpec) { *out = *in out.InitContainer = in.InitContainer out.DB = in.DB - out.Exporter = in.Exporter - out.Coordinator = in.Coordinator out.PodSecurityPolicies = in.PodSecurityPolicies - in.Stash.DeepCopyInto(&out.Stash) in.UpdateConstraints.DeepCopyInto(&out.UpdateConstraints) in.SecurityContext.DeepCopyInto(&out.SecurityContext) - out.GitSyncer = in.GitSyncer return } diff --git a/vendor/kubedb.dev/apimachinery/crds/catalog.kubedb.com_elasticsearchversions.yaml b/vendor/kubedb.dev/apimachinery/crds/catalog.kubedb.com_elasticsearchversions.yaml index a419ea15b..e2664dfc9 100644 --- a/vendor/kubedb.dev/apimachinery/crds/catalog.kubedb.com_elasticsearchversions.yaml +++ b/vendor/kubedb.dev/apimachinery/crds/catalog.kubedb.com_elasticsearchversions.yaml @@ -95,13 +95,6 @@ spec: required: - image type: object - gitSyncer: - properties: - image: - type: string - required: - - image - type: object initContainer: properties: image: diff --git a/vendor/kubedb.dev/apimachinery/crds/catalog.kubedb.com_kafkaversions.yaml b/vendor/kubedb.dev/apimachinery/crds/catalog.kubedb.com_kafkaversions.yaml index ef21822ac..29cf2dfce 100644 --- a/vendor/kubedb.dev/apimachinery/crds/catalog.kubedb.com_kafkaversions.yaml +++ b/vendor/kubedb.dev/apimachinery/crds/catalog.kubedb.com_kafkaversions.yaml @@ -90,53 +90,6 @@ spec: format: int64 type: integer type: object - stash: - properties: - addon: - properties: - backupTask: - properties: - name: - type: string - params: - items: - properties: - name: - type: string - value: - type: string - required: - - name - - value - type: object - type: array - required: - - name - type: object - restoreTask: - properties: - name: - type: string - params: - items: - properties: - name: - type: string - value: - type: string - required: - - name - - value - type: object - type: array - required: - - name - type: object - required: - - backupTask - - restoreTask - type: object - type: object ui: items: properties: diff --git a/vendor/kubedb.dev/apimachinery/crds/catalog.kubedb.com_mssqlserverversions.yaml b/vendor/kubedb.dev/apimachinery/crds/catalog.kubedb.com_mssqlserverversions.yaml index 02bf36c2c..c22cf4382 100644 --- a/vendor/kubedb.dev/apimachinery/crds/catalog.kubedb.com_mssqlserverversions.yaml +++ b/vendor/kubedb.dev/apimachinery/crds/catalog.kubedb.com_mssqlserverversions.yaml @@ -142,53 +142,6 @@ spec: format: int64 type: integer type: object - stash: - properties: - addon: - properties: - backupTask: - properties: - name: - type: string - params: - items: - properties: - name: - type: string - value: - type: string - required: - - name - - value - type: object - type: array - required: - - name - type: object - restoreTask: - properties: - name: - type: string - params: - items: - properties: - name: - type: string - value: - type: string - required: - - name - - value - type: object - type: array - required: - - name - type: object - required: - - backupTask - - restoreTask - type: object - type: object ui: items: properties: diff --git a/vendor/kubedb.dev/apimachinery/crds/catalog.kubedb.com_zookeeperversions.yaml b/vendor/kubedb.dev/apimachinery/crds/catalog.kubedb.com_zookeeperversions.yaml index 4e69a4a4a..6a6466658 100644 --- a/vendor/kubedb.dev/apimachinery/crds/catalog.kubedb.com_zookeeperversions.yaml +++ b/vendor/kubedb.dev/apimachinery/crds/catalog.kubedb.com_zookeeperversions.yaml @@ -45,13 +45,6 @@ spec: type: object spec: properties: - coordinator: - properties: - image: - type: string - required: - - image - type: object db: properties: image: @@ -63,20 +56,6 @@ spec: type: boolean endOfLife: type: boolean - exporter: - properties: - image: - type: string - required: - - image - type: object - gitSyncer: - properties: - image: - type: string - required: - - image - type: object initContainer: properties: image: @@ -97,53 +76,6 @@ spec: format: int64 type: integer type: object - stash: - properties: - addon: - properties: - backupTask: - properties: - name: - type: string - params: - items: - properties: - name: - type: string - value: - type: string - required: - - name - - value - type: object - type: array - required: - - name - type: object - restoreTask: - properties: - name: - type: string - params: - items: - properties: - name: - type: string - value: - type: string - required: - - name - - value - type: object - type: array - required: - - name - type: object - required: - - backupTask - - restoreTask - type: object - type: object updateConstraints: properties: allowlist: @@ -158,8 +90,8 @@ spec: version: type: string required: - - coordinator - db + - initContainer - version type: object type: object diff --git a/vendor/modules.txt b/vendor/modules.txt index d570bef3a..c82b5fd6e 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -2599,7 +2599,7 @@ kmodules.xyz/prober/api/v1 kmodules.xyz/resource-metadata/apis/node kmodules.xyz/resource-metadata/apis/node/v1alpha1 kmodules.xyz/resource-metadata/crds -# kubedb.dev/apimachinery v0.62.0 +# kubedb.dev/apimachinery v0.63.0 ## explicit; go 1.25.0 kubedb.dev/apimachinery/apis kubedb.dev/apimachinery/apis/archiver/v1alpha1 @@ -2650,7 +2650,7 @@ kubedb.dev/apimachinery/pkg/factory kubedb.dev/apimachinery/pkg/lib kubedb.dev/apimachinery/pkg/utils kubedb.dev/apimachinery/pkg/utils/raft -# kubedb.dev/db-client-go v0.17.0 +# kubedb.dev/db-client-go v0.18.0 ## explicit; go 1.25.5 kubedb.dev/db-client-go/elasticsearch kubedb.dev/db-client-go/redis @@ -2675,7 +2675,7 @@ kubeops.dev/petset/crds kubeops.dev/sidekick/apis/apps kubeops.dev/sidekick/apis/apps/v1alpha1 kubeops.dev/sidekick/crds -# kubestash.dev/apimachinery v0.25.0 +# kubestash.dev/apimachinery v0.26.0 ## explicit; go 1.25.0 kubestash.dev/apimachinery/apis kubestash.dev/apimachinery/apis/core/v1alpha1