Update argo to 2.4.0

gardener · Oct 8, 2019 · 7a1b813 · 7a1b813
1 parent 4402350
commit 7a1b813
Show file tree

Hide file tree

Showing 9 changed files with 27 additions and 7 deletions.
diff --git a/.ci/integration b/.ci/integration
@@ -94,6 +94,10 @@ for ns in $(kubectl --kubeconfig=$TM_KUBECONFIG get ns --no-headers | awk '{ pri
 
   kubectl --kubeconfig=$TM_KUBECONFIG -n $ns get tr -oname | xargs kubectl --kubeconfig=$TM_KUBECONFIG -n $ns patch -p '{"metadata":{"finalizers":[]}}' --type=merge
   kubectl --kubeconfig=$TM_KUBECONFIG -n $ns get wf -oname | xargs kubectl --kubeconfig=$TM_KUBECONFIG -n $ns patch -p '{"metadata":{"finalizers":[]}}' --type=merge
+
+  if [[ $ns == tm-it* ]]; then
+    kubectl --kubeconfig=$TM_KUBECONFIG delete ns $ns
+  fi
 done
 echo "$controller_chart" | kubectl --kubeconfig=$TM_KUBECONFIG delete -f -
 echo "$prerequisites_chart" | kubectl --kubeconfig=$TM_KUBECONFIG delete -f -

diff --git a/charts/bootstrap_tm_prerequisites/templates/argo-rbac.yaml b/charts/bootstrap_tm_prerequisites/templates/argo-rbac.yaml
@@ -63,6 +63,8 @@ rules:
   resources:
   - workflows
   - workflows/finalizers
+  - workflowtemplates
+  - workflowtemplates/finalizers
   verbs:
   - get
   - list

diff --git a/charts/bootstrap_tm_prerequisites/templates/crds.yaml b/charts/bootstrap_tm_prerequisites/templates/crds.yaml
@@ -58,4 +58,18 @@ spec:
     shortNames:
     - wf
   scope: Namespaced
-  version: v1alpha1
+  version: v1alpha1
+---
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+  name: workflowtemplates.argoproj.io
+spec:
+  group: argoproj.io
+  version: v1alpha1
+  scope: Namespaced
+  names:
+    kind: WorkflowTemplate
+    plural: workflowtemplates
+    shortNames:
+    - wftmpl
diff --git a/charts/bootstrap_tm_prerequisites/values.yaml b/charts/bootstrap_tm_prerequisites/values.yaml
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 argo:
-  tag: v2.3.0
+  tag: v2.4.0
   containerRuntimeExecutor: docker
 
 configmap:

diff --git a/cmd/testrunner/cmd/run_template/run_template.go b/cmd/testrunner/cmd/run_template/run_template.go
@@ -154,7 +154,7 @@ func init() {
 	runCmd.Flags().BoolVar(&collectConfig.UploadStatusAsset, "upload-status-asset", false, "Upload testrun status as a github release asset.")
 	runCmd.Flags().StringVar(&collectConfig.GithubUser, "github-user", os.Getenv("GITHUB_USER"), "On error dir which is used by Concourse.")
 	runCmd.Flags().StringVar(&collectConfig.GithubPassword, "github-password", os.Getenv("GITHUB_PASSWORD"), "Github password.")
-	runCmd.Flags().StringArrayVar(&collectConfig.AssetComponents, "asset-component", []string{}, "The github components to which the testrun status shall be attached as an asset." )
+	runCmd.Flags().StringArrayVar(&collectConfig.AssetComponents, "asset-component", []string{}, "The github components to which the testrun status shall be attached as an asset.")
 	runCmd.Flags().StringVar(&collectConfig.AssetPrefix, "asset-prefix", "", "Prefix of the asset name.")
 
 	// parameter flags

diff --git a/pkg/apis/testmachinery/v1beta1/types.go b/pkg/apis/testmachinery/v1beta1/types.go
@@ -143,7 +143,7 @@ type TestrunStatus struct {
 	Steps []*StepStatus `json:"steps,omitempty"`
 
 	// Ingested states whether the result of a testrun is already ingested into a persistant storage (db).
-	Ingested         bool `json:"ingested"`
+	Ingested bool `json:"ingested"`
 
 	// UploadedToGithub states whether the status of a testrun is already uploaded to github component
 	UploadedToGithub *bool `json:"uploadedToGithub"`

diff --git a/pkg/testrunner/result/collect.go b/pkg/testrunner/result/collect.go
@@ -93,7 +93,7 @@ func (c *Collector) uploadStatusAsset(cfg Config, runLogger logr.Logger, err err
 		return
 	}
 
-	if len(cfg.AssetComponents)  == 0 || cfg.GithubPassword == "" || cfg.GithubUser == "" || cfg.ComponentDescriptorPath == "" {
+	if len(cfg.AssetComponents) == 0 || cfg.GithubPassword == "" || cfg.GithubUser == "" || cfg.ComponentDescriptorPath == "" {
 		runLogger.Error(err, "missing github password / github user / component descriptor path argument")
 	}
 	componentsFromFile, err := componentdescriptor.GetComponentsFromFile(cfg.ComponentDescriptorPath)

diff --git a/pkg/testrunner/result/status-uploader.go b/pkg/testrunner/result/status-uploader.go
@@ -157,4 +157,4 @@ func MarkTestrunsAsUploadedToGithub(log logr.Logger, tmClient kubernetes.Interfa
 	log.V(3).Info("Successfully updated status of testrun")
 
 	return nil
-}
+}
diff --git a/pkg/testrunner/result/types.go b/pkg/testrunner/result/types.go
@@ -54,7 +54,7 @@ type Config struct {
 	UploadStatusAsset bool
 
 	// AssetPrefix defines the asset name prefix
-	AssetPrefix       string
+	AssetPrefix string
 }
 
 type Collector struct {
-Original file line number
+Diff line change
@@ Expand Up @@
     	log.V(3).Info("Successfully updated status of testrun")
     	return nil
-    }
+    }