test: update credentials proivider api version to v1

Author: supershal

api/v1alpha1/clusterconfig_types.go

@@ -263,7 +263,7 @@ func (ImageCredentials) VariableSchema() clusterv1.VariableSchema {
 						"namespace": {
 							Description: "The namespace of the Secret containing the registry credentials. " +
 								"Defaults to the namespace of the KubeadmControlPlaneTemplate and KubeadmConfigTemplate" +
-								" that reference this variable.",
+								"that reference this variable.",
 							Type: "string",
 						},
 					},

common/pkg/testutils/capitest/request/items.go

@@ -21,8 +21,8 @@ import (
 
 const (
 	ClusterName                                  = "test-cluster"
-	KubeadmConfigTemplateRequestObjectName       = "test-kubeadmconfigtemplate"
-	KubeadmControlPlaneTemplateRequestObjectName = "test-kubeadmcontrolplanetemplate"
+	kubeadmConfigTemplateRequestObjectName       = "test-kubeadmconfigtemplate"
+	kubeadmControlPlaneTemplateRequestObjectName = "test-kubeadmcontrolplanetemplate"
 	Namespace                                    = corev1.NamespaceDefault
 )
 
@@ -45,15 +45,24 @@ func NewRequestItem(
 	}
 }
 
-func NewKubeadmConfigTemplateRequestItem(uid types.UID) runtimehooksv1.GeneratePatchesRequestItem {
+func NewKubeadmConfigTemplateRequestItem(
+	uid types.UID,
+) runtimehooksv1.GeneratePatchesRequestItem {
+	return NewKubeadmConfigTemplateRequest(uid, kubeadmConfigTemplateRequestObjectName)
+}
+
+func NewKubeadmConfigTemplateRequest(
+	uid types.UID,
+	name string,
+) runtimehooksv1.GeneratePatchesRequestItem {
 	return NewRequestItem(
 		&bootstrapv1.KubeadmConfigTemplate{
 			TypeMeta: metav1.TypeMeta{
 				APIVersion: bootstrapv1.GroupVersion.String(),
 				Kind:       "KubeadmConfigTemplate",
 			},
 			ObjectMeta: metav1.ObjectMeta{
-				Name:      KubeadmConfigTemplateRequestObjectName,
+				Name:      name,
 				Namespace: Namespace,
 			},
 			Spec: bootstrapv1.KubeadmConfigTemplateSpec{
@@ -75,8 +84,9 @@ func NewKubeadmConfigTemplateRequestItem(uid types.UID) runtimehooksv1.GenerateP
 	)
 }
 
-func NewKubeadmControlPlaneTemplateRequestItem(
+func NewKubeadmControlPlaneTemplateRequest(
 	uid types.UID,
+	name string,
 ) runtimehooksv1.GeneratePatchesRequestItem {
 	return NewRequestItem(
 		&controlplanev1.KubeadmControlPlaneTemplate{
@@ -85,7 +95,7 @@ func NewKubeadmControlPlaneTemplateRequestItem(
 				Kind:       "KubeadmControlPlaneTemplate",
 			},
 			ObjectMeta: metav1.ObjectMeta{
-				Name:      KubeadmControlPlaneTemplateRequestObjectName,
+				Name:      name,
 				Namespace: Namespace,
 			},
 			Spec: controlplanev1.KubeadmControlPlaneTemplateSpec{
@@ -113,6 +123,12 @@ func NewKubeadmControlPlaneTemplateRequestItem(
 	)
 }
 
+func NewKubeadmControlPlaneTemplateRequestItem(
+	uid types.UID,
+) runtimehooksv1.GeneratePatchesRequestItem {
+	return NewKubeadmControlPlaneTemplateRequest(uid, kubeadmControlPlaneTemplateRequestObjectName)
+}
+
 func NewAWSClusterTemplateRequestItem(
 	uid types.UID,
 	existingSpec ...capav1.AWSClusterTemplateSpec,

pkg/handlers/aws/mutation/metapatch_handler_test.go

@@ -156,6 +156,14 @@ func TestGeneratePatches(t *testing.T) {
 		imageregistries.VariableName,
 	)
 
+	imageregistrycredentialstests.TestGenerateMirrorPatches(
+		t,
+		metaPatchGeneratorFunc(mgr),
+		mgr.GetClient(),
+		clusterconfig.MetaVariableName,
+		imageregistries.VariableName,
+	)
+
 	amitests.TestControlPlaneGeneratePatches(
 		t,
 		metaPatchGeneratorFunc(mgr),

pkg/handlers/docker/mutation/metapatch_handler_test.go

@@ -112,4 +112,12 @@ func TestGeneratePatches(t *testing.T) {
 		clusterconfig.MetaVariableName,
 		imageregistries.VariableName,
 	)
+
+	imageregistrycredentialstests.TestGenerateMirrorPatches(
+		t,
+		metaPatchGeneratorFunc(mgr),
+		mgr.GetClient(),
+		clusterconfig.MetaVariableName,
+		imageregistries.VariableName,
+	)
 }

pkg/handlers/generic/mutation/imageregistries/credentials/credential_provider_config_files_test.go

@@ -208,7 +208,7 @@ mirror:
   credentialsStrategy: "MirrorCredentialsOnly"
 credentialProviderPluginBinDir: /etc/kubernetes/image-credential-provider/
 credentialProviders:
-  apiVersion: kubelet.config.k8s.io/v1beta1
+  apiVersion: kubelet.config.k8s.io/v1
   kind: CredentialProviderConfig
   providers:
   - name: ecr-credential-provider
@@ -217,7 +217,7 @@ credentialProviders:
     matchImages:
     - "123456789.dkr.ecr.us-east-1.amazonaws.com"
     defaultCacheDuration: "0s"
-    apiVersion: credentialprovider.kubelet.k8s.io/v1alpha1
+    apiVersion: credentialprovider.kubelet.k8s.io/v1
 `,
 			},
 		},
@@ -244,7 +244,7 @@ mirror:
   credentialsStrategy: "MirrorCredentialsOnly"
 credentialProviderPluginBinDir: /etc/kubernetes/image-credential-provider/
 credentialProviders:
-  apiVersion: kubelet.config.k8s.io/v1beta1
+  apiVersion: kubelet.config.k8s.io/v1
   kind: CredentialProviderConfig
   providers:
   - name: static-credential-provider
@@ -253,7 +253,7 @@ credentialProviders:
     matchImages:
     - "myregistry.com"
     defaultCacheDuration: "0s"
-    apiVersion: credentialprovider.kubelet.k8s.io/v1beta1
+    apiVersion: credentialprovider.kubelet.k8s.io/v1
 `,
 			},
 		},