Skip to content

Commit

Permalink
Merge pull request #305 from yizhako/yo-default-version
Browse files Browse the repository at this point in the history
AWS and AliCloud - Change default version to R81.20
  • Loading branch information
chkp-romanka authored Sep 4, 2023
2 parents 8a83d00 + 9e0fed9 commit d4ddab9
Show file tree
Hide file tree
Showing 107 changed files with 215 additions and 191 deletions.
2 changes: 1 addition & 1 deletion aws/templates/asg/autoscale.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,7 @@ Parameters:
Default: ''
GatewayVersion:
Type: String
Default: R81.10-BYOL
Default: R81.20-BYOL
AllowedValues:
- R80.40-BYOL
- R80.40-PAYG-NGTP
Expand Down
4 changes: 2 additions & 2 deletions aws/templates/cluster/cluster-master.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
AWSTemplateFormatVersion: 2010-09-09
Description: Deploy a Check Point Cluster in a new VPC (20230503)
Description: Deploy a Check Point Cluster in a new VPC (20230830)
Metadata:
AWS::CloudFormation::Interface:
ParameterGroups:
Expand Down Expand Up @@ -281,7 +281,7 @@ Parameters:
- false
GatewayVersion:
Type: String
Default: R81.10-BYOL
Default: R81.20-BYOL
AllowedValues:
- R80.40-BYOL
- R80.40-PAYG-NGTP
Expand Down
8 changes: 4 additions & 4 deletions aws/templates/cluster/cluster.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
AWSTemplateFormatVersion: 2010-09-09
Description: Deploys a Check Point Cluster into an existing VPC (20230503)
Description: Deploys a Check Point Cluster into an existing VPC (20230830)
Metadata:
AWS::CloudFormation::Interface:
ParameterGroups:
Expand Down Expand Up @@ -276,7 +276,7 @@ Parameters:
- false
GatewayVersion:
Type: String
Default: R81.10-BYOL
Default: R81.20-BYOL
AllowedValues:
- R80.40-BYOL
- R80.40-PAYG-NGTP
Expand Down Expand Up @@ -542,7 +542,7 @@ Resources:
- !Join ['', [' pwd_hash="$(echo ', 'Fn::Base64': !Ref GatewayPasswordHash, ')"']]
- !Join ['', [' bootstrap="$(echo ', 'Fn::Base64': !Ref GatewayBootstrapScript, ')"']]
- !Sub [' version=${Version}', {Version: !Select [0, !Split ['-', !Ref GatewayVersion]]}]
- ' python3 /etc/cloud_config.py enableCloudWatch=\"${cw}\" waitHandle=\"${wait_handle}\" sicKey=\"${sic}\" "smart1CloudToken=\"${tokenA}\"" installationType=\"cluster\" osVersion=\"${version}\" allowUploadDownload=\"${allow_info}\" templateVersion=\"20230503\" templateName=\"cluster\" shell=\"${admin_shell}\" enableInstanceConnect=\"${eic}\" hostName=\"${hostname}\" ntpPrimary=\"${ntp1}\" ntpSecondary=\"${ntp2}\" passwordHash=\"${pwd_hash}\" elasticIp=\"${eip}\" bootstrapScript64=\"${bootstrap}\"'
- ' python3 /etc/cloud_config.py enableCloudWatch=\"${cw}\" waitHandle=\"${wait_handle}\" sicKey=\"${sic}\" "smart1CloudToken=\"${tokenA}\"" installationType=\"cluster\" osVersion=\"${version}\" allowUploadDownload=\"${allow_info}\" templateVersion=\"20230830\" templateName=\"cluster\" shell=\"${admin_shell}\" enableInstanceConnect=\"${eic}\" hostName=\"${hostname}\" ntpPrimary=\"${ntp1}\" ntpSecondary=\"${ntp2}\" passwordHash=\"${pwd_hash}\" elasticIp=\"${eip}\" bootstrapScript64=\"${bootstrap}\"'
MemberBInstance:
Type: AWS::EC2::Instance
DependsOn: [MemberBExternalInterface, MemberBInternalInterface]
Expand Down Expand Up @@ -584,7 +584,7 @@ Resources:
- !Join ['', [' pwd_hash="$(echo ', 'Fn::Base64': !Ref GatewayPasswordHash, ')"']]
- !Join ['', [' bootstrap="$(echo ', 'Fn::Base64': !Ref GatewayBootstrapScript, ')"']]
- !Sub [' version=${Version}', {Version: !Select [0, !Split ['.', !Select [0, !Split ['-', !Ref GatewayVersion]]]]}]
- ' python3 /etc/cloud_config.py enableCloudWatch=\"${cw}\" waitHandle=\"${wait_handle}\" sicKey=\"${sic}\" "smart1CloudToken=\"${tokenB}\"" installationType=\"cluster\" osVersion=\"${version}\" allowUploadDownload=\"${allow_info}\" templateVersion=\"20230503\" templateName=\"cluster\" shell=\"${admin_shell}\" enableInstanceConnect=\"${eic}\" hostName=\"${hostname}\" ntpPrimary=\"${ntp1}\" ntpSecondary=\"${ntp2}\" passwordHash=\"${pwd_hash}\" elasticIp=\"${eip}\" bootstrapScript64=\"${bootstrap}\"'
- ' python3 /etc/cloud_config.py enableCloudWatch=\"${cw}\" waitHandle=\"${wait_handle}\" sicKey=\"${sic}\" "smart1CloudToken=\"${tokenB}\"" installationType=\"cluster\" osVersion=\"${version}\" allowUploadDownload=\"${allow_info}\" templateVersion=\"20230830\" templateName=\"cluster\" shell=\"${admin_shell}\" enableInstanceConnect=\"${eic}\" hostName=\"${hostname}\" ntpPrimary=\"${ntp1}\" ntpSecondary=\"${ntp2}\" passwordHash=\"${pwd_hash}\" elasticIp=\"${eip}\" bootstrapScript64=\"${bootstrap}\"'
ClusterPublicAddress:
Type: AWS::EC2::EIP
Properties:
Expand Down
6 changes: 3 additions & 3 deletions aws/templates/cross-az-cluster/cross-az-cluster.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
AWSTemplateFormatVersion: 2010-09-09
Description: Deploys a Check Point Cluster into an existing VPC (20230503)
Description: Deploys a Check Point Cluster into an existing VPC (20230830)
Metadata:
AWS::CloudFormation::Interface:
ParameterGroups:
Expand Down Expand Up @@ -597,7 +597,7 @@ Resources:
- !Join ['', [' pwd_hash="$(echo ', 'Fn::Base64': !Ref GatewayPasswordHash, ')"']]
- !Join ['', [' bootstrap="$(echo ', 'Fn::Base64': !Ref GatewayBootstrapScript, ')"']]
- !Sub [' version=${Version}', {Version: !Select [0, !Split ['-', !Ref GatewayVersion]]}]
- ' python3 /etc/cloud_config.py enableCloudWatch=\"${cw}\" waitHandle=\"${wait_handle}\" sicKey=\"${sic}\" "smart1CloudToken=\"${tokenA}\"" installationType=\"cross-az-cluster\" osVersion=\"${version}\" allowUploadDownload=\"${allow_info}\" templateVersion=\"20230503\" templateName=\"cross_az_cluster\" shell=\"${admin_shell}\" enableInstanceConnect=\"${eic}\" hostName=\"${hostname}\" ntpPrimary=\"${ntp1}\" ntpSecondary=\"${ntp2}\" passwordHash=\"${pwd_hash}\" elasticIp=\"${eip}\" otherMemberIp=\"${other_member_ip}\" clusterIp=\"${cluster_ip}\" secondaryIp=\"${secondary_ip}\" otherMemberPrivateClusterIp=\"${remote_secondary_ip}\" bootstrapScript64=\"${bootstrap}\"'
- ' python3 /etc/cloud_config.py enableCloudWatch=\"${cw}\" waitHandle=\"${wait_handle}\" sicKey=\"${sic}\" "smart1CloudToken=\"${tokenA}\"" installationType=\"cross-az-cluster\" osVersion=\"${version}\" allowUploadDownload=\"${allow_info}\" templateVersion=\"20230830\" templateName=\"cross_az_cluster\" shell=\"${admin_shell}\" enableInstanceConnect=\"${eic}\" hostName=\"${hostname}\" ntpPrimary=\"${ntp1}\" ntpSecondary=\"${ntp2}\" passwordHash=\"${pwd_hash}\" elasticIp=\"${eip}\" otherMemberIp=\"${other_member_ip}\" clusterIp=\"${cluster_ip}\" secondaryIp=\"${secondary_ip}\" otherMemberPrivateClusterIp=\"${remote_secondary_ip}\" bootstrapScript64=\"${bootstrap}\"'
MemberBInstance:
Type: AWS::EC2::Instance
DependsOn: [MemberBExternalInterface, MemberBInternalInterface, ClusterPublicAddress, MemberAInternalInterface, MemberAExternalInterface]
Expand Down Expand Up @@ -643,7 +643,7 @@ Resources:
- !Join ['', [' pwd_hash="$(echo ', 'Fn::Base64': !Ref GatewayPasswordHash, ')"']]
- !Join ['', [' bootstrap="$(echo ', 'Fn::Base64': !Ref GatewayBootstrapScript, ')"']]
- !Sub [' version=${Version}', {Version: !Select [0, !Split ['-', !Ref GatewayVersion]]}]
- ' python3 /etc/cloud_config.py enableCloudWatch=\"${cw}\" waitHandle=\"${wait_handle}\" sicKey=\"${sic}\" "smart1CloudToken=\"${tokenB}\"" installationType=\"cross-az-cluster\" osVersion=\"${version}\" allowUploadDownload=\"${allow_info}\" templateVersion=\"20230503\" templateName=\"cross_az_cluster\" shell=\"${admin_shell}\" enableInstanceConnect=\"${eic}\" hostName=\"${hostname}\" ntpPrimary=\"${ntp1}\" ntpSecondary=\"${ntp2}\" passwordHash=\"${pwd_hash}\" elasticIp=\"${eip}\" otherMemberIp=\"${other_member_ip}\" clusterIp=\"${cluster_ip}\" secondaryIp=\"${secondary_ip}\" otherMemberPrivateClusterIp=\"${remote_secondary_ip}\" bootstrapScript64=\"${bootstrap}\"'
- ' python3 /etc/cloud_config.py enableCloudWatch=\"${cw}\" waitHandle=\"${wait_handle}\" sicKey=\"${sic}\" "smart1CloudToken=\"${tokenB}\"" installationType=\"cross-az-cluster\" osVersion=\"${version}\" allowUploadDownload=\"${allow_info}\" templateVersion=\"20230830\" templateName=\"cross_az_cluster\" shell=\"${admin_shell}\" enableInstanceConnect=\"${eic}\" hostName=\"${hostname}\" ntpPrimary=\"${ntp1}\" ntpSecondary=\"${ntp2}\" passwordHash=\"${pwd_hash}\" elasticIp=\"${eip}\" otherMemberIp=\"${other_member_ip}\" clusterIp=\"${cluster_ip}\" secondaryIp=\"${secondary_ip}\" otherMemberPrivateClusterIp=\"${remote_secondary_ip}\" bootstrapScript64=\"${bootstrap}\"'
Outputs:
ClusterPublicAddress:
Description: The public address of the cluster.
Expand Down
4 changes: 2 additions & 2 deletions aws/templates/gwlb-asg/gwlb-master.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -400,7 +400,7 @@ Parameters:
GatewayVersion:
Description: The version and license to install on the Security Gateways.
Type: String
Default: R80.40-BYOL
Default: R81.20-BYOL
AllowedValues:
- R80.40-BYOL
- R80.40-PAYG-NGTP
Expand Down Expand Up @@ -557,7 +557,7 @@ Parameters:
ManagementVersion:
Description: The license to install on the Security Management Server.
Type: String
Default: R81.10-BYOL
Default: R81.20-BYOL
AllowedValues:
- R80.40-BYOL
- R80.40-PAYG
Expand Down
4 changes: 2 additions & 2 deletions aws/templates/gwlb-asg/gwlb.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -350,7 +350,7 @@ Parameters:
GatewayVersion:
Description: The version and license to install on the Security Gateways.
Type: String
Default: R80.40-BYOL
Default: R81.20-BYOL
AllowedValues:
- R80.40-BYOL
- R80.40-PAYG-NGTP
Expand Down Expand Up @@ -507,7 +507,7 @@ Parameters:
ManagementVersion:
Description: The license to install on the Security Management Server.
Type: String
Default: R81.10-BYOL
Default: R81.20-BYOL
AllowedValues:
- R80.40-BYOL
- R80.40-PAYG
Expand Down
6 changes: 3 additions & 3 deletions aws/templates/gwlb-asg/tgw-gwlb-master.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
AWSTemplateFormatVersion: 2010-09-09
Description: Deploy a Gateway Load Balancer, Check Point CloudGuard IaaS Security Gateway Auto Scaling Group, and optionally a Security Management Server, Gateway Load Balancer Endpoints and NAT Gateways for each AZ, in a new VPC for Transit Gateway (20211212)
Description: Deploy a Gateway Load Balancer, Check Point CloudGuard IaaS Security Gateway Auto Scaling Group, and optionally a Security Management Server, Gateway Load Balancer Endpoints and NAT Gateways for each AZ, in a new VPC for Transit Gateway (20230830)
Metadata:
AWS::CloudFormation::Interface:
ParameterGroups:
Expand Down Expand Up @@ -493,7 +493,7 @@ Parameters:
GatewayVersion:
Description: The version and license to install on the Security Gateways.
Type: String
Default: R80.40-BYOL
Default: R81.20-BYOL
AllowedValues:
- R80.40-BYOL
- R80.40-PAYG-NGTP
Expand Down Expand Up @@ -650,7 +650,7 @@ Parameters:
ManagementVersion:
Description: The license to install on the Security Management Server.
Type: String
Default: R81.10-BYOL
Default: R81.20-BYOL
AllowedValues:
- R80.40-BYOL
- R80.40-PAYG
Expand Down
4 changes: 2 additions & 2 deletions aws/templates/gwlb-asg/tgw-gwlb.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -444,7 +444,7 @@ Parameters:
GatewayVersion:
Description: The version and license to install on the Security Gateways.
Type: String
Default: R80.40-BYOL
Default: R81.20-BYOL
AllowedValues:
- R80.40-BYOL
- R80.40-PAYG-NGTP
Expand Down Expand Up @@ -618,7 +618,7 @@ Parameters:
ManagementVersion:
Description: The license to install on the Security Management Server.
Type: String
Default: R81.10-BYOL
Default: R81.20-BYOL
AllowedValues:
- R80.40-BYOL
- R80.40-PAYG
Expand Down
4 changes: 2 additions & 2 deletions aws/templates/management/management.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
AWSTemplateFormatVersion: 2010-09-09
Description: Deploys a Check Point Management Server (20211212)
Description: Deploys a Check Point Management Server (20230830)
Metadata:
AWS::CloudFormation::Interface:
ParameterGroups:
Expand Down Expand Up @@ -286,7 +286,7 @@ Parameters:
ManagementVersion:
Description: The license to install on the Security Management Server.
Type: String
Default: R81.10-BYOL
Default: R81.20-BYOL
AllowedValues:
- R80.40-BYOL
- R80.40-PAYG
Expand Down
4 changes: 2 additions & 2 deletions aws/templates/mds/mds.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
AWSTemplateFormatVersion: '2010-09-09'
Description: Deploys a Check Point Multi-Domain Server (20211212)
Description: Deploys a Check Point Multi-Domain Server (20230830)
Metadata:
AWS::CloudFormation::Interface:
ParameterGroups:
Expand Down Expand Up @@ -273,7 +273,7 @@ Parameters:
MDSVersion:
Description: The license to install on the Multi-Domain Server.
Type: String
Default: R81.10-BYOL
Default: R81.20-BYOL
AllowedValues:
- R80.40-BYOL
- R81-BYOL
Expand Down
4 changes: 2 additions & 2 deletions aws/templates/single-gw/gateway-master.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
AWSTemplateFormatVersion: 2010-09-09
Description: Deploys a Check Point Security Gateway into a new VPC (20230503)
Description: Deploys a Check Point Security Gateway into a new VPC (20230830)
Metadata:
AWS::CloudFormation::Interface:
ParameterGroups:
Expand Down Expand Up @@ -278,7 +278,7 @@ Parameters:
- false
GatewayVersion:
Type: String
Default: R81.10-BYOL
Default: R81.20-BYOL
AllowedValues:
- R80.40-BYOL
- R80.40-PAYG-NGTP
Expand Down
6 changes: 3 additions & 3 deletions aws/templates/single-gw/gateway.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
AWSTemplateFormatVersion: 2010-09-09
Description: Deploys a Check Point Security Gateway into an existing VPC (20230503)
Description: Deploys a Check Point Security Gateway into an existing VPC (20230830)
Metadata:
AWS::CloudFormation::Interface:
ParameterGroups:
Expand Down Expand Up @@ -276,7 +276,7 @@ Parameters:
- false
GatewayVersion:
Type: String
Default: R81.10-BYOL
Default: R81.20-BYOL
AllowedValues:
- R80.40-BYOL
- R80.40-PAYG-NGTP
Expand Down Expand Up @@ -518,7 +518,7 @@ Resources:
- !Join ['', [' pwd_hash="$(echo ', 'Fn::Base64': !Ref GatewayPasswordHash, ')"']]
- !Join ['', [' bootstrap="$(echo ', 'Fn::Base64': !Ref GatewayBootstrapScript, ')"']]
- !Sub [' version=${Version}', {Version: !Select [0, !Split ['-', !Ref GatewayVersion]]}]
- ' python3 /etc/cloud_config.py enableCloudWatch=\"${cw}\" waitHandle=\"${wait_handle}\" sicKey=\"${sic}\" "smart1CloudToken=\"${token}\"" installationType=\"gateway\" osVersion=\"${version}\" allowUploadDownload=\"${allow_info}\" templateVersion=\"20230503\" templateName=\"gateway\" shell=\"${admin_shell}\" enableInstanceConnect=\"${eic}\" hostName=\"${hostname}\" ntpPrimary=\"${ntp1}\" ntpSecondary=\"${ntp2}\" passwordHash=\"${pwd_hash}\" allocatePublicAddress=\"${eip}\" bootstrapScript64=\"${bootstrap}\"'
- ' python3 /etc/cloud_config.py enableCloudWatch=\"${cw}\" waitHandle=\"${wait_handle}\" sicKey=\"${sic}\" "smart1CloudToken=\"${token}\"" installationType=\"gateway\" osVersion=\"${version}\" allowUploadDownload=\"${allow_info}\" templateVersion=\"20230830\" templateName=\"gateway\" shell=\"${admin_shell}\" enableInstanceConnect=\"${eic}\" hostName=\"${hostname}\" ntpPrimary=\"${ntp1}\" ntpSecondary=\"${ntp2}\" passwordHash=\"${pwd_hash}\" allocatePublicAddress=\"${eip}\" bootstrapScript64=\"${bootstrap}\"'
KeyName: !Ref KeyName
NetworkInterfaces:
- DeviceIndex: 0
Expand Down
4 changes: 2 additions & 2 deletions aws/templates/standalone/standalone-master.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
AWSTemplateFormatVersion: 2010-09-09
Description: Deploys either a manually configurable or a Check Point CloudGuard IaaS
Security Gateway & Management (Standalone) instance in a new VPC (20211212)
Security Gateway & Management (Standalone) instance in a new VPC (20230830)
Metadata:
AWS::CloudFormation::Interface:
ParameterGroups:
Expand Down Expand Up @@ -157,7 +157,7 @@ Parameters:
StandaloneVersion:
Description: Standalone Version & License.
Type: String
Default: R81.10-PAYG-NGTP
Default: R81.20-PAYG-NGTP
AllowedValues:
- R80.40-PAYG-NGTP
- R81-PAYG-NGTP
Expand Down
4 changes: 2 additions & 2 deletions aws/templates/standalone/standalone.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
AWSTemplateFormatVersion: 2010-09-09
Description: Deploys either a manually configurable or a Check Point CloudGuard IaaS
Security Gateway & Management (Standalone) instance into an existing VPC (20211212)
Security Gateway & Management (Standalone) instance into an existing VPC (20230830)
Metadata:
AWS::CloudFormation::Interface:
ParameterGroups:
Expand Down Expand Up @@ -262,7 +262,7 @@ Parameters:
StandaloneVersion:
Description: Standalone Version & License.
Type: String
Default: R81.10-PAYG-NGTP
Default: R81.20-PAYG-NGTP
AllowedValues:
- R80.40-PAYG-NGTP
- R81-PAYG-NGTP
Expand Down
6 changes: 3 additions & 3 deletions aws/templates/tgw-asg/tgw-asg-master.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
AWSTemplateFormatVersion: 2010-09-09
Description: Deploy an Auto Scaling Group of CloudGuard Security Gateways for Transit Gateway with an optional Management Server in a new VPC (20211212)
Description: Deploy an Auto Scaling Group of CloudGuard Security Gateways for Transit Gateway with an optional Management Server in a new VPC (20230830)
Metadata:
AWS::CloudFormation::Interface:
ParameterGroups:
Expand Down Expand Up @@ -340,7 +340,7 @@ Parameters:
GatewayVersion:
Description: The version and license to install on the Security Gateways.
Type: String
Default: R81.10-BYOL
Default: R81.20-BYOL
AllowedValues:
- R80.40-BYOL
- R80.40-PAYG-NGTP
Expand Down Expand Up @@ -500,7 +500,7 @@ Parameters:
ManagementVersion:
Description: The version and license to install on the Security Management Server.
Type: String
Default: R81.10-BYOL
Default: R81.20-BYOL
AllowedValues:
- R80.40-BYOL
- R80.40-PAYG
Expand Down
6 changes: 3 additions & 3 deletions aws/templates/tgw-asg/tgw-asg.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
AWSTemplateFormatVersion: '2010-09-09'
Description: Deploy an Auto Scaling Group of CloudGuard Security Gateways for Transit Gateway with an optional Management Server into an existing VPC (20211212)
Description: Deploy an Auto Scaling Group of CloudGuard Security Gateways for Transit Gateway with an optional Management Server into an existing VPC (20230830)
Metadata:
AWS::CloudFormation::Interface:
ParameterGroups:
Expand Down Expand Up @@ -294,7 +294,7 @@ Parameters:
GatewayVersion:
Description: The version and license to install on the Security Gateways.
Type: String
Default: R81.10-BYOL
Default: R81.20-BYOL
AllowedValues:
- R80.40-BYOL
- R80.40-PAYG-NGTP
Expand Down Expand Up @@ -454,7 +454,7 @@ Parameters:
ManagementVersion:
Description: The version and license to install on the Security Management Server.
Type: String
Default: R81.10-BYOL
Default: R81.20-BYOL
AllowedValues:
- R80.40-BYOL
- R80.40-PAYG
Expand Down
Loading

0 comments on commit d4ddab9

Please sign in to comment.