Skip to content

Commit b12863c

Browse files
authored
Fix SWCK oapserverconfig e2e version mismatch (#177)
Fix SWCK oapserverconfig e2e test for latest OAP compatibility Two issues prevented the oapserverconfig test from passing with the latest OAP images: 1. OAPServerConfig spec.version (9.5.0) didn't match OAPServer (latest), so the SWCK operator never applied the config and the pod was never restarted, causing a timeout. 2. The LAL rule from SWCK v0.9.0 was missing the layer property required by the latest OAP, so log_count metrics were never produced and log_count_info verification failed with all-zero values. This was fixed upstream in apache/skywalking-swck#177. Switch from SWCK v0.9.0 to the latest commit (e98e180) which includes the LAL layer fix, and add sed to align the version field.
1 parent 2850db1 commit b12863c

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

test/e2e/swck/oap-ui-agent-oapserverconfig.yaml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -84,15 +84,16 @@ setup:
8484
- name: setup java agent demo(test for dynamic configuration)
8585
command: |
8686
kubectl label namespace skywalking-system swck-injection=enabled
87-
curl https://raw.githubusercontent.com/apache/skywalking-swck/v0.9.0/test/e2e/demo.yaml | sed 's/oap-service/skywalking-system-oap.skywalking-system/' | kubectl create -f -
87+
curl https://raw.githubusercontent.com/apache/skywalking-swck/e98e180da09ff7cb98e82001542dcf002cece1cf/test/e2e/demo.yaml | sed 's/oap-service/skywalking-system-oap.skywalking-system/' | kubectl create -f -
8888
wait:
8989
- namespace: skywalking-system
9090
resource: deployment/demo
9191
for: condition=Available
9292
- name: setup oapserverconfig(static configuration) and wait for pod restart
9393
command: |
9494
oap_podname=$(kubectl get pod -lapp=oap -n skywalking-system -o jsonpath='{.items[*].metadata.name}')
95-
curl https://raw.githubusercontent.com/apache/skywalking-swck/v0.9.0/test/e2e/oapserverconfig-demo.yaml | \
95+
curl https://raw.githubusercontent.com/apache/skywalking-swck/e98e180da09ff7cb98e82001542dcf002cece1cf/test/e2e/oapserverconfig-demo.yaml | \
96+
sed 's/version: 9.5.0/version: latest/' | \
9697
sed '/env:/a\ - name: SW_STORAGE\n value: banyandb\n - name: SW_STORAGE_BANYANDB_TARGETS\n value: banyandb-grpc.default:17912' | \
9798
kubectl apply -f -
9899
while kubectl get pod $oap_podname -n skywalking-system > /dev/null 2>&1; \
@@ -101,14 +102,14 @@ setup:
101102
done
102103
- name: setup java agent demo(test for static configuration)
103104
command: |
104-
curl https://raw.githubusercontent.com/apache/skywalking-swck/v0.9.0/test/e2e/resource.yaml | sed 's/oap-service/skywalking-system-oap.skywalking-system/' | kubectl create -f -
105+
curl https://raw.githubusercontent.com/apache/skywalking-swck/e98e180da09ff7cb98e82001542dcf002cece1cf/test/e2e/resource.yaml | sed 's/oap-service/skywalking-system-oap.skywalking-system/' | kubectl create -f -
105106
wait:
106107
- namespace: skywalking-system
107108
resource: deployment/songs-deployment
108109
for: condition=Available
109110
- name: setup oapserverdynamicconfig(dynamic configuration)
110111
command: |
111-
curl https://raw.githubusercontent.com/apache/skywalking-swck/v0.9.0/test/e2e/oapserverdynamicconfig-demo.yaml | sed 's/default: 0.1/default: 500/' | kubectl apply -f -
112+
curl https://raw.githubusercontent.com/apache/skywalking-swck/e98e180da09ff7cb98e82001542dcf002cece1cf/test/e2e/oapserverdynamicconfig-demo.yaml | sed 's/default: 0.1/default: 500/' | kubectl apply -f -
112113
timeout: 20m
113114

114115
cleanup:

0 commit comments

Comments
 (0)