Skip to content
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

Jump to bottom

🌱 Remove previously deprecated code #9136

Merged
merged 3 commits into from
Aug 9, 2023
Merged

🌱 Remove previously deprecated code #9136

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
229e7ae
Remove deprecated code in v1.6
furkatgofurov7 Aug 7, 2023
e851cef
Update v1.5-v1.6 migration doc with deprecated code information
furkatgofurov7 Aug 7, 2023
ee574d9
Fix lint reported issue
furkatgofurov7 Aug 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
130 changes: 0 additions & 130 deletions controllers/noderefutil/providerid.go
View file
Open in desktop

This file was deleted.

170 changes: 0 additions & 170 deletions controllers/noderefutil/providerid_test.go
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions controllers/noderefutil/util.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/

// Package noderefutil implements noderef utilities.
package noderefutil

import (
Expand Down
6 changes: 0 additions & 6 deletions controllers/remote/index.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,3 @@ var NodeProviderIDIndex = Index{
Field: index.NodeProviderIDField,
ExtractValue: index.NodeByProviderID,
}

// DefaultIndexes is the default list of indexes on a ClusterCacheTracker.
//
// Deprecated: This variable is deprecated and will be removed in a future release of Cluster API.
// Instead please use `[]Index{NodeProviderIDIndex}`.
var DefaultIndexes = []Index{NodeProviderIDIndex}
5 changes: 5 additions & 0 deletions docs/book/src/developer/providers/migrations/v1.5-to-v1.6.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,11 @@ maintainers of providers and consumers of our Go API.
### Removals

- API version `v1alpha4` is not served in v1.6 (users can enable it manually in case they are lagging behind with deprecation cycles). Important: `v1alpha4` will be completely removed in 1.7.
- The function(s):
- `ClusterToObjectsMapper` is removed, please use `ClusterToTypedObjectsMapper` function instead.
- `Poll` and `PollImmediate` are removed, please use utils from "k8s.io/apimachinery/pkg/util/wait" instead.
- The variable `DefaultIndexes` is removed, please use `[]Index{NodeProviderIDIndex}`
- `ProviderID` type and all related methods/construct have been removed. Please see this [PR](https://github.com/kubernetes-sigs/cluster-api/pull/8577) for a reference.

### API Changes

Expand Down
18 changes: 0 additions & 18 deletions util/retry.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,21 +46,3 @@ func Retry(fn wait.ConditionFunc, initialBackoffSec int) error {
}
return nil
}

// Poll tries a condition func until it returns true, an error, or the timeout
// is reached.
//
// Deprecated: This function has been deprecated and will be removed in a future release.
// Please use utils from "k8s.io/apimachinery/pkg/util/wait" instead.
func Poll(interval, timeout time.Duration, condition wait.ConditionFunc) error {
return wait.Poll(interval, timeout, condition)
}

// PollImmediate tries a condition func until it returns true, an error, or the timeout
// is reached.
//
// Deprecated: This function has been deprecated and will be removed in a future release.
// Please use utils from "k8s.io/apimachinery/pkg/util/wait" instead.
func PollImmediate(interval, timeout time.Duration, condition wait.ConditionFunc) error {
return wait.PollImmediate(interval, timeout, condition)
}