diff --git a/CHANGELOG.md b/CHANGELOG.md index 2e40930..353b990 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,7 +11,7 @@ All notable changes to this project will be documented in this file. ### Added - Aggregate emitted Kubernetes events on the CustomResources ([#318]). -- Add the region field to the S3Connection CRD ([#331]). +- Add the region field to the S3Connection CRD ([#331], [#335]). ### Changed @@ -23,6 +23,7 @@ All notable changes to this project will be documented in this file. [#321]: https://github.com/stackabletech/commons-operator/pull/321 [#331]: https://github.com/stackabletech/commons-operator/pull/331 [#334]: https://github.com/stackabletech/commons-operator/pull/334 +[#335]: https://github.com/stackabletech/commons-operator/pull/335 ## [24.11.1] - 2025-01-09 diff --git a/Cargo.lock b/Cargo.lock index 672ca27..3b93779 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1884,9 +1884,9 @@ checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" [[package]] name = "ring" -version = "0.17.11" +version = "0.17.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da5349ae27d3887ca812fb375b45a4fbb36d8d12d2df394968cd86e35683fe73" +checksum = "70ac5d832aa16abd7d1def883a8545280c20a60f523a370aa3a9617c2b8550ee" dependencies = [ "cc", "cfg-if", @@ -2275,8 +2275,8 @@ dependencies = [ [[package]] name = "stackable-operator" -version = "0.87.0" -source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.87.0#53ccc1e9eca2a5b35a8618593c548e8687fb150d" +version = "0.87.2" +source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.87.2#bc176bfc23f15533cdb3b7a7e7a773d4f29891e1" dependencies = [ "chrono", "clap", @@ -2314,7 +2314,7 @@ dependencies = [ [[package]] name = "stackable-operator-derive" version = "0.3.1" -source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.87.0#53ccc1e9eca2a5b35a8618593c548e8687fb150d" +source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.87.2#bc176bfc23f15533cdb3b7a7e7a773d4f29891e1" dependencies = [ "darling", "proc-macro2", @@ -2325,7 +2325,7 @@ dependencies = [ [[package]] name = "stackable-shared" version = "0.0.1" -source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.87.0#53ccc1e9eca2a5b35a8618593c548e8687fb150d" +source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.87.2#bc176bfc23f15533cdb3b7a7e7a773d4f29891e1" dependencies = [ "kube", "semver", diff --git a/Cargo.nix b/Cargo.nix index f23eaf8..fda5a06 100644 --- a/Cargo.nix +++ b/Cargo.nix @@ -5918,10 +5918,10 @@ rec { }; "ring" = rec { crateName = "ring"; - version = "0.17.11"; + version = "0.17.13"; edition = "2021"; - links = "ring_core_0_17_11_"; - sha256 = "0wzyhdbf71ndd14kkpyj2a6nvczvli2mndzv2al7r26k4yp4jlys"; + links = "ring_core_0_17_13_"; + sha256 = "1vjhhlmpqqd9lc53ffjj1yk203188n2km27g3myvssm15a1mvb3h"; dependencies = [ { name = "cfg-if"; @@ -7110,13 +7110,13 @@ rec { }; "stackable-operator" = rec { crateName = "stackable-operator"; - version = "0.87.0"; + version = "0.87.2"; edition = "2021"; workspace_member = null; src = pkgs.fetchgit { url = "https://github.com/stackabletech/operator-rs.git"; - rev = "53ccc1e9eca2a5b35a8618593c548e8687fb150d"; - sha256 = "0asgwj93drwvqsgd5c563qawjc3avb42nav0i5dgs4zv8bldx6x0"; + rev = "bc176bfc23f15533cdb3b7a7e7a773d4f29891e1"; + sha256 = "0cqz1xmj3vbm5hm9x6wbgg2l265s30j5j5609wmg68p6giywh82a"; }; libName = "stackable_operator"; authors = [ @@ -7275,8 +7275,8 @@ rec { workspace_member = null; src = pkgs.fetchgit { url = "https://github.com/stackabletech/operator-rs.git"; - rev = "53ccc1e9eca2a5b35a8618593c548e8687fb150d"; - sha256 = "0asgwj93drwvqsgd5c563qawjc3avb42nav0i5dgs4zv8bldx6x0"; + rev = "bc176bfc23f15533cdb3b7a7e7a773d4f29891e1"; + sha256 = "0cqz1xmj3vbm5hm9x6wbgg2l265s30j5j5609wmg68p6giywh82a"; }; procMacro = true; libName = "stackable_operator_derive"; @@ -7310,8 +7310,8 @@ rec { workspace_member = null; src = pkgs.fetchgit { url = "https://github.com/stackabletech/operator-rs.git"; - rev = "53ccc1e9eca2a5b35a8618593c548e8687fb150d"; - sha256 = "0asgwj93drwvqsgd5c563qawjc3avb42nav0i5dgs4zv8bldx6x0"; + rev = "bc176bfc23f15533cdb3b7a7e7a773d4f29891e1"; + sha256 = "0cqz1xmj3vbm5hm9x6wbgg2l265s30j5j5609wmg68p6giywh82a"; }; libName = "stackable_shared"; authors = [ diff --git a/Cargo.toml b/Cargo.toml index d7b231d..b7c0b78 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -17,7 +17,7 @@ futures = { version = "0.3", features = ["compat"] } serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" snafu = "0.8" -stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "stackable-operator-0.87.0" } +stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "stackable-operator-0.87.2" } strum = { version = "0.27", features = ["derive"] } tokio = { version = "1.40", features = ["full"] } tracing = "0.1" diff --git a/crate-hashes.json b/crate-hashes.json index f8d07bd..720e6ba 100644 --- a/crate-hashes.json +++ b/crate-hashes.json @@ -1,6 +1,6 @@ { - "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.87.0#stackable-operator-derive@0.3.1": "0asgwj93drwvqsgd5c563qawjc3avb42nav0i5dgs4zv8bldx6x0", - "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.87.0#stackable-operator@0.87.0": "0asgwj93drwvqsgd5c563qawjc3avb42nav0i5dgs4zv8bldx6x0", - "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.87.0#stackable-shared@0.0.1": "0asgwj93drwvqsgd5c563qawjc3avb42nav0i5dgs4zv8bldx6x0", + "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.87.2#stackable-operator-derive@0.3.1": "0cqz1xmj3vbm5hm9x6wbgg2l265s30j5j5609wmg68p6giywh82a", + "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.87.2#stackable-operator@0.87.2": "0cqz1xmj3vbm5hm9x6wbgg2l265s30j5j5609wmg68p6giywh82a", + "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.87.2#stackable-shared@0.0.1": "0cqz1xmj3vbm5hm9x6wbgg2l265s30j5j5609wmg68p6giywh82a", "git+https://github.com/stackabletech/product-config.git?tag=0.7.0#product-config@0.7.0": "0gjsm80g6r75pm3824dcyiz4ysq1ka4c1if6k1mjm9cnd5ym0gny" } \ No newline at end of file diff --git a/deploy/helm/commons-operator/crds/crds.yaml b/deploy/helm/commons-operator/crds/crds.yaml index 995f403..a3b5a88 100644 --- a/deploy/helm/commons-operator/crds/crds.yaml +++ b/deploy/helm/commons-operator/crds/crds.yaml @@ -370,26 +370,14 @@ spec: default: name: us-east-1 description: |- - AWS service API region used by the AWS SDK when using AWS S3 buckets. + Bucket region used for signing headers (sigv4). - This defaults to `us-east-1` and can be ignored if not using AWS S3 buckets. + This defaults to `us-east-1` which is compatible with other implementations such as Minio. - NOTE: This is not the bucket region, and is used by the AWS SDK to construct endpoints for various AWS service APIs. It is only useful when using AWS S3 buckets. - - When using AWS S3 buckets, you can configure optimal AWS service API connections in the following ways: - From **inside** AWS: Use an auto-discovery source (eg: AWS IMDS). - From **outside** AWS, or when IMDS is disabled, explicity set the region name nearest to where the client application is running from. - oneOf: - - required: - - source - - required: - - name + WARNING: Some products use the Hadoop S3 implementation which falls back to us-east-2. properties: name: - description: 'An explicit region, eg: eu-central-1' - type: string - source: - description: Defer region detection to an auto-discovery mechanism. - enum: - - AwsImds + default: us-east-1 type: string type: object tls: @@ -537,26 +525,14 @@ spec: default: name: us-east-1 description: |- - AWS service API region used by the AWS SDK when using AWS S3 buckets. - - This defaults to `us-east-1` and can be ignored if not using AWS S3 buckets. + Bucket region used for signing headers (sigv4). - NOTE: This is not the bucket region, and is used by the AWS SDK to construct endpoints for various AWS service APIs. It is only useful when using AWS S3 buckets. + This defaults to `us-east-1` which is compatible with other implementations such as Minio. - When using AWS S3 buckets, you can configure optimal AWS service API connections in the following ways: - From **inside** AWS: Use an auto-discovery source (eg: AWS IMDS). - From **outside** AWS, or when IMDS is disabled, explicity set the region name nearest to where the client application is running from. - oneOf: - - required: - - source - - required: - - name + WARNING: Some products use the Hadoop S3 implementation which falls back to us-east-2. properties: name: - description: 'An explicit region, eg: eu-central-1' - type: string - source: - description: Defer region detection to an auto-discovery mechanism. - enum: - - AwsImds + default: us-east-1 type: string type: object tls: