[Merged by Bors] - Set explicit resources on all containers

CHANGELOG.md

@@ -8,6 +8,7 @@ All notable changes to this project will be documented in this file.
 
 - Generate OLM bundle for Release 23.4.0 ([#338]).
 - Missing CRD defaults for `status.conditions` field ([#340]).
+- Add support for resource quotas ([#345])
 
 ### Changed
 
@@ -19,6 +20,7 @@ All notable changes to this project will be documented in this file.
 [#337]: https://github.com/stackabletech/hive-operator/pull/337
 [#338]: https://github.com/stackabletech/hive-operator/pull/338
 [#340]: https://github.com/stackabletech/hive-operator/pull/340
+[#345]: https://github.com/stackabletech/hive-operator/pull/345
 
 ## [23.4.0] - 2023-04-17
 

Cargo.toml

@@ -4,5 +4,5 @@ members = [
     "rust/crd", "rust/operator-binary"
 ]
 
-# [patch."https://github.com/stackabletech/operator-rs.git"]
-# stackable-operator = { git = "https://github.com/stackabletech//operator-rs.git", branch = "main" }
+#[patch."https://github.com/stackabletech/operator-rs.git"]
+#stackable-operator = { git = "https://github.com/stackabletech//operator-rs.git", branch = "feature/resource-quotas" }

rust/crd/Cargo.toml

@@ -13,7 +13,7 @@ indoc = "1.0.8"
 serde = "1.0"
 serde_json = "1.0"
 snafu = "0.7"
-stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "0.41.0" }
+stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "0.42.1" }
 strum = { version = "0.24", features = ["derive"] }
 tracing = "0.1"
 

rust/operator-binary/Cargo.toml

@@ -10,7 +10,7 @@ publish = false
 
 [dependencies]
 anyhow = "1.0"
-clap = "4.0"
+clap = "4.3"
 fnv = "1.0"
 futures = { version = "0.3", features = ["compat"] }
 pin-project = "1.0"
@@ -19,12 +19,12 @@ serde = "1.0"
 serde_json = "1.0"
 snafu = "0.7"
 stackable-hive-crd = { path = "../crd" }
-stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "0.41.0" }
+stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "0.42.1" }
 strum = { version = "0.24", features = ["derive"] }
 tokio = { version = "1.23", features = ["full"] }
 tracing = "0.1"
 
 [build-dependencies]
 built = { version =  "0.5", features = ["chrono", "git2"] }
-stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "0.41.0" }
+stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "0.42.1" }
 stackable-hive-crd = { path = "../crd" }

rust/operator-binary/src/controller.rs

@@ -1,4 +1,6 @@
 //! Ensures that `Pod`s are configured and running for each [`HiveCluster`]
+use stackable_operator::builder::resources::ResourceRequirementsBuilder;
+
 use crate::command::{self, build_container_command_args, S3_SECRET_DIR};
 use crate::product_logging::{extend_role_group_config_map, resolve_vector_aggregator_address};
 use crate::{discovery, OPERATOR_NAME};
@@ -200,6 +202,10 @@ pub enum Error {
     BuildRbacResources {
         source: stackable_operator::error::Error,
     },
+    #[snafu(display("failed to build pod template"))]
+    BuildTemplate {
+        source: stackable_operator::error::Error,
+    },
 }
 type Result<T, E = Error> = std::result::Result<T, E>;
 
@@ -832,11 +838,19 @@ fn build_metastore_rolegroup_statefulset(
     }
 
     if merged_config.logging.enable_vector_agent {
+        let resources = ResourceRequirementsBuilder::new()
+            .with_cpu_limit("500m")
+            .with_cpu_request("100m")
+            .with_memory_limit("40Mi")
+            .with_memory_request("8Mi")
+            .build();
+
         pod_builder.add_container(product_logging::framework::vector_container(
             resolved_product_image,
             STACKABLE_CONFIG_DIR_NAME,
             STACKABLE_LOG_DIR_NAME,
             merged_config.logging.containers.get(&Container::Vector),
+            resources,
         ));
     }
 
@@ -866,7 +880,7 @@ fn build_metastore_rolegroup_statefulset(
                 ..LabelSelector::default()
             },
             service_name: rolegroup_ref.object_name(),
-            template: pod_builder.build_template(),
+            template: pod_builder.build_template().context(BuildTemplateSnafu)?,
             volume_claim_templates: Some(vec![merged_config
                 .resources
                 .storage

tests/templates/kuttl/smoke/00-limit-range.yaml

@@ -0,0 +1,5 @@
+---
+apiVersion: kuttl.dev/v1beta1
+kind: TestStep
+commands:
+  - script: kubectl apply -n $NAMESPACE -f limit-range.yaml