chore: omit replicas because nil equal to 1 by default

Signed-off-by: Ardika Bagus <[email protected]>
envoyproxy · Mar 8, 2024 · 545eb65 · 545eb65
1 parent e7f6d00
commit 545eb65
Show file tree

Hide file tree

Showing 22 changed files with 1 addition and 26 deletions.
diff --git a/api/v1alpha1/validation/envoygateway_validate_test.go b/api/v1alpha1/validation/envoygateway_validate_test.go
@@ -668,8 +668,7 @@ func TestEnvoyGatewayProvider(t *testing.T) {
 
 	envoyGatewayProvider.Kubernetes = &v1alpha1.EnvoyGatewayKubernetesProvider{
 		RateLimitDeployment: &v1alpha1.KubernetesDeploymentSpec{
-			Replicas: nil,
-			Pod:      nil,
+			Pod: nil,
 			Container: &v1alpha1.KubernetesContainerSpec{
 				Resources:       nil,
 				SecurityContext: nil,
@@ -684,8 +683,6 @@ func TestEnvoyGatewayProvider(t *testing.T) {
 
 	assert.NotNil(t, envoyGatewayProvider.Kubernetes.RateLimitDeployment)
 	assert.Equal(t, envoyGatewayProvider.Kubernetes.RateLimitDeployment, v1alpha1.DefaultKubernetesDeployment(v1alpha1.DefaultRateLimitImage))
-	assert.NotNil(t, envoyGatewayProvider.Kubernetes.RateLimitDeployment.Replicas)
-	assert.Equal(t, envoyGatewayProvider.Kubernetes.RateLimitDeployment.Replicas, v1alpha1.DefaultKubernetesDeploymentReplicas())
 	assert.NotNil(t, envoyGatewayProvider.Kubernetes.RateLimitDeployment.Pod)
 	assert.Equal(t, envoyGatewayProvider.Kubernetes.RateLimitDeployment.Pod, v1alpha1.DefaultKubernetesPod())
 	assert.NotNil(t, envoyGatewayProvider.Kubernetes.RateLimitDeployment.Container)

diff --git a/api/v1alpha1/validation/envoyproxy_validate_test.go b/api/v1alpha1/validation/envoyproxy_validate_test.go
@@ -599,8 +599,6 @@ func TestEnvoyProxyProvider(t *testing.T) {
 
 	assert.NotNil(t, envoyProxyProvider.Kubernetes.EnvoyDeployment)
 	assert.Equal(t, envoyProxyProvider.Kubernetes.EnvoyDeployment, egv1a1.DefaultKubernetesDeployment(egv1a1.DefaultEnvoyProxyImage))
-	assert.NotNil(t, envoyProxyProvider.Kubernetes.EnvoyDeployment.Replicas)
-	assert.Equal(t, envoyProxyProvider.Kubernetes.EnvoyDeployment.Replicas, egv1a1.DefaultKubernetesDeploymentReplicas())
 	assert.NotNil(t, envoyProxyProvider.Kubernetes.EnvoyDeployment.Pod)
 	assert.Equal(t, envoyProxyProvider.Kubernetes.EnvoyDeployment.Pod, egv1a1.DefaultKubernetesPod())
 	assert.NotNil(t, envoyProxyProvider.Kubernetes.EnvoyDeployment.Container)

diff --git a/internal/envoygateway/config/decoder_test.go b/internal/envoygateway/config/decoder_test.go
@@ -135,7 +135,6 @@ func TestDecode(t *testing.T) {
 						Type: v1alpha1.ProviderTypeKubernetes,
 						Kubernetes: &v1alpha1.EnvoyGatewayKubernetesProvider{
 							RateLimitDeployment: &v1alpha1.KubernetesDeploymentSpec{
-								Replicas: v1alpha1.DefaultKubernetesDeploymentReplicas(),
 								Strategy: v1alpha1.DefaultKubernetesDeploymentStrategy(),
 								Container: &v1alpha1.KubernetesContainerSpec{
 									Env: []corev1.EnvVar{

diff --git a/internal/envoygateway/config/testdata/decoder/in/gateway-ratelimit.yaml b/internal/envoygateway/config/testdata/decoder/in/gateway-ratelimit.yaml
@@ -6,7 +6,6 @@ provider:
   type: Kubernetes
   kubernetes:
     rateLimitDeployment:
-      replicas: 1
       strategy:
         type: RollingUpdate
       container:

diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/bootstrap.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/bootstrap.yaml
@@ -12,7 +12,6 @@ metadata:
   namespace: envoy-gateway-system
 spec:
   progressDeadlineSeconds: 600
-  replicas: 1
   revisionHistoryLimit: 10
   selector:
     matchLabels:

diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/component-level.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/component-level.yaml
@@ -12,7 +12,6 @@ metadata:
   namespace: envoy-gateway-system
 spec:
   progressDeadlineSeconds: 600
-  replicas: 1
   revisionHistoryLimit: 10
   selector:
     matchLabels:

diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/default.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/default.yaml
@@ -12,7 +12,6 @@ metadata:
   namespace: envoy-gateway-system
 spec:
   progressDeadlineSeconds: 600
-  replicas: 1
   revisionHistoryLimit: 10
   selector:
     matchLabels:

diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/disable-prometheus.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/disable-prometheus.yaml
@@ -12,7 +12,6 @@ metadata:
   namespace: envoy-gateway-system
 spec:
   progressDeadlineSeconds: 600
-  replicas: 1
   revisionHistoryLimit: 10
   selector:
     matchLabels:

diff --git a/...infrastructure/kubernetes/proxy/testdata/deployments/override-labels-and-annotations.yaml b/...infrastructure/kubernetes/proxy/testdata/deployments/override-labels-and-annotations.yaml
@@ -17,7 +17,6 @@ metadata:
   namespace: envoy-gateway-system
 spec:
   progressDeadlineSeconds: 600
-  replicas: 1
   revisionHistoryLimit: 10
   selector:
     matchLabels:

diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/patch-deployment.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/patch-deployment.yaml
@@ -12,7 +12,6 @@ metadata:
   namespace: envoy-gateway-system
 spec:
   progressDeadlineSeconds: 600
-  replicas: 1
   revisionHistoryLimit: 10
   selector:
     matchLabels:

diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/shutdown-manager.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/shutdown-manager.yaml
@@ -12,7 +12,6 @@ metadata:
   namespace: envoy-gateway-system
 spec:
   progressDeadlineSeconds: 600
-  replicas: 1
   revisionHistoryLimit: 10
   selector:
     matchLabels:

diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-annotations.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-annotations.yaml
@@ -15,7 +15,6 @@ metadata:
   namespace: envoy-gateway-system
 spec:
   progressDeadlineSeconds: 600
-  replicas: 1
   revisionHistoryLimit: 10
   selector:
     matchLabels:

diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-concurrency.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-concurrency.yaml
@@ -12,7 +12,6 @@ metadata:
   namespace: envoy-gateway-system
 spec:
   progressDeadlineSeconds: 600
-  replicas: 1
   revisionHistoryLimit: 10
   selector:
     matchLabels:

diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-extra-args.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-extra-args.yaml
@@ -12,7 +12,6 @@ metadata:
   namespace: envoy-gateway-system
 spec:
   progressDeadlineSeconds: 600
-  replicas: 1
   revisionHistoryLimit: 10
   selector:
     matchLabels:

diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-image-pull-secrets.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-image-pull-secrets.yaml
@@ -12,7 +12,6 @@ metadata:
   namespace: envoy-gateway-system
 spec:
   progressDeadlineSeconds: 600
-  replicas: 1
   revisionHistoryLimit: 10
   selector:
     matchLabels:

diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-node-selector.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/with-node-selector.yaml
@@ -12,7 +12,6 @@ metadata:
   namespace: envoy-gateway-system
 spec:
   progressDeadlineSeconds: 600
-  replicas: 1
   revisionHistoryLimit: 10
   selector:
     matchLabels:

diff --git a/...nfrastructure/kubernetes/proxy/testdata/deployments/with-topology-spread-constraints.yaml b/...nfrastructure/kubernetes/proxy/testdata/deployments/with-topology-spread-constraints.yaml
@@ -12,7 +12,6 @@ metadata:
   namespace: envoy-gateway-system
 spec:
   progressDeadlineSeconds: 600
-  replicas: 1
   revisionHistoryLimit: 10
   selector:
     matchLabels:

diff --git a/internal/infrastructure/kubernetes/ratelimit/testdata/deployments/default.yaml b/internal/infrastructure/kubernetes/ratelimit/testdata/deployments/default.yaml
@@ -15,7 +15,6 @@ metadata:
     uid: test-owner-reference-uid-for-deployment
 spec:
   progressDeadlineSeconds: 600
-  replicas: 1
   revisionHistoryLimit: 10
   selector:
     matchLabels:

diff --git a/internal/infrastructure/kubernetes/ratelimit/testdata/deployments/disable-prometheus.yaml b/internal/infrastructure/kubernetes/ratelimit/testdata/deployments/disable-prometheus.yaml
@@ -15,7 +15,6 @@ metadata:
     uid: test-owner-reference-uid-for-deployment
 spec:
   progressDeadlineSeconds: 600
-  replicas: 1
   revisionHistoryLimit: 10
   selector:
     matchLabels:

diff --git a/internal/infrastructure/kubernetes/ratelimit/testdata/deployments/patch-deployment.yaml b/internal/infrastructure/kubernetes/ratelimit/testdata/deployments/patch-deployment.yaml
@@ -15,7 +15,6 @@ metadata:
     uid: test-owner-reference-uid-for-deployment
 spec:
   progressDeadlineSeconds: 600
-  replicas: 1
   revisionHistoryLimit: 10
   selector:
     matchLabels:

diff --git a/internal/infrastructure/kubernetes/ratelimit/testdata/deployments/with-node-selector.yaml b/internal/infrastructure/kubernetes/ratelimit/testdata/deployments/with-node-selector.yaml
@@ -15,7 +15,6 @@ metadata:
     uid: test-owner-reference-uid-for-deployment
 spec:
   progressDeadlineSeconds: 600
-  replicas: 1
   revisionHistoryLimit: 10
   selector:
     matchLabels:

diff --git a/...structure/kubernetes/ratelimit/testdata/deployments/with-topology-spread-constraints.yaml b/...structure/kubernetes/ratelimit/testdata/deployments/with-topology-spread-constraints.yaml
@@ -15,7 +15,6 @@ metadata:
     uid: test-owner-reference-uid-for-deployment
 spec:
   progressDeadlineSeconds: 600
-  replicas: 1
   revisionHistoryLimit: 10
   selector:
     matchLabels: