From db67a7a8333edd877803640ea35bd57fdf22da3b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 2 Sep 2024 01:01:40 +0000 Subject: [PATCH 1/2] build(deps): bump the main group with 2 updates Bumps the main group with 2 updates: [github.com/ClickHouse/clickhouse-go/v2](https://github.com/ClickHouse/clickhouse-go) and [github.com/aiven/go-api-schemas](https://github.com/aiven/go-api-schemas). Updates `github.com/ClickHouse/clickhouse-go/v2` from 2.28.0 to 2.28.2 - [Release notes](https://github.com/ClickHouse/clickhouse-go/releases) - [Changelog](https://github.com/ClickHouse/clickhouse-go/blob/main/CHANGELOG.md) - [Commits](https://github.com/ClickHouse/clickhouse-go/compare/v2.28.0...v2.28.2) Updates `github.com/aiven/go-api-schemas` from 1.83.0 to 1.85.0 - [Release notes](https://github.com/aiven/go-api-schemas/releases) - [Commits](https://github.com/aiven/go-api-schemas/compare/v1.83.0...v1.85.0) --- updated-dependencies: - dependency-name: github.com/ClickHouse/clickhouse-go/v2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: main - dependency-name: github.com/aiven/go-api-schemas dependency-type: direct:production update-type: version-update:semver-minor dependency-group: main ... Signed-off-by: dependabot[bot] --- go.mod | 4 ++-- go.sum | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 2910730d..f0ed5b85 100644 --- a/go.mod +++ b/go.mod @@ -3,9 +3,9 @@ module github.com/aiven/aiven-operator go 1.22 require ( - github.com/ClickHouse/clickhouse-go/v2 v2.28.0 + github.com/ClickHouse/clickhouse-go/v2 v2.28.2 github.com/aiven/aiven-go-client/v2 v2.26.0 - github.com/aiven/go-api-schemas v1.83.0 + github.com/aiven/go-api-schemas v1.85.0 github.com/aiven/go-client-codegen v0.24.0 github.com/dave/jennifer v1.7.0 github.com/docker/go-units v0.5.0 diff --git a/go.sum b/go.sum index 5c1aa3f0..3a0f8a2b 100644 --- a/go.sum +++ b/go.sum @@ -35,12 +35,12 @@ github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/ClickHouse/ch-go v0.61.5 h1:zwR8QbYI0tsMiEcze/uIMK+Tz1D3XZXLdNrlaOpeEI4= github.com/ClickHouse/ch-go v0.61.5/go.mod h1:s1LJW/F/LcFs5HJnuogFMta50kKDO0lf9zzfrbl0RQg= -github.com/ClickHouse/clickhouse-go/v2 v2.28.0 h1:WKu05iotCR2ZKw9XKvhRgYFt4Ok92mqvpCR6hJiOKjw= -github.com/ClickHouse/clickhouse-go/v2 v2.28.0/go.mod h1:0U915l9qynE508ehh3ea9+UMGc7gZlAV+9W6pUZd7kk= +github.com/ClickHouse/clickhouse-go/v2 v2.28.2 h1:D/sPEJzPRptJg6aaeAmm/ByDN9H9WgMGrgEl26QH1k8= +github.com/ClickHouse/clickhouse-go/v2 v2.28.2/go.mod h1:PQfZvFzU7TYkY68eCjc8Jq8M3HXC4hMnUmO0ZtVGkaM= github.com/aiven/aiven-go-client/v2 v2.26.0 h1:1dBlF0BULbPsRXEEmcKs71AE3VZ+AYt5zv05LO/b8O4= github.com/aiven/aiven-go-client/v2 v2.26.0/go.mod h1:KdHfLIlIRZIfCSEBd39j1Q81jlSb6Nd+oCQKqERfnuA= -github.com/aiven/go-api-schemas v1.83.0 h1:qqJgCfd2bAbAN7CJr+oBKLYggn0+0bDsBzitFCNlvzg= -github.com/aiven/go-api-schemas v1.83.0/go.mod h1:/F7Rr8UVErsRxhgGN7CSo+Ac/uAg/OiAVCEKCfm3VAo= +github.com/aiven/go-api-schemas v1.85.0 h1:wpTCQWjTLKQvVQq184u6Ji0ZksDZkNPqS6f6zrZ+nGU= +github.com/aiven/go-api-schemas v1.85.0/go.mod h1:/F7Rr8UVErsRxhgGN7CSo+Ac/uAg/OiAVCEKCfm3VAo= github.com/aiven/go-client-codegen v0.24.0 h1:qWw7F1aNDZnvb28jECv8MkrH+a8aaI6fZRcar5lVt/A= github.com/aiven/go-client-codegen v0.24.0/go.mod h1:snetvsq1F5P49/rGofmdBGYBk19LpdNV6NWoupCAJ4s= github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= From 5df8a939861efd2a68e60e20e2f23d9da4d92843 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Mon, 2 Sep 2024 01:02:46 +0000 Subject: [PATCH 2/2] chore(userconfigs): generate files --- CHANGELOG.md | 4 ++++ api/v1alpha1/userconfig/service/kafka/kafka.go | 3 +++ .../service/kafka/zz_generated.deepcopy.go | 5 +++++ .../service/kafka_connect/kafka_connect.go | 3 +++ .../kafka_connect/zz_generated.deepcopy.go | 5 +++++ api/v1alpha1/userconfig/service/redis/redis.go | 10 ++++++++++ .../service/redis/zz_generated.deepcopy.go | 10 ++++++++++ .../templates/aiven.io_kafkaconnects.yaml | 7 +++++++ .../templates/aiven.io_kafkas.yaml | 7 +++++++ .../templates/aiven.io_redis.yaml | 16 ++++++++++++++++ config/crd/bases/aiven.io_kafkaconnects.yaml | 7 +++++++ config/crd/bases/aiven.io_kafkas.yaml | 7 +++++++ config/crd/bases/aiven.io_redis.yaml | 16 ++++++++++++++++ docs/docs/api-reference/kafka.md | 1 + docs/docs/api-reference/kafkaconnect.md | 1 + docs/docs/api-reference/redis.md | 2 ++ 16 files changed, 104 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index dc61cc0b..b81c4ce5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -26,6 +26,10 @@ - Change `OpenSearch` field `userConfig.openid.connect_url`: pattern `^[^\r\n]*$` - Change `OpenSearch` field `userConfig.opensearch.script_max_compilations_rate`: pattern `^[^\r\n]*$` - Change `OpenSearch` field `userConfig.saml.idp_metadata_url`: pattern `^[^\r\n]*$` +- Add `Redis` field `userConfig.backup_hour`, type `integer`: The hour of day (in UTC) when backup for + the service is started +- Add `Redis` field `userConfig.backup_minute`, type `integer`: The minute of an hour when backup for + the service is started ## v0.24.0 - 2024-07-16 diff --git a/api/v1alpha1/userconfig/service/kafka/kafka.go b/api/v1alpha1/userconfig/service/kafka/kafka.go index c09b376b..e033ce35 100644 --- a/api/v1alpha1/userconfig/service/kafka/kafka.go +++ b/api/v1alpha1/userconfig/service/kafka/kafka.go @@ -352,6 +352,9 @@ type Vault struct { // KV Secrets Engine version of the Vault server instance EngineVersion *int `groups:"create,update" json:"engine_version,omitempty"` + // Prefix path depth of the secrets Engine. Default is 1. If the secrets engine path has more than one segment it has to be increased to the number of segments. + PrefixPathDepth *int `groups:"create,update" json:"prefix_path_depth,omitempty"` + // +kubebuilder:validation:MaxLength=256 // Token used to authenticate with vault and auth method `token`. Token *string `groups:"create,update" json:"token,omitempty"` diff --git a/api/v1alpha1/userconfig/service/kafka/zz_generated.deepcopy.go b/api/v1alpha1/userconfig/service/kafka/zz_generated.deepcopy.go index 09380f9d..16f48614 100644 --- a/api/v1alpha1/userconfig/service/kafka/zz_generated.deepcopy.go +++ b/api/v1alpha1/userconfig/service/kafka/zz_generated.deepcopy.go @@ -906,6 +906,11 @@ func (in *Vault) DeepCopyInto(out *Vault) { *out = new(int) **out = **in } + if in.PrefixPathDepth != nil { + in, out := &in.PrefixPathDepth, &out.PrefixPathDepth + *out = new(int) + **out = **in + } if in.Token != nil { in, out := &in.Token, &out.Token *out = new(string) diff --git a/api/v1alpha1/userconfig/service/kafka_connect/kafka_connect.go b/api/v1alpha1/userconfig/service/kafka_connect/kafka_connect.go index 2fbf3a24..063dec8e 100644 --- a/api/v1alpha1/userconfig/service/kafka_connect/kafka_connect.go +++ b/api/v1alpha1/userconfig/service/kafka_connect/kafka_connect.go @@ -157,6 +157,9 @@ type Vault struct { // KV Secrets Engine version of the Vault server instance EngineVersion *int `groups:"create,update" json:"engine_version,omitempty"` + // Prefix path depth of the secrets Engine. Default is 1. If the secrets engine path has more than one segment it has to be increased to the number of segments. + PrefixPathDepth *int `groups:"create,update" json:"prefix_path_depth,omitempty"` + // +kubebuilder:validation:MaxLength=256 // Token used to authenticate with vault and auth method `token`. Token *string `groups:"create,update" json:"token,omitempty"` diff --git a/api/v1alpha1/userconfig/service/kafka_connect/zz_generated.deepcopy.go b/api/v1alpha1/userconfig/service/kafka_connect/zz_generated.deepcopy.go index 45a6cfa6..efcd39b9 100644 --- a/api/v1alpha1/userconfig/service/kafka_connect/zz_generated.deepcopy.go +++ b/api/v1alpha1/userconfig/service/kafka_connect/zz_generated.deepcopy.go @@ -331,6 +331,11 @@ func (in *Vault) DeepCopyInto(out *Vault) { *out = new(int) **out = **in } + if in.PrefixPathDepth != nil { + in, out := &in.PrefixPathDepth, &out.PrefixPathDepth + *out = new(int) + **out = **in + } if in.Token != nil { in, out := &in.Token, &out.Token *out = new(string) diff --git a/api/v1alpha1/userconfig/service/redis/redis.go b/api/v1alpha1/userconfig/service/redis/redis.go index 026742cf..6b0f3bb5 100644 --- a/api/v1alpha1/userconfig/service/redis/redis.go +++ b/api/v1alpha1/userconfig/service/redis/redis.go @@ -84,6 +84,16 @@ type RedisUserConfig struct { // Additional Cloud Regions for Backup Replication AdditionalBackupRegions []string `groups:"create,update" json:"additional_backup_regions,omitempty"` + // +kubebuilder:validation:Minimum=0 + // +kubebuilder:validation:Maximum=23 + // The hour of day (in UTC) when backup for the service is started. New backup is only started if previous backup has already completed. + BackupHour *int `groups:"create,update" json:"backup_hour,omitempty"` + + // +kubebuilder:validation:Minimum=0 + // +kubebuilder:validation:Maximum=59 + // The minute of an hour when backup for the service is started. New backup is only started if previous backup has already completed. + BackupMinute *int `groups:"create,update" json:"backup_minute,omitempty"` + // +kubebuilder:validation:MaxItems=1024 // Allow incoming connections from CIDR address block, e.g. '10.20.0.0/16' IpFilter []*IpFilter `groups:"create,update" json:"ip_filter,omitempty"` diff --git a/api/v1alpha1/userconfig/service/redis/zz_generated.deepcopy.go b/api/v1alpha1/userconfig/service/redis/zz_generated.deepcopy.go index 106c62e9..3e5da7ef 100644 --- a/api/v1alpha1/userconfig/service/redis/zz_generated.deepcopy.go +++ b/api/v1alpha1/userconfig/service/redis/zz_generated.deepcopy.go @@ -159,6 +159,16 @@ func (in *RedisUserConfig) DeepCopyInto(out *RedisUserConfig) { *out = make([]string, len(*in)) copy(*out, *in) } + if in.BackupHour != nil { + in, out := &in.BackupHour, &out.BackupHour + *out = new(int) + **out = **in + } + if in.BackupMinute != nil { + in, out := &in.BackupMinute, &out.BackupMinute + *out = new(int) + **out = **in + } if in.IpFilter != nil { in, out := &in.IpFilter, &out.IpFilter *out = make([]*IpFilter, len(*in)) diff --git a/charts/aiven-operator-crds/templates/aiven.io_kafkaconnects.yaml b/charts/aiven-operator-crds/templates/aiven.io_kafkaconnects.yaml index d416cf46..0414c140 100644 --- a/charts/aiven-operator-crds/templates/aiven.io_kafkaconnects.yaml +++ b/charts/aiven-operator-crds/templates/aiven.io_kafkaconnects.yaml @@ -467,6 +467,13 @@ spec: - 1 - 2 type: integer + prefix_path_depth: + description: + Prefix path depth of the secrets Engine. + Default is 1. If the secrets engine path has more + than one segment it has to be increased to the number + of segments. + type: integer token: description: Token used to authenticate with vault and diff --git a/charts/aiven-operator-crds/templates/aiven.io_kafkas.yaml b/charts/aiven-operator-crds/templates/aiven.io_kafkas.yaml index 3782a8a2..81af8eeb 100644 --- a/charts/aiven-operator-crds/templates/aiven.io_kafkas.yaml +++ b/charts/aiven-operator-crds/templates/aiven.io_kafkas.yaml @@ -867,6 +867,13 @@ spec: - 1 - 2 type: integer + prefix_path_depth: + description: + Prefix path depth of the secrets Engine. + Default is 1. If the secrets engine path has more + than one segment it has to be increased to the number + of segments. + type: integer token: description: Token used to authenticate with vault and diff --git a/charts/aiven-operator-crds/templates/aiven.io_redis.yaml b/charts/aiven-operator-crds/templates/aiven.io_redis.yaml index db2c278e..dbf2f828 100644 --- a/charts/aiven-operator-crds/templates/aiven.io_redis.yaml +++ b/charts/aiven-operator-crds/templates/aiven.io_redis.yaml @@ -230,6 +230,22 @@ spec: type: string maxItems: 1 type: array + backup_hour: + description: + The hour of day (in UTC) when backup for the service + is started. New backup is only started if previous backup has + already completed. + maximum: 23 + minimum: 0 + type: integer + backup_minute: + description: + The minute of an hour when backup for the service + is started. New backup is only started if previous backup has + already completed. + maximum: 59 + minimum: 0 + type: integer ip_filter: description: Allow incoming connections from CIDR address block, diff --git a/config/crd/bases/aiven.io_kafkaconnects.yaml b/config/crd/bases/aiven.io_kafkaconnects.yaml index d416cf46..0414c140 100644 --- a/config/crd/bases/aiven.io_kafkaconnects.yaml +++ b/config/crd/bases/aiven.io_kafkaconnects.yaml @@ -467,6 +467,13 @@ spec: - 1 - 2 type: integer + prefix_path_depth: + description: + Prefix path depth of the secrets Engine. + Default is 1. If the secrets engine path has more + than one segment it has to be increased to the number + of segments. + type: integer token: description: Token used to authenticate with vault and diff --git a/config/crd/bases/aiven.io_kafkas.yaml b/config/crd/bases/aiven.io_kafkas.yaml index 3782a8a2..81af8eeb 100644 --- a/config/crd/bases/aiven.io_kafkas.yaml +++ b/config/crd/bases/aiven.io_kafkas.yaml @@ -867,6 +867,13 @@ spec: - 1 - 2 type: integer + prefix_path_depth: + description: + Prefix path depth of the secrets Engine. + Default is 1. If the secrets engine path has more + than one segment it has to be increased to the number + of segments. + type: integer token: description: Token used to authenticate with vault and diff --git a/config/crd/bases/aiven.io_redis.yaml b/config/crd/bases/aiven.io_redis.yaml index db2c278e..dbf2f828 100644 --- a/config/crd/bases/aiven.io_redis.yaml +++ b/config/crd/bases/aiven.io_redis.yaml @@ -230,6 +230,22 @@ spec: type: string maxItems: 1 type: array + backup_hour: + description: + The hour of day (in UTC) when backup for the service + is started. New backup is only started if previous backup has + already completed. + maximum: 23 + minimum: 0 + type: integer + backup_minute: + description: + The minute of an hour when backup for the service + is started. New backup is only started if previous backup has + already completed. + maximum: 59 + minimum: 0 + type: integer ip_filter: description: Allow incoming connections from CIDR address block, diff --git a/docs/docs/api-reference/kafka.md b/docs/docs/api-reference/kafka.md index e7620f51..e35e068b 100644 --- a/docs/docs/api-reference/kafka.md +++ b/docs/docs/api-reference/kafka.md @@ -388,6 +388,7 @@ Vault Config for Secret Provider. **Optional** - [`engine_version`](#spec.userConfig.kafka_connect_secret_providers.vault.engine_version-property){: name='spec.userConfig.kafka_connect_secret_providers.vault.engine_version-property'} (integer, Enum: `1`, `2`). KV Secrets Engine version of the Vault server instance. +- [`prefix_path_depth`](#spec.userConfig.kafka_connect_secret_providers.vault.prefix_path_depth-property){: name='spec.userConfig.kafka_connect_secret_providers.vault.prefix_path_depth-property'} (integer). Prefix path depth of the secrets Engine. Default is 1. If the secrets engine path has more than one segment it has to be increased to the number of segments. - [`token`](#spec.userConfig.kafka_connect_secret_providers.vault.token-property){: name='spec.userConfig.kafka_connect_secret_providers.vault.token-property'} (string, MaxLength: 256). Token used to authenticate with vault and auth method `token`. ### kafka_rest_config {: #spec.userConfig.kafka_rest_config } diff --git a/docs/docs/api-reference/kafkaconnect.md b/docs/docs/api-reference/kafkaconnect.md index 6d2f501d..c50a6b5f 100644 --- a/docs/docs/api-reference/kafkaconnect.md +++ b/docs/docs/api-reference/kafkaconnect.md @@ -265,5 +265,6 @@ Vault Config for Secret Provider. **Optional** - [`engine_version`](#spec.userConfig.secret_providers.vault.engine_version-property){: name='spec.userConfig.secret_providers.vault.engine_version-property'} (integer, Enum: `1`, `2`). KV Secrets Engine version of the Vault server instance. +- [`prefix_path_depth`](#spec.userConfig.secret_providers.vault.prefix_path_depth-property){: name='spec.userConfig.secret_providers.vault.prefix_path_depth-property'} (integer). Prefix path depth of the secrets Engine. Default is 1. If the secrets engine path has more than one segment it has to be increased to the number of segments. - [`token`](#spec.userConfig.secret_providers.vault.token-property){: name='spec.userConfig.secret_providers.vault.token-property'} (string, MaxLength: 256). Token used to authenticate with vault and auth method `token`. diff --git a/docs/docs/api-reference/redis.md b/docs/docs/api-reference/redis.md index f68bf1b9..8bd077ef 100644 --- a/docs/docs/api-reference/redis.md +++ b/docs/docs/api-reference/redis.md @@ -195,6 +195,8 @@ Redis specific user configuration options. **Optional** - [`additional_backup_regions`](#spec.userConfig.additional_backup_regions-property){: name='spec.userConfig.additional_backup_regions-property'} (array of strings, MaxItems: 1). Additional Cloud Regions for Backup Replication. +- [`backup_hour`](#spec.userConfig.backup_hour-property){: name='spec.userConfig.backup_hour-property'} (integer, Minimum: 0, Maximum: 23). The hour of day (in UTC) when backup for the service is started. New backup is only started if previous backup has already completed. +- [`backup_minute`](#spec.userConfig.backup_minute-property){: name='spec.userConfig.backup_minute-property'} (integer, Minimum: 0, Maximum: 59). The minute of an hour when backup for the service is started. New backup is only started if previous backup has already completed. - [`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). - [`private_access`](#spec.userConfig.private_access-property){: name='spec.userConfig.private_access-property'} (object). Allow access to selected service ports from private networks. See below for [nested schema](#spec.userConfig.private_access).