Skip to content

Commit

Permalink
Fix defaultConfig regression
Browse files Browse the repository at this point in the history
The script condition failed if there were additional files.

Adding an sample key and kuttl test to ensure there is no future
regression.
  • Loading branch information
cschwede committed Mar 25, 2024
1 parent 00a1e4f commit 560d184
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 1 deletion.
3 changes: 3 additions & 0 deletions config/samples/swift_v1beta1_swift.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,6 @@ spec:
replicas: 1
passwordSelectors:
service: SwiftPassword
defaultConfigOverwrite:
01-proxy-server.conf: |
# Additional proxy config
2 changes: 1 addition & 1 deletion templates/common/ring-sync.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ for s in account-server \
object-server \
object-expirer \
proxy-server; do
if [ -e /var/lib/config-data/default/*${s}*.conf ]; then
if $(ls -1 /var/lib/config-data/default/ | grep -q "${s}"); then
[ ! -d /etc/swift/${s}.conf.d ] && mkdir /etc/swift/${s}.conf.d
cp -t /etc/swift/${s}.conf.d/ /var/lib/config-data/default/*${s}*.conf
fi
Expand Down
8 changes: 8 additions & 0 deletions tests/kuttl/tests/basic-deploy/01-assert-deploy-swift.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -141,3 +141,11 @@ apiVersion: kuttl.dev/v1beta1
kind: TestAssert
commands:
- script: $SWIFT_KUTTL_DIR/../common/scripts/check_ring_rebalance_output.sh
---
apiVersion: kuttl.dev/v1beta1
kind: TestAssert
commands:
- script: |
podname=$(oc get pod -n $NAMESPACE -l component=swift-proxy | grep Running | cut -f 1 -d " ")
files=$(oc rsh -n $NAMESPACE -c proxy-server "$podname" /bin/sh -c "ls -1 /etc/swift/proxy-server.conf.d/")
echo "$files" | grep -ze "00-proxy-server.conf.*01-proxy-server.conf"

0 comments on commit 560d184

Please sign in to comment.