Fix security vulnerabilities and upgrade deps (#376)

.github/workflows/e2e.yaml

@@ -35,7 +35,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v2
         with:
-          go-version: '^1.13.1'
+          go-version: '^1.16.0'
       - name: Restore Go cache
         uses: actions/cache@v1
         with:

Dockerfile

@@ -1,5 +1,5 @@
 # Build the manager binary
-FROM golang:1.15 as builder
+FROM golang:1.16 as builder
 
 WORKDIR /workspace
 # Copy the Go Modules manifests

go.mod

@@ -1,30 +1,30 @@
 module github.com/Azure/Orkestra
 
-go 1.15
+go 1.16
 
 require (
-	github.com/argoproj/argo-workflows/v3 v3.0.7
+	github.com/argoproj/argo-workflows/v3 v3.1.8
 	github.com/chartmuseum/helm-push v0.9.0
-	github.com/fluxcd/helm-controller/api v0.9.0
-	github.com/fluxcd/pkg/apis/meta v0.9.0
-	github.com/fluxcd/source-controller/api v0.12.2
+	github.com/fluxcd/helm-controller/api v0.11.2
+	github.com/fluxcd/pkg/apis/meta v0.10.0
+	github.com/fluxcd/source-controller/api v0.10.0
 	github.com/go-logr/logr v0.4.0
 	github.com/gofrs/flock v0.8.0
-	github.com/google/go-cmp v0.5.2
+	github.com/google/go-cmp v0.5.5
 	github.com/heptiolabs/healthcheck v0.0.0-20180807145615-6ff867650f40
 	github.com/jinzhu/copier v0.3.0
-	github.com/onsi/ginkgo v1.16.1
-	github.com/onsi/gomega v1.11.0
+	github.com/onsi/ginkgo v1.16.4
+	github.com/onsi/gomega v1.16.0
 	go.opencensus.io v0.22.5 // indirect
 	golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43 // indirect
 	gopkg.in/DATA-DOG/go-sqlmock.v1 v1.3.0 // indirect
 	gopkg.in/yaml.v2 v2.4.0
-	helm.sh/helm/v3 v3.5.4
-	k8s.io/api v0.20.4
-	k8s.io/apiextensions-apiserver v0.20.4
-	k8s.io/apimachinery v0.20.4
-	k8s.io/client-go v11.0.0+incompatible
-	sigs.k8s.io/controller-runtime v0.8.3
+	helm.sh/helm/v3 v3.6.2
+	k8s.io/api v0.21.3
+	k8s.io/apiextensions-apiserver v0.21.3
+	k8s.io/apimachinery v0.21.3
+	k8s.io/client-go v0.21.3
+	sigs.k8s.io/controller-runtime v0.9.5
 	sigs.k8s.io/yaml v1.2.0
 )
 
@@ -32,9 +32,9 @@ replace (
 	github.com/docker/distribution => github.com/docker/distribution v0.0.0-20191216044856-a8371794149d
 	github.com/docker/docker => github.com/moby/moby v1.4.2-0.20200203170920-46ec8731fbce
 	github.com/go-openapi/spec => github.com/go-openapi/spec v0.19.8
-	k8s.io/api => k8s.io/api v0.20.2
-	k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.20.2
-	k8s.io/apimachinery => k8s.io/apimachinery v0.20.2
-	k8s.io/client-go => k8s.io/client-go v0.20.2
-	sigs.k8s.io/controller-runtime => sigs.k8s.io/controller-runtime v0.8.3
+	k8s.io/api => k8s.io/api v0.21.0
+	k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.21.0
+	k8s.io/apimachinery => k8s.io/apimachinery v0.21.0
+	k8s.io/client-go => k8s.io/client-go v0.21.0
+	sigs.k8s.io/controller-runtime => sigs.k8s.io/controller-runtime v0.9.5
 )

pkg/helpers/reconcile.go

@@ -251,11 +251,10 @@ func (helper *ReconcileHelper) reconcileApplications() error {
 			if appCh.Templates == nil {
 				appCh.Templates = make([]*chart.File, 0)
 			}
-			dummy := &chart.File{
+			appCh.Templates = append(appCh.Templates, &chart.File{
 				Name: dummyConfigmapYAMLName,
 				Data: []byte(dummyConfigmapYAMLSpec),
-			}
-			appCh.Templates = append(appCh.Templates, dummy)
+			})
 		}
 
 		if err := appCh.Validate(); err != nil {