From 158e95ed80733655a0aec8b651705c2a3990fea9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 14 Dec 2023 08:51:43 +0000 Subject: [PATCH] build(deps): bump github.com/aiven/go-api-schemas from 1.47.0 to 1.48.0 (#567) --- CHANGELOG.md | 6 ++++++ api/v1alpha1/userconfig/service/pg/pg.go | 20 ++++++++++++------- .../templates/aiven.io_postgresqls.yaml | 16 +++++++++------ config/crd/bases/aiven.io_postgresqls.yaml | 16 +++++++++------ docs/docs/api-reference/postgresql.md | 14 ++++++------- go.mod | 2 +- go.sum | 4 ++-- 7 files changed, 49 insertions(+), 29 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5f10849b..81b14a4f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,12 @@ ## [MAJOR.MINOR.PATCH] - YYYY-MM-DD +- Change `PostgreSQL` field `userConfig.pg_qualstats.enabled`: deprecated +- Change `PostgreSQL` field `userConfig.pg_qualstats.min_err_estimate_num`: deprecated +- Change `PostgreSQL` field `userConfig.pg_qualstats.min_err_estimate_ratio`: deprecated +- Change `PostgreSQL` field `userConfig.pg_qualstats.track_constants`: deprecated +- Change `PostgreSQL` field `userConfig.pg_qualstats.track_pg_catalog`: deprecated + ## v0.16.1 - YYYY-MM-DD - Check VPC for running services before deletion diff --git a/api/v1alpha1/userconfig/service/pg/pg.go b/api/v1alpha1/userconfig/service/pg/pg.go index a4c2eac4..d8667b29 100644 --- a/api/v1alpha1/userconfig/service/pg/pg.go +++ b/api/v1alpha1/userconfig/service/pg/pg.go @@ -283,23 +283,28 @@ type Pg struct { WalWriterDelay *int `groups:"create,update" json:"wal_writer_delay,omitempty"` } -// System-wide settings for the pg_qualstats extension +// Deprecated. System-wide settings for the pg_qualstats extension type PgQualstats struct { - // Enable / Disable pg_qualstats + // +kubebuilder:deprecatedversion:warning="enabled is deprecated" + // Deprecated. Enable / Disable pg_qualstats Enabled *bool `groups:"create,update" json:"enabled,omitempty"` // +kubebuilder:validation:Minimum=0 - // Error estimation num threshold to save quals + // +kubebuilder:deprecatedversion:warning="min_err_estimate_num is deprecated" + // Deprecated. Error estimation num threshold to save quals MinErrEstimateNum *int `groups:"create,update" json:"min_err_estimate_num,omitempty"` // +kubebuilder:validation:Minimum=0 - // Error estimation ratio threshold to save quals + // +kubebuilder:deprecatedversion:warning="min_err_estimate_ratio is deprecated" + // Deprecated. Error estimation ratio threshold to save quals MinErrEstimateRatio *int `groups:"create,update" json:"min_err_estimate_ratio,omitempty"` - // Enable / Disable pg_qualstats constants tracking + // +kubebuilder:deprecatedversion:warning="track_constants is deprecated" + // Deprecated. Enable / Disable pg_qualstats constants tracking TrackConstants *bool `groups:"create,update" json:"track_constants,omitempty"` - // Track quals on system catalogs too. + // +kubebuilder:deprecatedversion:warning="track_pg_catalog is deprecated" + // Deprecated. Track quals on system catalogs too. TrackPgCatalog *bool `groups:"create,update" json:"track_pg_catalog,omitempty"` } @@ -438,7 +443,8 @@ type PgUserConfig struct { // postgresql.conf configuration values Pg *Pg `groups:"create,update" json:"pg,omitempty"` - // System-wide settings for the pg_qualstats extension + // +kubebuilder:deprecatedversion:warning="pg_qualstats is deprecated" + // Deprecated. System-wide settings for the pg_qualstats extension PgQualstats *PgQualstats `groups:"create,update" json:"pg_qualstats,omitempty"` // Should the service which is being forked be a read replica (deprecated, use read_replica service integration instead). diff --git a/charts/aiven-operator-crds/templates/aiven.io_postgresqls.yaml b/charts/aiven-operator-crds/templates/aiven.io_postgresqls.yaml index 1dfc0fe2..d22d4d69 100644 --- a/charts/aiven-operator-crds/templates/aiven.io_postgresqls.yaml +++ b/charts/aiven-operator-crds/templates/aiven.io_postgresqls.yaml @@ -624,24 +624,28 @@ spec: type: integer type: object pg_qualstats: - description: System-wide settings for the pg_qualstats extension + description: Deprecated. System-wide settings for the pg_qualstats + extension properties: enabled: - description: Enable / Disable pg_qualstats + description: Deprecated. Enable / Disable pg_qualstats type: boolean min_err_estimate_num: - description: Error estimation num threshold to save quals + description: Deprecated. Error estimation num threshold to + save quals minimum: 0 type: integer min_err_estimate_ratio: - description: Error estimation ratio threshold to save quals + description: Deprecated. Error estimation ratio threshold + to save quals minimum: 0 type: integer track_constants: - description: Enable / Disable pg_qualstats constants tracking + description: Deprecated. Enable / Disable pg_qualstats constants + tracking type: boolean track_pg_catalog: - description: Track quals on system catalogs too. + description: Deprecated. Track quals on system catalogs too. type: boolean type: object pg_read_replica: diff --git a/config/crd/bases/aiven.io_postgresqls.yaml b/config/crd/bases/aiven.io_postgresqls.yaml index 1dfc0fe2..d22d4d69 100644 --- a/config/crd/bases/aiven.io_postgresqls.yaml +++ b/config/crd/bases/aiven.io_postgresqls.yaml @@ -624,24 +624,28 @@ spec: type: integer type: object pg_qualstats: - description: System-wide settings for the pg_qualstats extension + description: Deprecated. System-wide settings for the pg_qualstats + extension properties: enabled: - description: Enable / Disable pg_qualstats + description: Deprecated. Enable / Disable pg_qualstats type: boolean min_err_estimate_num: - description: Error estimation num threshold to save quals + description: Deprecated. Error estimation num threshold to + save quals minimum: 0 type: integer min_err_estimate_ratio: - description: Error estimation ratio threshold to save quals + description: Deprecated. Error estimation ratio threshold + to save quals minimum: 0 type: integer track_constants: - description: Enable / Disable pg_qualstats constants tracking + description: Deprecated. Enable / Disable pg_qualstats constants + tracking type: boolean track_pg_catalog: - description: Track quals on system catalogs too. + description: Deprecated. Track quals on system catalogs too. type: boolean type: object pg_read_replica: diff --git a/docs/docs/api-reference/postgresql.md b/docs/docs/api-reference/postgresql.md index 82520699..3ee32409 100644 --- a/docs/docs/api-reference/postgresql.md +++ b/docs/docs/api-reference/postgresql.md @@ -139,7 +139,7 @@ PostgreSQL specific user configuration options. - [`ip_filter`](#spec.userConfig.ip_filter-property){: name='spec.userConfig.ip_filter-property'} (array of objects, MaxItems: 1024). Allow incoming connections from CIDR address block, e.g. `10.20.0.0/16`. See below for [nested schema](#spec.userConfig.ip_filter). - [`migration`](#spec.userConfig.migration-property){: name='spec.userConfig.migration-property'} (object). Migrate data from existing server. See below for [nested schema](#spec.userConfig.migration). - [`pg`](#spec.userConfig.pg-property){: name='spec.userConfig.pg-property'} (object). postgresql.conf configuration values. See below for [nested schema](#spec.userConfig.pg). -- [`pg_qualstats`](#spec.userConfig.pg_qualstats-property){: name='spec.userConfig.pg_qualstats-property'} (object). System-wide settings for the pg_qualstats extension. See below for [nested schema](#spec.userConfig.pg_qualstats). +- [`pg_qualstats`](#spec.userConfig.pg_qualstats-property){: name='spec.userConfig.pg_qualstats-property'} (object). Deprecated. System-wide settings for the pg_qualstats extension. See below for [nested schema](#spec.userConfig.pg_qualstats). - [`pg_read_replica`](#spec.userConfig.pg_read_replica-property){: name='spec.userConfig.pg_read_replica-property'} (boolean). Should the service which is being forked be a read replica (deprecated, use read_replica service integration instead). - [`pg_service_to_fork_from`](#spec.userConfig.pg_service_to_fork_from-property){: name='spec.userConfig.pg_service_to_fork_from-property'} (string, Immutable, MaxLength: 64). Name of the PG Service from which to fork (deprecated, use service_to_fork_from). This has effect only when a new service is being created. - [`pg_stat_monitor_enable`](#spec.userConfig.pg_stat_monitor_enable-property){: name='spec.userConfig.pg_stat_monitor_enable-property'} (boolean). Enable the pg_stat_monitor extension. Enabling this extension will cause the cluster to be restarted.When this extension is enabled, pg_stat_statements results for utility commands are unreliable. @@ -256,15 +256,15 @@ postgresql.conf configuration values. _Appears on [`spec.userConfig`](#spec.userConfig)._ -System-wide settings for the pg_qualstats extension. +Deprecated. System-wide settings for the pg_qualstats extension. **Optional** -- [`enabled`](#spec.userConfig.pg_qualstats.enabled-property){: name='spec.userConfig.pg_qualstats.enabled-property'} (boolean). Enable / Disable pg_qualstats. -- [`min_err_estimate_num`](#spec.userConfig.pg_qualstats.min_err_estimate_num-property){: name='spec.userConfig.pg_qualstats.min_err_estimate_num-property'} (integer, Minimum: 0). Error estimation num threshold to save quals. -- [`min_err_estimate_ratio`](#spec.userConfig.pg_qualstats.min_err_estimate_ratio-property){: name='spec.userConfig.pg_qualstats.min_err_estimate_ratio-property'} (integer, Minimum: 0). Error estimation ratio threshold to save quals. -- [`track_constants`](#spec.userConfig.pg_qualstats.track_constants-property){: name='spec.userConfig.pg_qualstats.track_constants-property'} (boolean). Enable / Disable pg_qualstats constants tracking. -- [`track_pg_catalog`](#spec.userConfig.pg_qualstats.track_pg_catalog-property){: name='spec.userConfig.pg_qualstats.track_pg_catalog-property'} (boolean). Track quals on system catalogs too. +- [`enabled`](#spec.userConfig.pg_qualstats.enabled-property){: name='spec.userConfig.pg_qualstats.enabled-property'} (boolean). Deprecated. Enable / Disable pg_qualstats. +- [`min_err_estimate_num`](#spec.userConfig.pg_qualstats.min_err_estimate_num-property){: name='spec.userConfig.pg_qualstats.min_err_estimate_num-property'} (integer, Minimum: 0). Deprecated. Error estimation num threshold to save quals. +- [`min_err_estimate_ratio`](#spec.userConfig.pg_qualstats.min_err_estimate_ratio-property){: name='spec.userConfig.pg_qualstats.min_err_estimate_ratio-property'} (integer, Minimum: 0). Deprecated. Error estimation ratio threshold to save quals. +- [`track_constants`](#spec.userConfig.pg_qualstats.track_constants-property){: name='spec.userConfig.pg_qualstats.track_constants-property'} (boolean). Deprecated. Enable / Disable pg_qualstats constants tracking. +- [`track_pg_catalog`](#spec.userConfig.pg_qualstats.track_pg_catalog-property){: name='spec.userConfig.pg_qualstats.track_pg_catalog-property'} (boolean). Deprecated. Track quals on system catalogs too. ### pgbouncer {: #spec.userConfig.pgbouncer } diff --git a/go.mod b/go.mod index b804fb86..259aa098 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.21 require ( github.com/aiven/aiven-go-client/v2 v2.4.0 - github.com/aiven/go-api-schemas v1.47.0 + github.com/aiven/go-api-schemas v1.48.0 github.com/dave/jennifer v1.7.0 github.com/docker/go-units v0.5.0 github.com/ghodss/yaml v1.0.0 diff --git a/go.sum b/go.sum index e2027c68..a1e3821b 100644 --- a/go.sum +++ b/go.sum @@ -65,8 +65,8 @@ github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= github.com/aiven/aiven-go-client/v2 v2.4.0 h1:vBBKgYEYyFZp/f+vcdxTkWnJ2b09Wlto3kwEzj5uvBQ= github.com/aiven/aiven-go-client/v2 v2.4.0/go.mod h1:x0xhzxWEKAwKv0xY5FvECiI6tesWshcPHvjwl0B/1SU= -github.com/aiven/go-api-schemas v1.47.0 h1:TWzXlDrhh2SO6Xi+FSpgFT1YFJIJ+Qkkq15XcvdfPzE= -github.com/aiven/go-api-schemas v1.47.0/go.mod h1:/bPxBUHza/2Aeer6hIIdB++GxKiw9K1KCBtRa2rtZ5I= +github.com/aiven/go-api-schemas v1.48.0 h1:igci7tl0cDG6CSCrfyquOVGBs0blWRbsZUxkLsD+EmI= +github.com/aiven/go-api-schemas v1.48.0/go.mod h1:/bPxBUHza/2Aeer6hIIdB++GxKiw9K1KCBtRa2rtZ5I= github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=