fix: revert incorrect variable name changes

Author: dkoshkin

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

@@ -20,13 +20,13 @@ import (
 )
 
 const (
-	//nolint:gosec // Does not contain hard coded config.
-	kubeletStaticCredentialProviderCredentialsOnRemote = "/etc/kubernetes/static-image-config.json"
+	//nolint:gosec // Does not contain hard coded credentials.
+	kubeletStaticCredentialProviderCredentialsOnRemote = "/etc/kubernetes/static-image-credentials.json"
 
-	//nolint:gosec // Does not contain hard coded config.
+	//nolint:gosec // Does not contain hard coded credentials.
 	kubeletImageCredentialProviderConfigOnRemote = "/etc/kubernetes/image-credential-provider-config.yaml"
 
-	//nolint:gosec // Does not contain hard coded config.
+	//nolint:gosec // Does not contain hard coded credentials.
 	kubeletDynamicCredentialProviderConfigOnRemote = "/etc/kubernetes/dynamic-credential-provider-config.yaml"
 
 	azureCloudConfigFilePath = "/etc/kubernetes/azure.json"
@@ -153,7 +153,7 @@ func kubeletCredentialProvider() (
 	providerBinary string, providerArgs []string, providerAPIVersion string, err error,
 ) {
 	return "dynamic-credential-provider",
-		[]string{"get-config", "-c", kubeletDynamicCredentialProviderConfigOnRemote},
+		[]string{"get-credentials", "-c", kubeletDynamicCredentialProviderConfigOnRemote},
 		credentialproviderv1beta1.SchemeGroupVersion.String(),
 		nil
 }
@@ -162,12 +162,12 @@ func dynamicCredentialProvider(host string) (
 	providerBinary string, providerArgs []string, providerAPIVersion string, err error,
 ) {
 	if matches, err := credentialprovider.URLMatchesECR(host); matches || err != nil {
-		return "ecr-credential-provider", []string{"get-config"},
+		return "ecr-credential-provider", []string{"get-credentials"},
 			credentialproviderv1alpha1.SchemeGroupVersion.String(), err
 	}
 
 	if matches, err := credentialprovider.URLMatchesGCR(host); matches || err != nil {
-		return "gcr-credential-provider", []string{"get-config"},
+		return "gcr-credential-provider", []string{"get-credentials"},
 			credentialproviderv1alpha1.SchemeGroupVersion.String(), err
 	}
 

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

@@ -32,7 +32,7 @@ kind: CredentialProviderConfig
 providers:
 - name: dynamic-credential-provider
   args:
-  - get-config
+  - get-credentials
   - -c
   - /etc/kubernetes/dynamic-credential-provider-config.yaml
   matchImages:
@@ -65,7 +65,7 @@ kind: CredentialProviderConfig
 providers:
 - name: dynamic-credential-provider
   args:
-  - get-config
+  - get-credentials
   - -c
   - /etc/kubernetes/dynamic-credential-provider-config.yaml
   matchImages:
@@ -117,7 +117,7 @@ credentialProviders:
   providers:
   - name: ecr-credential-provider
     args:
-    - get-config
+    - get-credentials
     matchImages:
     - "123456789.dkr.ecr.us-east-1.amazonaws.com"
     defaultCacheDuration: "0s"
@@ -126,7 +126,7 @@ credentialProviders:
 			},
 		},
 		{
-			name: "image registry with static config",
+			name: "image registry with static credentials",
 			credentials: providerConfig{
 				URL:      "https://myregistry.com",
 				Username: "myuser",
@@ -156,7 +156,7 @@ credentialProviders:
 			},
 		},
 		{
-			name: "docker.io registry with static config",
+			name: "docker.io registry with static credentials",
 			credentials: providerConfig{
 				URL:      "https://registry-1.docker.io",
 				Username: "myuser",
@@ -187,7 +187,7 @@ credentialProviders:
 			},
 		},
 		{
-			name: "image registry with static config",
+			name: "error for a registry with no credentials",
 			credentials: providerConfig{
 				URL: "https://myregistry.com",
 			},

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

@@ -13,15 +13,15 @@ import (
 )
 
 const (
-	//nolint:gosec // Does not contain hard coded config.
+	//nolint:gosec // Does not contain hard coded credentials.
 	installKubeletCredentialProvidersScriptOnRemote = "/etc/konvoy/install-kubelet-credential-providers.sh"
 
 	installKubeletCredentialProvidersScriptOnRemoteCommand = "/bin/bash " + installKubeletCredentialProvidersScriptOnRemote
 
-	//nolint:gosec // Does not contain hard coded config.
+	//nolint:gosec // Does not contain hard coded credentials.
 	dynamicCredentialProviderImage = "ghcr.io/mesosphere/dynamic-credential-provider:v0.2.0"
 
-	//nolint:gosec // Does not contain hard coded config.
+	//nolint:gosec // Does not contain hard coded credentials.
 	credentialProviderTargetDir = "/etc/kubernetes/image-credential-provider/"
 )
 

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

@@ -287,7 +287,7 @@ func createSecretIfNeeded(
 ) error {
 	credentialsSecret, err := generateCredentialsSecret(registryWithOptionalCredentials, clusterKey.Name, obj.GetName(), obj.GetNamespace())
 	if err != nil {
-		return fmt.Errorf("error generating config Secret for Image Registry Credentials variable: %w", err)
+		return fmt.Errorf("error generating crdentials Secret for Image Registry Credentials variable: %w", err)
 	}
 	if credentialsSecret != nil {
 		if err := client.ServerSideApply(ctx, c, credentialsSecret); err != nil {

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

@@ -21,7 +21,7 @@ import (
 )
 
 const (
-	validSecretName = "myregistry-config"
+	validSecretName = "myregistry-credentials"
 )
 
 func TestGeneratePatches(t *testing.T) {

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

@@ -21,7 +21,7 @@ var (
 
 const (
 	// variableName is the external patch variable name.
-	variableName = "config"
+	variableName = "credentials"
 
 	// HandlerNameVariable is the name of the variable handler.
 	HandlerNameVariable = "ImageRegistryCredentialsVars"