From 441b583dafc5acca847c6ee518e94a14e2aebb2a Mon Sep 17 00:00:00 2001 From: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> Date: Fri, 7 Oct 2022 19:42:25 -0400 Subject: [PATCH] docs: remove unused plugin config fields (#10304) * docs: remove unused plugin config fields Signed-off-by: CI * fix codegen Signed-off-by: CI Signed-off-by: CI --- cmpserver/plugin/config.go | 2 -- .../testdata/ksonnet/config/plugin.yaml | 2 -- .../kustomize-neg/config/plugin-bad.yaml | 2 -- .../testdata/kustomize/config/plugin.yaml | 2 -- docs/proposals/config-management-plugin-v2.md | 2 -- manifests/core-install.yaml | 23 +++++++++---------- manifests/crds/application-crd.yaml | 23 +++++++++---------- manifests/ha/install.yaml | 23 +++++++++---------- manifests/install.yaml | 23 +++++++++---------- pkg/apis/application/v1alpha1/generated.proto | 2 +- .../application/v1alpha1/openapi_generated.go | 2 +- pkg/apis/application/v1alpha1/types.go | 2 +- test/cmp/plugin.yaml | 2 -- .../e2e/testdata/cmp-find-command/plugin.yaml | 2 -- test/e2e/testdata/cmp-find-glob/plugin.yaml | 2 -- 15 files changed, 47 insertions(+), 67 deletions(-) diff --git a/cmpserver/plugin/config.go b/cmpserver/plugin/config.go index d37df72283732..0c6a68f5151ca 100644 --- a/cmpserver/plugin/config.go +++ b/cmpserver/plugin/config.go @@ -25,8 +25,6 @@ type PluginConfigSpec struct { Init Command `json:"init,omitempty"` Generate Command `json:"generate"` Discover Discover `json:"discover"` - AllowConcurrency bool `json:"allowConcurrency"` - LockRepo bool `json:"lockRepo"` } //Discover holds find and fileName diff --git a/cmpserver/plugin/testdata/ksonnet/config/plugin.yaml b/cmpserver/plugin/testdata/ksonnet/config/plugin.yaml index 73919859f3cbb..0a14afe5d3bf5 100644 --- a/cmpserver/plugin/testdata/ksonnet/config/plugin.yaml +++ b/cmpserver/plugin/testdata/ksonnet/config/plugin.yaml @@ -11,5 +11,3 @@ spec: discover: find: glob: "**/*/main.jsonnet" - allowConcurrency: false - lockRepo: false \ No newline at end of file diff --git a/cmpserver/plugin/testdata/kustomize-neg/config/plugin-bad.yaml b/cmpserver/plugin/testdata/kustomize-neg/config/plugin-bad.yaml index 092c08c021fa0..b6b7a154a7aee 100644 --- a/cmpserver/plugin/testdata/kustomize-neg/config/plugin-bad.yaml +++ b/cmpserver/plugin/testdata/kustomize-neg/config/plugin-bad.yaml @@ -12,5 +12,3 @@ spec: find: command: [sh, -c, find . -name kustomization.yaml] glob: "**/*/kustomization.yaml" - allowConcurrency: true - lockRepo: false \ No newline at end of file diff --git a/cmpserver/plugin/testdata/kustomize/config/plugin.yaml b/cmpserver/plugin/testdata/kustomize/config/plugin.yaml index 092c08c021fa0..b6b7a154a7aee 100644 --- a/cmpserver/plugin/testdata/kustomize/config/plugin.yaml +++ b/cmpserver/plugin/testdata/kustomize/config/plugin.yaml @@ -12,5 +12,3 @@ spec: find: command: [sh, -c, find . -name kustomization.yaml] glob: "**/*/kustomization.yaml" - allowConcurrency: true - lockRepo: false \ No newline at end of file diff --git a/docs/proposals/config-management-plugin-v2.md b/docs/proposals/config-management-plugin-v2.md index d64885586717f..d5d68cc0af942 100644 --- a/docs/proposals/config-management-plugin-v2.md +++ b/docs/proposals/config-management-plugin-v2.md @@ -168,7 +168,6 @@ spec: check: - command: [-f ./main.ts] glob: "main.ts" - allowConcurrency: true # enables generating multiple manifests in parallel. ``` #### Config Management Plugin API Server (cmp-server) @@ -320,6 +319,5 @@ spec: check: - command: [-f ./main.ts] glob: "main.ts" - allowConcurrency: true # enables generating multiple manifests in parallel. ``` 2. Something magically patches the relevant manifest to add the sidecar. diff --git a/manifests/core-install.yaml b/manifests/core-install.yaml index 2c018d43f55e0..15d3ccffa27fc 100644 --- a/manifests/core-install.yaml +++ b/manifests/core-install.yaml @@ -336,8 +336,8 @@ spec: and is only valid for applications sourced from Git. type: string plugin: - description: ConfigManagementPlugin holds config management - plugin specific options + description: Plugin holds config management plugin specific + options properties: env: description: Env is a list of environment variable entries @@ -682,8 +682,7 @@ spec: and is only valid for applications sourced from Git. type: string plugin: - description: ConfigManagementPlugin holds config management plugin - specific options + description: Plugin holds config management plugin specific options properties: env: description: Env is a list of environment variable entries @@ -1038,8 +1037,8 @@ spec: and is only valid for applications sourced from Git. type: string plugin: - description: ConfigManagementPlugin holds config management - plugin specific options + description: Plugin holds config management plugin specific + options properties: env: description: Env is a list of environment variable entries @@ -1410,8 +1409,8 @@ spec: from Git. type: string plugin: - description: ConfigManagementPlugin holds config management - plugin specific options + description: Plugin holds config management plugin + specific options properties: env: description: Env is a list of environment variable @@ -1754,8 +1753,8 @@ spec: and is only valid for applications sourced from Git. type: string plugin: - description: ConfigManagementPlugin holds config management - plugin specific options + description: Plugin holds config management plugin specific + options properties: env: description: Env is a list of environment variable @@ -2092,8 +2091,8 @@ spec: and is only valid for applications sourced from Git. type: string plugin: - description: ConfigManagementPlugin holds config management - plugin specific options + description: Plugin holds config management plugin specific + options properties: env: description: Env is a list of environment variable diff --git a/manifests/crds/application-crd.yaml b/manifests/crds/application-crd.yaml index 522aabc0d3345..1829f55f19f9e 100644 --- a/manifests/crds/application-crd.yaml +++ b/manifests/crds/application-crd.yaml @@ -335,8 +335,8 @@ spec: and is only valid for applications sourced from Git. type: string plugin: - description: ConfigManagementPlugin holds config management - plugin specific options + description: Plugin holds config management plugin specific + options properties: env: description: Env is a list of environment variable entries @@ -681,8 +681,7 @@ spec: and is only valid for applications sourced from Git. type: string plugin: - description: ConfigManagementPlugin holds config management plugin - specific options + description: Plugin holds config management plugin specific options properties: env: description: Env is a list of environment variable entries @@ -1037,8 +1036,8 @@ spec: and is only valid for applications sourced from Git. type: string plugin: - description: ConfigManagementPlugin holds config management - plugin specific options + description: Plugin holds config management plugin specific + options properties: env: description: Env is a list of environment variable entries @@ -1409,8 +1408,8 @@ spec: from Git. type: string plugin: - description: ConfigManagementPlugin holds config management - plugin specific options + description: Plugin holds config management plugin + specific options properties: env: description: Env is a list of environment variable @@ -1753,8 +1752,8 @@ spec: and is only valid for applications sourced from Git. type: string plugin: - description: ConfigManagementPlugin holds config management - plugin specific options + description: Plugin holds config management plugin specific + options properties: env: description: Env is a list of environment variable @@ -2091,8 +2090,8 @@ spec: and is only valid for applications sourced from Git. type: string plugin: - description: ConfigManagementPlugin holds config management - plugin specific options + description: Plugin holds config management plugin specific + options properties: env: description: Env is a list of environment variable diff --git a/manifests/ha/install.yaml b/manifests/ha/install.yaml index 7a943cb0a4a01..94c8e82e0211a 100644 --- a/manifests/ha/install.yaml +++ b/manifests/ha/install.yaml @@ -336,8 +336,8 @@ spec: and is only valid for applications sourced from Git. type: string plugin: - description: ConfigManagementPlugin holds config management - plugin specific options + description: Plugin holds config management plugin specific + options properties: env: description: Env is a list of environment variable entries @@ -682,8 +682,7 @@ spec: and is only valid for applications sourced from Git. type: string plugin: - description: ConfigManagementPlugin holds config management plugin - specific options + description: Plugin holds config management plugin specific options properties: env: description: Env is a list of environment variable entries @@ -1038,8 +1037,8 @@ spec: and is only valid for applications sourced from Git. type: string plugin: - description: ConfigManagementPlugin holds config management - plugin specific options + description: Plugin holds config management plugin specific + options properties: env: description: Env is a list of environment variable entries @@ -1410,8 +1409,8 @@ spec: from Git. type: string plugin: - description: ConfigManagementPlugin holds config management - plugin specific options + description: Plugin holds config management plugin + specific options properties: env: description: Env is a list of environment variable @@ -1754,8 +1753,8 @@ spec: and is only valid for applications sourced from Git. type: string plugin: - description: ConfigManagementPlugin holds config management - plugin specific options + description: Plugin holds config management plugin specific + options properties: env: description: Env is a list of environment variable @@ -2092,8 +2091,8 @@ spec: and is only valid for applications sourced from Git. type: string plugin: - description: ConfigManagementPlugin holds config management - plugin specific options + description: Plugin holds config management plugin specific + options properties: env: description: Env is a list of environment variable diff --git a/manifests/install.yaml b/manifests/install.yaml index dba87db26feab..e23f1265c1121 100644 --- a/manifests/install.yaml +++ b/manifests/install.yaml @@ -336,8 +336,8 @@ spec: and is only valid for applications sourced from Git. type: string plugin: - description: ConfigManagementPlugin holds config management - plugin specific options + description: Plugin holds config management plugin specific + options properties: env: description: Env is a list of environment variable entries @@ -682,8 +682,7 @@ spec: and is only valid for applications sourced from Git. type: string plugin: - description: ConfigManagementPlugin holds config management plugin - specific options + description: Plugin holds config management plugin specific options properties: env: description: Env is a list of environment variable entries @@ -1038,8 +1037,8 @@ spec: and is only valid for applications sourced from Git. type: string plugin: - description: ConfigManagementPlugin holds config management - plugin specific options + description: Plugin holds config management plugin specific + options properties: env: description: Env is a list of environment variable entries @@ -1410,8 +1409,8 @@ spec: from Git. type: string plugin: - description: ConfigManagementPlugin holds config management - plugin specific options + description: Plugin holds config management plugin + specific options properties: env: description: Env is a list of environment variable @@ -1754,8 +1753,8 @@ spec: and is only valid for applications sourced from Git. type: string plugin: - description: ConfigManagementPlugin holds config management - plugin specific options + description: Plugin holds config management plugin specific + options properties: env: description: Env is a list of environment variable @@ -2092,8 +2091,8 @@ spec: and is only valid for applications sourced from Git. type: string plugin: - description: ConfigManagementPlugin holds config management - plugin specific options + description: Plugin holds config management plugin specific + options properties: env: description: Env is a list of environment variable diff --git a/pkg/apis/application/v1alpha1/generated.proto b/pkg/apis/application/v1alpha1/generated.proto index d898aff52148f..bd7e6ad4874ae 100644 --- a/pkg/apis/application/v1alpha1/generated.proto +++ b/pkg/apis/application/v1alpha1/generated.proto @@ -322,7 +322,7 @@ message ApplicationSource { // Directory holds path/directory specific options optional ApplicationSourceDirectory directory = 10; - // ConfigManagementPlugin holds config management plugin specific options + // Plugin holds config management plugin specific options optional ApplicationSourcePlugin plugin = 11; // Chart is a Helm chart name, and must be specified for applications sourced from a Helm repo. diff --git a/pkg/apis/application/v1alpha1/openapi_generated.go b/pkg/apis/application/v1alpha1/openapi_generated.go index 1c8969e32791b..f7f9c90233599 100644 --- a/pkg/apis/application/v1alpha1/openapi_generated.go +++ b/pkg/apis/application/v1alpha1/openapi_generated.go @@ -1209,7 +1209,7 @@ func schema_pkg_apis_application_v1alpha1_ApplicationSource(ref common.Reference }, "plugin": { SchemaProps: spec.SchemaProps{ - Description: "ConfigManagementPlugin holds config management plugin specific options", + Description: "Plugin holds config management plugin specific options", Ref: ref("github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.ApplicationSourcePlugin"), }, }, diff --git a/pkg/apis/application/v1alpha1/types.go b/pkg/apis/application/v1alpha1/types.go index 1dc115335c8b8..a404fbef71fa8 100644 --- a/pkg/apis/application/v1alpha1/types.go +++ b/pkg/apis/application/v1alpha1/types.go @@ -166,7 +166,7 @@ type ApplicationSource struct { Kustomize *ApplicationSourceKustomize `json:"kustomize,omitempty" protobuf:"bytes,8,opt,name=kustomize"` // Directory holds path/directory specific options Directory *ApplicationSourceDirectory `json:"directory,omitempty" protobuf:"bytes,10,opt,name=directory"` - // ConfigManagementPlugin holds config management plugin specific options + // Plugin holds config management plugin specific options Plugin *ApplicationSourcePlugin `json:"plugin,omitempty" protobuf:"bytes,11,opt,name=plugin"` // Chart is a Helm chart name, and must be specified for applications sourced from a Helm repo. Chart string `json:"chart,omitempty" protobuf:"bytes,12,opt,name=chart"` diff --git a/test/cmp/plugin.yaml b/test/cmp/plugin.yaml index 1184b715d284d..2439f3d73ec6c 100644 --- a/test/cmp/plugin.yaml +++ b/test/cmp/plugin.yaml @@ -9,5 +9,3 @@ spec: discover: find: glob: "**/kustomization.yaml" - allowConcurrency: true - lockRepo: false diff --git a/test/e2e/testdata/cmp-find-command/plugin.yaml b/test/e2e/testdata/cmp-find-command/plugin.yaml index a34c6c441eb3e..7916a14c2c3c2 100644 --- a/test/e2e/testdata/cmp-find-command/plugin.yaml +++ b/test/e2e/testdata/cmp-find-command/plugin.yaml @@ -9,5 +9,3 @@ spec: discover: find: command: [sh, -c, find . -name env.yaml] - allowConcurrency: true - lockRepo: false \ No newline at end of file diff --git a/test/e2e/testdata/cmp-find-glob/plugin.yaml b/test/e2e/testdata/cmp-find-glob/plugin.yaml index 2f8bae8e207e2..f9724d9347c4d 100644 --- a/test/e2e/testdata/cmp-find-glob/plugin.yaml +++ b/test/e2e/testdata/cmp-find-glob/plugin.yaml @@ -12,5 +12,3 @@ spec: find: command: [sh, -c, find . -name kustomization.yaml] glob: "**/kustomization.yaml" - allowConcurrency: true - lockRepo: false \ No newline at end of file