Address CR + k8s.io/* deprecations

Signed-off-by: Stefan Büringer buringerst@vmware.com

Author: sbueringer

.golangci.yml

@@ -261,6 +261,10 @@ linters:
       - linters:
           - staticcheck
         text: 'SA1019: .*\.Deprecated\.V1Beta1.* is deprecated'
+        # CR v0.21 deprecated Result.Requeue, will be fixed incrementally and tracked via https://github.com/kubernetes-sigs/cluster-api/issues/12272
+      - linters:
+          - staticcheck
+        text: 'SA1019: .*(res|result|i|j)\.Requeue is deprecated: Use `RequeueAfter` instead'
       - linters:
           - revive
         text: 'exported: exported method .*\.(Reconcile|SetupWithManager|SetupWebhookWithManager) should have comment or be unexported'

util/conditions/deprecated/v1beta1/unstructured_test.go

@@ -53,7 +53,7 @@ func TestUnstructuredGetConditions(t *testing.T) {
 	g.Expect(UnstructuredGetter(u).GetV1Beta1Conditions()).To(BeNil())
 
 	// GetV1Beta1Conditions should return nil for an unstructured object without conditions
-	e := &corev1.Endpoints{}
+	e := &corev1.Pod{}
 	u = &unstructured.Unstructured{}
 	g.Expect(scheme.Scheme.Convert(e, u, nil)).To(Succeed())