Skip to content

Commit 80bfdcc

Browse files
authored
Backport of istio generated replication channel with tunneling set to false (#2754)
* backport owls-96198 * update copyrights * update copyrights
1 parent 8abfb99 commit 80bfdcc

File tree

3 files changed

+8
-4
lines changed

3 files changed

+8
-4
lines changed

operator/src/main/resources/scripts/introspectDomain.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1371,7 +1371,7 @@ def _writeIstioReplicationChannelNAP(self, name, listen_address, listen_port,
13711371
self.writeln('<d:public-address %s>%s.%s</d:public-address>' % (action, listen_address,
13721372
self.env.getEnvOrDef("ISTIO_POD_NAMESPACE", "default")))
13731373
self.writeln('<d:listen-port %s>%s</d:listen-port>' % (action, listen_port))
1374-
self.writeln('<d:http-enabled-for-this-protocol %s>true</d:http-enabled-for-this-protocol>' %
1374+
self.writeln('<d:http-enabled-for-this-protocol %s>false</d:http-enabled-for-this-protocol>' %
13751375
(action))
13761376
self.writeln('<d:enabled %s>true</d:enabled>' % action)
13771377
self.writeln('<d:outbound-enabled %s>false</d:outbound-enabled>' % action)

operator/src/main/resources/scripts/model_wdt_mii_filter.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2018, 2021, Oracle and/or its affiliates.
1+
# Copyright (c) 2018, 2022, Oracle and/or its affiliates.
22
# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
33
#
44
# ------------
@@ -538,12 +538,12 @@ def customizeIstioReplicationChannel(server, name, listen_address):
538538
_writeIstioNAP(name='istiorepl', server=server, listen_address=listen_address,
539539
listen_port=istio_repl_listen_port, protocol='t3', http_enabled="true",
540540
bind_to_localhost="true", use_fast_serialization='true',
541-
tunneling_enabled='true')
541+
tunneling_enabled='false')
542542
else:
543543
_writeIstioNAP(name='istiorepl', server=server, listen_address=listen_address,
544544
listen_port=istio_repl_listen_port, protocol='t3', http_enabled="true",
545545
bind_to_localhost="false", use_fast_serialization='true',
546-
tunneling_enabled='true')
546+
tunneling_enabled='false')
547547

548548
def raise_replication_port_conflict(name, listen_port, replication_port, SSL):
549549
raise ValueError('Server/ServerTemplate %s %s listen port %s conflicts with default replication channel port %s when '

operator/src/test/python/test_wdt_mii_filter.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
# Copyright (c) 2021, 2022, Oracle and/or its affiliates.
2+
# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
3+
14
import ast
25
import os
36
import unittest
@@ -376,6 +379,7 @@ def test_customizeIstioReplicationChannel_version_1_10(self):
376379
istiorepl_nap = model['topology']['ServerTemplate']['cluster-1-template']['NetworkAccessPoint']['istiorepl']
377380
self.assertIsNotNone(istiorepl_nap, "Expected a NAP named \'istiorepl\' to be defined")
378381

382+
self.assertEqual(istiorepl_nap['TunnelingEnabled'], 'false')
379383
nap_listen_address = istiorepl_nap['ListenAddress']
380384
self.assertEqual('sample-domain1-managed-server${id}', nap_listen_address,
381385
"Expected nap listen address to be \'sample-domain1-managed-server${id}\'")

0 commit comments

Comments
 (0)