diff --git a/internal/controller/reconcile-domains.go b/internal/controller/reconcile-domains.go index f00f7c2..9d29bb6 100644 --- a/internal/controller/reconcile-domains.go +++ b/internal/controller/reconcile-domains.go @@ -680,7 +680,7 @@ func (c *Controller) getUpdatedTenantDestinationRuleObject(ctx context.Context, ConsistentHash: &networkingv1beta1.LoadBalancerSettings_ConsistentHashLB{ HashKey: &networkingv1beta1.LoadBalancerSettings_ConsistentHashLB_HttpCookie{ HttpCookie: &networkingv1beta1.LoadBalancerSettings_ConsistentHashLB_HTTPCookie{ - Name: HttpCookieName, + Name: RouterHttpCookieName, Ttl: durationpb.New(0 * time.Second), Path: "/", }, diff --git a/internal/controller/reconcile.go b/internal/controller/reconcile.go index 3cc42f4..582fa2f 100644 --- a/internal/controller/reconcile.go +++ b/internal/controller/reconcile.go @@ -69,8 +69,8 @@ const ( ConsumerTenantType = "consumer" ) -// Use same name as default cookie from approuter used for session stickiness -const HttpCookieName = "JSESSIONID" +// Use a different name for sticky cookie than the one from approuter (JSESSIONID) used for session handling +const RouterHttpCookieName = "CAPOP_ROUTER_STICKY" const ( EnvCAPOpAppVersion = "CAPOP_APP_VERSION" diff --git a/internal/controller/testdata/captenant/cat-04.expected.yaml b/internal/controller/testdata/captenant/cat-04.expected.yaml index cfdbf5f..a282e55 100644 --- a/internal/controller/testdata/captenant/cat-04.expected.yaml +++ b/internal/controller/testdata/captenant/cat-04.expected.yaml @@ -94,6 +94,6 @@ spec: loadBalancer: consistentHash: httpCookie: - name: JSESSIONID + name: CAPOP_ROUTER_STICKY path: / ttl: 0s diff --git a/internal/controller/testdata/captenant/cat-13.expected.yaml b/internal/controller/testdata/captenant/cat-13.expected.yaml index 3847064..4dbe2c4 100644 --- a/internal/controller/testdata/captenant/cat-13.expected.yaml +++ b/internal/controller/testdata/captenant/cat-13.expected.yaml @@ -100,6 +100,6 @@ spec: loadBalancer: consistentHash: httpCookie: - name: JSESSIONID + name: CAPOP_ROUTER_STICKY path: / ttl: 0s diff --git a/internal/controller/testdata/captenant/cat-15.expected.yaml b/internal/controller/testdata/captenant/cat-15.expected.yaml index ba4fe88..447aae8 100644 --- a/internal/controller/testdata/captenant/cat-15.expected.yaml +++ b/internal/controller/testdata/captenant/cat-15.expected.yaml @@ -97,6 +97,6 @@ spec: loadBalancer: consistentHash: httpCookie: - name: JSESSIONID + name: CAPOP_ROUTER_STICKY path: / ttl: 0s diff --git a/internal/controller/testdata/captenant/cat-17.expected.yaml b/internal/controller/testdata/captenant/cat-17.expected.yaml index aa4c128..f9a5c09 100644 --- a/internal/controller/testdata/captenant/cat-17.expected.yaml +++ b/internal/controller/testdata/captenant/cat-17.expected.yaml @@ -97,7 +97,7 @@ spec: loadBalancer: consistentHash: httpCookie: - name: JSESSIONID + name: CAPOP_ROUTER_STICKY path: / ttl: 0s --- diff --git a/internal/controller/testdata/captenant/cat-17.initial.yaml b/internal/controller/testdata/captenant/cat-17.initial.yaml index d3dfea9..85150e3 100644 --- a/internal/controller/testdata/captenant/cat-17.initial.yaml +++ b/internal/controller/testdata/captenant/cat-17.initial.yaml @@ -96,6 +96,6 @@ spec: loadBalancer: consistentHash: httpCookie: - name: JSESSIONID + name: CAPOP_ROUTER_STICKY path: / ttl: 0s diff --git a/internal/controller/testdata/captenant/provider-tenant-dr-v1.yaml b/internal/controller/testdata/captenant/provider-tenant-dr-v1.yaml index 06d0700..cb41808 100644 --- a/internal/controller/testdata/captenant/provider-tenant-dr-v1.yaml +++ b/internal/controller/testdata/captenant/provider-tenant-dr-v1.yaml @@ -22,6 +22,6 @@ spec: loadBalancer: consistentHash: httpCookie: - name: JSESSIONID + name: CAPOP_ROUTER_STICKY path: / ttl: 0s