Skip to content

Commit 5c6fc75

Browse files
razvanxeniape
andauthored
fix(test): smoke testing env and config overrides (#855)
* extend smoke test with env overrides * extend smoke test with config overrides * bump op-rs * regenerate nix files --------- Co-authored-by: xeniape <[email protected]>
1 parent 7d17cf5 commit 5c6fc75

File tree

6 files changed

+44
-16
lines changed

6 files changed

+44
-16
lines changed

Cargo.lock

Lines changed: 3 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.nix

Lines changed: 5 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ serde = { version = "1.0", features = ["derive"] }
2222
serde_json = "1.0"
2323
serde_yaml = "0.9"
2424
snafu = "0.8"
25-
stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "stackable-operator-0.73.0" }
25+
stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "stackable-operator-0.74.0" }
2626
product-config = { git = "https://github.com/stackabletech/product-config.git", tag = "0.7.0" }
2727
strum = { version = "0.26", features = ["derive"] }
2828
tokio = { version = "1.39", features = ["full"] }

crate-hashes.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tests/templates/kuttl/smoke/10-install-zookeeper.yaml.j2

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,25 @@ spec:
4444
min: '250m'
4545
memory:
4646
limit: '512Mi'
47+
envOverrides:
48+
COMMON_VAR: role-value # overridden by role group below
49+
ROLE_VAR: role-value # only defined here at role level
50+
configOverrides:
51+
zoo.cfg:
52+
prop.common: role
53+
prop.role: role
4754
roleGroups:
4855
primary:
4956
replicas: 2
5057
config:
5158
myidOffset: 10
59+
envOverrides:
60+
COMMON_VAR: group-value # overrides role value
61+
GROUP_VAR: group-value # only defined here at group level
62+
configOverrides:
63+
zoo.cfg:
64+
prop.common: group
65+
prop.group: group
5266
secondary:
5367
replicas: 1
5468
config:
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
---
2+
apiVersion: kuttl.dev/v1beta1
3+
kind: TestAssert
4+
timeout: 600
5+
commands:
6+
#
7+
# Test envOverrides
8+
#
9+
- script: |
10+
kubectl -n $NAMESPACE get sts test-zk-server-primary -o yaml | yq -e '.spec.template.spec.containers[] | select (.name == "zookeeper") | .env[] | select (.name == "COMMON_VAR" and .value == "group-value")'
11+
kubectl -n $NAMESPACE get sts test-zk-server-primary -o yaml | yq -e '.spec.template.spec.containers[] | select (.name == "zookeeper") | .env[] | select (.name == "GROUP_VAR" and .value == "group-value")'
12+
kubectl -n $NAMESPACE get sts test-zk-server-primary -o yaml | yq -e '.spec.template.spec.containers[] | select (.name == "zookeeper") | .env[] | select (.name == "ROLE_VAR" and .value == "role-value")'
13+
#
14+
# Test configOverrides
15+
#
16+
- script: |
17+
kubectl -n $NAMESPACE get cm test-zk-server-primary -o yaml | yq -e '.data."zoo.cfg"' | grep "prop.common=group"
18+
kubectl -n $NAMESPACE get cm test-zk-server-primary -o yaml | yq -e '.data."zoo.cfg"' | grep "prop.group=group"
19+
kubectl -n $NAMESPACE get cm test-zk-server-primary -o yaml | yq -e '.data."zoo.cfg"' | grep "prop.role=role"

0 commit comments

Comments
 (0)