Skip to content

Commit f705180

Browse files
authored
Adjust egress IP self service ManagedResource for Espejote 0.13.0 (#172)
With vshn/espejote#93 nsTrigger is no longer `null` on deleted resources. The PR still keeps the null check for older espejote versions.
1 parent f9faffa commit f705180

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

component/espejote-templates/egress-gateway-self-service.jsonnet

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ if esp.triggerName() == 'namespace' then (
9696
// nsTrigger can be null if we're called when the namespace is getting
9797
// deleted. If it's not null, we still don't want to do anything when the
9898
// namespace is getting deleted.
99-
if nsTrigger != null && !inDelete(nsTrigger.resource) then
99+
if nsTrigger != null && std.get(nsTrigger, 'resource') != null && !inDelete(nsTrigger.resource) then
100100
reconcileNamespace(nsTrigger.resource)
101101
) else
102102
// Reconcile all namespaces for jsonnetlibrary update or managedresource

tests/golden/egress-gateway/cilium/cilium/40_egress_ip_managed_resource.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -514,7 +514,7 @@ spec:
514514
// nsTrigger can be null if we're called when the namespace is getting
515515
// deleted. If it's not null, we still don't want to do anything when the
516516
// namespace is getting deleted.
517-
if nsTrigger != null && !inDelete(nsTrigger.resource) then
517+
if nsTrigger != null && std.get(nsTrigger, 'resource') != null && !inDelete(nsTrigger.resource) then
518518
reconcileNamespace(nsTrigger.resource)
519519
) else
520520
// Reconcile all namespaces for jsonnetlibrary update or managedresource

0 commit comments

Comments
 (0)