Set non-empty defaults for registry mirror secret credentials (#7933)

aws · Apr 4, 2024 · 96d504b · 96d504b
1 parent 989e06b
commit 96d504b
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/pkg/curatedpackages/packagecontrollerclient.go b/pkg/curatedpackages/packagecontrollerclient.go
@@ -34,8 +34,10 @@ import (
 var secretsValueYaml string
 
 const (
-	eksaDefaultRegion = "us-west-2"
-	valueFileName     = "values.yaml"
+	eksaDefaultRegion             = "us-west-2"
+	valueFileName                 = "values.yaml"
+	defaultRegistryMirrorUsername = "username"
+	defaultRegistryMirrorPassword = "password"
 )
 
 type PackageControllerClientOpt func(client *PackageControllerClient)
@@ -304,7 +306,7 @@ func (pc *PackageControllerClient) CreateHelmOverrideValuesYaml() (string, []byt
 
 func (pc *PackageControllerClient) generateHelmOverrideValues() ([]byte, error) {
 	var err error
-	endpoint, username, password, caCertContent, insecureSkipVerify := "", "", "", "", "false"
+	endpoint, username, password, caCertContent, insecureSkipVerify := "", defaultRegistryMirrorUsername, defaultRegistryMirrorPassword, "", "false"
 	if pc.registryMirror != nil {
 		endpoint = pc.registryMirror.BaseRegistry
 		username, password, err = config.ReadCredentials()

diff --git a/pkg/curatedpackages/testdata/values_empty.yaml b/pkg/curatedpackages/testdata/values_empty.yaml
@@ -1,7 +1,7 @@
 registryMirrorSecret:
   endpoint: ""
-  username: ""
-  password: ""
+  username: "dXNlcm5hbWU="
+  password: "cGFzc3dvcmQ="
   cacertcontent: ""
   insecure: "ZmFsc2U="
 awsSecret:

diff --git a/pkg/curatedpackages/testdata/values_empty_registrymirrorsecret.yaml b/pkg/curatedpackages/testdata/values_empty_registrymirrorsecret.yaml
@@ -1,7 +1,7 @@
 registryMirrorSecret:
   endpoint: ""
-  username: ""
-  password: ""
+  username: "dXNlcm5hbWU="
+  password: "cGFzc3dvcmQ="
   cacertcontent: ""
   insecure: "ZmFsc2U="
 awsSecret: