Adds doc on secrets, updates changelog, updates Github templates (arg…

…oproj#2550)

.github/ISSUE_TEMPLATE/bug_report.md

@@ -7,6 +7,7 @@ assignees: ''
 ---
 Checklist:
 
+* [ ] I've searched in the docs and FAQ for my answer: http://bit.ly/argocd-faq.
 * [ ] I've included steps to reproduce the bug.
 * [ ] I've pasted the output of `argocd version`.
 

.github/pull_request_template.md

@@ -1,5 +1,7 @@
 Checklist:
 
-* [ ] I've created an [enhancement proposal](https://github.com/argoproj/argo-cd/issues/new/choose) and I feel I've gotten a green light from the community. 
-* [ ] My build is green ([troubleshooting builds](https://argoproj.github.io/argo-cd/developer-guide/ci/)). 
-* [ ] Optional. My organisation is added to the README.
+* [ ] Either (a) I've created an [enhancement proposal](https://github.com/argoproj/argo-cd/issues/new/choose) and discussed it with the community, (b) this is a bug fix, or (c) this does not need to be in the release notes.
+* [ ] The title of the PR states what changed and the related issues number (used for the release note).
+* [ ] I've updated both the CLI and UI to expose my feature, or I plan to submit a second PR with them.
+* [ ] Optional. My organization is added to the README.
+* [ ] I've signed the CLA and my build is green ([troubleshooting builds](https://argoproj.github.io/argo-cd/developer-guide/ci/)). 

CHANGELOG.md

@@ -1,6 +1,14 @@
 # Changelog
 
-## v1.3-rc1 (2019-10-16)
+## v1.3.0-rc2 (2019-20-23)
+
+- Issue #2339 - Controller should compare with latest git revision if app has changed (#2543)
+- Unknown child app should not affect app health (#2544)
+- Redact secrets in dex logs (#2538)
+- Allows Helm parameters that contains arrays or maps.  (#2525)
+- Set cookie policy to SameSite=lax and httpOnly (#2498)
+
+## v1.3.0-rc1 (2019-10-16)
 
 #### New Features
 
@@ -154,6 +162,13 @@ There may be instances when you want to control the times during which an Argo C
 * jannfis <!-- num=8 -->
 * ssbtn <!-- num=2 -->
 
+## v1.2.4 (2019-10-23)
+
+- Issue #2185 - Manual sync don't trigger hooks (#2477)
+- Issue #2339 - Controller should compare with latest git revision if app has changed (#2543)
+- Unknown child app should not affect app health (#2544)
+- Redact secrets in dex logs (#2538)
+
 ## v1.2.3 (2019-10-1)
 * Make argo-cd docker images openshift friendly (#2362) (@duboisf)
 * Add dest-server and dest-namespace field to reconciliation logs (#2354)

docs/operator-manual/secret-management.md

@@ -0,0 +1,11 @@
+# Secret Management
+
+Argo CD is un-opinionated about how secrets are managed. There's many ways to do it and there's no one-size-fits-all solution. Here's some ways people are doing GitOps secrets:
+
+* [Bitnami Sealed Secrets](https://github.com/bitnami-labs/sealed-secrets)
+* [Godaddy Kubernetes External Secrets](https://github.com/godaddy/kubernetes-external-secrets)
+* [Hasicorp Vault](https://www.vaultproject.io)
+* [Helm Secrets](https://github.com/futuresimple/helm-secrets)
+* [Kustomize secret generator plugins](https://github.com/kubernetes-sigs/kustomize/blob/fd7a353df6cece4629b8e8ad56b71e30636f38fc/examples/kvSourceGoPlugin.md#secret-values-from-anywhere)
+
+For discussion, see [#1364](https://github.com/argoproj/argo-cd/issues/1364)

mkdocs.yml

@@ -35,6 +35,7 @@ nav:
       - operator-manual/rbac.md
     - operator-manual/security.md
     - operator-manual/cluster-bootstrapping.md
+    - operator-manual/secret-management.md
     - operator-manual/high_availability.md
     - operator-manual/disaster_recovery.md
     - operator-manual/webhook.md

white-list

@@ -4,7 +4,10 @@
 argocd.example.com
 api.github.com/user
 cd.apps.argoproj.io
+docker-build
+docker-build:443
 git.example.com
+git.example.com:443
 github.com/argoproj/another-private-repo
 github.com/argoproj/my-private-repository
 github.com/argoproj/other-private-repo
@@ -13,11 +16,17 @@ github.com/otherproj/another-private-repo
 ksonnet.io
 raw.githubusercontent.com/argoproj/argo-cd
 repo.example.com
+repo.example.com:443
 server.example.com
 kubernetes.default.svc
 kubernetes.default.svc:443
+localhost:4000
 localhost:6443
 localhost:8080
 mycluster.com
 storage.googleapis.com
-your-kubernetes-cluster-addr
+ui.argocd.yourorganization.net
+ui.argocd.yourorganization.net:443
+your-kubernetes-cluster-addr
+yourorganization.oktapreview.com
+yourorganization.oktapreview.com:443