This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/skywalking-helm.git
The following commit(s) were added to refs/heads/master by this push:
new b12863c Fix SWCK oapserverconfig e2e version mismatch (#177)
b12863c is described below
commit b12863c600f9651fd609c4523d3aaa6d6e89b637
Author: 吴晟 Wu Sheng <[email protected]>
AuthorDate: Fri Feb 27 10:54:19 2026 +0800
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.
---
test/e2e/swck/oap-ui-agent-oapserverconfig.yaml | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/test/e2e/swck/oap-ui-agent-oapserverconfig.yaml
b/test/e2e/swck/oap-ui-agent-oapserverconfig.yaml
index ae837da..1f1133c 100644
--- a/test/e2e/swck/oap-ui-agent-oapserverconfig.yaml
+++ b/test/e2e/swck/oap-ui-agent-oapserverconfig.yaml
@@ -84,7 +84,7 @@ setup:
- name: setup java agent demo(test for dynamic configuration)
command: |
kubectl label namespace skywalking-system swck-injection=enabled
- 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 -
+ 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 -
wait:
- namespace: skywalking-system
resource: deployment/demo
@@ -92,7 +92,8 @@ setup:
- name: setup oapserverconfig(static configuration) and wait for pod
restart
command: |
oap_podname=$(kubectl get pod -lapp=oap -n skywalking-system -o
jsonpath='{.items[*].metadata.name}')
- curl
https://raw.githubusercontent.com/apache/skywalking-swck/v0.9.0/test/e2e/oapserverconfig-demo.yaml
| \
+ curl
https://raw.githubusercontent.com/apache/skywalking-swck/e98e180da09ff7cb98e82001542dcf002cece1cf/test/e2e/oapserverconfig-demo.yaml
| \
+ sed 's/version: 9.5.0/version: latest/' | \
sed '/env:/a\ - name: SW_STORAGE\n value: banyandb\n -
name: SW_STORAGE_BANYANDB_TARGETS\n value: banyandb-grpc.default:17912' | \
kubectl apply -f -
while kubectl get pod $oap_podname -n skywalking-system > /dev/null
2>&1; \
@@ -101,14 +102,14 @@ setup:
done
- name: setup java agent demo(test for static configuration)
command: |
- 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 -
+ 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 -
wait:
- namespace: skywalking-system
resource: deployment/songs-deployment
for: condition=Available
- name: setup oapserverdynamicconfig(dynamic configuration)
command: |
- 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 -
+ curl
https://raw.githubusercontent.com/apache/skywalking-swck/e98e180da09ff7cb98e82001542dcf002cece1cf/test/e2e/oapserverdynamicconfig-demo.yaml
| sed 's/default: 0.1/default: 500/' | kubectl apply -f -
timeout: 20m
cleanup:
