Merge pull request #3350 from benyp/release-3.0

fix duplicate args error

.github/workflows/build.yml

@@ -10,6 +10,7 @@ on:
   pull_request:
     branches:
       - 'master'
+      - 'release*'
 
 jobs:
   build:

pkg/apis/devops/v1alpha3/credential_types.go

@@ -48,7 +48,7 @@ const (
 	// SSHAuthPrivateKey is the key of the passphrase for SecretTypeSSHAuth secrets
 	SSHAuthPassphraseKey = "passphrase"
 	// SSHAuthPrivateKey is the key of the privatekey for SecretTypeSSHAuth secrets
-	SSHAuthPrivateKey = "privatekey"
+	SSHAuthPrivateKey = "private_key"
 
 	// SecretTypeSecretText contains data.
 	//

pkg/controller/devopscredential/devopscredential_controller.go

@@ -239,8 +239,8 @@ func (c *Controller) syncHandler(key string) error {
 		}
 		// Check secret config exists, otherwise we will create it.
 		// if secret exists, update config
-		_, err := c.devopsClient.CreateCredentialInProject(nsName, copySecret)
+		_, err := c.devopsClient.GetCredentialInProject(nsName, copySecret.Name)
-		if err != nil {
+		if err == nil {
 			if _, ok := copySecret.Annotations[devopsv1alpha3.CredentialAutoSyncAnnoKey]; ok {
 				_, err := c.devopsClient.UpdateCredentialInProject(nsName, copySecret)
 				if err != nil {
@@ -248,8 +248,13 @@ func (c *Controller) syncHandler(key string) error {
 					return err
 				}
 			}
+		} else {
+			_, err = c.devopsClient.CreateCredentialInProject(nsName, copySecret)
+			if err != nil {
+				klog.V(8).Info(err, fmt.Sprintf("failed to create secret %s ", key))
+				return err
+			}
 		}
-
 	} else {
 		// Finalizers processing logic
 		if sliceutil.HasString(copySecret.ObjectMeta.Finalizers, devopsv1alpha3.CredentialFinalizerName) {

pkg/models/devops/devops.go

@@ -274,6 +274,7 @@ func (d devopsOperator) ListPipelineObj(projectName string, limit, offset int) (
 //credentialobj in crd
 func (d devopsOperator) CreateCredentialObj(projectName string, secret *v1.Secret) (*v1.Secret, error) {
 	projectObj, err := d.ksInformers.Devops().V1alpha3().DevOpsProjects().Lister().Get(projectName)
+	secret.Annotations[devopsv1alpha3.CredentialAutoSyncAnnoKey] = "true"
 	if err != nil {
 		return nil, err
 	}

pkg/models/routers/routers.go

@@ -19,6 +19,9 @@ package routers
 import (
 	"fmt"
 	"io/ioutil"
+	"sort"
+	"strings"
+
 	v1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/errors"
@@ -29,8 +32,7 @@ import (
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/kubernetes/scheme"
 	"k8s.io/klog"
-	"sort"
+	"kubesphere.io/kubesphere/pkg/utils/sliceutil"
-	"strings"
 )
 
 // choose router node ip by labels, currently select master node
@@ -318,13 +320,13 @@ func (c *routerOperator) createOrUpdateRouterWorkload(namespace string, publishS
 			deployment.Spec.Template.Labels["project"] = namespace
 
 			// Add configmap
-			deployment.Spec.Template.Spec.Containers[0].Args = append(deployment.Spec.Template.Spec.Containers[0].Args, "--configmap=$(POD_NAMESPACE)/"+deployment.Name+configMapSuffix)
+			deployment.Spec.Template.Spec.Containers[0].Args = sliceutil.AppendArg(deployment.Spec.Template.Spec.Containers[0].Args, "--configmap=$(POD_NAMESPACE)/"+deployment.Name+configMapSuffix)
 
 			// Isolate namespace
-			deployment.Spec.Template.Spec.Containers[0].Args = append(deployment.Spec.Template.Spec.Containers[0].Args, "--watch-namespace="+namespace)
+			deployment.Spec.Template.Spec.Containers[0].Args = sliceutil.AppendArg(deployment.Spec.Template.Spec.Containers[0].Args, "--watch-namespace="+namespace)
 
 			// Choose self as master
-			deployment.Spec.Template.Spec.Containers[0].Args = append(deployment.Spec.Template.Spec.Containers[0].Args, "--election-id="+deployment.Name)
+			deployment.Spec.Template.Spec.Containers[0].Args = sliceutil.AppendArg(deployment.Spec.Template.Spec.Containers[0].Args, "--election-id="+deployment.Name)
 
 		}
 	} else {
@@ -340,7 +342,7 @@ func (c *routerOperator) createOrUpdateRouterWorkload(namespace string, publishS
 						strings.HasPrefix("--report-node-internal-ip-address", argument) {
 						continue
 					}
-					args = append(args, deployment.Spec.Template.Spec.Containers[i].Args[j])
+					args = sliceutil.AppendArg(args, deployment.Spec.Template.Spec.Containers[i].Args[j])
 				}
 				deployment.Spec.Template.Spec.Containers[i].Args = args
 			}
@@ -357,9 +359,9 @@ func (c *routerOperator) createOrUpdateRouterWorkload(namespace string, publishS
 	}
 
 	if publishService {
-		deployment.Spec.Template.Spec.Containers[0].Args = append(deployment.Spec.Template.Spec.Containers[0].Args, "--publish-service="+ingressControllerNamespace+"/"+ingressControllerPrefix+namespace)
+		deployment.Spec.Template.Spec.Containers[0].Args = sliceutil.AppendArg(deployment.Spec.Template.Spec.Containers[0].Args, "--publish-service="+ingressControllerNamespace+"/"+ingressControllerPrefix+namespace)
 	} else {
-		deployment.Spec.Template.Spec.Containers[0].Args = append(deployment.Spec.Template.Spec.Containers[0].Args, "--report-node-internal-ip-address")
+		deployment.Spec.Template.Spec.Containers[0].Args = sliceutil.AppendArg(deployment.Spec.Template.Spec.Containers[0].Args, "--report-node-internal-ip-address")
 	}
 
 	if createDeployment {

pkg/simple/client/devops/jenkins/credential_test.go

@@ -67,9 +67,9 @@ func TestNewSshCredential(t *testing.T) {
 			Namespace: "test",
 		},
 		Data: map[string][]byte{
-			"username":   []byte(username),
+			"username":    []byte(username),
-			"passphrase": []byte(passphrase),
+			"passphrase":  []byte(passphrase),
-			"privatekey": []byte(privatekey),
+			"private_key": []byte(privatekey),
 		},
 		Type: "credential.devops.kubesphere.io/ssh-auth",
 	}

pkg/simple/client/devops/pipeline.go

@@ -894,9 +894,10 @@ type BranchPipeline struct {
 			Name  string `json:"name,omitempty" description:"name"`
 			Value string `json:"value,omitempty" description:"value"`
 		} `json:"defaultParameterValue,omitempty" description:""`
-		Description string `json:"description,omitempty" description:"description"`
+		Description string        `json:"description,omitempty" description:"description"`
-		Name        string `json:"name,omitempty" description:"name"`
+		Name        string        `json:"name,omitempty" description:"name"`
-		Type        string `json:"type,omitempty" description:"type"`
+		Type        string        `json:"type,omitempty" description:"type"`
+		Choices     []interface{} `json:"choices,omitempty" description:"choices"`
 	} `json:"parameters,omitempty"`
 	Permissions struct {
 		Create    bool `json:"create,omitempty" description:"create action"`

pkg/utils/sliceutil/sliceutil_test.go

@@ -0,0 +1,57 @@
+/*
+Copyright 2020 KubeSphere Authors
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package sliceutil
+
+import (
+	"fmt"
+	"testing"
+
+	"github.com/google/go-cmp/cmp"
+)
+
+func TestAppendArg(t *testing.T) {
+	var tests = []struct {
+		args     []string
+		arg      string
+		expected []string
+	}{
+		{
+			args:     []string{"--arg1=val1", "--arg2=val2", "--arg3=val3"},
+			arg:      "--arg4=val4",
+			expected: []string{"--arg1=val1", "--arg2=val2", "--arg3=val3", "--arg4=val4"},
+		},
+		{
+			args:     []string{"--arg1=val1", "--arg2=val2", "--arg3=val3"},
+			arg:      "  --arg2=val2 ",
+			expected: []string{"--arg1=val1", "--arg2=val2", "--arg3=val3"},
+		},
+		{
+			args:     []string{"  --arg1 = val1", " --arg2=val2 ", " --arg3"},
+			arg:      "  --arg2=val2 ",
+			expected: []string{"  --arg1 = val1", " --arg2=val2 ", " --arg3"},
+		},
+	}
+
+	for i, test := range tests {
+		t.Run(fmt.Sprintf("%d", i), func(t *testing.T) {
+			result := AppendArg(test.args, test.arg)
+			if diff := cmp.Diff(result, test.expected); diff != "" {
+				t.Fatalf("%T differ (-got, +want): %s", test.expected, diff)
+			}
+		})
+	}
+}

pkg/utils/sliceutil/sliceutils.go

@@ -16,6 +16,10 @@ limitations under the License.
 
 package sliceutil
 
+import (
+	"strings"
+)
+
 func RemoveString(slice []string, remove func(item string) bool) []string {
 	for i := 0; i < len(slice); i++ {
 		if remove(slice[i]) {
@@ -34,3 +38,14 @@ func HasString(slice []string, str string) bool {
 	}
 	return false
 }
+
+func AppendArg(args []string, arg string) []string {
+	n := strings.TrimSpace(strings.Split(arg, "=")[0])
+	for _, v := range args {
+		if strings.TrimSpace(strings.Split(v, "=")[0]) == n {
+			return args
+		}
+	}
+
+	return append(args, arg)
+}