Skip to content

Commit

Permalink
Merge pull request kubernetes#105037 from pohly/automated-cherry-pick…
Browse files Browse the repository at this point in the history
…-of-#104913-origin-release-1.21

Automated cherry pick of kubernetes#104913: kube-controller-manager: properly check generic ephemeral
  • Loading branch information
k8s-ci-robot committed Oct 6, 2021
2 parents e010ed4 + edc2915 commit f47bef3
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion cmd/kube-controller-manager/app/core.go
Expand Up @@ -577,7 +577,7 @@ func startPVCProtectionController(ctx ControllerContext) (http.Handler, bool, er
ctx.InformerFactory.Core().V1().Pods(),
ctx.ClientBuilder.ClientOrDie("pvc-protection-controller"),
utilfeature.DefaultFeatureGate.Enabled(features.StorageObjectInUseProtection),
utilfeature.DefaultFeatureGate.Enabled(features.StorageObjectInUseProtection),
utilfeature.DefaultFeatureGate.Enabled(features.GenericEphemeralVolume),
)
if err != nil {
return nil, true, fmt.Errorf("failed to start the pvc protection controller: %v", err)
Expand Down

0 comments on commit f47bef3

Please sign in to comment.