Remove global attributes from plugin overrides

Signed-off-by: Maysun J Faisal <[email protected]>

Author: maysunfaisal

crds/workspace.devfile.io_devworkspaces.v1beta1.yaml

@@ -4142,9 +4142,12 @@ spec:
                 properties:
                   attributes:
                     description: Map of implementation-dependant free-form YAML attributes.
-                      Attribute values can be referenced through out the devfile in
+                      Attribute values can be referenced throughout the devfile in
                       string type fields in the form {{attribute-key}} except for
-                      schemaVersion and metadata
+                      schemaVersion and metadata. Exception to the string field include
+                      element's key identifiers(command id, component name, endpoint
+                      name, project name, etc.) and string enums(command group kind,
+                      endpoint exposure, etc.)
                     type: object
                     x-kubernetes-preserve-unknown-fields: true
                   commands:
@@ -4830,12 +4833,6 @@ spec:
                           - required:
                             - kubernetes
                           properties:
-                            attributes:
-                              description: Overrides of attributes encapsulated in
-                                a parent devfile or a plugin. Overriding is done according
-                                to K8S strategic merge patch standard rules.
-                              type: object
-                              x-kubernetes-preserve-unknown-fields: true
                             commands:
                               description: Overrides of commands encapsulated in a
                                 parent devfile or a plugin. Overriding is done according
@@ -5576,8 +5573,8 @@ spec:
                     properties:
                       attributes:
                         description: Overrides of attributes encapsulated in a parent
-                          devfile or a plugin. Overriding is done according to K8S
-                          strategic merge patch standard rules.
+                          devfile. Overriding is done according to K8S strategic merge
+                          patch standard rules.
                         type: object
                         x-kubernetes-preserve-unknown-fields: true
                       commands:
@@ -6198,13 +6195,6 @@ spec:
                               - required:
                                 - kubernetes
                               properties:
-                                attributes:
-                                  description: Overrides of attributes encapsulated
-                                    in a parent devfile or a plugin. Overriding is
-                                    done according to K8S strategic merge patch standard
-                                    rules.
-                                  type: object
-                                  x-kubernetes-preserve-unknown-fields: true
                                 commands:
                                   description: Overrides of commands encapsulated
                                     in a parent devfile or a plugin. Overriding is

crds/workspace.devfile.io_devworkspaces.yaml

@@ -4140,9 +4140,12 @@ spec:
                 properties:
                   attributes:
                     description: Map of implementation-dependant free-form YAML attributes.
-                      Attribute values can be referenced through out the devfile in
+                      Attribute values can be referenced throughout the devfile in
                       string type fields in the form {{attribute-key}} except for
-                      schemaVersion and metadata
+                      schemaVersion and metadata. Exception to the string field include
+                      element's key identifiers(command id, component name, endpoint
+                      name, project name, etc.) and string enums(command group kind,
+                      endpoint exposure, etc.)
                     type: object
                     x-kubernetes-preserve-unknown-fields: true
                   commands:
@@ -4835,12 +4838,6 @@ spec:
                           - required:
                             - kubernetes
                           properties:
-                            attributes:
-                              description: Overrides of attributes encapsulated in
-                                a parent devfile or a plugin. Overriding is done according
-                                to K8S strategic merge patch standard rules.
-                              type: object
-                              x-kubernetes-preserve-unknown-fields: true
                             commands:
                               description: Overrides of commands encapsulated in a
                                 parent devfile or a plugin. Overriding is done according
@@ -5581,8 +5578,8 @@ spec:
                     properties:
                       attributes:
                         description: Overrides of attributes encapsulated in a parent
-                          devfile or a plugin. Overriding is done according to K8S
-                          strategic merge patch standard rules.
+                          devfile. Overriding is done according to K8S strategic merge
+                          patch standard rules.
                         type: object
                         x-kubernetes-preserve-unknown-fields: true
                       commands:
@@ -6203,13 +6200,6 @@ spec:
                               - required:
                                 - kubernetes
                               properties:
-                                attributes:
-                                  description: Overrides of attributes encapsulated
-                                    in a parent devfile or a plugin. Overriding is
-                                    done according to K8S strategic merge patch standard
-                                    rules.
-                                  type: object
-                                  x-kubernetes-preserve-unknown-fields: true
                                 commands:
                                   description: Overrides of commands encapsulated
                                     in a parent devfile or a plugin. Overriding is

crds/workspace.devfile.io_devworkspacetemplates.v1beta1.yaml

@@ -3916,9 +3916,11 @@ spec:
             properties:
               attributes:
                 description: Map of implementation-dependant free-form YAML attributes.
-                  Attribute values can be referenced through out the devfile in string
+                  Attribute values can be referenced throughout the devfile in string
                   type fields in the form {{attribute-key}} except for schemaVersion
-                  and metadata
+                  and metadata. Exception to the string field include element's key
+                  identifiers(command id, component name, endpoint name, project name,
+                  etc.) and string enums(command group kind, endpoint exposure, etc.)
                 type: object
                 x-kubernetes-preserve-unknown-fields: true
               commands:
@@ -4578,12 +4580,6 @@ spec:
                       - required:
                         - kubernetes
                       properties:
-                        attributes:
-                          description: Overrides of attributes encapsulated in a parent
-                            devfile or a plugin. Overriding is done according to K8S
-                            strategic merge patch standard rules.
-                          type: object
-                          x-kubernetes-preserve-unknown-fields: true
                         commands:
                           description: Overrides of commands encapsulated in a parent
                             devfile or a plugin. Overriding is done according to K8S
@@ -5298,8 +5294,8 @@ spec:
                 properties:
                   attributes:
                     description: Overrides of attributes encapsulated in a parent
-                      devfile or a plugin. Overriding is done according to K8S strategic
-                      merge patch standard rules.
+                      devfile. Overriding is done according to K8S strategic merge
+                      patch standard rules.
                     type: object
                     x-kubernetes-preserve-unknown-fields: true
                   commands:
@@ -5899,12 +5895,6 @@ spec:
                           - required:
                             - kubernetes
                           properties:
-                            attributes:
-                              description: Overrides of attributes encapsulated in
-                                a parent devfile or a plugin. Overriding is done according
-                                to K8S strategic merge patch standard rules.
-                              type: object
-                              x-kubernetes-preserve-unknown-fields: true
                             commands:
                               description: Overrides of commands encapsulated in a
                                 parent devfile or a plugin. Overriding is done according

crds/workspace.devfile.io_devworkspacetemplates.yaml

@@ -3914,9 +3914,11 @@ spec:
             properties:
               attributes:
                 description: Map of implementation-dependant free-form YAML attributes.
-                  Attribute values can be referenced through out the devfile in string
+                  Attribute values can be referenced throughout the devfile in string
                   type fields in the form {{attribute-key}} except for schemaVersion
-                  and metadata
+                  and metadata. Exception to the string field include element's key
+                  identifiers(command id, component name, endpoint name, project name,
+                  etc.) and string enums(command group kind, endpoint exposure, etc.)
                 type: object
                 x-kubernetes-preserve-unknown-fields: true
               commands:
@@ -4583,12 +4585,6 @@ spec:
                       - required:
                         - kubernetes
                       properties:
-                        attributes:
-                          description: Overrides of attributes encapsulated in a parent
-                            devfile or a plugin. Overriding is done according to K8S
-                            strategic merge patch standard rules.
-                          type: object
-                          x-kubernetes-preserve-unknown-fields: true
                         commands:
                           description: Overrides of commands encapsulated in a parent
                             devfile or a plugin. Overriding is done according to K8S
@@ -5303,8 +5299,8 @@ spec:
                 properties:
                   attributes:
                     description: Overrides of attributes encapsulated in a parent
-                      devfile or a plugin. Overriding is done according to K8S strategic
-                      merge patch standard rules.
+                      devfile. Overriding is done according to K8S strategic merge
+                      patch standard rules.
                     type: object
                     x-kubernetes-preserve-unknown-fields: true
                   commands:
@@ -5904,12 +5900,6 @@ spec:
                           - required:
                             - kubernetes
                           properties:
-                            attributes:
-                              description: Overrides of attributes encapsulated in
-                                a parent devfile or a plugin. Overriding is done according
-                                to K8S strategic merge patch standard rules.
-                              type: object
-                              x-kubernetes-preserve-unknown-fields: true
                             commands:
                               description: Overrides of commands encapsulated in a
                                 parent devfile or a plugin. Overriding is done according

pkg/apis/workspaces/v1alpha2/devworkspaceTemplateSpec.go

@@ -15,11 +15,12 @@ type DevWorkspaceTemplateSpec struct {
 // +devfile:overrides:generate
 type DevWorkspaceTemplateSpecContent struct {
 	// Map of implementation-dependant free-form YAML attributes.
-	// Attribute values can be referenced through out the devfile in string type fields in the form {{attribute-key}}
-	// except for schemaVersion and metadata
+	// Attribute values can be referenced throughout the devfile in string type fields in the form {{attribute-key}}
+	// except for schemaVersion and metadata. Exception to the string field include element's key identifiers(command id,
+	// component name, endpoint name, project name, etc.) and string enums(command group kind, endpoint exposure, etc.)
 	// +optional
 	// +patchStrategy=merge
-	// +devfile:overrides:include:description=Overrides of attributes encapsulated in a parent devfile or a plugin.
+	// +devfile:overrides:include:omitInPlugin=true,description=Overrides of attributes encapsulated in a parent devfile.
 	Attributes attributes.Attributes `json:"attributes,omitempty" patchStrategy:"merge"`
 
 	// List of the workspace components, such as editor and plugins,

pkg/apis/workspaces/v1alpha2/zz_generated.deepcopy.go

@@ -4,7 +4,7 @@
   "title": "DevWorkspaceTemplateSpec schema - Version 2.1.0-alpha",
   "properties": {
     "attributes": {
-      "description": "Map of implementation-dependant free-form YAML attributes. Attribute values can be referenced through out the devfile in string type fields in the form {{attribute-key}} except for schemaVersion and metadata",
+      "description": "Map of implementation-dependant free-form YAML attributes. Attribute values can be referenced throughout the devfile in string type fields in the form {{attribute-key}} except for schemaVersion and metadata. Exception to the string field include element's key identifiers(command id, component name, endpoint name, project name, etc.) and string enums(command group kind, endpoint exposure, etc.)",
       "type": "object",
       "additionalProperties": true
     },
@@ -679,11 +679,6 @@
               }
             ],
             "properties": {
-              "attributes": {
-                "description": "Overrides of attributes encapsulated in a parent devfile or a plugin. Overriding is done according to K8S strategic merge patch standard rules.",
-                "type": "object",
-                "additionalProperties": true
-              },
               "commands": {
                 "description": "Overrides of commands encapsulated in a parent devfile or a plugin. Overriding is done according to K8S strategic merge patch standard rules.",
                 "type": "array",
@@ -1345,7 +1340,7 @@
       ],
       "properties": {
         "attributes": {
-          "description": "Overrides of attributes encapsulated in a parent devfile or a plugin. Overriding is done according to K8S strategic merge patch standard rules.",
+          "description": "Overrides of attributes encapsulated in a parent devfile. Overriding is done according to K8S strategic merge patch standard rules.",
           "type": "object",
           "additionalProperties": true
         },
@@ -1911,11 +1906,6 @@
                   }
                 ],
                 "properties": {
-                  "attributes": {
-                    "description": "Overrides of attributes encapsulated in a parent devfile or a plugin. Overriding is done according to K8S strategic merge patch standard rules.",
-                    "type": "object",
-                    "additionalProperties": true
-                  },
                   "commands": {
                     "description": "Overrides of commands encapsulated in a parent devfile or a plugin. Overriding is done according to K8S strategic merge patch standard rules.",
                     "type": "array",