Merge branch 'argoproj:master' into master

Author: pasha-codefresh

Makefile

@@ -4,6 +4,8 @@ DIST_DIR=${CURRENT_DIR}/dist
 CLI_NAME=argocd
 BIN_NAME=argocd
 
+GEN_RESOURCES_CLI_NAME=argocd-resources-gen
+
 HOST_OS:=$(shell go env GOOS)
 HOST_ARCH:=$(shell go env GOARCH)
 
@@ -222,6 +224,10 @@ cli: test-tools-image
 cli-local: clean-debug
 	CGO_ENABLED=0 go build -v -ldflags '${LDFLAGS}' -o ${DIST_DIR}/${CLI_NAME} ./cmd
 
+.PHONY: gen-resources-cli-local
+gen-resources-cli-local: clean-debug
+	CGO_ENABLED=0 go build -v -ldflags '${LDFLAGS}' -o ${DIST_DIR}/${GEN_RESOURCES_CLI_NAME} ./hack/gen-resources/cmd
+
 .PHONY: release-cli
 release-cli: clean-debug
 	make BIN_NAME=argocd-darwin-amd64 GOOS=darwin argocd-all

assets/swagger.json

@@ -4974,6 +4974,10 @@
           "type": "string",
           "title": "ReleaseName is the Helm release name to use. If omitted it will use the application name"
         },
+        "skipCrds": {
+          "type": "boolean",
+          "title": "SkipCrds skips custom resource definition installation step (Helm's --skip-crds)"
+        },
         "valueFiles": {
           "type": "array",
           "title": "ValuesFiles is a list of Helm value files to use when generating a template",

cmd/argocd/commands/admin/notifications.go

@@ -27,8 +27,8 @@ func NewNotificationsCommand() *cobra.Command {
 
 	var argocdService service.Service
 	toolsCommand := cmd.NewToolsCommand(
-		"argocd-notifications",
-		"argocd-notifications",
+		"notifications",
+		"notifications",
 		applications,
 		settings.GetFactorySettings(argocdService, "argocd-notifications-secret", "argocd-notifications-cm"), func(clientConfig clientcmd.ClientConfig) {
 			k8sCfg, err := clientConfig.ClientConfig()

cmd/util/app.go

@@ -44,6 +44,7 @@ type AppOptions struct {
 	helmSetFiles                    []string
 	helmVersion                     string
 	helmPassCredentials             bool
+	helmSkipCrds                    bool
 	project                         string
 	syncPolicy                      string
 	syncOptions                     []string
@@ -95,6 +96,7 @@ func AddAppFlags(command *cobra.Command, opts *AppOptions) {
 	command.Flags().StringArrayVar(&opts.helmSets, "helm-set", []string{}, "Helm set values on the command line (can be repeated to set several values: --helm-set key1=val1 --helm-set key2=val2)")
 	command.Flags().StringArrayVar(&opts.helmSetStrings, "helm-set-string", []string{}, "Helm set STRING values on the command line (can be repeated to set several values: --helm-set-string key1=val1 --helm-set-string key2=val2)")
 	command.Flags().StringArrayVar(&opts.helmSetFiles, "helm-set-file", []string{}, "Helm set values from respective files specified via the command line (can be repeated to set several values: --helm-set-file key1=path1 --helm-set-file key2=path2)")
+	command.Flags().BoolVar(&opts.helmSkipCrds, "helm-skip-crds", false, "Skip helm crd installation step")
 	command.Flags().StringVar(&opts.project, "project", "", "Application project name")
 	command.Flags().StringVar(&opts.syncPolicy, "sync-policy", "", "Set the sync policy (one of: none, automated (aliases of automated: auto, automatic))")
 	command.Flags().StringArrayVar(&opts.syncOptions, "sync-option", []string{}, "Add or remove a sync option, e.g add `Prune=false`. Remove using `!` prefix, e.g. `!Prune=false`")
@@ -175,6 +177,8 @@ func SetAppSpecOptions(flags *pflag.FlagSet, spec *argoappv1.ApplicationSpec, ap
 			setHelmOpt(&spec.Source, helmOpts{helmSetStrings: appOpts.helmSetStrings})
 		case "helm-set-file":
 			setHelmOpt(&spec.Source, helmOpts{helmSetFiles: appOpts.helmSetFiles})
+		case "helm-skip-crds":
+			setHelmOpt(&spec.Source, helmOpts{skipCrds: appOpts.helmSkipCrds})
 		case "directory-recurse":
 			if spec.Source.Directory != nil {
 				spec.Source.Directory.Recurse = appOpts.directoryRecurse
@@ -394,6 +398,7 @@ type helmOpts struct {
 	helmSetStrings          []string
 	helmSetFiles            []string
 	passCredentials         bool
+	skipCrds                bool
 }
 
 func setHelmOpt(src *argoappv1.ApplicationSource, opts helmOpts) {
@@ -418,6 +423,9 @@ func setHelmOpt(src *argoappv1.ApplicationSource, opts helmOpts) {
 	if opts.passCredentials {
 		src.Helm.PassCredentials = opts.passCredentials
 	}
+	if opts.skipCrds {
+		src.Helm.SkipCrds = opts.skipCrds
+	}
 	for _, text := range opts.helmSets {
 		p, err := argoappv1.NewHelmParameter(text, false)
 		if err != nil {

cmd/util/app_test.go

@@ -59,6 +59,11 @@ func Test_setHelmOpt(t *testing.T) {
 		setHelmOpt(&src, helmOpts{passCredentials: true})
 		assert.Equal(t, true, src.Helm.PassCredentials)
 	})
+	t.Run("HelmSkipCrds", func(t *testing.T) {
+		src := v1alpha1.ApplicationSource{}
+		setHelmOpt(&src, helmOpts{skipCrds: true})
+		assert.Equal(t, true, src.Helm.SkipCrds)
+	})
 }
 
 func Test_setKustomizeOpt(t *testing.T) {

docs/operator-manual/notifications/troubleshooting-commands.md

@@ -1,19 +1,19 @@
-## argocd-notifications template get
+## notifications template get
 
 Prints information about configured templates
 
 ```
-argocd-notifications template get [flags]
+notifications template get [flags]
 ```
 
 ### Examples
 
 ```
 
 # prints all templates
-argocd-notifications template get
+notifications template get
 # print YAML formatted app-sync-succeeded template definition
-argocd-notifications template get app-sync-succeeded -o=yaml
+notifications template get app-sync-succeeded -o=yaml
 
 ```
 
@@ -51,23 +51,23 @@ argocd-notifications template get app-sync-succeeded -o=yaml
       --username string                 Username for basic authentication to the API server
 ```
 
-## argocd-notifications template notify
+## notifications template notify
 
 Generates notification using the specified template and send it to specified recipients
 
 ```
-argocd-notifications template notify NAME RESOURCE_NAME [flags]
+notifications template notify NAME RESOURCE_NAME [flags]
 ```
 
 ### Examples
 
 ```
 
 # Trigger notification using in-cluster config map and secret
-argocd-notifications template notify app-sync-succeeded guestbook --recipient slack:my-slack-channel
+notifications template notify app-sync-succeeded guestbook --recipient slack:my-slack-channel
 
 # Render notification render generated notification in console
-argocd-notifications template notify app-sync-succeeded guestbook
+notifications template notify app-sync-succeeded guestbook
 
 ```
 
@@ -105,22 +105,22 @@ argocd-notifications template notify app-sync-succeeded guestbook
       --username string                 Username for basic authentication to the API server
 ```
 
-## argocd-notifications trigger get
+## notifications trigger get
 
 Prints information about configured triggers
 
 ```
-argocd-notifications trigger get [flags]
+notifications trigger get [flags]
 ```
 
 ### Examples
 
 ```
 
 # prints all triggers
-argocd-notifications trigger get
+notifications trigger get
 # print YAML formatted on-sync-failed trigger definition
-argocd-notifications trigger get on-sync-failed -o=yaml
+notifications trigger get on-sync-failed -o=yaml
 
 ```
 
@@ -158,23 +158,23 @@ argocd-notifications trigger get on-sync-failed -o=yaml
       --username string                 Username for basic authentication to the API server
 ```
 
-## argocd-notifications trigger run
+## notifications trigger run
 
 Evaluates specified trigger condition and prints the result
 
 ```
-argocd-notifications trigger run NAME RESOURCE_NAME [flags]
+notifications trigger run NAME RESOURCE_NAME [flags]
 ```
 
 ### Examples
 
 ```
 
 # Execute trigger configured in 'argocd-notification-cm' ConfigMap
-argocd-notifications trigger run on-sync-status-unknown ./sample-app.yaml
+notifications trigger run on-sync-status-unknown ./sample-app.yaml
 
 # Execute trigger using my-config-map.yaml instead of 'argocd-notifications-cm' ConfigMap
-argocd-notifications trigger run on-sync-status-unknown ./sample-app.yaml \
+notifications trigger run on-sync-status-unknown ./sample-app.yaml \
     --config-map ./my-config-map.yaml
 ```
 

docs/roadmap.md

@@ -3,14 +3,18 @@
 - [Roadmap](#roadmap)
   - [v2.3](#v23)
     - [Merge Argo CD Notifications into Argo CD](#merge-argo-cd-notifications-into-argo-cd)
-    - [Input Forms UI Refresh](#input-forms-ui-refresh)
+    - [Merge ApplicationSet controller into Argo CD](#merge-applicationset-controller-into-argo-cd)
     - [Compact resources tree](#compact-resources-tree)
     - [Maintain difference in cluster and git values for specific fields](#maintain-difference-in-cluster-and-git-values-for-specific-fields)
-    - [Web Shell](#web-shell)
-    - [Helm values from external repo](#helm-values-from-external-repo)
+    - [ARM images and CLI binary](#arm-images-and-cli-binary)
+    - [Server side apply](#server-side-apply)
   - [v2.4 and beyond](#v24-and-beyond)
-    - [Merge ApplicationSet controller into Argo CD](#merge-applicationset-controller-into-argo-cd)
+    - [First class support for ApplicationSet resources](#first-class-support-for-applicationset-resources)
+    - [Input Forms UI Refresh](#input-forms-ui-refresh)
     - [Merge Argo CD Image Updater into Argo CD](#merge-argo-cd-image-updater-into-argo-cd)
+    - [Web Shell](#web-shell)
+    - [Helm values from external repo](#helm-values-from-external-repo)
+    - [Add support for secrets in Application parameters](#add-support-for-secrets-in-application-parameters)
     - [Config Management Tools Integrations UI/CLI](#config-management-tools-integrations-uicli)
     - [Allow specifying parent/child relationships in config](#allow-specifying-parentchild-relationships-in-config)
     - [Dependencies between applications](#dependencies-between-applications)
@@ -32,13 +36,15 @@
 
 ## v2.3
 
+> ETA: Feb 2021
+
 ### Merge Argo CD Notifications into Argo CD
 
 The [Argo CD Notifications](https://github.com/argoproj-labs/argocd-notifications) should be merged into Argo CD and available out-of-the-box: [#7350](https://github.com/argoproj/argo-cd/issues/7350)
 
-### Input Forms UI Refresh
+### Merge ApplicationSet controller into Argo CD
 
-Improved design of the input forms in Argo CD Web UI: https://www.figma.com/file/IIlsFqqmM5UhqMVul9fQNq/Argo-CD?node-id=0%3A1
+The ApplicationSet functionality is available in Argo CD out-of-the-box ([#7351](https://github.com/argoproj/argo-cd/issues/7351)).
 
 ### Compact resources tree
 
@@ -48,28 +54,40 @@ An ability to collaps leaf resources tree to improve visualization of very large
 
 The feature allows to avoid updating fields excluded from diffing ([#2913](https://github.com/argoproj/argo-cd/issues/2913)).
 
-### Web Shell
+### ARM images and CLI binary
 
-Exec into the Kubernetes Pod right from Argo CD Web UI! [#4351](https://github.com/argoproj/argo-cd/issues/4351)
+The release workflow should build and publish ARM images and CLI binaries: ([#4211](https://github.com/argoproj/argo-cd/issues/4211))
 
-### Helm values from external repo
-
-The feature allows combining of-the-shelf Helm chart and value file in Git repository ([#2789](https://github.com/argoproj/argo-cd/issues/2789))
+### Server side apply
 
+Support using [server side apply](https://kubernetes.io/docs/reference/using-api/server-side-apply/) during application syncing
+[#2267](https://github.com/argoproj/argo-cd/issues/2267)
 
 ## v2.4 and beyond
 
+### First class support for ApplicationSet resources
 
-### Merge ApplicationSet controller into Argo CD
-
-The ApplicationSet functionality is available in Argo CD out-of-the-box ([#7351](https://github.com/argoproj/argo-cd/issues/7351)).
 The Argo CD UI/CLI/API allows to manage ApplicationSet resources same as Argo CD Applications ([#7352](https://github.com/argoproj/argo-cd/issues/7352)).
 
+### Input Forms UI Refresh
+
+Improved design of the input forms in Argo CD Web UI: https://www.figma.com/file/IIlsFqqmM5UhqMVul9fQNq/Argo-CD?node-id=0%3A1
 
 ### Merge Argo CD Image Updater into Argo CD
 
 The [Argo CD Image Updater](https://github.com/argoproj-labs/argocd-image-updater) should be merged into Argo CD and available out-of-the-box: [#7385](https://github.com/argoproj/argo-cd/issues/7385)
 
+### Web Shell
+
+Exec into the Kubernetes Pod right from Argo CD Web UI! [#4351](https://github.com/argoproj/argo-cd/issues/4351)
+
+### Helm values from external repo
+
+The feature allows combining of-the-shelf Helm chart and value file in Git repository ([#2789](https://github.com/argoproj/argo-cd/issues/2789))
+
+### Add support for secrets in Application parameters
+
+The feature allows referencing secrets in Application parameters. [#1786](https://github.com/argoproj/argo-cd/issues/1786).
 
 ### Config Management Tools Integrations UI/CLI
 

docs/user-guide/commands/argocd_admin.md

@@ -38,11 +38,11 @@ argocd admin [flags]
 
 * [argocd](argocd.md)	 - argocd controls a Argo CD server
 * [argocd admin app](argocd_admin_app.md)	 - Manage applications configuration
-* [argocd admin argocd-notifications](argocd_admin_argocd-notifications.md)	 - Set of CLI commands that helps manage notifications settings
 * [argocd admin cluster](argocd_admin_cluster.md)	 - Manage clusters configuration
 * [argocd admin dashboard](argocd_admin_dashboard.md)	 - Starts Argo CD Web UI locally
 * [argocd admin export](argocd_admin_export.md)	 - Export all Argo CD data to stdout (default) or a file
 * [argocd admin import](argocd_admin_import.md)	 - Import Argo CD data from stdin (specify `-') or a file
+* [argocd admin notifications](argocd_admin_notifications.md)	 - Set of CLI commands that helps manage notifications settings
 * [argocd admin proj](argocd_admin_proj.md)	 - Manage projects configuration
 * [argocd admin repo](argocd_admin_repo.md)	 - Manage repositories configuration
 * [argocd admin settings](argocd_admin_settings.md)	 - Provides set of commands for settings validation and troubleshooting

docs/user-guide/commands/argocd_admin_app_generate-spec.md

@@ -50,6 +50,7 @@ argocd admin app generate-spec APPNAME [flags]
       --helm-set stringArray                       Helm set values on the command line (can be repeated to set several values: --helm-set key1=val1 --helm-set key2=val2)
       --helm-set-file stringArray                  Helm set values from respective files specified via the command line (can be repeated to set several values: --helm-set-file key1=path1 --helm-set-file key2=path2)
       --helm-set-string stringArray                Helm set STRING values on the command line (can be repeated to set several values: --helm-set-string key1=val1 --helm-set-string key2=val2)
+      --helm-skip-crds                             Skip helm crd installation step
       --helm-version string                        Helm version
   -h, --help                                       help for generate-spec
       --ignore-missing-value-files                 Ignore locally missing valueFiles when setting helm template --values

docs/user-guide/commands/argocd_admin_argocd-notifications.md renamed to docs/user-guide/commands/argocd_admin_notifications.md

@@ -1,9 +1,9 @@
-## argocd admin argocd-notifications
+## argocd admin notifications
 
 Set of CLI commands that helps manage notifications settings
 
 ```
-argocd admin argocd-notifications [flags]
+argocd admin notifications [flags]
 ```
 
 ### Options
@@ -20,7 +20,7 @@ argocd admin argocd-notifications [flags]
       --cluster string                  The name of the kubeconfig cluster to use
       --config-map string               argocd-notifications-cm.yaml file path
       --context string                  The name of the kubeconfig context to use
-  -h, --help                            help for argocd-notifications
+  -h, --help                            help for notifications
       --insecure-skip-tls-verify        If true, the server's certificate will not be checked for validity. This will make your HTTPS connections insecure
       --kubeconfig string               Path to a kube config. Only required if out-of-cluster
   -n, --namespace string                If present, the namespace scope for this CLI request
@@ -58,6 +58,6 @@ argocd admin argocd-notifications [flags]
 ### SEE ALSO
 
 * [argocd admin](argocd_admin.md)	 - Contains a set of commands useful for Argo CD administrators and requires direct Kubernetes access
-* [argocd admin argocd-notifications template](argocd_admin_argocd-notifications_template.md)	 - Notification templates related commands
-* [argocd admin argocd-notifications trigger](argocd_admin_argocd-notifications_trigger.md)	 - Notification triggers related commands
+* [argocd admin notifications template](argocd_admin_notifications_template.md)	 - Notification templates related commands
+* [argocd admin notifications trigger](argocd_admin_notifications_trigger.md)	 - Notification triggers related commands