Merge branch 'main' into dependabot/go_modules/k8s.io/api-0.21.3

argoproj-labs · Aug 3, 2021 · 71b5fd2 · 71b5fd2
2 parents ccec2ff + 4df53a7
commit 71b5fd2
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 29 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Changelog:
 
+# v0.2.13
+
+### New Features:
+* Allow installation of Argo-CD in `insecure` mode (useful when you want the SSL termination to happen in the ingress controller)[#144](https://github.com/argoproj-labs/argocd-autopilot/issues/144)
+
+### Breaking Changes:
+* Removed the `--namespaced` option from `repo bootstrap`. Installing argo-cd in namespaced mode cannot be used for bootstraping as the bootstrap installation contains CRDs, which are cluster scoped resources, which cannot be created by argo-cd in namespaced mode. Bottom line: it was never useable.
+
 # v0.2.12
 
 ### New Features:

diff --git a/Makefile b/Makefile
@@ -1,4 +1,4 @@
-VERSION=v0.2.12
+VERSION=v0.2.13
 OUT_DIR=dist
 
 CLI_NAME?=argocd-autopilot

diff --git a/build/release.yml b/build/release.yml
@@ -131,10 +131,6 @@ steps:
         title: linux_s390x
         environment:
          - TARGET=linux-s390x
-      linux_ppc64le:
-        title: linux_ppc64le
-        environment:
-         - TARGET=linux-ppc64le
       windows_amd64:
         title: windows_amd64
         environment:

diff --git a/cmd/commands/repo.go b/cmd/commands/repo.go
@@ -409,10 +409,6 @@ func setBootstrapOptsDefaults(opts RepoBootstrapOptions) (*RepoBootstrapOptions,
 
 	if opts.AppSpecifier == "" {
 		opts.AppSpecifier = getBootstrapAppSpecifier(opts.Insecure)
-	} else {
-		if opts.Insecure {
-			return nil, fmt.Errorf("cannot use flag '--insecure' in combination with '--app' flag")
-		}
 	}
 
 	if _, err := os.Stat(opts.AppSpecifier); err == nil {

diff --git a/cmd/commands/repo_test.go b/cmd/commands/repo_test.go
@@ -82,18 +82,6 @@ func Test_setBootstrapOptsDefaults(t *testing.T) {
 				assert.Equal(t, "manifests/insecure", opts.AppSpecifier)
 			},
 		},
-		"InsecureWithAppSpecifier": {
-			opts: &RepoBootstrapOptions{
-				CloneOptions:     &git.CloneOptions{},
-				InstallationMode: installationModeFlat,
-				Insecure:         true,
-				Namespace:        "bar",
-				AppSpecifier:     "https://github.com/foo/bar",
-			},
-			assertFn: func(t *testing.T, opts *RepoBootstrapOptions, ret error) {
-				assert.EqualError(t, ret, "cannot use flag '--insecure' in combination with '--app' flag")
-			},
-		},
 	}
 
 	orgCurrentKubeContext := currentKubeContext

diff --git a/docs/releases/release_notes.md b/docs/releases/release_notes.md
@@ -1,13 +1,11 @@
 ### New Features:
-* Allow sending extra key-value pairs to app create [138](https://github.com/argoproj-labs/argocd-autopilot/issues/138)
-
-### Documentation fixes:
-* update url path to core_concepts docs [#141](https://github.com/argoproj-labs/argocd-autopilot/pull/141)
+* Allow installation of Argo-CD in `insecure` mode (useful when you want the SSL termination to happen in the ingress controller)[#144](https://github.com/argoproj-labs/argocd-autopilot/issues/144)
+  
+### Breaking Changes:
+* Removed the `--namespaced` option from `repo bootstrap`. Installing argo-cd in namespaced mode cannot be used for bootstraping as the bootstrap installation contains CRDs, which are cluster scoped resources, which cannot be created by argo-cd in namespaced mode. Bottom line: it was never useable.
 
 ### Contributors:
-- ehf ([ehf](https://github.com/ehf))
 - Roi Kramer ([@roi-codefresh](https://github.com/roi-codefresh))
-- Noam Gal ([@noam-codefresh](https://github.com/noam-codefresh))
 
 ## Installation:
 
@@ -25,7 +23,7 @@ argocd-autopilot version
 ### Linux and WSL (using curl):
 ```bash
 # download and extract the binary
-curl -L --output - https://github.com/argoproj-labs/argocd-autopilot/releases/download/v0.2.12/argocd-autopilot-linux-amd64.tar.gz | tar zx
+curl -L --output - https://github.com/argoproj-labs/argocd-autopilot/releases/download/v0.2.13/argocd-autopilot-linux-amd64.tar.gz | tar zx
 
 # move the binary to your $PATH
 mv ./argocd-autopilot-* /usr/local/bin/argocd-autopilot
@@ -37,7 +35,7 @@ argocd-autopilot version
 ### Mac (using curl):
 ```bash
 # download and extract the binary
-curl -L --output - https://github.com/argoproj-labs/argocd-autopilot/releases/download/v0.2.12/argocd-autopilot-darwin-amd64.tar.gz | tar zx
+curl -L --output - https://github.com/argoproj-labs/argocd-autopilot/releases/download/v0.2.13/argocd-autopilot-darwin-amd64.tar.gz | tar zx
 
 # move the binary to your $PATH
 mv ./argocd-autopilot-* /usr/local/bin/argocd-autopilot