Skip to content

Commit 26ef5a6

Browse files
razvanxeniape
andauthored
fix(test): smoke testing env and config overrides (#507)
* expand smoke test with env overrides * expand smoke test with config overrides * remove blank line * op-rs version 0.74.0 * implement review feedback * regenerate nix files --------- Co-authored-by: xeniape <xenia.fischer@stackable.tech>
1 parent 4d3dd9b commit 26ef5a6

File tree

6 files changed

+47
-16
lines changed

6 files changed

+47
-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
@@ -23,7 +23,7 @@ serde = { version = "1.0", features = ["derive"] }
2323
serde_json = "1.0"
2424
serde_yaml = "0.9"
2525
snafu = "0.8"
26-
stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "stackable-operator-0.73.0" }
26+
stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "stackable-operator-0.74.0" }
2727
product-config = { git = "https://github.com/stackabletech/product-config.git", tag = "0.7.0" }
2828
strum = { version = "0.26", features = ["derive"] }
2929
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/60-install-hive.yaml.j2

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,25 @@ spec:
2626
config:
2727
logging:
2828
enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }}
29+
envOverrides:
30+
COMMON_VAR: role-value # overridden by role group below
31+
ROLE_VAR: role-value # only defined here at role level
32+
configOverrides:
33+
hive-env.sh:
34+
HADOOP_HEAPSIZE: "512" # also set by the operator
35+
COMMON_VAR: role-value # overridden by role group below
36+
ROLE_VAR: role-value # only defined here at role level
2937
roleGroups:
3038
default:
3139
replicas: 1
40+
envOverrides:
41+
COMMON_VAR: group-value # overrides role value
42+
GROUP_VAR: group-value # only defined here at group level
43+
configOverrides:
44+
hive-env.sh:
45+
COMMON_VAR: group-value # overridden by role group below
46+
GROUP_VAR: group-value # only defined here at group level
47+
3248
---
3349
apiVersion: s3.stackable.tech/v1alpha1
3450
kind: S3Connection
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
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 hive-metastore-default -o yaml | yq -e '.spec.template.spec.containers[] | select (.name == "hive") | .env[] | select (.name == "COMMON_VAR" and .value == "group-value")'
11+
kubectl -n $NAMESPACE get sts hive-metastore-default -o yaml | yq -e '.spec.template.spec.containers[] | select (.name == "hive") | .env[] | select (.name == "GROUP_VAR" and .value == "group-value")'
12+
kubectl -n $NAMESPACE get sts hive-metastore-default -o yaml | yq -e '.spec.template.spec.containers[] | select (.name == "hive") | .env[] | select (.name == "ROLE_VAR" and .value == "role-value")'
13+
#
14+
# Test configOverrides
15+
#
16+
- script: |
17+
kubectl -n $NAMESPACE get cm hive-metastore-default -o yaml | yq -e '.data."hive-env.sh"' | grep "export ROLE_VAR=role-value"
18+
kubectl -n $NAMESPACE get cm hive-metastore-default -o yaml | yq -e '.data."hive-env.sh"' | grep "export GROUP_VAR=group-value"
19+
kubectl -n $NAMESPACE get cm hive-metastore-default -o yaml | yq -e '.data."hive-env.sh"' | grep "export COMMON_VAR=group-value"
20+
kubectl -n $NAMESPACE get cm hive-metastore-default -o yaml | yq -e '.data."hive-env.sh"' | grep "export HADOOP_HEAPSIZE=512"

0 commit comments

Comments
 (0)