fixup! fix: Default value of qps and burst

Signed-off-by: Mateus Oliveira <[email protected]>
openshift · Jul 31, 2024 · 8a0732c · 8a0732c
1 parent aa998ac
commit 8a0732c
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 25 deletions.
diff --git a/api/v1alpha1/oadp_types.go b/api/v1alpha1/oadp_types.go
@@ -109,10 +109,10 @@ type VeleroConfig struct {
 	// Default is 10m
 	// +optional
 	ResourceTimeout string `json:"resourceTimeout,omitempty"`
-	// Maximum number of requests by the server to the Kubernetes API in a short period of time. (default 100)
+	// maximum number of requests by the server to the Kubernetes API in a short period of time. (default 100)
 	// +optional
 	ClientBurst *int `json:"client-burst,omitempty"`
-	// Maximum number of requests per second by the server to the Kubernetes API once the burst limit has been reached. (default 100)
+	// maximum number of requests per second by the server to the Kubernetes API once the burst limit has been reached. (default 100)
 	// +optional
 	ClientQPS *int `json:"client-qps,omitempty"`
 	// Velero args are settings to customize velero server arguments. Overrides values in other fields.

diff --git a/bundle/manifests/oadp.openshift.io_dataprotectionapplications.yaml b/bundle/manifests/oadp.openshift.io_dataprotectionapplications.yaml
@@ -799,10 +799,10 @@ spec:
                               type: string
                           type: object
                         client-burst:
-                          description: Maximum number of requests by the server to the Kubernetes API in a short period of time. (default 100)
+                          description: maximum number of requests by the server to the Kubernetes API in a short period of time. (default 100)
                           type: integer
                         client-qps:
-                          description: Maximum number of requests per second by the server to the Kubernetes API once the burst limit has been reached. (default 100)
+                          description: maximum number of requests per second by the server to the Kubernetes API once the burst limit has been reached. (default 100)
                           type: integer
                         customPlugins:
                           description: customPlugins defines the custom plugin to be installed with Velero

diff --git a/config/crd/bases/oadp.openshift.io_dataprotectionapplications.yaml b/config/crd/bases/oadp.openshift.io_dataprotectionapplications.yaml
@@ -799,10 +799,10 @@ spec:
                               type: string
                           type: object
                         client-burst:
-                          description: Maximum number of requests by the server to the Kubernetes API in a short period of time. (default 100)
+                          description: maximum number of requests by the server to the Kubernetes API in a short period of time. (default 100)
                           type: integer
                         client-qps:
-                          description: Maximum number of requests per second by the server to the Kubernetes API once the burst limit has been reached. (default 100)
+                          description: maximum number of requests per second by the server to the Kubernetes API once the burst limit has been reached. (default 100)
                           type: integer
                         customPlugins:
                           description: customPlugins defines the custom plugin to be installed with Velero

diff --git a/controllers/velero_test.go b/controllers/velero_test.go
@@ -4561,15 +4561,6 @@ func TestDPAReconciler_buildVeleroDeployment(t *testing.T) {
 		},
 		{
 			name: "Override burst and qps",
-			veleroDeployment: &appsv1.Deployment{
-				ObjectMeta: metav1.ObjectMeta{
-					Name:      "test-velero-deployment",
-					Namespace: "test-ns",
-				},
-				Spec: appsv1.DeploymentSpec{
-					Selector: &metav1.LabelSelector{MatchLabels: veleroDeploymentMatchLabels},
-				},
-			},
 			dpa: &oadpv1alpha1.DataProtectionApplication{
 				ObjectMeta: metav1.ObjectMeta{
 					Name:      "test-Velero-CR",
@@ -4587,6 +4578,15 @@ func TestDPAReconciler_buildVeleroDeployment(t *testing.T) {
 					},
 				},
 			},
+			veleroDeployment: &appsv1.Deployment{
+				ObjectMeta: metav1.ObjectMeta{
+					Name:      "test-velero-deployment",
+					Namespace: "test-ns",
+				},
+				Spec: appsv1.DeploymentSpec{
+					Selector: &metav1.LabelSelector{MatchLabels: veleroDeploymentMatchLabels},
+				},
+			},
 			wantVeleroDeployment: &appsv1.Deployment{
 				ObjectMeta: metav1.ObjectMeta{
 					Name:      "test-velero-deployment",
@@ -4635,15 +4635,6 @@ func TestDPAReconciler_buildVeleroDeployment(t *testing.T) {
 		},
 		{
 			name: "Conflicting burst and qps",
-			veleroDeployment: &appsv1.Deployment{
-				ObjectMeta: metav1.ObjectMeta{
-					Name:      "test-velero-deployment",
-					Namespace: "test-ns",
-				},
-				Spec: appsv1.DeploymentSpec{
-					Selector: &metav1.LabelSelector{MatchLabels: veleroDeploymentMatchLabels},
-				},
-			},
 			dpa: &oadpv1alpha1.DataProtectionApplication{
 				ObjectMeta: metav1.ObjectMeta{
 					Name:      "test-Velero-CR",
@@ -4667,6 +4658,15 @@ func TestDPAReconciler_buildVeleroDeployment(t *testing.T) {
 					},
 				},
 			},
+			veleroDeployment: &appsv1.Deployment{
+				ObjectMeta: metav1.ObjectMeta{
+					Name:      "test-velero-deployment",
+					Namespace: "test-ns",
+				},
+				Spec: appsv1.DeploymentSpec{
+					Selector: &metav1.LabelSelector{MatchLabels: veleroDeploymentMatchLabels},
+				},
+			},
 			wantVeleroDeployment: &appsv1.Deployment{
 				ObjectMeta: metav1.ObjectMeta{
 					Name:      "test-velero-deployment",
@@ -4712,7 +4712,6 @@ func TestDPAReconciler_buildVeleroDeployment(t *testing.T) {
 					},
 				},
 			},
-			wantErr: true, // TODO should error to avoid user confusion?
 		},
 	}
 	for _, tt := range tests {