chore(registry): remove registry_secret_prefix

Author: duanhongyi

charts/builder/templates/builder-deployment.yaml

@@ -55,8 +55,6 @@ spec:
               value: "{{ .Values.global.storage }}"
             - name: "DRYCC_REGISTRY_LOCATION"
               value: "{{ .Values.global.registry_location }}"
-            - name: "DRYCC_REGISTRY_SECRET_PREFIX"
-              value: "{{ .Values.global.registry_secret_prefix }}"
             # Set GIT_LOCK_TIMEOUT to number of minutes you want to wait to git push again to the same repository
             - name: "GIT_LOCK_TIMEOUT"
               value: "10"

pkg/gitreceive/build.go

@@ -169,7 +169,7 @@ func build(
 		registryLocation := conf.RegistryLocation
 		registryEnv := make(map[string]string)
 		if registryLocation != "on-cluster" {
-			registryEnv, err = getRegistryDetails(kubeClient, &image, registryLocation, conf.PodNamespace, conf.RegistrySecretPrefix)
+			registryEnv, err = getRegistryDetails(kubeClient, &image, registryLocation, conf.PodNamespace)
 			if err != nil {
 				return fmt.Errorf("error getting private registry details %s", err)
 			}

pkg/gitreceive/config.go

@@ -14,12 +14,11 @@ const (
 // builder's git-receive hook.
 type Config struct {
 	// k8s service discovery env vars
-	ControllerHost       string `envconfig:"DRYCC_CONTROLLER_SERVICE_HOST" required:"true"`
-	ControllerPort       string `envconfig:"DRYCC_CONTROLLER_SERVICE_PORT" required:"true"`
-	RegistryHost         string `envconfig:"DRYCC_REGISTRY_PROXY_HOST" required:"true"`
-	RegistryPort         string `envconfig:"DRYCC_REGISTRY_PROXY_PORT" required:"true"`
-	RegistryLocation     string `envconfig:"DRYCC_REGISTRY_LOCATION" default:"on-cluster"`
-	RegistrySecretPrefix string `envconfig:"DRYCC_REGISTRY_SECRET_PREFIX" default:"private-registry"`
+	ControllerHost   string `envconfig:"DRYCC_CONTROLLER_SERVICE_HOST" required:"true"`
+	ControllerPort   string `envconfig:"DRYCC_CONTROLLER_SERVICE_PORT" required:"true"`
+	RegistryHost     string `envconfig:"DRYCC_REGISTRY_PROXY_HOST" required:"true"`
+	RegistryPort     string `envconfig:"DRYCC_REGISTRY_PROXY_PORT" required:"true"`
+	RegistryLocation string `envconfig:"DRYCC_REGISTRY_LOCATION" default:"on-cluster"`
 
 	GitHome                       string `envconfig:"GIT_HOME" required:"true"`
 	SSHConnection                 string `envconfig:"SSH_CONNECTION" required:"true"`

pkg/gitreceive/registry.go

@@ -22,7 +22,7 @@ func getDetailsFromRegistrySecret(secretGetter client.SecretsInterface, secret s
 	return regDetails, nil
 }
 
-func getRegistryDetails(kubeClient client.SecretsNamespacer, image *string, registryLocation, namespace, registrySecretPrefix string) (map[string]string, error) {
+func getRegistryDetails(kubeClient client.SecretsNamespacer, image *string, registryLocation, namespace string) (map[string]string, error) {
 	privateRegistrySecretInterface := kubeClient.Secrets(namespace)
 	registryEnv := make(map[string]string)
 	var regSecretData map[string]string

pkg/gitreceive/registry_test.go

@@ -54,7 +54,7 @@ func TestGetRegistryDetailsOffclusterErr(t *testing.T) {
 		},
 	}
 	image := "test-image"
-	_, err := getRegistryDetails(kubeClient, &image, "off-cluster", dryccNamespace, "private-registry")
+	_, err := getRegistryDetails(kubeClient, &image, "off-cluster", dryccNamespace)
 	assert.Err(t, err, expectedErr)
 }
 
@@ -75,7 +75,7 @@ func TestGetRegistryDetailsOffclusterSuccess(t *testing.T) {
 		},
 	}
 	image := "test-image"
-	regDetails, err := getRegistryDetails(kubeClient, &image, "off-cluster", dryccNamespace, "private-registry")
+	regDetails, err := getRegistryDetails(kubeClient, &image, "off-cluster", dryccNamespace)
 	assert.NoErr(t, err)
 	assert.Equal(t, expectedData, regDetails, "registry details")
 	assert.Equal(t, expectedImage, image, "image")