Skip to content

Commit b3e3029

Browse files
committed
fix: r
Signed-off-by: Ashing Zheng <[email protected]>
1 parent 8d02117 commit b3e3029

File tree

3 files changed

+19
-14
lines changed

3 files changed

+19
-14
lines changed

internal/provider/adc/executor.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -383,6 +383,8 @@ func (e *HTTPADCExecutor) buildHTTPRequest(ctx context.Context, serverAddr, mode
383383
return nil, fmt.Errorf("failed to marshal request body: %w", err)
384384
}
385385

386+
log.Debugw("request body", zap.String("body", string(jsonData)))
387+
386388
log.Debugw("sending HTTP request to ADC Server",
387389
zap.String("url", e.serverURL+"/sync"),
388390
zap.String("server", serverAddr),

test/e2e/framework/manifests/ingress.yaml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -455,11 +455,7 @@ spec:
455455
port: 3001
456456
initialDelaySeconds: 5
457457
periodSeconds: 5
458-
securityContext:
459-
allowPrivilegeEscalation: false
460-
capabilities:
461-
drop:
462-
- ALL
458+
securityContext: {}
463459
volumes:
464460
- name: ingress-config
465461
configMap:

test/e2e/scaffold/scaffold.go

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -220,16 +220,23 @@ func (s *Scaffold) GetDeploymentLogs(name string) string {
220220
var buf strings.Builder
221221
for _, pod := range pods.Items {
222222
buf.WriteString(fmt.Sprintf("=== pod: %s ===\n", pod.Name))
223-
logs, err := cli.CoreV1().RESTClient().Get().
224-
Resource("pods").
225-
Namespace(s.namespace).
226-
Name(pod.Name).SubResource("log").
227-
Do(context.TODO()).
228-
Raw()
229-
if err == nil {
230-
buf.Write(logs)
223+
for _, c := range pod.Spec.Containers {
224+
buf.WriteString(fmt.Sprintf("--- container: %s ---\n", c.Name))
225+
logs, err := cli.CoreV1().RESTClient().Get().
226+
Resource("pods").
227+
Namespace(s.namespace).
228+
Name(pod.Name).
229+
SubResource("log").
230+
Param("container", c.Name).
231+
Do(context.TODO()).
232+
Raw()
233+
if err == nil {
234+
buf.Write(logs)
235+
} else {
236+
buf.WriteString(fmt.Sprintf("Error getting logs: %v\n", err))
237+
}
238+
buf.WriteByte('\n')
231239
}
232-
buf.WriteByte('\n')
233240
}
234241
return buf.String()
235242
}

0 commit comments

Comments
 (0)