Skip to content

Commit 9d7a326

Browse files
Peter HrvolaPeter Hrvola
Peter Hrvola
authored and
Peter Hrvola
committed
fix: use region-agnostic OKE service alias
1 parent dab1385 commit 9d7a326

4 files changed

Lines changed: 11 additions & 11 deletions

File tree

‎gen/workload-extensions/oke/simple/oke_network_resources.libsonnet‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@ local public_lb = import './oke_public_load_balancer.libsonnet';
287287
ingress_rules: {
288288
nsg_cp_6443: nsg.tcp_ingress_src('Allow TCP ingress for Kubernetes control plane inter-communication on source port 6443', ctx.nsg_cp_key, '6443'),
289289
} + ctx.api_endpoint_ingress_rules + {
290-
nsg_service: service.tcp_ingress(ctx, 'Allow TCP ingress from OCI services to control plane for responses'),
290+
nsg_service: service.tcp_ingress('Allow TCP ingress from OCI services to control plane for responses'),
291291
nsg_workers_10250: nsg.tcp_ingress_src('Allow TCP ingress to control plane from worker nodes for Kubelet responses on source port 10250', ctx.nsg_workers_key, '10250'),
292292
nsg_workers_12250: nsg.tcp_ingress('Allow TCP ingress to kube-apiserver from workers on port 12250', ctx.nsg_workers_key, '12250'),
293293
nsg_workers_6443: nsg.tcp_ingress('Allow TCP ingress to kube-apiserver from workers on port 6443', ctx.nsg_workers_key, '6443'),
@@ -365,7 +365,7 @@ local public_lb = import './oke_public_load_balancer.libsonnet';
365365
nsg_lb_tcp: nsg.tcp_ingress_any('Allow TCP ingress to pods from load balancers', ctx.nsg_lb_key),
366366
nsg_lb_udp: nsg.udp_ingress_any('Allow UDP ingress to pods from load balancers', ctx.nsg_lb_key),
367367
nsg_pods: nsg.all_ingress('Allow ALL ingress to pods from other pods', ctx.nsg_pods_key),
368-
nsg_service: service.tcp_ingress(ctx, 'Allow TCP ingress from OCI services to pods'),
368+
nsg_service: service.tcp_ingress('Allow TCP ingress from OCI services to pods'),
369369
nsg_workers: nsg.all_ingress('Allow ALL ingress to pods from workers', ctx.nsg_workers_key),
370370
} + hub_public_lb.pod_ingress(ctx),
371371
},
@@ -408,7 +408,7 @@ local public_lb = import './oke_public_load_balancer.libsonnet';
408408
nsg_lb_10256: nsg.tcp_ingress('Allow TCP ingress to workers for health check from load balancer on port 10256', ctx.nsg_lb_key, '10256'),
409409
nsg_lb_tcp: nsg.tcp_ingress_range('Allow TCP ingress to workers from load balancers on service ports 30000-32767', ctx.nsg_lb_key, '30000', '32767'),
410410
nsg_lb_udp: nsg.udp_ingress_range('Allow UDP ingress to workers from load balancers on service ports 30000-32767', ctx.nsg_lb_key, '30000', '32767'),
411-
nsg_service: service.tcp_ingress(ctx, 'Allow TCP ingress from OCI services to workers'),
411+
nsg_service: service.tcp_ingress('Allow TCP ingress from OCI services to workers'),
412412
nsg_workers: nsg.all_ingress('Allow ALL ingress to workers from other workers', ctx.nsg_workers_key),
413413
} + (if ctx.create_fss then {
414414
nsg_fss_udp_111: nsg.udp_ingress_src('Allow UDP return traffic to workers from NFS portmapper on source port 111', ctx.nsg_fss_key, '111'),

‎gen/workload-extensions/oke/simple/oke_network_rule_factories.libsonnet‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,10 +89,10 @@ local cidr_ingress(description, protocol, src_cidr, port_fields={}) = {
8989
stateless: true,
9090
},
9191

92-
tcp_ingress(ctx, description):: {
92+
tcp_ingress(description):: {
9393
description: description,
9494
protocol: 'TCP',
95-
src: 'all-%s-services-in-oracle-services-network' % ctx.n.region,
95+
src: 'all-services',
9696
src_type: 'SERVICE_CIDR_BLOCK',
9797
stateless: true,
9898
},

‎workload-extensions/oke/simple/multi-stack/oke_network.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -383,7 +383,7 @@
383383

384384
"nsg_service": {
385385
"description" : "Allow TCP ingress from OCI services to control plane for responses",
386-
"src" : "all-fra-services-in-oracle-services-network",
386+
"src" : "all-services",
387387
"src_type" : "SERVICE_CIDR_BLOCK",
388388
"protocol" : "TCP",
389389
"stateless" : true
@@ -673,7 +673,7 @@
673673

674674
"nsg_service": {
675675
"description" : "Allow TCP ingress from OCI services to pods",
676-
"src" : "all-fra-services-in-oracle-services-network",
676+
"src" : "all-services",
677677
"src_type" : "SERVICE_CIDR_BLOCK",
678678
"protocol" : "TCP",
679679
"stateless" : true
@@ -885,7 +885,7 @@
885885

886886
"nsg_service": {
887887
"description" : "Allow TCP ingress from OCI services to workers",
888-
"src" : "all-fra-services-in-oracle-services-network",
888+
"src" : "all-services",
889889
"src_type" : "SERVICE_CIDR_BLOCK",
890890
"protocol" : "TCP",
891891
"stateless" : true

‎workload-extensions/oke/simple/single-stack/oke_network.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -814,7 +814,7 @@
814814

815815
"nsg_service": {
816816
"description" : "Allow TCP ingress from OCI services to control plane for responses",
817-
"src" : "all-fra-services-in-oracle-services-network",
817+
"src" : "all-services",
818818
"src_type" : "SERVICE_CIDR_BLOCK",
819819
"protocol" : "TCP",
820820
"stateless" : true
@@ -1104,7 +1104,7 @@
11041104

11051105
"nsg_service": {
11061106
"description" : "Allow TCP ingress from OCI services to pods",
1107-
"src" : "all-fra-services-in-oracle-services-network",
1107+
"src" : "all-services",
11081108
"src_type" : "SERVICE_CIDR_BLOCK",
11091109
"protocol" : "TCP",
11101110
"stateless" : true
@@ -1316,7 +1316,7 @@
13161316

13171317
"nsg_service": {
13181318
"description" : "Allow TCP ingress from OCI services to workers",
1319-
"src" : "all-fra-services-in-oracle-services-network",
1319+
"src" : "all-services",
13201320
"src_type" : "SERVICE_CIDR_BLOCK",
13211321
"protocol" : "TCP",
13221322
"stateless" : true

0 commit comments

Comments
 (0)