From 6146d16565e79a01d46022717ed855f004c60df0 Mon Sep 17 00:00:00 2001 From: Sabbir Date: Thu, 22 Aug 2024 11:01:17 +0600 Subject: [PATCH] Update go.mod Signed-off-by: Sabbir --- go.mod | 2 +- go.sum | 4 +- .../apis/kubedb/v1/openapi_generated.go | 14 ++ .../apis/kubedb/v1/pgbouncer_helpers.go | 2 +- .../apis/kubedb/v1/pgbouncer_types.go | 18 +-- .../apis/kubedb/v1/proxysql_types.go | 4 + .../apis/kubedb/v1alpha2/conversion.go | 2 +- .../apis/kubedb/v1alpha2/openapi_generated.go | 14 ++ .../apis/kubedb/v1alpha2/pgbouncer_types.go | 8 +- .../apis/kubedb/v1alpha2/proxysql_types.go | 4 + .../crds/kubedb.com_pgbouncers.yaml | 6 + .../crds/kubedb.com_proxysqls.yaml | 4 + ...ops.kubedb.com_singlestoreopsrequests.yaml | 122 ++++++++++++++++++ vendor/modules.txt | 6 +- 14 files changed, 188 insertions(+), 22 deletions(-) diff --git a/go.mod b/go.mod index dea24b416..736b77162 100644 --- a/go.mod +++ b/go.mod @@ -33,7 +33,7 @@ require ( k8s.io/klog/v2 v2.130.1 kmodules.xyz/client-go v0.30.13 kmodules.xyz/custom-resources v0.30.0 - kubedb.dev/apimachinery v0.47.0-rc.2.0.20240815122515-e51cacc5e58f + kubedb.dev/apimachinery v0.47.1-0.20240822044956-3da387889ca5 sigs.k8s.io/controller-runtime v0.18.4 xorm.io/xorm v1.3.6 ) diff --git a/go.sum b/go.sum index 014f365fa..4b971368e 100644 --- a/go.sum +++ b/go.sum @@ -802,8 +802,8 @@ kmodules.xyz/monitoring-agent-api v0.29.0 h1:gpFl6OZrlMLb/ySMHdREI9EwGtnJ91oZBn9 kmodules.xyz/monitoring-agent-api v0.29.0/go.mod h1:iNbvaMTgVFOI5q2LJtGK91j4Dmjv4ZRiRdasGmWLKQI= kmodules.xyz/offshoot-api v0.30.0 h1:dq9F93pu4Q8rL9oTcCk+vGGy8vpS7RNt0GSwx7Bvhec= kmodules.xyz/offshoot-api v0.30.0/go.mod h1:o9VoA3ImZMDBp3lpLb8+kc2d/KBxioRwCpaKDfLIyDw= -kubedb.dev/apimachinery v0.47.0-rc.2.0.20240815122515-e51cacc5e58f h1:nZ4JJb4hSJPNqHqbKL1jamBbroUQB+0bwha4xwaFnmU= -kubedb.dev/apimachinery v0.47.0-rc.2.0.20240815122515-e51cacc5e58f/go.mod h1:rBcbP9564zy6gla7nMmQs7NsFS0OwB958AJijeAO2zY= +kubedb.dev/apimachinery v0.47.1-0.20240822044956-3da387889ca5 h1:+gfLsub9ZyzO9XSydpELJPz1WUsp1rjAR6p2JF3b34k= +kubedb.dev/apimachinery v0.47.1-0.20240822044956-3da387889ca5/go.mod h1:VSzi3IpellQ8ZqtEu3FokfN6siZdG2AB87wPXv9Xh54= kubeops.dev/petset v0.0.5-0.20240603165102-e2d9decb8abe h1:uWyps3VIDFwGuL0yQa0eMGaLg4ofVwpy59U14Trxnz8= kubeops.dev/petset v0.0.5-0.20240603165102-e2d9decb8abe/go.mod h1:A15vh0r979NsvL65DTIZKWsa/NoX9VapHBAEw1ZsdYI= lukechampine.com/uint128 v1.1.1/go.mod h1:c4eWIwlEGaxC/+H1VguhU4PHXNWDCDMUlWdIWl2j1gk= diff --git a/vendor/kubedb.dev/apimachinery/apis/kubedb/v1/openapi_generated.go b/vendor/kubedb.dev/apimachinery/apis/kubedb/v1/openapi_generated.go index 55b4f47b7..56cf63f7a 100644 --- a/vendor/kubedb.dev/apimachinery/apis/kubedb/v1/openapi_generated.go +++ b/vendor/kubedb.dev/apimachinery/apis/kubedb/v1/openapi_generated.go @@ -29048,6 +29048,13 @@ func schema_apimachinery_apis_kubedb_v1_PgBouncerSpec(ref common.ReferenceCallba Ref: ref("kmodules.xyz/client-go/api/v1.HealthCheckSpec"), }, }, + "halted": { + SchemaProps: spec.SchemaProps{ + Description: "Indicates that the database is halted and all offshoot Kubernetes resources are deleted.", + Type: []string{"boolean"}, + Format: "", + }, + }, }, Required: []string{"version"}, }, @@ -29803,6 +29810,13 @@ func schema_apimachinery_apis_kubedb_v1_ProxySQLSpec(ref common.ReferenceCallbac Ref: ref("kmodules.xyz/client-go/api/v1.HealthCheckSpec"), }, }, + "halted": { + SchemaProps: spec.SchemaProps{ + Description: "Indicates that the database is halted and all offshoot Kubernetes resources except PVCs are deleted.", + Type: []string{"boolean"}, + Format: "", + }, + }, }, Required: []string{"version"}, }, diff --git a/vendor/kubedb.dev/apimachinery/apis/kubedb/v1/pgbouncer_helpers.go b/vendor/kubedb.dev/apimachinery/apis/kubedb/v1/pgbouncer_helpers.go index 5b01205dc..b64f8d081 100644 --- a/vendor/kubedb.dev/apimachinery/apis/kubedb/v1/pgbouncer_helpers.go +++ b/vendor/kubedb.dev/apimachinery/apis/kubedb/v1/pgbouncer_helpers.go @@ -197,7 +197,7 @@ func (p *PgBouncer) SetDefaults(pgBouncerVersion *catalog.PgBouncerVersion, uses } if p.Spec.DeletionPolicy == "" { - p.Spec.DeletionPolicy = PgBouncerDeletionPolicyDelete + p.Spec.DeletionPolicy = DeletionPolicyDelete } p.setConnectionPoolConfigDefaults() diff --git a/vendor/kubedb.dev/apimachinery/apis/kubedb/v1/pgbouncer_types.go b/vendor/kubedb.dev/apimachinery/apis/kubedb/v1/pgbouncer_types.go index d58ff1d54..30dbe2bfe 100644 --- a/vendor/kubedb.dev/apimachinery/apis/kubedb/v1/pgbouncer_types.go +++ b/vendor/kubedb.dev/apimachinery/apis/kubedb/v1/pgbouncer_types.go @@ -100,12 +100,16 @@ type PgBouncerSpec struct { // DeletionPolicy controls the delete operation for database // +optional - DeletionPolicy PgBouncerDeletionPolicy `json:"deletionPolicy,omitempty"` + DeletionPolicy DeletionPolicy `json:"deletionPolicy,omitempty"` // HealthChecker defines attributes of the health checker // +optional // +kubebuilder:default={periodSeconds: 10, timeoutSeconds: 10, failureThreshold: 1} HealthChecker kmapi.HealthCheckSpec `json:"healthChecker"` + + // Indicates that the database is halted and all offshoot Kubernetes resources are deleted. + // +optional + Halted bool `json:"halted,omitempty"` } // +kubebuilder:validation:Enum=server;archiver;metrics-exporter @@ -262,15 +266,3 @@ const ( // to Send the client cert and client key certificate for authentication. PgBouncerClientAuthModeCert PgBouncerClientAuthMode = "cert" ) - -// +kubebuilder:validation:Enum=Delete;WipeOut;DoNotTerminate -type PgBouncerDeletionPolicy string - -const ( - // Deletes database pods, service, pvcs but leave the stash backup data intact. - PgBouncerDeletionPolicyDelete PgBouncerDeletionPolicy = "Delete" - // Deletes database pods, service, pvcs and stash backup data. - PgBouncerDeletionPolicyWipeOut PgBouncerDeletionPolicy = "WipeOut" - // Rejects attempt to delete database using ValidationWebhook. - PgBouncerDeletionPolicyDoNotTerminate PgBouncerDeletionPolicy = "DoNotTerminate" -) diff --git a/vendor/kubedb.dev/apimachinery/apis/kubedb/v1/proxysql_types.go b/vendor/kubedb.dev/apimachinery/apis/kubedb/v1/proxysql_types.go index 2ac2b37e5..985c248f8 100644 --- a/vendor/kubedb.dev/apimachinery/apis/kubedb/v1/proxysql_types.go +++ b/vendor/kubedb.dev/apimachinery/apis/kubedb/v1/proxysql_types.go @@ -173,6 +173,10 @@ type ProxySQLSpec struct { // +optional // +kubebuilder:default={periodSeconds: 10, timeoutSeconds: 10, failureThreshold: 1} HealthChecker kmapi.HealthCheckSpec `json:"healthChecker"` + + // Indicates that the database is halted and all offshoot Kubernetes resources except PVCs are deleted. + // +optional + Halted bool `json:"halted,omitempty"` } // +kubebuilder:validation:Enum=server;archiver;metrics-exporter diff --git a/vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/conversion.go b/vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/conversion.go index fd347d990..983900d41 100644 --- a/vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/conversion.go +++ b/vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/conversion.go @@ -1001,7 +1001,7 @@ func Convert_v1alpha2_PgBouncerSpec_To_v1_PgBouncerSpec(in *PgBouncerSpec, out * out.Monitor = (*monitoringagentapiapiv1.AgentSpec)(unsafe.Pointer(in.Monitor)) out.SSLMode = v1.PgBouncerSSLMode(in.SSLMode) out.TLS = (*clientgoapiv1.TLSConfig)(unsafe.Pointer(in.TLS)) - out.DeletionPolicy = v1.PgBouncerDeletionPolicy(in.TerminationPolicy) + out.DeletionPolicy = v1.DeletionPolicy(in.TerminationPolicy) out.HealthChecker = in.HealthChecker return nil } diff --git a/vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/openapi_generated.go b/vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/openapi_generated.go index c9ff26270..a2480347a 100644 --- a/vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/openapi_generated.go +++ b/vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/openapi_generated.go @@ -31437,6 +31437,13 @@ func schema_apimachinery_apis_kubedb_v1alpha2_PgBouncerSpec(ref common.Reference Ref: ref("kmodules.xyz/client-go/api/v1.HealthCheckSpec"), }, }, + "halted": { + SchemaProps: spec.SchemaProps{ + Description: "Indicates that the database is halted and all offshoot Kubernetes resources are deleted.", + Type: []string{"boolean"}, + Format: "", + }, + }, }, Required: []string{"version"}, }, @@ -32498,6 +32505,13 @@ func schema_apimachinery_apis_kubedb_v1alpha2_ProxySQLSpec(ref common.ReferenceC Ref: ref("kmodules.xyz/client-go/api/v1.HealthCheckSpec"), }, }, + "halted": { + SchemaProps: spec.SchemaProps{ + Description: "Indicates that the database is halted and all offshoot Kubernetes resources except PVCs are deleted.", + Type: []string{"boolean"}, + Format: "", + }, + }, }, Required: []string{"version"}, }, diff --git a/vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/pgbouncer_types.go b/vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/pgbouncer_types.go index f618d4725..095e99cff 100644 --- a/vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/pgbouncer_types.go +++ b/vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/pgbouncer_types.go @@ -105,6 +105,10 @@ type PgBouncerSpec struct { // +optional // +kubebuilder:default={periodSeconds: 10, timeoutSeconds: 10, failureThreshold: 1} HealthChecker kmapi.HealthCheckSpec `json:"healthChecker"` + + // Indicates that the database is halted and all offshoot Kubernetes resources are deleted. + // +optional + Halted bool `json:"halted,omitempty"` } // +kubebuilder:validation:Enum=server;archiver;metrics-exporter @@ -262,10 +266,12 @@ const ( PgBouncerClientAuthModeCert PgBouncerClientAuthMode = "cert" ) -// +kubebuilder:validation:Enum=Delete;WipeOut;DoNotTerminate +// +kubebuilder:validation:Enum=Halt;Delete;WipeOut;DoNotTerminate type PgBouncerTerminationPolicy string const ( + // Deletes database pods, service but leave the PVCs and stash backup data intact. + PgBouncerDeletionPolicyHalt PgBouncerTerminationPolicy = "Halt" // Deletes database pods, service, pvcs but leave the stash backup data intact. PgBouncerTerminationPolicyDelete PgBouncerTerminationPolicy = "Delete" // Deletes database pods, service, pvcs and stash backup data. diff --git a/vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/proxysql_types.go b/vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/proxysql_types.go index a85495151..9a196ce2a 100644 --- a/vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/proxysql_types.go +++ b/vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/proxysql_types.go @@ -172,6 +172,10 @@ type ProxySQLSpec struct { // +optional // +kubebuilder:default={periodSeconds: 10, timeoutSeconds: 10, failureThreshold: 1} HealthChecker kmapi.HealthCheckSpec `json:"healthChecker"` + + // Indicates that the database is halted and all offshoot Kubernetes resources except PVCs are deleted. + // +optional + Halted bool `json:"halted,omitempty"` } // +kubebuilder:validation:Enum=server;archiver;metrics-exporter diff --git a/vendor/kubedb.dev/apimachinery/crds/kubedb.com_pgbouncers.yaml b/vendor/kubedb.dev/apimachinery/crds/kubedb.com_pgbouncers.yaml index 5bee45471..4d74cf13b 100644 --- a/vendor/kubedb.dev/apimachinery/crds/kubedb.com_pgbouncers.yaml +++ b/vendor/kubedb.dev/apimachinery/crds/kubedb.com_pgbouncers.yaml @@ -147,10 +147,13 @@ spec: type: object deletionPolicy: enum: + - Halt - Delete - WipeOut - DoNotTerminate type: string + halted: + type: boolean healthChecker: default: failureThreshold: 1 @@ -3790,6 +3793,8 @@ spec: - databaseName - databaseRef type: object + halted: + type: boolean healthChecker: default: failureThreshold: 1 @@ -6729,6 +6734,7 @@ spec: type: string terminationPolicy: enum: + - Halt - Delete - WipeOut - DoNotTerminate diff --git a/vendor/kubedb.dev/apimachinery/crds/kubedb.com_proxysqls.yaml b/vendor/kubedb.dev/apimachinery/crds/kubedb.com_proxysqls.yaml index 13cf813a4..c5941a6f6 100644 --- a/vendor/kubedb.dev/apimachinery/crds/kubedb.com_proxysqls.yaml +++ b/vendor/kubedb.dev/apimachinery/crds/kubedb.com_proxysqls.yaml @@ -83,6 +83,8 @@ spec: - WipeOut - DoNotTerminate type: string + halted: + type: boolean healthChecker: default: failureThreshold: 1 @@ -3701,6 +3703,8 @@ spec: type: string type: object x-kubernetes-map-type: atomic + halted: + type: boolean healthChecker: default: failureThreshold: 1 diff --git a/vendor/kubedb.dev/apimachinery/crds/ops.kubedb.com_singlestoreopsrequests.yaml b/vendor/kubedb.dev/apimachinery/crds/ops.kubedb.com_singlestoreopsrequests.yaml index 58964896f..224eff87e 100644 --- a/vendor/kubedb.dev/apimachinery/crds/ops.kubedb.com_singlestoreopsrequests.yaml +++ b/vendor/kubedb.dev/apimachinery/crds/ops.kubedb.com_singlestoreopsrequests.yaml @@ -106,17 +106,139 @@ spec: type: string type: object x-kubernetes-map-type: atomic + horizontalScaling: + properties: + aggregator: + format: int32 + type: integer + leaf: + format: int32 + type: integer + type: object restart: type: object timeout: type: string + tls: + properties: + certificates: + items: + properties: + alias: + type: string + dnsNames: + items: + type: string + type: array + duration: + type: string + emailAddresses: + items: + type: string + type: array + ipAddresses: + items: + type: string + type: array + issuerRef: + properties: + apiGroup: + type: string + kind: + type: string + name: + type: string + required: + - kind + - name + type: object + x-kubernetes-map-type: atomic + privateKey: + properties: + encoding: + enum: + - PKCS1 + - PKCS8 + type: string + type: object + renewBefore: + type: string + secretName: + type: string + subject: + properties: + countries: + items: + type: string + type: array + localities: + items: + type: string + type: array + organizationalUnits: + items: + type: string + type: array + organizations: + items: + type: string + type: array + postalCodes: + items: + type: string + type: array + provinces: + items: + type: string + type: array + serialNumber: + type: string + streetAddresses: + items: + type: string + type: array + type: object + uris: + items: + type: string + type: array + required: + - alias + type: object + type: array + issuerRef: + properties: + apiGroup: + type: string + kind: + type: string + name: + type: string + required: + - kind + - name + type: object + x-kubernetes-map-type: atomic + remove: + type: boolean + rotateCertificates: + type: boolean + type: object type: enum: + - UpdateVersion + - HorizontalScaling - VerticalScaling - VolumeExpansion - Restart - Configuration + - ReconfigureTLS type: string + updateVersion: + properties: + targetVersion: + type: string + type: object verticalScaling: properties: aggregator: diff --git a/vendor/modules.txt b/vendor/modules.txt index 33912fabb..46c1405fc 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -966,7 +966,7 @@ github.com/pierrec/lz4/v4/internal/xxh32 # github.com/pkg/errors v0.9.1 ## explicit github.com/pkg/errors -# github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.75.1 +# github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.75.2 ## explicit; go 1.22.0 github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1 @@ -1534,7 +1534,7 @@ k8s.io/utils/trace # kmodules.xyz/apiversion v0.2.0 ## explicit; go 1.14 kmodules.xyz/apiversion -# kmodules.xyz/client-go v0.30.9 +# kmodules.xyz/client-go v0.30.13 ## explicit; go 1.22.0 kmodules.xyz/client-go kmodules.xyz/client-go/api/v1 @@ -1561,7 +1561,7 @@ kmodules.xyz/offshoot-api/api/v1 kmodules.xyz/offshoot-api/api/v1/conversion kmodules.xyz/offshoot-api/api/v2 kmodules.xyz/offshoot-api/util -# kubedb.dev/apimachinery v0.47.0-rc.2.0.20240815122515-e51cacc5e58f +# kubedb.dev/apimachinery v0.47.1-0.20240822044956-3da387889ca5 ## explicit; go 1.22.1 kubedb.dev/apimachinery/apis kubedb.dev/apimachinery/apis/catalog