From 8c2178c934832d82ff180c8907a8dfb4e0681c08 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 23 Jan 2024 07:28:55 +0000 Subject: [PATCH 1/2] build(deps): bump github.com/aiven/go-api-schemas from 1.53.0 to 1.55.0 Bumps [github.com/aiven/go-api-schemas](https://github.com/aiven/go-api-schemas) from 1.53.0 to 1.55.0. - [Release notes](https://github.com/aiven/go-api-schemas/releases) - [Commits](https://github.com/aiven/go-api-schemas/compare/v1.53.0...v1.55.0) --- updated-dependencies: - dependency-name: github.com/aiven/go-api-schemas dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 983e7c1c..62543014 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.21 require ( github.com/aiven/aiven-go-client/v2 v2.12.0 - github.com/aiven/go-api-schemas v1.53.0 + github.com/aiven/go-api-schemas v1.55.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 23d826cd..7f0a9f15 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.12.0 h1:VxOfn61AtfLjy2B+DdXF2/7OHyyFZ1aQaIlE3TOyIsE= github.com/aiven/aiven-go-client/v2 v2.12.0/go.mod h1:x0xhzxWEKAwKv0xY5FvECiI6tesWshcPHvjwl0B/1SU= -github.com/aiven/go-api-schemas v1.53.0 h1:I6kfG4TYF6490fnbj+0GDvs3xZs9zhzogRT3KZL5kuU= -github.com/aiven/go-api-schemas v1.53.0/go.mod h1:/bPxBUHza/2Aeer6hIIdB++GxKiw9K1KCBtRa2rtZ5I= +github.com/aiven/go-api-schemas v1.55.0 h1:hGwfUoZjftcMQgZXo/IhJYcNPXOOQKaSkqVFIzUpTUw= +github.com/aiven/go-api-schemas v1.55.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= From 13a4f076078f49df026e2f12c1b8f8c375b0680a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Tue, 23 Jan 2024 07:29:55 +0000 Subject: [PATCH 2/2] chore(userconfigs): generate files --- CHANGELOG.md | 1 + api/v1alpha1/userconfig/service/cassandra/cassandra.go | 2 +- charts/aiven-operator-crds/templates/aiven.io_cassandras.yaml | 1 + config/crd/bases/aiven.io_cassandras.yaml | 1 + docs/docs/api-reference/cassandra.md | 2 +- 5 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2e72f24a..5b2ce98d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -34,6 +34,7 @@ - Change `PostgreSQL` field `userConfig.pg_version`: enum ~~`[11, 12, 13, 14, 15]`~~ → `[11, 12, 13, 14, 15, 16]` - Change `Redis` field `userConfig.additional_backup_regions`: deprecated +- Change `Cassandra` field `userConfig.cassandra_version`: enum ~~`[3, 4]`~~ → `[3, 4, 4.1]` ## v0.16.1 - 2023-12-15 diff --git a/api/v1alpha1/userconfig/service/cassandra/cassandra.go b/api/v1alpha1/userconfig/service/cassandra/cassandra.go index 47f4112f..3a3b0313 100644 --- a/api/v1alpha1/userconfig/service/cassandra/cassandra.go +++ b/api/v1alpha1/userconfig/service/cassandra/cassandra.go @@ -61,7 +61,7 @@ type CassandraUserConfig struct { // cassandra configuration values Cassandra *Cassandra `groups:"create,update" json:"cassandra,omitempty"` - // +kubebuilder:validation:Enum="4";"3" + // +kubebuilder:validation:Enum="4";"3";"4.1" // Cassandra major version CassandraVersion *string `groups:"create,update" json:"cassandra_version,omitempty"` diff --git a/charts/aiven-operator-crds/templates/aiven.io_cassandras.yaml b/charts/aiven-operator-crds/templates/aiven.io_cassandras.yaml index c35851d4..40c2d9f4 100644 --- a/charts/aiven-operator-crds/templates/aiven.io_cassandras.yaml +++ b/charts/aiven-operator-crds/templates/aiven.io_cassandras.yaml @@ -264,6 +264,7 @@ spec: enum: - "4" - "3" + - "4.1" type: string ip_filter: description: diff --git a/config/crd/bases/aiven.io_cassandras.yaml b/config/crd/bases/aiven.io_cassandras.yaml index c35851d4..40c2d9f4 100644 --- a/config/crd/bases/aiven.io_cassandras.yaml +++ b/config/crd/bases/aiven.io_cassandras.yaml @@ -264,6 +264,7 @@ spec: enum: - "4" - "3" + - "4.1" type: string ip_filter: description: diff --git a/docs/docs/api-reference/cassandra.md b/docs/docs/api-reference/cassandra.md index 5ad1afed..e392b9c0 100644 --- a/docs/docs/api-reference/cassandra.md +++ b/docs/docs/api-reference/cassandra.md @@ -151,7 +151,7 @@ Cassandra specific user configuration options. - [`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. - [`cassandra`](#spec.userConfig.cassandra-property){: name='spec.userConfig.cassandra-property'} (object). cassandra configuration values. See below for [nested schema](#spec.userConfig.cassandra). -- [`cassandra_version`](#spec.userConfig.cassandra_version-property){: name='spec.userConfig.cassandra_version-property'} (string, Enum: `4`, `3`). Cassandra major version. +- [`cassandra_version`](#spec.userConfig.cassandra_version-property){: name='spec.userConfig.cassandra_version-property'} (string, Enum: `4`, `3`, `4.1`). Cassandra major version. - [`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). - [`migrate_sstableloader`](#spec.userConfig.migrate_sstableloader-property){: name='spec.userConfig.migrate_sstableloader-property'} (boolean). Sets the service into migration mode enabling the sstableloader utility to be used to upload Cassandra data files. Available only on service create. - [`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).