Merge pull request #283 from captainroy-hy/fix-trait-apply

use update instead of patch on applying trait
crossplane · Nov 8, 2020 · 60e1d3d · 60e1d3d
2 parents 7a6a94a + 2651f61
commit 60e1d3d
Show file tree

Hide file tree

Showing 24 changed files with 758 additions and 916 deletions.
diff --git a/charts/oam-kubernetes-runtime/crds/core.oam.dev_applicationconfigurations.yaml b/charts/oam-kubernetes-runtime/crds/core.oam.dev_applicationconfigurations.yaml
diff --git a/charts/oam-kubernetes-runtime/crds/core.oam.dev_components.yaml b/charts/oam-kubernetes-runtime/crds/core.oam.dev_components.yaml
@@ -32,60 +32,43 @@ spec:
         description: A Component describes how an OAM workload kind may be instantiated.
         properties:
           apiVersion:
-            description: 'APIVersion defines the versioned schema of this representation
-              of an object. Servers should convert recognized schemas to the latest
-              internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+            description: 'APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
             type: string
           kind:
-            description: 'Kind is a string value representing the REST resource this
-              object represents. Servers may infer this from the endpoint the client
-              submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+            description: 'Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
             type: string
           metadata:
             type: object
           spec:
             description: A ComponentSpec defines the desired state of a Component.
             properties:
               parameters:
-                description: Parameters exposed by this component. ApplicationConfigurations
-                  that reference this component may specify values for these parameters,
-                  which will in turn be injected into the embedded workload.
+                description: Parameters exposed by this component. ApplicationConfigurations that reference this component may specify values for these parameters, which will in turn be injected into the embedded workload.
                 items:
-                  description: A ComponentParameter defines a configurable parameter
-                    of a component.
+                  description: A ComponentParameter defines a configurable parameter of a component.
                   properties:
                     description:
                       description: Description of this parameter.
                       type: string
                     fieldPaths:
-                      description: FieldPaths specifies an array of fields within
-                        this Component's workload that will be overwritten by the
-                        value of this parameter. The type of the parameter (e.g. int,
-                        string) is inferred from the type of these fields; All fields
-                        must be of the same type. Fields are specified as JSON field
-                        paths without a leading dot, for example 'spec.replicas'.
+                      description: FieldPaths specifies an array of fields within this Component's workload that will be overwritten by the value of this parameter. The type of the parameter (e.g. int, string) is inferred from the type of these fields; All fields must be of the same type. Fields are specified as JSON field paths without a leading dot, for example 'spec.replicas'.
                       items:
                         type: string
                       type: array
                     name:
-                      description: Name of this parameter. OAM ApplicationConfigurations
-                        will specify parameter values using this name.
+                      description: Name of this parameter. OAM ApplicationConfigurations will specify parameter values using this name.
                       type: string
                     required:
                       default: false
-                      description: Required specifies whether or not a value for this
-                        parameter must be supplied when authoring an ApplicationConfiguration.
+                      description: Required specifies whether or not a value for this parameter must be supplied when authoring an ApplicationConfiguration.
                       type: boolean
                   required:
                   - fieldPaths
                   - name
                   type: object
                 type: array
               workload:
-                description: A Workload that will be created for each ApplicationConfiguration
-                  that includes this Component. Workload is an instance of a workloadDefinition.
-                  We either use the GVK info or a special "type" field in the workload
-                  to associate the content of the workload with its workloadDefinition
+                description: A Workload that will be created for each ApplicationConfiguration that includes this Component. Workload is an instance of a workloadDefinition. We either use the GVK info or a special "type" field in the workload to associate the content of the workload with its workloadDefinition
                 type: object
                 x-kubernetes-embedded-resource: true
                 x-kubernetes-preserve-unknown-fields: true
@@ -101,25 +84,20 @@ spec:
                   description: A Condition that may apply to a resource.
                   properties:
                     lastTransitionTime:
-                      description: LastTransitionTime is the last time this condition
-                        transitioned from one status to another.
+                      description: LastTransitionTime is the last time this condition transitioned from one status to another.
                       format: date-time
                       type: string
                     message:
-                      description: A Message containing details about this condition's
-                        last transition from one status to another, if any.
+                      description: A Message containing details about this condition's last transition from one status to another, if any.
                       type: string
                     reason:
-                      description: A Reason for this condition's last transition from
-                        one status to another.
+                      description: A Reason for this condition's last transition from one status to another.
                       type: string
                     status:
-                      description: Status of this condition; is it currently True,
-                        False, or Unknown?
+                      description: Status of this condition; is it currently True, False, or Unknown?
                       type: string
                     type:
-                      description: Type of this condition. At most one of each condition
-                        type may apply to a resource at any point in time.
+                      description: Type of this condition. At most one of each condition type may apply to a resource at any point in time.
                       type: string
                   required:
                   - lastTransitionTime