github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-11-02 14:51:58 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #105983 from jiahuif-forks/dep/bump-smd

Browse Source 
Upgrade sigs.k8s.io/structured-merge-diff/v4 to v4.2.0
This commit is contained in:
Kubernetes Prow Robot
2021-11-03 15:24:32 -07:00
committed by GitHub
parent f28881de25 fbc8ac9c96
commit 8e2d7a3d64
37 changed files with 100 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
test/integration/client/client_test.go
View File

@@ -1366,12 +1366,12 @@ func TestExtractModifyApply_ForceOwnership(t *testing.T) {
WithTemplate(corev1ac.PodTemplateSpec().
WithSpec(corev1ac.PodSpec().
WithContainers(
corev1ac.Container().
WithName("nginx").
WithWorkingDir("/tmp/v2"),
corev1ac.Container().
WithName("sidecar").
WithImage("nginx:1.14.3"),
corev1ac.Container().
WithName("nginx").
WithWorkingDir("/tmp/v2"),
),
),
),