Merge pull request #309 from ASBishop/OSPRH-16131

Fix setting Resources parameter in main section

Author: openshift-merge-bot[bot]

api/bases/test.openstack.org_ansibletests.yaml

@@ -2161,13 +2161,6 @@ spec:
                         of tobiko tests).
                       type: boolean
                     resources:
-                      default:
-                        limits:
-                          cpu: 2000m
-                          memory: 2Gi
-                        requests:
-                          cpu: 1000m
-                          memory: 2Gi
                       description: |-
                         The desired amount of resources that should be assigned to each test pod
                         spawned using the AnsibleTest CR. https://pkg.go.dev/k8s.io/api/core/v1#ResourceRequirements

api/bases/test.openstack.org_tempests.yaml

@@ -2481,13 +2481,6 @@ spec:
                         of tobiko tests).
                       type: boolean
                     resources:
-                      default:
-                        limits:
-                          cpu: 8000m
-                          memory: 4Gi
-                        requests:
-                          cpu: 4000m
-                          memory: 2Gi
                       description: |-
                         The desired amount of resources that should be assigned to each test pod
                         spawned using the Tempest CR. https://pkg.go.dev/k8s.io/api/core/v1#ResourceRequirements

api/bases/test.openstack.org_tobikoes.yaml

@@ -2167,13 +2167,6 @@ spec:
                         when it runs tobiko tests
                       type: string
                     resources:
-                      default:
-                        limits:
-                          cpu: 8000m
-                          memory: 8Gi
-                        requests:
-                          cpu: 4000m
-                          memory: 4Gi
                       description: |-
                         The desired amount of resources that should be assigned to each test pod
                         spawned using the Tobiko CR. https://pkg.go.dev/k8s.io/api/core/v1#ResourceRequirements

api/v1beta1/ansibletest_types.go

@@ -111,7 +111,6 @@ type AnsibleTestWorkflowSpec struct {
 
 	// The desired amount of resources that should be assigned to each test pod
 	// spawned using the AnsibleTest CR. https://pkg.go.dev/k8s.io/api/core/v1#ResourceRequirements
-	// +kubebuilder:default:={limits: {cpu: "2000m", memory: "2Gi"}, requests: {cpu: "1000m", memory: "2Gi"}}
 	Resources *corev1.ResourceRequirements `json:"resources,omitempty"`
 
 	// +operator-sdk:csv:customresourcedefinitions:type=spec

api/v1beta1/tempest_types_workflow.go

@@ -232,7 +232,6 @@ type WorkflowTempestSpec struct {
 
 	// The desired amount of resources that should be assigned to each test pod
 	// spawned using the Tempest CR. https://pkg.go.dev/k8s.io/api/core/v1#ResourceRequirements
-	// +kubebuilder:default:={limits: {cpu: "8000m", memory: "4Gi"}, requests: {cpu: "4000m", memory: "2Gi"}}
 	Resources *corev1.ResourceRequirements `json:"resources,omitempty"`
 
 	// +kubebuilder:validation:Required

api/v1beta1/tobiko_types.go

@@ -121,7 +121,6 @@ type TobikoSpec struct {
 type TobikoWorkflowSpec struct {
 	WorkflowCommonOptions `json:",inline"`
 
-	// +kubebuilder:default:={limits: {cpu: "8000m", memory: "8Gi"}, requests: {cpu: "4000m", memory: "4Gi"}}
 	// The desired amount of resources that should be assigned to each test pod
 	// spawned using the Tobiko CR. https://pkg.go.dev/k8s.io/api/core/v1#ResourceRequirements
 	Resources *corev1.ResourceRequirements `json:"resources,omitempty"`

config/crd/bases/test.openstack.org_ansibletests.yaml

@@ -2161,13 +2161,6 @@ spec:
                         of tobiko tests).
                       type: boolean
                     resources:
-                      default:
-                        limits:
-                          cpu: 2000m
-                          memory: 2Gi
-                        requests:
-                          cpu: 1000m
-                          memory: 2Gi
                       description: |-
                         The desired amount of resources that should be assigned to each test pod
                         spawned using the AnsibleTest CR. https://pkg.go.dev/k8s.io/api/core/v1#ResourceRequirements

config/crd/bases/test.openstack.org_tempests.yaml

@@ -2481,13 +2481,6 @@ spec:
                         of tobiko tests).
                       type: boolean
                     resources:
-                      default:
-                        limits:
-                          cpu: 8000m
-                          memory: 4Gi
-                        requests:
-                          cpu: 4000m
-                          memory: 2Gi
                       description: |-
                         The desired amount of resources that should be assigned to each test pod
                         spawned using the Tempest CR. https://pkg.go.dev/k8s.io/api/core/v1#ResourceRequirements

config/crd/bases/test.openstack.org_tobikoes.yaml

@@ -2167,13 +2167,6 @@ spec:
                         when it runs tobiko tests
                       type: string
                     resources:
-                      default:
-                        limits:
-                          cpu: 8000m
-                          memory: 8Gi
-                        requests:
-                          cpu: 4000m
-                          memory: 4Gi
                       description: |-
                         The desired amount of resources that should be assigned to each test pod
                         spawned using the Tobiko CR. https://pkg.go.dev/k8s.io/api/core/v1#ResourceRequirements