Merge pull request #127513 from tkashem/delete-undecryptable

k8s-publishing-bot · k8s-publishing-bot · commit 0869e9d258da · 2024-11-08T11:43:14.000Z
KEP-3926: unsafe deletion of corrupt objects

Kubernetes-commit: 4d10ae8fdc579e2bb09789507cae7b8d32cbd306
diff --git a/go.mod b/go.mod
@@ -8,7 +8,7 @@ godebug default=go1.23
 
 require (
 	github.com/gogo/protobuf v1.3.2
-	k8s.io/apimachinery v0.0.0-20241106231735-d941d9fb4c83
+	k8s.io/apimachinery v0.0.0-20241108022104-96b97de8d6ba
 )
 
 require (
diff --git a/go.sum b/go.sum
@@ -88,8 +88,8 @@ gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc=
 gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-k8s.io/apimachinery v0.0.0-20241106231735-d941d9fb4c83 h1:4KfMPmiiRIpvYJQ8cBYFEFht59EKysW1anuJWzHLHNg=
-k8s.io/apimachinery v0.0.0-20241106231735-d941d9fb4c83/go.mod h1:HqhdaJUgQqky29T1V0o2yFkt/pZqLFIDyn9Zi/8rxoY=
+k8s.io/apimachinery v0.0.0-20241108022104-96b97de8d6ba h1:ghB5Iygt6Ge8UyIwW7C1kJx4kP7AUTCL9Qg6GCsUUOY=
+k8s.io/apimachinery v0.0.0-20241108022104-96b97de8d6ba/go.mod h1:HqhdaJUgQqky29T1V0o2yFkt/pZqLFIDyn9Zi/8rxoY=
 k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
 k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
 k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 h1:M3sRQVHv7vB20Xc2ybTt7ODCeFj6JSWYFzOFnYeS6Ro=
diff --git a/testdata/HEAD/core.v1.DeleteOptions.json b/testdata/HEAD/core.v1.DeleteOptions.json
@@ -10,5 +10,6 @@
   "propagationPolicy": "propagationPolicyValue",
   "dryRun": [
     "dryRunValue"
-  ]
+  ],
+  "ignoreStoreReadErrorWithClusterBreakingPotential": true
 }
diff --git a/testdata/HEAD/core.v1.DeleteOptions.pb b/testdata/HEAD/core.v1.DeleteOptions.pb
diff --git a/testdata/HEAD/core.v1.DeleteOptions.yaml b/testdata/HEAD/core.v1.DeleteOptions.yaml
@@ -2,6 +2,7 @@ apiVersion: v1
 dryRun:
 - dryRunValue
 gracePeriodSeconds: 1
+ignoreStoreReadErrorWithClusterBreakingPotential: true
 kind: DeleteOptions
 orphanDependents: true
 preconditions:
diff --git a/testdata/HEAD/policy.v1.Eviction.json b/testdata/HEAD/policy.v1.Eviction.json
@@ -53,6 +53,7 @@
     "propagationPolicy": "propagationPolicyValue",
     "dryRun": [
       "dryRunValue"
-    ]
+    ],
+    "ignoreStoreReadErrorWithClusterBreakingPotential": true
   }
 }
diff --git a/testdata/HEAD/policy.v1.Eviction.pb b/testdata/HEAD/policy.v1.Eviction.pb
diff --git a/testdata/HEAD/policy.v1.Eviction.yaml b/testdata/HEAD/policy.v1.Eviction.yaml
@@ -3,6 +3,7 @@ deleteOptions:
   dryRun:
   - dryRunValue
   gracePeriodSeconds: 1
+  ignoreStoreReadErrorWithClusterBreakingPotential: true
   orphanDependents: true
   preconditions:
     resourceVersion: resourceVersionValue
diff --git a/testdata/HEAD/policy.v1beta1.Eviction.json b/testdata/HEAD/policy.v1beta1.Eviction.json
@@ -53,6 +53,7 @@
     "propagationPolicy": "propagationPolicyValue",
     "dryRun": [
       "dryRunValue"
-    ]
+    ],
+    "ignoreStoreReadErrorWithClusterBreakingPotential": true
   }
 }
diff --git a/testdata/HEAD/policy.v1beta1.Eviction.pb b/testdata/HEAD/policy.v1beta1.Eviction.pb
diff --git a/testdata/HEAD/policy.v1beta1.Eviction.yaml b/testdata/HEAD/policy.v1beta1.Eviction.yaml
@@ -3,6 +3,7 @@ deleteOptions:
   dryRun:
   - dryRunValue
   gracePeriodSeconds: 1
+  ignoreStoreReadErrorWithClusterBreakingPotential: true
   orphanDependents: true
   preconditions:
     resourceVersion: resourceVersionValue

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ godebug default=go1.23`
`8`	`8`
`9`	`9`	`require (`
`10`	`10`	`github.com/gogo/protobuf v1.3.2`
`11`		`- k8s.io/apimachinery v0.0.0-20241106231735-d941d9fb4c83`
	`11`	`+ k8s.io/apimachinery v0.0.0-20241108022104-96b97de8d6ba`
`12`	`12`	`)`
`13`	`13`
`14`	`14`	`require (`
Original file line number	Diff line number	Diff line change
`@@ -10,5 +10,6 @@`
`10`	`10`	`"propagationPolicy": "propagationPolicyValue",`
`11`	`11`	`"dryRun": [`
`12`	`12`	`"dryRunValue"`
`13`		`- ]`
	`13`	`+ ],`
	`14`	`+ "ignoreStoreReadErrorWithClusterBreakingPotential": true`
`14`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -53,6 +53,7 @@`
`53`	`53`	`"propagationPolicy": "propagationPolicyValue",`
`54`	`54`	`"dryRun": [`
`55`	`55`	`"dryRunValue"`
`56`		`- ]`
	`56`	`+ ],`
	`57`	`+ "ignoreStoreReadErrorWithClusterBreakingPotential": true`
`57`	`58`	`}`
`58`	`59`	`}`