Skip to content

Commit 2eb3910

Browse files
authored
Fix patch format (#140)
1 parent c9626bf commit 2eb3910

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

patches/CVE-2020-8554.1.19.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Subject: [PATCH 1/2] Move defaultingressclass admission to net subdir
1616
rename plugin/pkg/admission/{ => network}/defaultingressclass/admission_test.go (100%)
1717

1818
diff --git a/pkg/kubeapiserver/options/BUILD b/pkg/kubeapiserver/options/BUILD
19-
index f0b9aabbeb8..43263b50313 100644
19+
index bd631e32707..45c6b4d8d38 100644
2020
--- a/pkg/kubeapiserver/options/BUILD
2121
+++ b/pkg/kubeapiserver/options/BUILD
2222
@@ -25,7 +25,6 @@ go_library(
@@ -79,7 +79,7 @@ diff --git a/plugin/pkg/admission/defaultingressclass/BUILD b/plugin/pkg/admissi
7979
similarity index 95%
8080
rename from plugin/pkg/admission/defaultingressclass/BUILD
8181
rename to plugin/pkg/admission/network/defaultingressclass/BUILD
82-
index 65399b5bb88..b00bb57dfac 100644
82+
index 367c3cf3b3d..e11d7f292e0 100644
8383
--- a/plugin/pkg/admission/defaultingressclass/BUILD
8484
+++ b/plugin/pkg/admission/network/defaultingressclass/BUILD
8585
@@ -3,7 +3,7 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test")
@@ -118,7 +118,7 @@ Subject: [PATCH 2/2] Add denyserviceexternalips admission
118118
create mode 100644 plugin/pkg/admission/network/denyserviceexternalips/admission_test.go
119119

120120
diff --git a/pkg/kubeapiserver/options/BUILD b/pkg/kubeapiserver/options/BUILD
121-
index 43263b50313..aeb25eea3f0 100644
121+
index 45c6b4d8d38..04732f82df5 100644
122122
--- a/pkg/kubeapiserver/options/BUILD
123123
+++ b/pkg/kubeapiserver/options/BUILD
124124
@@ -36,6 +36,7 @@ go_library(

patches/nokmem.1.20.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Subject: [PATCH] Disabled kmem
99
2 files changed, 2 insertions(+), 2 deletions(-)
1010

1111
diff --git a/vendor/github.com/opencontainers/runc/libcontainer/cgroups/fs/kmem.go b/vendor/github.com/opencontainers/runc/libcontainer/cgroups/fs/kmem.go
12-
index 69b5a1946c7..678faccd370 100644
12+
index 8d97a6791a4..8935e811742 100644
1313
--- a/vendor/github.com/opencontainers/runc/libcontainer/cgroups/fs/kmem.go
1414
+++ b/vendor/github.com/opencontainers/runc/libcontainer/cgroups/fs/kmem.go
1515
@@ -1,4 +1,4 @@

0 commit comments

Comments
 (0)