Cr 11890 sync v2.3.4 And fixing of kustomize features (#92)

* Merge pull request from GHSA-xmg8-99r8-jc2j Signed-off-by: Michael Crenshaw <[email protected]> Co-authored-by: Michael Crenshaw <[email protected]> * Merge pull request from GHSA-6gcg-hp2x-q54h * fix: do not allow symlinks from directory-type applications Signed-off-by: Michael Crenshaw <[email protected]> * chore: add new util file Signed-off-by: Michael Crenshaw <[email protected]> * chore: lint Signed-off-by: Michael Crenshaw <[email protected]> * chore: use t.TempDir for simpler tests Signed-off-by: Michael Crenshaw <[email protected]> * address comments Signed-off-by: Michael Crenshaw <[email protected]> * Merge pull request from GHSA-r642-gv9p-2wjj Signed-off-by: jannfis <[email protected]> Co-authored-by: Michael Crenshaw <[email protected]> Co-authored-by: Michael Crenshaw <[email protected]> * Bump version to 2.3.4 * Bump version to 2.3.4 * all codefresh changes * fixed kustomize mutations to main kustomization file * fixed linting * fixed forceNamespace normalize app spec Co-authored-by: jannfis <[email protected]> Co-authored-by: Michael Crenshaw <[email protected]> Co-authored-by: argo-bot <[email protected]> Co-authored-by: Noam Gal <[email protected]>
codefresh-io · May 30, 2022 · b3c88d3 · b3c88d3
1 parent ebac94e
commit b3c88d3
Show file tree

Hide file tree

Showing 33 changed files with 41,917 additions and 42,662 deletions.
diff --git a/.github/workflows/ci-build.yaml b/.github/workflows/ci-build.yaml
@@ -68,8 +68,8 @@ jobs:
       - name: Run golangci-lint
         uses: golangci/golangci-lint-action@v3
         with:
-          version: v1.38.0
-          args: --timeout 10m --exclude SA5011
+          version: v1.46.2
+          args: --timeout 10m --exclude SA5011 --verbose
 
   test-go:
     name: Run unit tests for Go packages

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-2.1.14-cap-CR-11584-fix-resource-cache
+2.3.4-cap-CR-11890
diff --git a/assets/swagger.json b/assets/swagger.json
@@ -5177,6 +5177,10 @@
           "type": "boolean",
           "title": "ForceCommonLabels specifies whether to force applying common labels to resources for Kustomize apps"
         },
+        "forceNamespace": {
+          "type": "boolean",
+          "title": "ForceNamespace if true, will use the application's destination namespace as a kustomization file namespace"
+        },
         "images": {
           "type": "array",
           "title": "Images is a list of Kustomize image override specifications",

diff --git a/go.mod b/go.mod
@@ -63,7 +63,7 @@ require (
 	github.com/soheilhy/cmux v0.1.5
 	github.com/spf13/cobra v1.2.1
 	github.com/spf13/pflag v1.0.5
-	github.com/stretchr/testify v1.7.0
+	github.com/stretchr/testify v1.7.1
 	github.com/undefinedlabs/go-mpatch v1.0.6
 	github.com/whilp/git-urls v0.0.0-20191001220047-6db9661140c0
 	github.com/yuin/gopher-lua v0.0.0-20200816102855-ee81675732da

diff --git a/go.sum b/go.sum
@@ -952,8 +952,9 @@ github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UV
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
 github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMTY=
+github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw=
 github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww=
 github.com/tidwall/pretty v1.0.0 h1:HsD+QiTn7sK6flMKIvNmpqz1qrpP3Ps6jOKIKMooyg4=

diff --git a/manifests/base/kustomization.yaml b/manifests/base/kustomization.yaml
@@ -2,14 +2,14 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 
 images:
-  - name: quay.io/argoproj/argocd
-    newName: quay.io/codefresh/argocd
-    newTag: latest
+- name: quay.io/argoproj/argocd
+  newName: quay.io/codefresh/argocd
+  newTag: latest
 resources:
-  - ./application-controller
-  - ./dex
-  - ./repo-server
-  - ./server
-  - ./config
-  - ./redis
-  - ./notification
+- ./application-controller
+- ./dex
+- ./repo-server
+- ./server
+- ./config
+- ./redis
+- ./notification
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		2.1.14-cap-CR-11584-fix-resource-cache
		2.3.4-cap-CR-11890