Remove Deprecated Code

[cahillsf]

Relates to https://github.com/kubernetes-sigs/cluster-api/blob/main/docs/release/release-tasks.md#track-remove-previously-deprecated-code (part of #9800)

Here are some potential items I came up with using some basic keyword searches (excluding anything related to v1alpha4 removal as that is being tracked separately (#8038))

Would like some feedback before moving forward.

• UseExperimentalRetryJoin is referenced in may places but appears to have been marked as deprecated for quite awhile:

  • cluster-api/bootstrap/kubeadm/api/v1beta1/kubeadmconfig_types.go

    Lines 103 to 117 in ec45bdb

    	// UseExperimentalRetryJoin replaces a basic kubeadm command with a shell
    	// script with retries for joins.
    	//
    	// This is meant to be an experimental temporary workaround on some environments
    	// where joins fail due to timing (and other issues). The long term goal is to add retries to
    	// kubeadm proper and use that functionality.
    	//
    	// This will add about 40KB to userdata
    	//
    	// For more information, refer to https://github.com/kubernetes-sigs/cluster-api/pull/2763#discussion_r397306055.
    	// +optional
    	//
    	// Deprecated: This experimental fix is no longer needed and this field will be removed in a future release.
    	// When removing also remove from staticcheck exclude-rules for SA1019 in golangci.yml
    	UseExperimentalRetryJoin bool `json:"useExperimentalRetryJoin,omitempty"`

  • ✨ Add UseExperimentalRetryJoin to KubeadmConfig #2763 (comment)
• metricsBindAddr in metrics serving config:

  cluster-api/util/flags/diagnostics.go

  Line 45 in ec45bdb

  _ = fs.MarkDeprecated("metrics-bind-addr", "Please use --diagnostics-address instead. To continue to serve"+

• binding/ownerref funcs in exp/addons/api/v1beta1/clusterresourcesetbinding_types.go: https://github.com/kubernetes-sigs/cluster-api/blob/main/exp/addons/api/v1beta1/clusterresourcesetbinding_types.go#L110-L166

Please let me know if there are other items I might have missed as well

[k8s-ci-robot]

This issue is currently awaiting triage.

If CAPI contributors determines this is a relevant issue, they will accept it by applying the triage/accepted label and provide further guidance.

The triage/accepted label can be added by org members by writing /triage accepted in a comment.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

[sbueringer]

We can't drop code in api packages in general (we will only not include it in new apiVersion (e.g. v1beta2 / v1)). See

We can't just remove all code flagged with Deprecated. In some cases like e.g. in API packages we have to keep the old code.

For the metrics-bind-addr. I would guess we want to keep it around for a few more releases to give folks time to adjust.

[cahillsf]

ah-- that makes sense, thanks for the guidance @sbueringer

[sbueringer]

@cahillsf Checked the occurrences of "Deprecated". We don't have do remove anything for this round.

A general improvement could be that we clearly state in the Deprecated messages when something can be removed
(although I wouldn't do this for api packages and just have the general rule for them to never remove deprecated code in the API packages)

[cahillsf]

sounds good, thanks for confirming @sbueringer, will go ahead and close this out