Skip to content

Commit a2a7648

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

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
@@ -24,7 +24,7 @@ serde = { version = "1.0", features = ["derive"] }
2424
serde_json = "1.0"
2525
serde_yaml = "0.9"
2626
snafu = "0.8"
27-
stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "stackable-operator-0.73.0" }
27+
stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "stackable-operator-0.74.0" }
2828
strum = { version = "0.26", features = ["derive"] }
2929
tokio = { version = "1.39", features = ["full"] }
3030
tracing = "0.1"

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/30-install-nifi.yaml.j2

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,23 @@ spec:
4848
vectorAggregatorConfigMapName: vector-aggregator-discovery
4949
{% endif %}
5050
nodes:
51+
envOverrides:
52+
COMMON_VAR: role-value # overridden by role group below
53+
ROLE_VAR: role-value # only defined here at role level
54+
configOverrides:
55+
"nifi.properties":
56+
"nifi.diagnostics.on.shutdown.enabled": "true"
57+
"nifi.diagnostics.on.shutdown.verbose": "false"
5158
config:
5259
logging:
5360
enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }}
5461
roleGroups:
5562
default:
5663
replicas: 2
64+
envOverrides:
65+
COMMON_VAR: group-value # overrides role value
66+
GROUP_VAR: group-value # only defined here at group level
67+
configOverrides:
68+
"nifi.properties":
69+
"nifi.diagnostics.on.shutdown.enabled": "false"
70+
"nifi.diagnostics.on.shutdown.max.filecount": "20"
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-nifi-node-default -o yaml | yq -e '.spec.template.spec.containers[] | select (.name == "nifi") | .env[] | select (.name == "COMMON_VAR" and .value == "group-value")'
11+
kubectl -n $NAMESPACE get sts test-nifi-node-default -o yaml | yq -e '.spec.template.spec.containers[] | select (.name == "nifi") | .env[] | select (.name == "GROUP_VAR" and .value == "group-value")'
12+
kubectl -n $NAMESPACE get sts test-nifi-node-default -o yaml | yq -e '.spec.template.spec.containers[] | select (.name == "nifi") | .env[] | select (.name == "ROLE_VAR" and .value == "role-value")'
13+
#
14+
# Test configOverrides
15+
#
16+
- script: |
17+
kubectl -n $NAMESPACE get cm test-nifi-node-default -o yaml | yq -e '.data."nifi.properties"' | grep "nifi.diagnostics.on.shutdown.enabled=false"
18+
kubectl -n $NAMESPACE get cm test-nifi-node-default -o yaml | yq -e '.data."nifi.properties"' | grep "nifi.diagnostics.on.shutdown.verbose=false"
19+
kubectl -n $NAMESPACE get cm test-nifi-node-default -o yaml | yq -e '.data."nifi.properties"' | grep "nifi.diagnostics.on.shutdown.max.filecount=20"

0 commit comments

Comments
 (0)