-
Notifications
You must be signed in to change notification settings - Fork 333
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix(k8s): don't temporarily remove all AvailableServices on ZoneIngre…
…ss Pod reconciliations (backport of #8301) (#8305) fix(k8s): don't temporarily remove all AvailableServices on ZoneIngress Pod reconciliations (#8301) * test(k8s): add existing ZoneIngress test * fix(k8s): don't temporarily remove all AvailableServices on ZoneIngress Pod reconciliations * test: add ResourceConverter * test: update with fixed golden file --------- Signed-off-by: Mike Beaumont <mjboamail@gmail.com> Co-authored-by: Krzysztof Słonka <slonka@users.noreply.github.com> Co-authored-by: Mike Beaumont <mjboamail@gmail.com>
- Loading branch information
1 parent
89704e0
commit 5496ca3
Showing
7 changed files
with
117 additions
and
28 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
14 changes: 14 additions & 0 deletions
14
pkg/plugins/runtime/k8s/controllers/testdata/ingress/ingress-exists.existing-dataplane.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,14 @@ | ||
metadata: | ||
creationTimestamp: null | ||
spec: | ||
networking: | ||
address: 192.168.0.1 | ||
advertisedAddress: 192.168.100.1 | ||
advertisedPort: 10001 | ||
port: 10001 | ||
availableServices: | ||
- tags: | ||
kuma.io/service: service-1-zone-2 | ||
kuma.io/protocol: http | ||
instances: 3 | ||
mesh: mesh-1 |
14 changes: 14 additions & 0 deletions
14
pkg/plugins/runtime/k8s/controllers/testdata/ingress/ingress-exists.golden.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,14 @@ | ||
metadata: | ||
creationTimestamp: null | ||
spec: | ||
availableServices: | ||
- instances: 3 | ||
mesh: mesh-1 | ||
tags: | ||
kuma.io/protocol: http | ||
kuma.io/service: service-1-zone-2 | ||
networking: | ||
address: 192.168.0.1 | ||
advertisedAddress: 192.168.100.1 | ||
advertisedPort: 10001 | ||
port: 10001 |
13 changes: 13 additions & 0 deletions
13
pkg/plugins/runtime/k8s/controllers/testdata/ingress/ingress-exists.pod.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
metadata: | ||
namespace: kuma-system | ||
name: kuma-ingress | ||
labels: | ||
app: kuma-ingress | ||
annotations: | ||
kuma.io/ingress: enabled | ||
spec: | ||
containers: | ||
- ports: | ||
- containerPort: 10001 | ||
status: | ||
podIP: 192.168.0.1 |
15 changes: 15 additions & 0 deletions
15
pkg/plugins/runtime/k8s/controllers/testdata/ingress/ingress-exists.services-for-pod.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
--- | ||
metadata: | ||
namespace: kuma-system | ||
name: kuma-ingress | ||
spec: | ||
type: LoadBalancer | ||
ports: | ||
- port: 10001 | ||
targetPort: 10001 | ||
selector: | ||
app: kuma-ingress | ||
status: | ||
loadBalancer: | ||
ingress: | ||
- ip: 192.168.100.1 |