Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update release branch #890

Merged
merged 7 commits into from
Nov 27, 2024
Merged
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
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -4,6 +4,14 @@ All notable changes to this project will be documented in this file.

## [Unreleased]

### Fixed

- 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 ([#889]).

[#889]: https://github.com/stackabletech/zookeeper-operator/pull/889

## [24.11.0] - 2024-11-18

### Added
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
@@ -22,7 +22,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"] }
3 changes: 3 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
@@ -29,6 +29,9 @@ SHELL=/usr/bin/env bash -euo pipefail
render-readme:
scripts/render_readme.sh

render-docs:
scripts/docs_templating.sh

## Docker related targets
docker-build:
docker build --force-rm --build-arg VERSION=${VERSION} -t "${DOCKER_REPO}/${ORGANIZATION}/${OPERATOR_NAME}:${VERSION}-${ARCH}" -f docker/Dockerfile .
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.

Original file line number Diff line number Diff line change
@@ -2,17 +2,7 @@
set -euo pipefail

# DO NOT EDIT THE SCRIPT
# Instead, update the j2 template, and regenerate it for dev:
# cat <<EOF | jinja2 --format yaml getting_started.sh.j2 -o getting_started.sh
# helm:
# repo_name: stackable-dev
# repo_url: https://repo.stackable.tech/repository/helm-dev/
# versions:
# commons: 0.0.0-dev
# listener: 0.0.0-dev
# secret: 0.0.0-dev
# zookeeper: 0.0.0-dev
# EOF
# Instead, update the j2 template, and regenerate it for dev with `make render-docs`.

# This script contains all the code snippets from the guide, as well as some assert tests
# to test if the instructions in the guide work. The user *could* use it, but it is intended
Original file line number Diff line number Diff line change
@@ -2,17 +2,7 @@
set -euo pipefail

# DO NOT EDIT THE SCRIPT
# Instead, update the j2 template, and regenerate it for dev:
# cat <<EOF | jinja2 --format yaml getting_started.sh.j2 -o getting_started.sh
# helm:
# repo_name: stackable-dev
# repo_url: https://repo.stackable.tech/repository/helm-dev/
# versions:
# commons: 0.0.0-dev
# listener: 0.0.0-dev
# secret: 0.0.0-dev
# zookeeper: 0.0.0-dev
# EOF
# Instead, update the j2 template, and regenerate it for dev with `make render-docs`.

# This script contains all the code snippets from the guide, as well as some assert tests
# to test if the instructions in the guide work. The user *could* use it, but it is intended
18 changes: 9 additions & 9 deletions rust/operator-binary/src/zk_controller.rs
Original file line number Diff line number Diff line change
@@ -23,17 +23,14 @@ use stackable_operator::{
pod::{container::ContainerBuilder, resources::ResourceRequirementsBuilder, PodBuilder},
},
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, EmptyDirVolumeSource, EnvVar, EnvVarSource,
ExecAction, ObjectFieldSelector, PodSecurityContext, Probe, Service, ServicePort,
ServiceSpec, Volume,
ExecAction, ObjectFieldSelector, PodSecurityContext, Probe, Service,
ServiceAccount, ServicePort, ServiceSpec, Volume,
},
},
apimachinery::pkg::apis::meta::v1::LabelSelector,
@@ -43,7 +40,7 @@ use stackable_operator::{
api::DynamicObject,
core::{error_boundary, DeserializeGuard},
runtime::controller,
Resource,
Resource, ResourceExt,
},
kvp::{Label, LabelError, Labels},
logging::controller::ReconcilerError,
@@ -395,7 +392,7 @@ pub async fn reconcile_zk(
.context(BuildRbacResourcesSnafu)?;

cluster_resources
.add(client, rbac_sa)
.add(client, rbac_sa.clone())
.await
.context(ApplyServiceAccountSnafu)?;

@@ -444,6 +441,7 @@ pub async fn reconcile_zk(
&zookeeper_security,
&resolved_product_image,
&merged_config,
&rbac_sa,
)?;
cluster_resources
.add(client, rg_service)
@@ -749,6 +747,7 @@ fn build_server_rolegroup_service(
/// The rolegroup [`StatefulSet`] runs the rolegroup, as configured by the administrator.
///
/// The [`Pod`](`stackable_operator::k8s_openapi::api::core::v1::Pod`)s are accessible through the corresponding [`Service`] (from [`build_server_rolegroup_service`]).
#[allow(clippy::too_many_arguments)]
fn build_server_rolegroup_statefulset(
zk: &ZookeeperCluster,
zk_role: &ZookeeperRole,
@@ -757,6 +756,7 @@ fn build_server_rolegroup_statefulset(
zookeeper_security: &ZookeeperSecurity,
resolved_product_image: &ResolvedProductImage,
config: &ZookeeperConfig,
service_account: &ServiceAccount,
) -> Result<StatefulSet> {
let role = zk.role(zk_role).context(InternalOperatorFailureSnafu)?;
let rolegroup = zk
@@ -964,7 +964,7 @@ fn build_server_rolegroup_statefulset(
fs_group: Some(1000),
..PodSecurityContext::default()
})
.service_account_name(service_account_name(APP_NAME));
.service_account_name(service_account.name_any());

if let Some(ContainerLogConfig {
choice:
Loading