Skip to content

Commit 3dae17e

Browse files
authored
Use proper internal GKE service annotation (#3431)
Problem: The service annotation for the GKE services was improperly formatted. Solution: Fix the annotation so it provisions the proper service.
1 parent 699fed9 commit 3dae17e

33 files changed

+33
-33
lines changed

charts/nginx-gateway-fabric/values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -493,7 +493,7 @@ gateways: []
493493
# gatewayClassName: nginx
494494
# infrastructure:
495495
# annotations:
496-
# service.annotations.networking.gke.io/load-balancer-type: Internal
496+
# networking.gke.io/load-balancer-type: Internal
497497
# listeners:
498498
# - name: https
499499
# port: 80

tests/suite/manifests/dp-perf/gateway.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ spec:
66
gatewayClassName: nginx
77
infrastructure:
88
annotations:
9-
service.annotations.networking.gke.io/load-balancer-type: Internal
9+
networking.gke.io/load-balancer-type: Internal
1010
listeners:
1111
- name: http
1212
port: 80

tests/suite/manifests/longevity/gateway.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ spec:
66
gatewayClassName: nginx
77
infrastructure:
88
annotations:
9-
service.annotations.networking.gke.io/load-balancer-type: Internal
9+
networking.gke.io/load-balancer-type: Internal
1010
listeners:
1111
- name: http
1212
port: 80

tests/suite/manifests/ngf-upgrade/gateway-updated.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ spec:
66
gatewayClassName: nginx
77
infrastructure:
88
annotations:
9-
service.annotations.networking.gke.io/load-balancer-type: Internal
9+
networking.gke.io/load-balancer-type: Internal
1010
listeners:
1111
- name: http
1212
port: 80

tests/suite/manifests/ngf-upgrade/gateway.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ spec:
66
gatewayClassName: nginx
77
infrastructure:
88
annotations:
9-
service.annotations.networking.gke.io/load-balancer-type: Internal
9+
networking.gke.io/load-balancer-type: Internal
1010
listeners:
1111
- name: http
1212
port: 80

tests/suite/manifests/reconfig/gateway.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ spec:
66
gatewayClassName: nginx
77
infrastructure:
88
annotations:
9-
service.annotations.networking.gke.io/load-balancer-type: Internal
9+
networking.gke.io/load-balancer-type: Internal
1010
listeners:
1111
- name: http
1212
port: 80

tests/suite/manifests/scale/matches.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ spec:
66
gatewayClassName: nginx
77
infrastructure:
88
annotations:
9-
service.annotations.networking.gke.io/load-balancer-type: Internal
9+
networking.gke.io/load-balancer-type: Internal
1010
listeners:
1111
- name: listener
1212
port: 80

tests/suite/manifests/scale/upstreams.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ spec:
66
gatewayClassName: nginx
77
infrastructure:
88
annotations:
9-
service.annotations.networking.gke.io/load-balancer-type: Internal
9+
networking.gke.io/load-balancer-type: Internal
1010
listeners:
1111
- name: listener
1212
hostname: "*.example.com"

tests/suite/manifests/scale/zero-downtime/gateway-1.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ spec:
66
gatewayClassName: nginx
77
infrastructure:
88
annotations:
9-
service.annotations.networking.gke.io/load-balancer-type: Internal
9+
networking.gke.io/load-balancer-type: Internal
1010
listeners:
1111
- name: http
1212
port: 80

tests/suite/manifests/scale/zero-downtime/gateway-10.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ spec:
66
gatewayClassName: nginx
77
infrastructure:
88
annotations:
9-
service.annotations.networking.gke.io/load-balancer-type: Internal
9+
networking.gke.io/load-balancer-type: Internal
1010
listeners:
1111
- name: http
1212
port: 80

tests/suite/manifests/scale/zero-downtime/gateway-11.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ spec:
66
gatewayClassName: nginx
77
infrastructure:
88
annotations:
9-
service.annotations.networking.gke.io/load-balancer-type: Internal
9+
networking.gke.io/load-balancer-type: Internal
1010
listeners:
1111
- name: http
1212
port: 80

tests/suite/manifests/scale/zero-downtime/gateway-12.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ spec:
66
gatewayClassName: nginx
77
infrastructure:
88
annotations:
9-
service.annotations.networking.gke.io/load-balancer-type: Internal
9+
networking.gke.io/load-balancer-type: Internal
1010
listeners:
1111
- name: http
1212
port: 80

tests/suite/manifests/scale/zero-downtime/gateway-13.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ spec:
66
gatewayClassName: nginx
77
infrastructure:
88
annotations:
9-
service.annotations.networking.gke.io/load-balancer-type: Internal
9+
networking.gke.io/load-balancer-type: Internal
1010
listeners:
1111
- name: http
1212
port: 80

tests/suite/manifests/scale/zero-downtime/gateway-14.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ spec:
66
gatewayClassName: nginx
77
infrastructure:
88
annotations:
9-
service.annotations.networking.gke.io/load-balancer-type: Internal
9+
networking.gke.io/load-balancer-type: Internal
1010
listeners:
1111
- name: http
1212
port: 80

tests/suite/manifests/scale/zero-downtime/gateway-15.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ spec:
66
gatewayClassName: nginx
77
infrastructure:
88
annotations:
9-
service.annotations.networking.gke.io/load-balancer-type: Internal
9+
networking.gke.io/load-balancer-type: Internal
1010
listeners:
1111
- name: http
1212
port: 80

tests/suite/manifests/scale/zero-downtime/gateway-16.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ spec:
66
gatewayClassName: nginx
77
infrastructure:
88
annotations:
9-
service.annotations.networking.gke.io/load-balancer-type: Internal
9+
networking.gke.io/load-balancer-type: Internal
1010
listeners:
1111
- name: http
1212
port: 80

tests/suite/manifests/scale/zero-downtime/gateway-17.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ spec:
66
gatewayClassName: nginx
77
infrastructure:
88
annotations:
9-
service.annotations.networking.gke.io/load-balancer-type: Internal
9+
networking.gke.io/load-balancer-type: Internal
1010
listeners:
1111
- name: http
1212
port: 80

tests/suite/manifests/scale/zero-downtime/gateway-18.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ spec:
66
gatewayClassName: nginx
77
infrastructure:
88
annotations:
9-
service.annotations.networking.gke.io/load-balancer-type: Internal
9+
networking.gke.io/load-balancer-type: Internal
1010
listeners:
1111
- name: http
1212
port: 80

tests/suite/manifests/scale/zero-downtime/gateway-19.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ spec:
66
gatewayClassName: nginx
77
infrastructure:
88
annotations:
9-
service.annotations.networking.gke.io/load-balancer-type: Internal
9+
networking.gke.io/load-balancer-type: Internal
1010
listeners:
1111
- name: http
1212
port: 80

tests/suite/manifests/scale/zero-downtime/gateway-2.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ spec:
66
gatewayClassName: nginx
77
infrastructure:
88
annotations:
9-
service.annotations.networking.gke.io/load-balancer-type: Internal
9+
networking.gke.io/load-balancer-type: Internal
1010
listeners:
1111
- name: http
1212
port: 80

tests/suite/manifests/scale/zero-downtime/gateway-20.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ spec:
66
gatewayClassName: nginx
77
infrastructure:
88
annotations:
9-
service.annotations.networking.gke.io/load-balancer-type: Internal
9+
networking.gke.io/load-balancer-type: Internal
1010
listeners:
1111
- name: http
1212
port: 80

tests/suite/manifests/scale/zero-downtime/gateway-21.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ spec:
66
gatewayClassName: nginx
77
infrastructure:
88
annotations:
9-
service.annotations.networking.gke.io/load-balancer-type: Internal
9+
networking.gke.io/load-balancer-type: Internal
1010
listeners:
1111
- name: http
1212
port: 80

tests/suite/manifests/scale/zero-downtime/gateway-22.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ spec:
66
gatewayClassName: nginx
77
infrastructure:
88
annotations:
9-
service.annotations.networking.gke.io/load-balancer-type: Internal
9+
networking.gke.io/load-balancer-type: Internal
1010
listeners:
1111
- name: http
1212
port: 80

tests/suite/manifests/scale/zero-downtime/gateway-23.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ spec:
66
gatewayClassName: nginx
77
infrastructure:
88
annotations:
9-
service.annotations.networking.gke.io/load-balancer-type: Internal
9+
networking.gke.io/load-balancer-type: Internal
1010
listeners:
1111
- name: http
1212
port: 80

tests/suite/manifests/scale/zero-downtime/gateway-24.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ spec:
66
gatewayClassName: nginx
77
infrastructure:
88
annotations:
9-
service.annotations.networking.gke.io/load-balancer-type: Internal
9+
networking.gke.io/load-balancer-type: Internal
1010
listeners:
1111
- name: http
1212
port: 80

tests/suite/manifests/scale/zero-downtime/gateway-25.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ spec:
66
gatewayClassName: nginx
77
infrastructure:
88
annotations:
9-
service.annotations.networking.gke.io/load-balancer-type: Internal
9+
networking.gke.io/load-balancer-type: Internal
1010
listeners:
1111
- name: http
1212
port: 80

tests/suite/manifests/scale/zero-downtime/gateway-3.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ spec:
66
gatewayClassName: nginx
77
infrastructure:
88
annotations:
9-
service.annotations.networking.gke.io/load-balancer-type: Internal
9+
networking.gke.io/load-balancer-type: Internal
1010
listeners:
1111
- name: http
1212
port: 80

tests/suite/manifests/scale/zero-downtime/gateway-4.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ spec:
66
gatewayClassName: nginx
77
infrastructure:
88
annotations:
9-
service.annotations.networking.gke.io/load-balancer-type: Internal
9+
networking.gke.io/load-balancer-type: Internal
1010
listeners:
1111
- name: http
1212
port: 80

tests/suite/manifests/scale/zero-downtime/gateway-5.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ spec:
66
gatewayClassName: nginx
77
infrastructure:
88
annotations:
9-
service.annotations.networking.gke.io/load-balancer-type: Internal
9+
networking.gke.io/load-balancer-type: Internal
1010
listeners:
1111
- name: http
1212
port: 80

tests/suite/manifests/scale/zero-downtime/gateway-6.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ spec:
66
gatewayClassName: nginx
77
infrastructure:
88
annotations:
9-
service.annotations.networking.gke.io/load-balancer-type: Internal
9+
networking.gke.io/load-balancer-type: Internal
1010
listeners:
1111
- name: http
1212
port: 80

tests/suite/manifests/scale/zero-downtime/gateway-7.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ spec:
66
gatewayClassName: nginx
77
infrastructure:
88
annotations:
9-
service.annotations.networking.gke.io/load-balancer-type: Internal
9+
networking.gke.io/load-balancer-type: Internal
1010
listeners:
1111
- name: http
1212
port: 80

tests/suite/manifests/scale/zero-downtime/gateway-8.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ spec:
66
gatewayClassName: nginx
77
infrastructure:
88
annotations:
9-
service.annotations.networking.gke.io/load-balancer-type: Internal
9+
networking.gke.io/load-balancer-type: Internal
1010
listeners:
1111
- name: http
1212
port: 80

tests/suite/manifests/scale/zero-downtime/gateway-9.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ spec:
66
gatewayClassName: nginx
77
infrastructure:
88
annotations:
9-
service.annotations.networking.gke.io/load-balancer-type: Internal
9+
networking.gke.io/load-balancer-type: Internal
1010
listeners:
1111
- name: http
1212
port: 80

0 commit comments

Comments
 (0)