Merge pull request #9136 from furkatgofurov7/deprecated-code-1-6

🌱 Remove previously deprecated code
kubernetes-sigs · Aug 9, 2023 · dc57d8d · dc57d8d
2 parents 03ab8cd + ee574d9
commit dc57d8d
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 374 deletions.
diff --git a/controllers/noderefutil/providerid.go b/controllers/noderefutil/providerid.go
diff --git a/controllers/noderefutil/providerid_test.go b/controllers/noderefutil/providerid_test.go
diff --git a/controllers/noderefutil/util.go b/controllers/noderefutil/util.go
@@ -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 (

diff --git a/controllers/remote/index.go b/controllers/remote/index.go
@@ -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}
diff --git a/docs/book/src/developer/providers/migrations/v1.5-to-v1.6.md b/docs/book/src/developer/providers/migrations/v1.5-to-v1.6.md
@@ -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
 

diff --git a/util/retry.go b/util/retry.go
@@ -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)
-}