Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
- Implement `envOverrides` for HbaseCluster ([#550]).
- Omid test: use 1.1.2, update default port number and raise test timeout ([#556]).
- An invalid `HBaseCluster` doesn't cause the operator to stop functioning (#[575]).
- BREAKING: Use distinct ServiceAccounts for the Stacklets, so that multiple Stacklets can be deployed in one namespace. Existing Stacklets will use the newly created ServiceAccounts after restart ([#594]).

### Removed

Expand All @@ -32,6 +33,7 @@
[#558]: https://github.com/stackabletech/hbase-operator/pull/558
[#574]: https://github.com/stackabletech/hbase-operator/pull/574
[#584]: https://github.com/stackabletech/hbase-operator/pull/584
[#594]: https://github.com/stackabletech/hbase-operator/pull/594

## [24.7.0] - 2024-07-24

Expand Down
8 changes: 4 additions & 4 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 7 additions & 7 deletions Cargo.nix

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"
serde_yaml = "0.9"
snafu = "0.8"
stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "stackable-operator-0.80.0" }
stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "stackable-operator-0.82.0" }
product-config = { git = "https://github.com/stackabletech/product-config.git", tag = "0.7.0" }
strum = { version = "0.26", features = ["derive"] }
tokio = { version = "1.40", features = ["full"] }
Expand Down
6 changes: 3 additions & 3 deletions crate-hashes.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

22 changes: 12 additions & 10 deletions rust/operator-binary/src/hbase_controller.rs
Original file line number Diff line number Diff line change
Expand Up @@ -24,23 +24,23 @@ use stackable_operator::{
},
},
cluster_resources::{ClusterResourceApplyStrategy, ClusterResources},
commons::{
product_image_selection::ResolvedProductImage,
rbac::{build_rbac_resources, service_account_name},
},
commons::{product_image_selection::ResolvedProductImage, rbac::build_rbac_resources},
k8s_openapi::{
api::{
apps::v1::{StatefulSet, StatefulSetSpec},
core::v1::{
ConfigMap, ConfigMapVolumeSource, ContainerPort, Probe, Service, ServicePort,
ServiceSpec, TCPSocketAction, Volume,
ConfigMap, ConfigMapVolumeSource, ContainerPort, Probe, Service, ServiceAccount,
ServicePort, ServiceSpec, TCPSocketAction, Volume,
},
},
apimachinery::pkg::{apis::meta::v1::LabelSelector, util::intstr::IntOrString},
DeepMerge,
},
kube::core::{error_boundary, DeserializeGuard},
kube::{runtime::controller::Action, Resource},
kube::{
core::{error_boundary, DeserializeGuard},
runtime::controller::Action,
Resource, ResourceExt,
},
kvp::{Label, LabelError, Labels, ObjectLabels},
logging::controller::ReconcilerError,
memory::{BinaryMultiple, MemoryQuantity},
Expand Down Expand Up @@ -407,7 +407,7 @@ pub async fn reconcile_hbase(
)
.context(BuildRbacResourcesSnafu)?;
cluster_resources
.add(client, rbac_sa)
.add(client, rbac_sa.clone())
.await
.context(ApplyServiceAccountSnafu)?;
cluster_resources
Expand Down Expand Up @@ -452,6 +452,7 @@ pub async fn reconcile_hbase(
rolegroup_config,
&merged_config,
&resolved_product_image,
&rbac_sa,
)?;
cluster_resources
.add(client, rg_service)
Expand Down Expand Up @@ -778,6 +779,7 @@ fn build_rolegroup_statefulset(
rolegroup_config: &HashMap<PropertyNameKind, BTreeMap<String, String>>,
config: &HbaseConfig,
resolved_product_image: &ResolvedProductImage,
service_account: &ServiceAccount,
) -> Result<StatefulSet> {
let hbase_version = &resolved_product_image.app_version_label;

Expand Down Expand Up @@ -943,7 +945,7 @@ fn build_rolegroup_statefulset(
)),
)
.context(AddVolumeSnafu)?
.service_account_name(service_account_name(APP_NAME))
.service_account_name(service_account.name_any())
.security_context(
PodSecurityContextBuilder::new()
.run_as_user(HBASE_UID)
Expand Down
Loading