add repository adderss (#88)

Signed-off-by: soulseen <sunzhu@yunify.com>
kubesphere · Jul 9, 2019 · 401d495 · 401d495
1 parent bee781b
commit 401d495
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 7 deletions.
diff --git a/api/api-rules/violation_exceptions.list b/api/api-rules/violation_exceptions.list
@@ -1,4 +1,3 @@
-API rule violation: names_match,github.com/kubesphere/s2ioperator/pkg/apis/devops/v1alpha1,AuthConfig,ServerAddress
 API rule violation: names_match,github.com/kubesphere/s2ioperator/pkg/apis/devops/v1alpha1,CGroupLimits,CPUPeriod
 API rule violation: names_match,github.com/kubesphere/s2ioperator/pkg/apis/devops/v1alpha1,CGroupLimits,CPUQuota
 API rule violation: names_match,github.com/kubesphere/s2ioperator/pkg/apis/devops/v1alpha1,CGroupLimits,CPUShares

diff --git a/config/crds/devops_v1alpha1_s2ibuilder.yaml b/config/crds/devops_v1alpha1_s2ibuilder.yaml
@@ -188,6 +188,8 @@ spec:
                       type: string
                     secretRef:
                       type: object
+                    serverAddress:
+                      type: string
                     username:
                       type: string
                   type: object
@@ -243,6 +245,8 @@ spec:
                       type: string
                     secretRef:
                       type: object
+                    serverAddress:
+                      type: string
                     username:
                       type: string
                   type: object
@@ -256,6 +260,8 @@ spec:
                       type: string
                     secretRef:
                       type: object
+                    serverAddress:
+                      type: string
                     username:
                       type: string
                   type: object
@@ -295,6 +301,8 @@ spec:
                       type: string
                     secretRef:
                       type: object
+                    serverAddress:
+                      type: string
                     username:
                       type: string
                   type: object

diff --git a/pkg/apis/devops/v1alpha1/openapi_generated.go b/pkg/apis/devops/v1alpha1/openapi_generated.go
diff --git a/pkg/apis/devops/v1alpha1/s2ibuilder_types.go b/pkg/apis/devops/v1alpha1/s2ibuilder_types.go
@@ -113,7 +113,7 @@ type AuthConfig struct {
 	Username      string                       `json:"username,omitempty"`
 	Password      string                       `json:"password,omitempty"`
 	Email         string                       `json:"email,omitempty"`
-	ServerAddress string                       `json:"server_address,omitempty"`
+	ServerAddress string                       `json:"serverAddress,omitempty"`
 	SecretRef     *corev1.LocalObjectReference `json:"secretRef,omitempty"`
 }
 
@@ -483,9 +483,10 @@ type DockerConfigJson struct {
 type DockerConfigMap map[string]DockerConfigEntry
 
 type DockerConfigEntry struct {
-	Username string `json:"username"`
-	Password string `json:"password"`
-	Email    string `json:"email"`
+	Username      string `json:"username"`
+	Password      string `json:"password"`
+	Email         string `json:"email"`
+	ServerAddress string `json:"serverAddress,omitempty"`
 }
 
 func init() {

diff --git a/pkg/controller/s2irun/ksbuilder_jobs.go b/pkg/controller/s2irun/ksbuilder_jobs.go
@@ -164,6 +164,7 @@ func (r *ReconcileS2iRun) setDockerSecret(instance *devopsv1alpha1.S2iRun, confi
 		if err != nil {
 			return err
 		}
+		config.PushAuthentication.ServerAddress = entry.ServerAddress
 		config.PushAuthentication.Username = entry.Username
 		config.PushAuthentication.Password = entry.Password
 		config.PushAuthentication.Email = entry.Email
@@ -181,6 +182,7 @@ func (r *ReconcileS2iRun) setDockerSecret(instance *devopsv1alpha1.S2iRun, confi
 		if err != nil {
 			return err
 		}
+		config.PushAuthentication.ServerAddress = entry.ServerAddress
 		config.PullAuthentication.Username = entry.Username
 		config.PullAuthentication.Password = entry.Password
 		config.PullAuthentication.Email = entry.Email
@@ -198,6 +200,7 @@ func (r *ReconcileS2iRun) setDockerSecret(instance *devopsv1alpha1.S2iRun, confi
 		if err != nil {
 			return err
 		}
+		config.PushAuthentication.ServerAddress = entry.ServerAddress
 		config.IncrementalAuthentication.Username = entry.Username
 		config.IncrementalAuthentication.Password = entry.Password
 		config.IncrementalAuthentication.Email = entry.Email
@@ -215,6 +218,7 @@ func (r *ReconcileS2iRun) setDockerSecret(instance *devopsv1alpha1.S2iRun, confi
 		if err != nil {
 			return err
 		}
+		config.PushAuthentication.ServerAddress = entry.ServerAddress
 		config.RuntimeAuthentication.Username = entry.Username
 		config.RuntimeAuthentication.Password = entry.Password
 		config.RuntimeAuthentication.Email = entry.Email
@@ -316,7 +320,8 @@ func getDockerEntryFromDockerSecret(instance *corev1.Secret) (dockerConfigEntry
 	if len(dockerConfig.Auths) == 0 {
 		return nil, fmt.Errorf("docker config auth len should not be 0")
 	}
-	for _, dockerConfigEntry := range dockerConfig.Auths {
+	for registryAddress, dockerConfigEntry := range dockerConfig.Auths {
+		dockerConfigEntry.ServerAddress = registryAddress
 		return dockerConfigEntry.DeepCopy(), nil
 	}
 	return nil, nil