Set default gateway replicas to 1 and default affinity to null

hashicorp · Nov 11, 2022 · 3fff75f · 3fff75f
1 parent 437eee1
commit 3fff75f
Show file tree

Hide file tree

Showing 4 changed files with 110 additions and 86 deletions.
diff --git a/charts/consul/test/unit/ingress-gateways-deployment.bats b/charts/consul/test/unit/ingress-gateways-deployment.bats
@@ -336,15 +336,15 @@ load _helpers
 #--------------------------------------------------------------------
 # replicas
 
-@test "ingressGateways/Deployment: replicas defaults to 2" {
+@test "ingressGateways/Deployment: replicas defaults to 1" {
   cd `chart_dir`
   local actual=$(helm template \
       -s templates/ingress-gateways-deployment.yaml  \
       --set 'ingressGateways.enabled=true' \
       --set 'connectInject.enabled=true' \
       . | tee /dev/stderr |
       yq -s -r '.[0].spec.replicas' | tee /dev/stderr)
-  [ "${actual}" = "2" ]
+  [ "${actual}" = "1" ]
 }
 
 @test "ingressGateways/Deployment: replicas can be set through defaults" {
@@ -561,15 +561,15 @@ load _helpers
 #--------------------------------------------------------------------
 # affinity
 
-@test "ingressGateways/Deployment: affinity defaults to one per node" {
+@test "ingressGateways/Deployment: affinity defaults to null" {
   cd `chart_dir`
   local actual=$(helm template \
       -s templates/ingress-gateways-deployment.yaml  \
       --set 'ingressGateways.enabled=true' \
       --set 'connectInject.enabled=true' \
       . | tee /dev/stderr |
-      yq -s -r '.[0].spec.template.spec.affinity.podAntiAffinity.requiredDuringSchedulingIgnoredDuringExecution[0].topologyKey' | tee /dev/stderr)
-  [ "${actual}" = "kubernetes.io/hostname" ]
+      yq -s -r '.[0].spec.template.spec.affinity' | tee /dev/stderr)
+  [ "${actual}" = "null" ]
 }
 
 @test "ingressGateways/Deployment: affinity can be set through defaults" {

diff --git a/charts/consul/test/unit/mesh-gateway-deployment.bats b/charts/consul/test/unit/mesh-gateway-deployment.bats
@@ -164,15 +164,15 @@ key2: value2' \
 #--------------------------------------------------------------------
 # replicas
 
-@test "meshGateway/Deployment: replicas defaults to 2" {
+@test "meshGateway/Deployment: replicas defaults to 1" {
   cd `chart_dir`
   local actual=$(helm template \
       -s templates/mesh-gateway-deployment.yaml  \
       --set 'meshGateway.enabled=true' \
       --set 'connectInject.enabled=true' \
       . | tee /dev/stderr |
       yq -r '.spec.replicas' | tee /dev/stderr)
-  [ "${actual}" = "2" ]
+  [ "${actual}" = "1" ]
 }
 
 @test "meshGateway/Deployment: replicas can be overridden" {
@@ -190,15 +190,15 @@ key2: value2' \
 #--------------------------------------------------------------------
 # affinity
 
-@test "meshGateway/Deployment: affinity defaults to one per node" {
+@test "meshGateway/Deployment: affinity defaults to null" {
   cd `chart_dir`
   local actual=$(helm template \
       -s templates/mesh-gateway-deployment.yaml  \
       --set 'meshGateway.enabled=true' \
       --set 'connectInject.enabled=true' \
       . | tee /dev/stderr |
-      yq -r '.spec.template.spec.affinity.podAntiAffinity.requiredDuringSchedulingIgnoredDuringExecution[0].topologyKey' | tee /dev/stderr)
-  [ "${actual}" = "kubernetes.io/hostname" ]
+      yq -r '.spec.template.spec.affinity' | tee /dev/stderr)
+  [ "${actual}" = "null" ]
 }
 
 @test "meshGateway/Deployment: affinity can be overridden" {

diff --git a/charts/consul/test/unit/terminating-gateways-deployment.bats b/charts/consul/test/unit/terminating-gateways-deployment.bats
@@ -393,15 +393,15 @@ load _helpers
 #--------------------------------------------------------------------
 # replicas
 
-@test "terminatingGateways/Deployment: replicas defaults to 2" {
+@test "terminatingGateways/Deployment: replicas defaults to 1" {
   cd `chart_dir`
   local actual=$(helm template \
       -s templates/terminating-gateways-deployment.yaml \
       --set 'terminatingGateways.enabled=true' \
       --set 'connectInject.enabled=true' \
       . | tee /dev/stderr |
       yq -s -r '.[0].spec.replicas' | tee /dev/stderr)
-  [ "${actual}" = "2" ]
+  [ "${actual}" = "1" ]
 }
 
 @test "terminatingGateways/Deployment: replicas can be set through defaults" {
@@ -653,15 +653,15 @@ load _helpers
 #--------------------------------------------------------------------
 # affinity
 
-@test "terminatingGateways/Deployment: affinity defaults to one per node" {
+@test "terminatingGateways/Deployment: affinity defaults to null" {
   cd `chart_dir`
   local actual=$(helm template \
       -s templates/terminating-gateways-deployment.yaml \
       --set 'terminatingGateways.enabled=true' \
       --set 'connectInject.enabled=true' \
       . | tee /dev/stderr |
-      yq -s -r '.[0].spec.template.spec.affinity.podAntiAffinity.requiredDuringSchedulingIgnoredDuringExecution[0].topologyKey' | tee /dev/stderr)
-  [ "${actual}" = "kubernetes.io/hostname" ]
+      yq -s -r '.[0].spec.template.spec.affinity' | tee /dev/stderr)
+  [ "${actual}" = "null" ]
 }
 
 @test "terminatingGateways/Deployment: affinity can be set through defaults" {