chore(registry): remove ecr and gcr registry

Author: duanhongyi

pkg/gitreceive/k8s_util.go

@@ -18,17 +18,15 @@ const (
 	slugBuilderName   = "drycc-slugbuilder"
 	dockerBuilderName = "drycc-dockerbuilder"
 
-	tarPath          = "TAR_PATH"
-	putPath          = "PUT_PATH"
-	cachePath        = "CACHE_PATH"
-	debugKey         = "DRYCC_DEBUG"
-	sourceVersion    = "SOURCE_VERSION"
-	objectStore      = "objectstorage-keyfile"
-	dockerSocketName = "docker-socket"
-	dockerSocketPath = "/var/run/docker.sock"
-	builderStorage   = "BUILDER_STORAGE"
-	objectStorePath  = "/var/run/secrets/drycc/objectstore/creds"
-	envRoot          = "/tmp/env"
+	tarPath         = "TAR_PATH"
+	putPath         = "PUT_PATH"
+	cachePath       = "CACHE_PATH"
+	debugKey        = "DRYCC_DEBUG"
+	sourceVersion   = "SOURCE_VERSION"
+	objectStore     = "objectstorage-keyfile"
+	builderStorage  = "BUILDER_STORAGE"
+	objectStorePath = "/var/run/secrets/drycc/objectstore/creds"
+	envRoot         = "/tmp/env"
 )
 
 func dockerBuilderPodName(appName, shortSha string) string {
@@ -98,20 +96,6 @@ func dockerBuilderPod(
 		addEnvToPod(pod, key, value)
 	}
 
-	pod.Spec.Containers[0].VolumeMounts = append(pod.Spec.Containers[0].VolumeMounts, api.VolumeMount{
-		Name:      dockerSocketName,
-		MountPath: dockerSocketPath,
-	})
-
-	pod.Spec.Volumes = append(pod.Spec.Volumes, api.Volume{
-		Name: dockerSocketName,
-		VolumeSource: api.VolumeSource{
-			HostPath: &api.HostPathVolumeSource{
-				Path: dockerSocketPath,
-			},
-		},
-	})
-
 	return &pod
 }
 

pkg/gitreceive/registry.go

@@ -1,13 +1,8 @@
 package gitreceive
 
 import (
-	"encoding/base64"
-	"encoding/json"
-	"errors"
 	"strings"
 
-	"github.com/drycc/builder/pkg/storage"
-	"k8s.io/kubernetes/pkg/api"
 	client "k8s.io/kubernetes/pkg/client/unversioned"
 )
 
@@ -27,43 +22,7 @@ func getDetailsFromRegistrySecret(secretGetter client.SecretsInterface, secret s
 	return regDetails, nil
 }
 
-func getDetailsFromDockerConfigSecret(secretGetter client.SecretsInterface, secret string) (map[string]string, error) {
-	configSecret, err := secretGetter.Get(secret)
-	if err != nil {
-		return nil, err
-	}
-	dockerConfigJSONBytes := configSecret.Data[api.DockerConfigJsonKey]
-	var secretData map[string]interface{}
-	if err = json.Unmarshal(dockerConfigJSONBytes, &secretData); err != nil {
-		return nil, err
-	}
-
-	var authdata map[string]interface{}
-	var hostname string
-	for key, value := range secretData["auths"].(map[string]interface{}) {
-		hostname = key
-		authdata = value.(map[string]interface{})
-	}
-	token := authdata["auth"].(string)
-	decodedToken, err := base64.StdEncoding.DecodeString(token)
-	if err != nil {
-		return nil, err
-	}
-	parts := strings.SplitN(string(decodedToken), ":", 2)
-	if len(parts) != 2 {
-		return nil, errors.New("Invalid token in docker config secret")
-	}
-	user := parts[0]
-	password := parts[1]
-	regDetails := make(map[string]string)
-	regDetails["DRYCC_REGISTRY_USERNAME"] = user
-	regDetails["DRYCC_REGISTRY_PASSWORD"] = password
-	regDetails["DRYCC_REGISTRY_HOSTNAME"] = hostname
-	return regDetails, nil
-}
-
 func getRegistryDetails(kubeClient client.SecretsNamespacer, image *string, registryLocation, namespace, registrySecretPrefix string) (map[string]string, error) {
-	registryConfigSecretInterface := kubeClient.Secrets(*image)
 	privateRegistrySecretInterface := kubeClient.Secrets(namespace)
 	registryEnv := make(map[string]string)
 	var regSecretData map[string]string
@@ -82,44 +41,6 @@ func getRegistryDetails(kubeClient client.SecretsNamespacer, image *string, regi
 		if registryEnv["DRYCC_REGISTRY_HOSTNAME"] != "" {
 			*image = registryEnv["DRYCC_REGISTRY_HOSTNAME"] + "/" + *image
 		}
-	} else if registryLocation == "ecr" {
-		registryEnv, err = getDetailsFromDockerConfigSecret(registryConfigSecretInterface, registrySecretPrefix+"-"+registryLocation)
-		if err != nil {
-			return nil, err
-		}
-
-		regSecretData, err = getDetailsFromRegistrySecret(privateRegistrySecretInterface, registrySecret)
-		if err != nil {
-			return nil, err
-		}
-		err = storage.CreateImageRepo(*image, regSecretData)
-		if err != nil {
-			return nil, err
-		}
-		hostname := strings.Replace(registryEnv["DRYCC_REGISTRY_HOSTNAME"], "https://", "", 1)
-		*image = hostname + "/" + *image
-
-	} else if registryLocation == "gcr" {
-		registryEnv, err = getDetailsFromDockerConfigSecret(registryConfigSecretInterface, registrySecretPrefix+"-"+registryLocation)
-		if err != nil {
-			return nil, err
-		}
-
-		regSecretData, err = getDetailsFromRegistrySecret(privateRegistrySecretInterface, registrySecret)
-		if err != nil {
-			return nil, err
-		}
-		var key struct {
-			ProjectID string `json:"project_id"`
-		}
-		jsonKey := []byte(regSecretData["key.json"])
-		if err := json.Unmarshal(jsonKey, &key); err != nil {
-			return nil, err
-		}
-		hostname := strings.Replace(registryEnv["DRYCC_REGISTRY_HOSTNAME"], "https://", "", 1)
-		projectID := strings.Replace(key.ProjectID, ":", "/", -1)
-		registryEnv["DRYCC_REGISTRY_GCS_PROJ_ID"] = projectID
-		*image = strings.Replace(hostname, "https://", "", 1) + "/" + projectID + "/" + *image
 	}
 	return registryEnv, nil
 }