Skip to content

Commit df30c60

Browse files
chkp-natanelmchkp-yizhako
chkp-natanelm
and
chkp-yizhako
authored
feat(VSECPC-12276): Add Support to AWS R82.10 version (#531)
Co-authored-by: yizhako <[email protected]>
1 parent 66df9d6 commit df30c60

27 files changed

+113
-24
lines changed

‎aws/templates/asg/autoscale-master.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -506,6 +506,9 @@ Parameters:
506506
- R82-BYOL
507507
- R82-PAYG-NGTP
508508
- R82-PAYG-NGTX
509+
- R82.10-BYOL
510+
- R82.10-PAYG-NGTP
511+
- R82.10-PAYG-NGTX
509512
Shell:
510513
Description: Change the admin shell to enable advanced command line configuration.
511514
Type: String

‎aws/templates/asg/autoscale.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -419,6 +419,9 @@ Parameters:
419419
- R82-BYOL
420420
- R82-PAYG-NGTP
421421
- R82-PAYG-NGTX
422+
- R82.10-BYOL
423+
- R82.10-PAYG-NGTP
424+
- R82.10-PAYG-NGTX
422425
Shell:
423426
Description: Change the admin shell to enable advanced command line configuration.
424427
Type: String

‎aws/templates/cluster/cluster-master.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -423,6 +423,9 @@ Parameters:
423423
- R82-BYOL
424424
- R82-PAYG-NGTP
425425
- R82-PAYG-NGTX
426+
- R82.10-BYOL
427+
- R82.10-PAYG-NGTP
428+
- R82.10-PAYG-NGTX
426429
Shell:
427430
Description: Change the admin shell to enable advanced command line configuration.
428431
Type: String

‎aws/templates/cluster/cluster.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -418,6 +418,9 @@ Parameters:
418418
- R82-BYOL
419419
- R82-PAYG-NGTP
420420
- R82-PAYG-NGTX
421+
- R82.10-BYOL
422+
- R82.10-PAYG-NGTP
423+
- R82.10-PAYG-NGTX
421424
Shell:
422425
Description: Change the admin shell to enable advanced command line configuration.
423426
Type: String

‎aws/templates/cross-az-cluster/cross-az-cluster-master.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -428,6 +428,9 @@ Parameters:
428428
- R82-BYOL
429429
- R82-PAYG-NGTP
430430
- R82-PAYG-NGTX
431+
- R82.10-BYOL
432+
- R82.10-PAYG-NGTP
433+
- R82.10-PAYG-NGTX
431434
Shell:
432435
Description: Change the admin shell to enable advanced command line configuration.
433436
Type: String

‎aws/templates/cross-az-cluster/cross-az-cluster.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -433,6 +433,9 @@ Parameters:
433433
- R82-BYOL
434434
- R82-PAYG-NGTP
435435
- R82-PAYG-NGTX
436+
- R82.10-BYOL
437+
- R82.10-PAYG-NGTP
438+
- R82.10-PAYG-NGTX
436439
Shell:
437440
Description: Change the admin shell to enable advanced command line configuration.
438441
Type: String

‎aws/templates/geo-cluster/geo-cluster-master.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -440,6 +440,9 @@ Parameters:
440440
- R82-BYOL
441441
- R82-PAYG-NGTP
442442
- R82-PAYG-NGTX
443+
- R82.10-BYOL
444+
- R82.10-PAYG-NGTP
445+
- R82.10-PAYG-NGTX
443446
Shell:
444447
Description: Change the admin shell to enable advanced command line configuration.
445448
Type: String

‎aws/templates/geo-cluster/geo-cluster.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -434,6 +434,9 @@ Parameters:
434434
- R82-BYOL
435435
- R82-PAYG-NGTP
436436
- R82-PAYG-NGTX
437+
- R82.10-BYOL
438+
- R82.10-PAYG-NGTP
439+
- R82.10-PAYG-NGTX
437440
Shell:
438441
Description: Change the admin shell to enable advanced command line configuration.
439442
Type: String

‎aws/templates/gwlb-asg/gwlb-master.yaml‎

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ Metadata:
4949
- GatewayMaintenancePasswordHash
5050
- GatewaySICKey
5151
- ControlGatewayOverPrivateOrPublicAddress
52+
- IPMode
5253
- AllocatePublicAddress
53-
- EnableIPv6Traffic
5454
- CloudWatch
5555
- GatewayBootstrapScript
5656
- Label:
@@ -82,6 +82,8 @@ Metadata:
8282
default: Auto Scaling Group Public Subnet 4
8383
KeyName:
8484
default: Key name
85+
IPMode:
86+
default: IP Configuration Mode
8587
EnableVolumeEncryption:
8688
default: Enable environment volume encryption
8789
VolumeSize:
@@ -156,8 +158,6 @@ Metadata:
156158
default: Gateways addresses
157159
AutoScaleGroupName:
158160
default: Auto Scale Group name
159-
EnableIPv6Traffic:
160-
default: Add support for IPv6 traffic inspection
161161
Parameters:
162162
AvailabilityZones:
163163
Description: List of Availability Zones (AZs) to use for the subnets in the VPC. Select at least two.
@@ -553,6 +553,9 @@ Parameters:
553553
- R82-BYOL
554554
- R82-PAYG-NGTP
555555
- R82-PAYG-NGTX
556+
- R82.10-BYOL
557+
- R82.10-PAYG-NGTP
558+
- R82.10-PAYG-NGTX
556559
GatewayPasswordHash:
557560
Description: Admin user's password hash (use command "openssl passwd -6 PASSWORD" to get the PASSWORD's hash). (optional)
558561
Type: String
@@ -585,13 +588,13 @@ Parameters:
585588
AllowedValues:
586589
- true
587590
- false
588-
EnableIPv6Traffic:
589-
Description: Enables inspection of IPv6 traffic encapsulated within IPv4 Geneve tunnels, ensuring proper handling of IPv6 traffic on IPv4 autoscale gateways (supported on version R81.20 with JHF 99 and above).
591+
IPMode:
592+
Description: Specifies the IP mode for inspection of traffic encapsulation in IPv4 Geneve headers. When set to DualStack, both IPv4 and IPv6 traffic are inspected. For supported versions and Jumbo Hotfix requirements, refer to the admin guide.
590593
Type: String
591-
Default: false
592594
AllowedValues:
593-
- true
594-
- false
595+
- IPv4
596+
- DualStack
597+
Default: IPv4
595598
CloudWatch:
596599
Description: Report Check Point specific CloudWatch metrics.
597600
Type: String
@@ -736,6 +739,8 @@ Parameters:
736739
- R81.20-PAYG
737740
- R82-BYOL
738741
- R82-PAYG
742+
- R82.10-BYOL
743+
- R82.10-PAYG
739744
ManagementPasswordHash:
740745
Description: Admin user's password hash (use command "openssl passwd -6 PASSWORD" to get the PASSWORD's hash). (optional)
741746
Type: String
@@ -778,12 +783,12 @@ Conditions:
778783
3AZs: !Or [!Equals [!Ref NumberOfAZs, 3], !Condition 4AZs]
779784
DeployManagement: !Equals [!Ref ManagementDeploy, true]
780785
GenerateAutoScalingName: !Equals [!Ref AutoScaleGroupName, ""]
781-
EnableIPv6: !Equals [!Ref EnableIPv6Traffic, true]
786+
IsIPv6Enabled: !Not [!Equals [!Ref IPMode, "IPv4"]]
782787
Resources:
783788
VPCStack:
784789
Type: AWS::CloudFormation::Stack
785790
Properties:
786-
TemplateURL: !If [EnableIPv6, https://cgi-cfts.s3.amazonaws.com/utils/vpc-ipv6.yaml, https://cgi-cfts.s3.amazonaws.com/utils/vpc.yaml]
791+
TemplateURL: !If [IsIPv6Enabled, https://cgi-cfts.s3.amazonaws.com/utils/vpc-ipv6.yaml, https://cgi-cfts.s3.amazonaws.com/utils/vpc.yaml]
787792
Parameters:
788793
AvailabilityZones: !Join [',' , !Ref AvailabilityZones]
789794
NumberOfAZs: !Ref NumberOfAZs
@@ -843,7 +848,7 @@ Resources:
843848
AdminCIDR: !Ref AdminCIDR
844849
GatewayManagement: !Ref GatewayManagement
845850
GatewaysAddresses: !Ref GatewaysAddresses
846-
EnableIPv6Traffic: !Ref EnableIPv6Traffic
851+
IPMode: !Ref IPMode
847852
Outputs:
848853
VPCID:
849854
Description: VPC ID.

‎aws/templates/gwlb-asg/gwlb.yaml‎

Lines changed: 18 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ Metadata:
4545
- GatewaySICKey
4646
- ControlGatewayOverPrivateOrPublicAddress
4747
- AllocatePublicAddress
48-
- EnableIPv6Traffic
48+
- IPMode
4949
- CloudWatch
5050
- GatewayBootstrapScript
5151
- Label:
@@ -67,6 +67,8 @@ Metadata:
6767
default: Gateways subnets
6868
KeyName:
6969
default: Key name
70+
IPMode:
71+
default: IP Configuration Mode
7072
EnableVolumeEncryption:
7173
default: Enable environment volume encryption
7274
VolumeSize:
@@ -141,8 +143,6 @@ Metadata:
141143
default: Gateways addresses
142144
AutoScaleGroupName:
143145
default: Auto Scale Group name
144-
EnableIPv6Traffic:
145-
default: Add support for IPv6 traffic inspection
146146
Parameters:
147147
VPC:
148148
Description: Select an existing VPC.
@@ -503,6 +503,9 @@ Parameters:
503503
- R82-BYOL
504504
- R82-PAYG-NGTP
505505
- R82-PAYG-NGTX
506+
- R82.10-BYOL
507+
- R82.10-PAYG-NGTP
508+
- R82.10-PAYG-NGTX
506509
GatewayPasswordHash:
507510
Description: Admin user's password hash (use command "openssl passwd -6 PASSWORD" to get the PASSWORD's hash). (optional)
508511
Type: String
@@ -542,13 +545,13 @@ Parameters:
542545
AllowedValues:
543546
- true
544547
- false
545-
EnableIPv6Traffic:
546-
Description: Enables inspection of IPv6 traffic encapsulated within IPv4 Geneve tunnels, ensuring proper handling of IPv6 traffic on IPv4 autoscale gateways (supported on version R81.20 with JHF 99 and above).
548+
IPMode:
549+
Description: Specifies the IP mode for inspection of traffic encapsulation in IPv4 Geneve headers. When set to DualStack, both IPv4 and IPv6 traffic are inspected. For supported versions and Jumbo Hotfix requirements, refer to the admin guide.
547550
Type: String
548-
Default: false
549551
AllowedValues:
550-
- true
551-
- false
552+
- IPv4
553+
- DualStack
554+
Default: IPv4
552555
GatewayBootstrapScript:
553556
Description: An optional script with semicolon (;) separated commands to run on the initial boot. (optional)
554557
Type: String
@@ -686,6 +689,8 @@ Parameters:
686689
- R81.20-PAYG
687690
- R82-BYOL
688691
- R82-PAYG
692+
- R82.10-BYOL
693+
- R82.10-PAYG
689694
ManagementPasswordHash:
690695
Description: Admin user's password hash (use command "openssl passwd -6 PASSWORD" to get the PASSWORD's hash). (optional)
691696
Type: String
@@ -718,24 +723,23 @@ Parameters:
718723
Description: Allow gateways only from this network to communicate with the Security Management Server.
719724
Type: String
720725
AllowedPattern: '^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])(\/([0-9]|[1-2][0-9]|3[0-2]))$'
721-
AutoScaleGroupName:
722-
Conditions:
726+
AutoScaleGroupName:
723727
Description: The Name of the Auto Scaling Group. (optional)
724728
Type: String
725729
Default: ""
726730
MaxLength: 100
727-
Conditions:
731+
Conditions:
728732
DeployManagement: !Equals [!Ref ManagementDeploy, true]
729733
VolumeEncryption: !Equals [!Ref EnableVolumeEncryption, true]
730734
GenerateAutoScalingName: !Equals [!Ref AutoScaleGroupName, ""]
731-
EnableIPv6: !Equals [!Ref EnableIPv6Traffic, true]
735+
IsIPv6Enabled: !Not [!Equals [!Ref IPMode, "IPv4"]]
732736
Resources:
733737
GatewayLoadBalancer:
734738
Type: AWS::ElasticLoadBalancingV2::LoadBalancer
735739
Properties:
736740
Type: gateway
737741
Name: !Ref GWLBName
738-
IpAddressType: !If [EnableIPv6, dualstack, ipv4]
742+
IpAddressType: !If [IsIPv6Enabled, dualstack, ipv4]
739743
LoadBalancerAttributes:
740744
- Key: load_balancing.cross_zone.enabled
741745
Value: !Ref CrossZoneLoadBalancing
@@ -811,6 +815,7 @@ Resources:
811815
GatewayBootstrapScript: !Ref GatewayBootstrapScript
812816
ManagementServer: !Ref ManagementServer
813817
ConfigurationTemplate: !Ref ConfigurationTemplate
818+
IPMode: !Ref IPMode
814819
ManagementStack:
815820
Type: AWS::CloudFormation::Stack
816821
Condition: DeployManagement

0 commit comments

Comments
 (0)