fix: k8sChaos duration should be optional

form3tech-oss · Jan 11, 2024 · 203d666 · 203d666
1 parent 94cfdf0
commit 203d666
Show file tree

Hide file tree

Showing 13 changed files with 7 additions and 34 deletions.
diff --git a/api/v1alpha1/k8schaos_types.go b/api/v1alpha1/k8schaos_types.go
@@ -46,7 +46,8 @@ var (
 // K8SChaosSpec defines the desired state of K8SChaos
 type K8SChaosSpec struct {
 	// Duration represents the duration of the chaos action
-	Duration *string `json:"duration" webhook:"Duration"`
+	// +optional
+	Duration *string `json:"duration,omitempty" webhook:"Duration"`
 
 	// +kubebuilder:validation:Required
 	APIObjects *K8SChaosAPIObjects `json:"apiObjects"`

diff --git a/config/crd/bases/chaos-mesh.org_k8schaos.yaml b/config/crd/bases/chaos-mesh.org_k8schaos.yaml
@@ -59,7 +59,6 @@ spec:
                 type: string
             required:
             - apiObjects
-            - duration
             type: object
           status:
             description: Most recently observed status of the chaos experiment about

diff --git a/config/crd/bases/chaos-mesh.org_schedules.yaml b/config/crd/bases/chaos-mesh.org_schedules.yaml
@@ -1232,7 +1232,6 @@ spec:
                     type: string
                 required:
                 - apiObjects
-                - duration
                 type: object
               kernelChaos:
                 description: KernelChaosSpec defines the desired state of KernelChaos
@@ -4595,7 +4594,6 @@ spec:
                               type: string
                           required:
                           - apiObjects
-                          - duration
                           type: object
                         kernelChaos:
                           description: KernelChaosSpec defines the desired state of
@@ -7725,7 +7723,6 @@ spec:
                                   type: string
                               required:
                               - apiObjects
-                              - duration
                               type: object
                             kernelChaos:
                               description: KernelChaosSpec defines the desired state

diff --git a/config/crd/bases/chaos-mesh.org_workflownodes.yaml b/config/crd/bases/chaos-mesh.org_workflownodes.yaml
@@ -1253,7 +1253,6 @@ spec:
                     type: string
                 required:
                 - apiObjects
-                - duration
                 type: object
               kernelChaos:
                 description: KernelChaosSpec defines the desired state of KernelChaos
@@ -4186,7 +4185,6 @@ spec:
                         type: string
                     required:
                     - apiObjects
-                    - duration
                     type: object
                   kernelChaos:
                     description: KernelChaosSpec defines the desired state of KernelChaos
@@ -7622,7 +7620,6 @@ spec:
                                   type: string
                               required:
                               - apiObjects
-                              - duration
                               type: object
                             kernelChaos:
                               description: KernelChaosSpec defines the desired state
@@ -10856,7 +10853,6 @@ spec:
                                       type: string
                                   required:
                                   - apiObjects
-                                  - duration
                                   type: object
                                 kernelChaos:
                                   description: KernelChaosSpec defines the desired

diff --git a/config/crd/bases/chaos-mesh.org_workflows.yaml b/config/crd/bases/chaos-mesh.org_workflows.yaml
@@ -1303,7 +1303,6 @@ spec:
                           type: string
                       required:
                       - apiObjects
-                      - duration
                       type: object
                     kernelChaos:
                       description: KernelChaosSpec defines the desired state of KernelChaos
@@ -4350,7 +4349,6 @@ spec:
                               type: string
                           required:
                           - apiObjects
-                          - duration
                           type: object
                         kernelChaos:
                           description: KernelChaosSpec defines the desired state of

diff --git a/helm/chaos-mesh/crds/chaos-mesh.org_k8schaos.yaml b/helm/chaos-mesh/crds/chaos-mesh.org_k8schaos.yaml
@@ -59,7 +59,6 @@ spec:
                 type: string
             required:
             - apiObjects
-            - duration
             type: object
           status:
             description: Most recently observed status of the chaos experiment about

diff --git a/helm/chaos-mesh/crds/chaos-mesh.org_schedules.yaml b/helm/chaos-mesh/crds/chaos-mesh.org_schedules.yaml
@@ -1232,7 +1232,6 @@ spec:
                     type: string
                 required:
                 - apiObjects
-                - duration
                 type: object
               kernelChaos:
                 description: KernelChaosSpec defines the desired state of KernelChaos
@@ -4595,7 +4594,6 @@ spec:
                               type: string
                           required:
                           - apiObjects
-                          - duration
                           type: object
                         kernelChaos:
                           description: KernelChaosSpec defines the desired state of
@@ -7725,7 +7723,6 @@ spec:
                                   type: string
                               required:
                               - apiObjects
-                              - duration
                               type: object
                             kernelChaos:
                               description: KernelChaosSpec defines the desired state

diff --git a/helm/chaos-mesh/crds/chaos-mesh.org_workflownodes.yaml b/helm/chaos-mesh/crds/chaos-mesh.org_workflownodes.yaml
@@ -1253,7 +1253,6 @@ spec:
                     type: string
                 required:
                 - apiObjects
-                - duration
                 type: object
               kernelChaos:
                 description: KernelChaosSpec defines the desired state of KernelChaos
@@ -4186,7 +4185,6 @@ spec:
                         type: string
                     required:
                     - apiObjects
-                    - duration
                     type: object
                   kernelChaos:
                     description: KernelChaosSpec defines the desired state of KernelChaos
@@ -7622,7 +7620,6 @@ spec:
                                   type: string
                               required:
                               - apiObjects
-                              - duration
                               type: object
                             kernelChaos:
                               description: KernelChaosSpec defines the desired state
@@ -10856,7 +10853,6 @@ spec:
                                       type: string
                                   required:
                                   - apiObjects
-                                  - duration
                                   type: object
                                 kernelChaos:
                                   description: KernelChaosSpec defines the desired

diff --git a/helm/chaos-mesh/crds/chaos-mesh.org_workflows.yaml b/helm/chaos-mesh/crds/chaos-mesh.org_workflows.yaml
@@ -1303,7 +1303,6 @@ spec:
                           type: string
                       required:
                       - apiObjects
-                      - duration
                       type: object
                     kernelChaos:
                       description: KernelChaosSpec defines the desired state of KernelChaos
@@ -4350,7 +4349,6 @@ spec:
                               type: string
                           required:
                           - apiObjects
-                          - duration
                           type: object
                         kernelChaos:
                           description: KernelChaosSpec defines the desired state of

diff --git a/manifests/crd.yaml b/manifests/crd.yaml
@@ -2263,7 +2263,6 @@ spec:
                 type: string
             required:
             - apiObjects
-            - duration
             type: object
           status:
             description: Most recently observed status of the chaos experiment about
@@ -6639,7 +6638,6 @@ spec:
                     type: string
                 required:
                 - apiObjects
-                - duration
                 type: object
               kernelChaos:
                 description: KernelChaosSpec defines the desired state of KernelChaos
@@ -10002,7 +10000,6 @@ spec:
                               type: string
                           required:
                           - apiObjects
-                          - duration
                           type: object
                         kernelChaos:
                           description: KernelChaosSpec defines the desired state of
@@ -13132,7 +13129,6 @@ spec:
                                   type: string
                               required:
                               - apiObjects
-                              - duration
                               type: object
                             kernelChaos:
                               description: KernelChaosSpec defines the desired state
@@ -21290,7 +21286,6 @@ spec:
                     type: string
                 required:
                 - apiObjects
-                - duration
                 type: object
               kernelChaos:
                 description: KernelChaosSpec defines the desired state of KernelChaos
@@ -24223,7 +24218,6 @@ spec:
                         type: string
                     required:
                     - apiObjects
-                    - duration
                     type: object
                   kernelChaos:
                     description: KernelChaosSpec defines the desired state of KernelChaos
@@ -27659,7 +27653,6 @@ spec:
                                   type: string
                               required:
                               - apiObjects
-                              - duration
                               type: object
                             kernelChaos:
                               description: KernelChaosSpec defines the desired state
@@ -30893,7 +30886,6 @@ spec:
                                       type: string
                                   required:
                                   - apiObjects
-                                  - duration
                                   type: object
                                 kernelChaos:
                                   description: KernelChaosSpec defines the desired
@@ -41984,7 +41976,6 @@ spec:
                           type: string
                       required:
                       - apiObjects
-                      - duration
                       type: object
                     kernelChaos:
                       description: KernelChaosSpec defines the desired state of KernelChaos
@@ -45031,7 +45022,6 @@ spec:
                               type: string
                           required:
                           - apiObjects
-                          - duration
                           type: object
                         kernelChaos:
                           description: KernelChaosSpec defines the desired state of

diff --git a/pkg/dashboard/swaggerdocs/docs.go b/pkg/dashboard/swaggerdocs/docs.go
@@ -6054,7 +6054,7 @@ const docTemplate = `{
                     "$ref": "#/definitions/v1alpha1.K8SChaosAPIObjects"
                 },
                 "duration": {
-                    "description": "Duration represents the duration of the chaos action",
+                    "description": "Duration represents the duration of the chaos action\n+optional",
                     "type": "string"
                 },
                 "remoteCluster": {

diff --git a/pkg/dashboard/swaggerdocs/swagger.json b/pkg/dashboard/swaggerdocs/swagger.json
@@ -6046,7 +6046,7 @@
                     "$ref": "#/definitions/v1alpha1.K8SChaosAPIObjects"
                 },
                 "duration": {
-                    "description": "Duration represents the duration of the chaos action",
+                    "description": "Duration represents the duration of the chaos action\n+optional",
                     "type": "string"
                 },
                 "remoteCluster": {

diff --git a/pkg/dashboard/swaggerdocs/swagger.yaml b/pkg/dashboard/swaggerdocs/swagger.yaml
@@ -4313,7 +4313,9 @@ definitions:
         $ref: '#/definitions/v1alpha1.K8SChaosAPIObjects'
         description: +kubebuilder:validation:Required
       duration:
-        description: Duration represents the duration of the chaos action
+        description: |-
+          Duration represents the duration of the chaos action
+          +optional
         type: string
       remoteCluster:
         description: |-