Skip to content

Commit dc57d8d

Browse files
authored
Merge pull request #9136 from furkatgofurov7/deprecated-code-1-6
🌱 Remove previously deprecated code
2 parents 03ab8cd + ee574d9 commit dc57d8d

File tree

7 files changed

+6
-374
lines changed

7 files changed

+6
-374
lines changed

controllers/noderefutil/providerid.go

Lines changed: 0 additions & 130 deletions
This file was deleted.

controllers/noderefutil/providerid_test.go

Lines changed: 0 additions & 170 deletions
This file was deleted.

controllers/noderefutil/util.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ See the License for the specific language governing permissions and
1414
limitations under the License.
1515
*/
1616

17+
// Package noderefutil implements noderef utilities.
1718
package noderefutil
1819

1920
import (

controllers/remote/index.go

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,3 @@ var NodeProviderIDIndex = Index{
3636
Field: index.NodeProviderIDField,
3737
ExtractValue: index.NodeByProviderID,
3838
}
39-
40-
// DefaultIndexes is the default list of indexes on a ClusterCacheTracker.
41-
//
42-
// Deprecated: This variable is deprecated and will be removed in a future release of Cluster API.
43-
// Instead please use `[]Index{NodeProviderIDIndex}`.
44-
var DefaultIndexes = []Index{NodeProviderIDIndex}

docs/book/src/developer/providers/migrations/v1.5-to-v1.6.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,11 @@ maintainers of providers and consumers of our Go API.
2222
### Removals
2323

2424
- 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.
25+
- The function(s):
26+
- `ClusterToObjectsMapper` is removed, please use `ClusterToTypedObjectsMapper` function instead.
27+
- `Poll` and `PollImmediate` are removed, please use utils from "k8s.io/apimachinery/pkg/util/wait" instead.
28+
- The variable `DefaultIndexes` is removed, please use `[]Index{NodeProviderIDIndex}`
29+
- `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.
2530

2631
### API Changes
2732

util/retry.go

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -46,21 +46,3 @@ func Retry(fn wait.ConditionFunc, initialBackoffSec int) error {
4646
}
4747
return nil
4848
}
49-
50-
// Poll tries a condition func until it returns true, an error, or the timeout
51-
// is reached.
52-
//
53-
// Deprecated: This function has been deprecated and will be removed in a future release.
54-
// Please use utils from "k8s.io/apimachinery/pkg/util/wait" instead.
55-
func Poll(interval, timeout time.Duration, condition wait.ConditionFunc) error {
56-
return wait.Poll(interval, timeout, condition)
57-
}
58-
59-
// PollImmediate tries a condition func until it returns true, an error, or the timeout
60-
// is reached.
61-
//
62-
// Deprecated: This function has been deprecated and will be removed in a future release.
63-
// Please use utils from "k8s.io/apimachinery/pkg/util/wait" instead.
64-
func PollImmediate(interval, timeout time.Duration, condition wait.ConditionFunc) error {
65-
return wait.PollImmediate(interval, timeout, condition)
66-
}

0 commit comments

Comments
 (0)