Skip to content

Commit d2cf5aa

Browse files
chore(deps): bump the main group with 2 updates (#834)
Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: dependabot[bot] <dependabot[bot]@users.noreply.github.com>
1 parent c59f04f commit d2cf5aa

File tree

8 files changed

+69
-6
lines changed

8 files changed

+69
-6
lines changed

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,12 @@
3434
- Add `OpenSearch` field `userConfig.s3_migration.restore_global_state`, type `boolean`: If true, restore
3535
the cluster state. Defaults to false
3636
- Change `Redis` field `userConfig.redis_timeout`: maximum ~~`31536000`~~`2073600`
37+
- Add `OpenSearch` field `userConfig.azure_migration.include_aliases`, type `boolean`: Whether to restore
38+
aliases alongside their associated indexes. Default is true
39+
- Add `OpenSearch` field `userConfig.gcs_migration.include_aliases`, type `boolean`: Whether to restore
40+
aliases alongside their associated indexes. Default is true
41+
- Add `OpenSearch` field `userConfig.s3_migration.include_aliases`, type `boolean`: Whether to restore
42+
aliases alongside their associated indexes. Default is true
3743

3844
## v0.25.0 - 2024-09-19
3945

api/v1alpha1/userconfig/service/opensearch/opensearch.go

Lines changed: 9 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

api/v1alpha1/userconfig/service/opensearch/zz_generated.deepcopy.go

Lines changed: 15 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

charts/aiven-operator-crds/templates/aiven.io_opensearches.yaml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -264,6 +264,11 @@ spec:
264264
description: Defines the DNS suffix for Azure Storage endpoints.
265265
pattern: ^[^\r\n]*$
266266
type: string
267+
include_aliases:
268+
description:
269+
Whether to restore aliases alongside their associated
270+
indexes. Default is true.
271+
type: boolean
267272
indices:
268273
description:
269274
A comma-delimited list of indices to restore
@@ -345,6 +350,11 @@ spec:
345350
description: Google Cloud Storage credentials file content
346351
pattern: ^[^\r\n]*$
347352
type: string
353+
include_aliases:
354+
description:
355+
Whether to restore aliases alongside their associated
356+
indexes. Default is true.
357+
type: boolean
348358
indices:
349359
description:
350360
A comma-delimited list of indices to restore
@@ -1419,6 +1429,11 @@ spec:
14191429
to the service’s endpoint
14201430
pattern: ^[^\r\n]*$
14211431
type: string
1432+
include_aliases:
1433+
description:
1434+
Whether to restore aliases alongside their associated
1435+
indexes. Default is true.
1436+
type: boolean
14221437
indices:
14231438
description:
14241439
A comma-delimited list of indices to restore

config/crd/bases/aiven.io_opensearches.yaml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -264,6 +264,11 @@ spec:
264264
description: Defines the DNS suffix for Azure Storage endpoints.
265265
pattern: ^[^\r\n]*$
266266
type: string
267+
include_aliases:
268+
description:
269+
Whether to restore aliases alongside their associated
270+
indexes. Default is true.
271+
type: boolean
267272
indices:
268273
description:
269274
A comma-delimited list of indices to restore
@@ -345,6 +350,11 @@ spec:
345350
description: Google Cloud Storage credentials file content
346351
pattern: ^[^\r\n]*$
347352
type: string
353+
include_aliases:
354+
description:
355+
Whether to restore aliases alongside their associated
356+
indexes. Default is true.
357+
type: boolean
348358
indices:
349359
description:
350360
A comma-delimited list of indices to restore
@@ -1419,6 +1429,11 @@ spec:
14191429
to the service’s endpoint
14201430
pattern: ^[^\r\n]*$
14211431
type: string
1432+
include_aliases:
1433+
description:
1434+
Whether to restore aliases alongside their associated
1435+
indexes. Default is true.
1436+
type: boolean
14221437
indices:
14231438
description:
14241439
A comma-delimited list of indices to restore

docs/docs/api-reference/opensearch.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -236,6 +236,7 @@ Azure migration settings.
236236
- [`chunk_size`](#spec.userConfig.azure_migration.chunk_size-property){: name='spec.userConfig.azure_migration.chunk_size-property'} (string, Pattern: `^[^\r\n]*$`). Big files can be broken down into chunks during snapshotting if needed. Should be the same as for the 3rd party repository.
237237
- [`compress`](#spec.userConfig.azure_migration.compress-property){: name='spec.userConfig.azure_migration.compress-property'} (boolean). when set to true metadata files are stored in compressed format.
238238
- [`endpoint_suffix`](#spec.userConfig.azure_migration.endpoint_suffix-property){: name='spec.userConfig.azure_migration.endpoint_suffix-property'} (string, Pattern: `^[^\r\n]*$`). Defines the DNS suffix for Azure Storage endpoints.
239+
- [`include_aliases`](#spec.userConfig.azure_migration.include_aliases-property){: name='spec.userConfig.azure_migration.include_aliases-property'} (boolean). Whether to restore aliases alongside their associated indexes. Default is true.
239240
- [`indices`](#spec.userConfig.azure_migration.indices-property){: name='spec.userConfig.azure_migration.indices-property'} (string). A comma-delimited list of indices to restore from the snapshot. Multi-index syntax is supported. By default, a restore operation includes all data streams and indices in the snapshot. If this argument is provided, the restore operation only includes the data streams and indices that you specify.
240241
- [`key`](#spec.userConfig.azure_migration.key-property){: name='spec.userConfig.azure_migration.key-property'} (string, Pattern: `^[^\r\n]*$`). Azure account secret key. One of key or sas_token should be specified.
241242
- [`restore_global_state`](#spec.userConfig.azure_migration.restore_global_state-property){: name='spec.userConfig.azure_migration.restore_global_state-property'} (boolean). If true, restore the cluster state. Defaults to false.
@@ -258,6 +259,7 @@ Google Cloud Storage migration settings.
258259

259260
- [`chunk_size`](#spec.userConfig.gcs_migration.chunk_size-property){: name='spec.userConfig.gcs_migration.chunk_size-property'} (string, Pattern: `^[^\r\n]*$`). Big files can be broken down into chunks during snapshotting if needed. Should be the same as for the 3rd party repository.
260261
- [`compress`](#spec.userConfig.gcs_migration.compress-property){: name='spec.userConfig.gcs_migration.compress-property'} (boolean). when set to true metadata files are stored in compressed format.
262+
- [`include_aliases`](#spec.userConfig.gcs_migration.include_aliases-property){: name='spec.userConfig.gcs_migration.include_aliases-property'} (boolean). Whether to restore aliases alongside their associated indexes. Default is true.
261263
- [`indices`](#spec.userConfig.gcs_migration.indices-property){: name='spec.userConfig.gcs_migration.indices-property'} (string). A comma-delimited list of indices to restore from the snapshot. Multi-index syntax is supported. By default, a restore operation includes all data streams and indices in the snapshot. If this argument is provided, the restore operation only includes the data streams and indices that you specify.
262264
- [`restore_global_state`](#spec.userConfig.gcs_migration.restore_global_state-property){: name='spec.userConfig.gcs_migration.restore_global_state-property'} (boolean). If true, restore the cluster state. Defaults to false.
263265

@@ -616,6 +618,7 @@ AWS S3 / AWS S3 compatible migration settings.
616618
- [`chunk_size`](#spec.userConfig.s3_migration.chunk_size-property){: name='spec.userConfig.s3_migration.chunk_size-property'} (string, Pattern: `^[^\r\n]*$`). Big files can be broken down into chunks during snapshotting if needed. Should be the same as for the 3rd party repository.
617619
- [`compress`](#spec.userConfig.s3_migration.compress-property){: name='spec.userConfig.s3_migration.compress-property'} (boolean). when set to true metadata files are stored in compressed format.
618620
- [`endpoint`](#spec.userConfig.s3_migration.endpoint-property){: name='spec.userConfig.s3_migration.endpoint-property'} (string, Pattern: `^[^\r\n]*$`). The S3 service endpoint to connect to. If you are using an S3-compatible service then you should set this to the service’s endpoint.
621+
- [`include_aliases`](#spec.userConfig.s3_migration.include_aliases-property){: name='spec.userConfig.s3_migration.include_aliases-property'} (boolean). Whether to restore aliases alongside their associated indexes. Default is true.
619622
- [`indices`](#spec.userConfig.s3_migration.indices-property){: name='spec.userConfig.s3_migration.indices-property'} (string). A comma-delimited list of indices to restore from the snapshot. Multi-index syntax is supported. By default, a restore operation includes all data streams and indices in the snapshot. If this argument is provided, the restore operation only includes the data streams and indices that you specify.
620623
- [`restore_global_state`](#spec.userConfig.s3_migration.restore_global_state-property){: name='spec.userConfig.s3_migration.restore_global_state-property'} (boolean). If true, restore the cluster state. Defaults to false.
621624
- [`server_side_encryption`](#spec.userConfig.s3_migration.server_side_encryption-property){: name='spec.userConfig.s3_migration.server_side_encryption-property'} (boolean). When set to true files are encrypted on server side.

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ toolchain go1.23.0
77
require (
88
github.com/ClickHouse/clickhouse-go/v2 v2.30.0
99
github.com/aiven/aiven-go-client/v2 v2.30.0
10-
github.com/aiven/go-api-schemas v1.94.0
11-
github.com/aiven/go-client-codegen v0.45.0
10+
github.com/aiven/go-api-schemas v1.96.0
11+
github.com/aiven/go-client-codegen v0.48.0
1212
github.com/avast/retry-go v3.0.0+incompatible
1313
github.com/dave/jennifer v1.7.1
1414
github.com/docker/go-units v0.5.0

go.sum

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,10 @@ github.com/ClickHouse/clickhouse-go/v2 v2.30.0 h1:AG4D/hW39qa58+JHQIFOSnxyL46H6h
3939
github.com/ClickHouse/clickhouse-go/v2 v2.30.0/go.mod h1:i9ZQAojcayW3RsdCb3YR+n+wC2h65eJsZCscZ1Z1wyo=
4040
github.com/aiven/aiven-go-client/v2 v2.30.0 h1:dj1nRuO1XglnwH2IwKmqEl3SGaqKebDoxnd+SRjxQRg=
4141
github.com/aiven/aiven-go-client/v2 v2.30.0/go.mod h1:Eyxa+fNgayObmUBW94uJuEkyOe1646cEpjFzhm/NETY=
42-
github.com/aiven/go-api-schemas v1.94.0 h1:kbszL56VLORPZ2jXmQBP6FJpihcmiLGdH051G8zBRd0=
43-
github.com/aiven/go-api-schemas v1.94.0/go.mod h1:qS3E/3R+aKQbHsqXzNHqlXATY1kbVNzhiJvk2IDmADI=
44-
github.com/aiven/go-client-codegen v0.45.0 h1:5+5eCN42Qb0QegJSYDw7WCi3z1IHemFyRxzJBN2TnaQ=
45-
github.com/aiven/go-client-codegen v0.45.0/go.mod h1:FfbH32Xb+Hx5zeKTIug1Y8SfMeB+AKNRzxgrzkts2oA=
42+
github.com/aiven/go-api-schemas v1.96.0 h1:h/8ENjiyj6G2fliXGygLgWfTjzFT7wNC86WOz9IYHow=
43+
github.com/aiven/go-api-schemas v1.96.0/go.mod h1:ATdCq7aRp+URkFI4W4mVZaNZgoN5FRicXKH3c2fpgW4=
44+
github.com/aiven/go-client-codegen v0.48.0 h1:4etkt+/tBMHzj8JJJDO1MK6pG33+2fTjI3MeDt5wB7w=
45+
github.com/aiven/go-client-codegen v0.48.0/go.mod h1:FfbH32Xb+Hx5zeKTIug1Y8SfMeB+AKNRzxgrzkts2oA=
4646
github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
4747
github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
4848
github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=

0 commit comments

Comments
 (0)