Skip to content

Bug 1970828: Revert "Bug 1946479: Re-enable BoundServiceAccountTokenVolume disabled by 1.21 rebase" #803

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
s-urbaniak wants to merge 1 commit into from
Closed

Bug 1970828: Revert "Bug 1946479: Re-enable BoundServiceAccountTokenVolume disabled by 1.21 rebase" #803

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 0 additions & 14 deletions cmd/kube-controller-manager/app/certificates.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ import (

"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/klog/v2"
"k8s.io/kubernetes/openshift-kube-controller-manager/servicecacertpublisher"
"k8s.io/kubernetes/pkg/controller/certificates/approver"
"k8s.io/kubernetes/pkg/controller/certificates/cleaner"
"k8s.io/kubernetes/pkg/controller/certificates/rootcacertpublisher"
Expand Down Expand Up @@ -216,16 +215,3 @@ func startRootCACertPublisher(ctx ControllerContext) (http.Handler, bool, error)
go sac.Run(1, ctx.Stop)
return nil, true, nil
}

func startServiceCACertPublisher(ctx ControllerContext) (http.Handler, bool, error) {
sac, err := servicecacertpublisher.NewPublisher(
ctx.InformerFactory.Core().V1().ConfigMaps(),
ctx.InformerFactory.Core().V1().Namespaces(),
ctx.ClientBuilder.ClientOrDie("service-ca-cert-publisher"),
)
if err != nil {
return nil, true, fmt.Errorf("error creating service CA certificate publisher: %v", err)
}
go sac.Run(1, ctx.Stop)
return nil, true, nil
}
1 change: 0 additions & 1 deletion cmd/kube-controller-manager/app/controllermanager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -489,7 +489,6 @@ func NewControllerInitializers(loopMode ControllerLoopMode) map[string]InitFunc
controllers["pv-protection"] = startPVProtectionController
controllers["ttl-after-finished"] = startTTLAfterFinishedController
controllers["root-ca-cert-publisher"] = startRootCACertPublisher
controllers["service-ca-cert-publisher"] = startServiceCACertPublisher
controllers["ephemeral-volume"] = startEphemeralVolumeController
if utilfeature.DefaultFeatureGate.Enabled(genericfeatures.APIServerIdentity) &&
utilfeature.DefaultFeatureGate.Enabled(genericfeatures.StorageVersionAPI) {
Expand Down
56 changes: 0 additions & 56 deletions openshift-kube-controller-manager/servicecacertpublisher/metrics.go
View file
Open in desktop

This file was deleted.

81 changes: 0 additions & 81 deletions openshift-kube-controller-manager/servicecacertpublisher/metrics_test.go
View file
Open in desktop

This file was deleted.

222 changes: 0 additions & 222 deletions openshift-kube-controller-manager/servicecacertpublisher/publisher.go
View file
Open in desktop

This file was deleted.

Loading