Skip to content
This repository was archived by the owner on Mar 22, 2018. It is now read-only.

Commit 608abe2

Browse files
author
Kubernetes Submit Queue
authored
Merge pull request #56955 from feiskyer/scrub-dns
Automatic merge from submit-queue (batch tested with PRs 56997, 57008, 56984, 56975, 56955). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Remove unused ScrubDNS interface from cloudprovider **What this PR does / why we need it**: DNS scrubber from kubelet has been removed in #36785 and cloudprovider's `ScrubDNS()` interface is not used anywhere. **Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*: Fixes #56953. **Special notes for your reviewer**: **Release note**: ```release-note Remove ScrubDNS interface from cloudprovider. ```
2 parents 3ab8a7f + 1e13e97 commit 608abe2

1 file changed

Lines changed: 0 additions & 5 deletions

File tree

pkg/cloudprovider/providers/openstack/openstack.go

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -486,11 +486,6 @@ func (os *OpenStack) ProviderName() string {
486486
return ProviderName
487487
}
488488

489-
// ScrubDNS filters DNS settings for pods.
490-
func (os *OpenStack) ScrubDNS(nameServers, searches []string) ([]string, []string) {
491-
return nameServers, searches
492-
}
493-
494489
// HasClusterID returns true if the cluster has a clusterID
495490
func (os *OpenStack) HasClusterID() bool {
496491
return true

0 commit comments

Comments
 (0)