diff --git a/CHANGELOG.md b/CHANGELOG.md index 81c8e51..893607a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +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]). ### Changed @@ -19,6 +20,7 @@ All notable changes to this project will be documented in this file. [#318]: https://github.com/stackabletech/commons-operator/pull/318 [#320]: https://github.com/stackabletech/commons-operator/pull/320 [#321]: https://github.com/stackabletech/commons-operator/pull/321 +[#331]: https://github.com/stackabletech/commons-operator/pull/331 ## [24.11.1] - 2025-01-09 diff --git a/Cargo.lock b/Cargo.lock index 1b00818..1baf4d4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2282,8 +2282,8 @@ dependencies = [ [[package]] name = "stackable-operator" -version = "0.85.0" -source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.85.0#59506c6202778889a27b6ae8153457e60a49c68d" +version = "0.86.1" +source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.86.1#93004e19513f96f053c713ed054fc42b2b088443" dependencies = [ "chrono", "clap", @@ -2321,7 +2321,7 @@ dependencies = [ [[package]] name = "stackable-operator-derive" version = "0.3.1" -source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.85.0#59506c6202778889a27b6ae8153457e60a49c68d" +source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.86.1#93004e19513f96f053c713ed054fc42b2b088443" dependencies = [ "darling", "proc-macro2", @@ -2332,7 +2332,7 @@ dependencies = [ [[package]] name = "stackable-shared" version = "0.0.1" -source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.85.0#59506c6202778889a27b6ae8153457e60a49c68d" +source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.86.1#93004e19513f96f053c713ed054fc42b2b088443" dependencies = [ "kube", "semver", diff --git a/Cargo.nix b/Cargo.nix index 8d868bd..feccdb3 100644 --- a/Cargo.nix +++ b/Cargo.nix @@ -1560,7 +1560,7 @@ rec { "default" = [ "Debug" "Clone" "Copy" "PartialEq" "Eq" "PartialOrd" "Ord" "Hash" "Default" "Deref" "DerefMut" "Into" ]; "full" = [ "syn/full" ]; }; - resolvedDefaultFeatures = [ "Clone" "Debug" "Default" "Hash" "PartialEq" ]; + resolvedDefaultFeatures = [ "Clone" "Debug" "Default" "Eq" "Hash" "PartialEq" ]; }; "either" = rec { crateName = "either"; @@ -7132,13 +7132,13 @@ rec { }; "stackable-operator" = rec { crateName = "stackable-operator"; - version = "0.85.0"; + version = "0.86.1"; edition = "2021"; workspace_member = null; src = pkgs.fetchgit { url = "https://github.com/stackabletech/operator-rs.git"; - rev = "59506c6202778889a27b6ae8153457e60a49c68d"; - sha256 = "0rh476rmn5850yj85hq8znwmlfhd7l5bkxz0n5i9m4cddxhi2cl5"; + rev = "93004e19513f96f053c713ed054fc42b2b088443"; + sha256 = "18vy0n5liqcy8axrlq2s5cag93nx0ldva5676k791qdp68sz5spr"; }; libName = "stackable_operator"; authors = [ @@ -7171,7 +7171,7 @@ rec { name = "educe"; packageId = "educe"; usesDefaultFeatures = false; - features = [ "Clone" "Debug" "Default" "PartialEq" ]; + features = [ "Clone" "Debug" "Default" "PartialEq" "Eq" ]; } { name = "either"; @@ -7297,8 +7297,8 @@ rec { workspace_member = null; src = pkgs.fetchgit { url = "https://github.com/stackabletech/operator-rs.git"; - rev = "59506c6202778889a27b6ae8153457e60a49c68d"; - sha256 = "0rh476rmn5850yj85hq8znwmlfhd7l5bkxz0n5i9m4cddxhi2cl5"; + rev = "93004e19513f96f053c713ed054fc42b2b088443"; + sha256 = "18vy0n5liqcy8axrlq2s5cag93nx0ldva5676k791qdp68sz5spr"; }; procMacro = true; libName = "stackable_operator_derive"; @@ -7332,8 +7332,8 @@ rec { workspace_member = null; src = pkgs.fetchgit { url = "https://github.com/stackabletech/operator-rs.git"; - rev = "59506c6202778889a27b6ae8153457e60a49c68d"; - sha256 = "0rh476rmn5850yj85hq8znwmlfhd7l5bkxz0n5i9m4cddxhi2cl5"; + rev = "93004e19513f96f053c713ed054fc42b2b088443"; + sha256 = "18vy0n5liqcy8axrlq2s5cag93nx0ldva5676k791qdp68sz5spr"; }; libName = "stackable_shared"; authors = [ diff --git a/Cargo.toml b/Cargo.toml index 90a71d4..eca3eff 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.85.0" } +stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "stackable-operator-0.86.1" } strum = { version = "0.26", features = ["derive"] } tokio = { version = "1.40", features = ["full"] } tracing = "0.1" diff --git a/crate-hashes.json b/crate-hashes.json index 290d87f..238df27 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.85.0#stackable-operator-derive@0.3.1": "0rh476rmn5850yj85hq8znwmlfhd7l5bkxz0n5i9m4cddxhi2cl5", - "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.85.0#stackable-operator@0.85.0": "0rh476rmn5850yj85hq8znwmlfhd7l5bkxz0n5i9m4cddxhi2cl5", - "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.85.0#stackable-shared@0.0.1": "0rh476rmn5850yj85hq8znwmlfhd7l5bkxz0n5i9m4cddxhi2cl5", + "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.86.1#stackable-operator-derive@0.3.1": "18vy0n5liqcy8axrlq2s5cag93nx0ldva5676k791qdp68sz5spr", + "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.86.1#stackable-operator@0.86.1": "18vy0n5liqcy8axrlq2s5cag93nx0ldva5676k791qdp68sz5spr", + "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.86.1#stackable-shared@0.0.1": "18vy0n5liqcy8axrlq2s5cag93nx0ldva5676k791qdp68sz5spr", "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 73ba29c..995f403 100644 --- a/deploy/helm/commons-operator/crds/crds.yaml +++ b/deploy/helm/commons-operator/crds/crds.yaml @@ -366,6 +366,32 @@ spec: minimum: 0.0 nullable: true type: integer + region: + 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. + + 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 + properties: + name: + description: 'An explicit region, eg: eu-central-1' + type: string + source: + description: Defer region detection to an auto-discovery mechanism. + enum: + - AwsImds + type: string + type: object tls: description: Use a TLS connection. If not specified no TLS will be used. nullable: true @@ -507,6 +533,32 @@ spec: minimum: 0.0 nullable: true type: integer + region: + 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. + + 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 + properties: + name: + description: 'An explicit region, eg: eu-central-1' + type: string + source: + description: Defer region detection to an auto-discovery mechanism. + enum: + - AwsImds + type: string + type: object tls: description: Use a TLS connection. If not specified no TLS will be used. nullable: true