Merge pull request #361 from chkp-meravbe/mb-versions

chkp-romanka · web-flow · commit 2c832790f33c · 2024-04-25T17:33:01.000+03:00
AWS | TF | Remove R80.40 and R81 versions from qs-autoscale
diff --git a/terraform/aws/qs-autoscale-master/README.md b/terraform/aws/qs-autoscale-master/README.md
diff --git a/terraform/aws/qs-autoscale-master/terraform.tfvars b/terraform/aws/qs-autoscale-master/terraform.tfvars
@@ -35,7 +35,7 @@ gateways_min_group_size = 2
 gateways_max_group_size = 8
 gateway_version = "R81.20-BYOL"
 gateway_password_hash = ""
-gateway_maintenance_mode_password_hash = "" # For R81.10 and below the gateway_password_hash is used also as maintenance-mode password.
+gateway_maintenance_mode_password_hash = "" # For R81.10 the gateway_password_hash is used also as maintenance-mode password.
 gateway_SICKey = "12345678"
 enable_cloudwatch = true
 
@@ -44,7 +44,7 @@ management_deploy = true
 management_instance_type = "m5.xlarge"
 management_version = "R81.20-BYOL"
 management_password_hash = ""
-management_maintenance_mode_password_hash = "" # For R81.10 and below the management_password_hash is used also as maintenance-mode password.
+management_maintenance_mode_password_hash = "" # For R81.10 the management_password_hash is used also as maintenance-mode password.
 gateways_policy = "Standard"
 gateways_blades = true
 admin_cidr = "0.0.0.0/0"
diff --git a/terraform/aws/qs-autoscale-master/variables.tf b/terraform/aws/qs-autoscale-master/variables.tf
@@ -141,7 +141,7 @@ variable "gateway_password_hash" {
   default = ""
 }
 variable "gateway_maintenance_mode_password_hash" {
-  description = "(optional) Check Point recommends setting Admin user's password and maintenance-mode password for recovery purposes. For R81.10 and below the Admin user's password is used also as maintenance-mode password. (To generate a password hash use the command 'grub2-mkpasswd-pbkdf2' on Linux and paste it here)."
+  description = "(optional) Check Point recommends setting Admin user's password and maintenance-mode password for recovery purposes. For R81.10 the Admin user's password is used also as maintenance-mode password. (To generate a password hash use the command 'grub2-mkpasswd-pbkdf2' on Linux and paste it here)."
   type = string
   default = ""
 }
@@ -189,7 +189,7 @@ variable "management_password_hash" {
   default = ""
 }
 variable "management_maintenance_mode_password_hash" {
-  description = "(optional) Check Point recommends setting Admin user's password and maintenance-mode password for recovery purposes. For R81.10 and below the Admin user's password is used also as maintenance-mode password. (To generate a password hash use the command 'grub2-mkpasswd-pbkdf2' on Linux and paste it here)."
+  description = "(optional) Check Point recommends setting Admin user's password and maintenance-mode password for recovery purposes. For R81.10 the Admin user's password is used also as maintenance-mode password. (To generate a password hash use the command 'grub2-mkpasswd-pbkdf2' on Linux and paste it here)."
   type = string
   default = ""
 }
diff --git a/terraform/aws/qs-autoscale/README.md b/terraform/aws/qs-autoscale/README.md
diff --git a/terraform/aws/qs-autoscale/locals.tf b/terraform/aws/qs-autoscale/locals.tf
@@ -68,6 +68,4 @@ locals {
   encrypted_protocol_condition = (local.alb_condition && var.load_balancer_protocol == "HTTPS") || (local.nlb_condition && var.load_balancer_protocol == "TLS") ? true : false
   deploy_management_condition = var.management_deploy == true
   deploy_servers_condition = var.servers_deploy == true
-  r81_below_gw_versions = ["R80.40-BYOL", "R80.40-PAYG-NGTP", "R80.40-PAYG-NGTX", "R81-BYOL", "R81-PAYG-NGTP", "R81-PAYG-NGTX"]
-  is_gw_version_r81_below = contains(local.r81_below_gw_versions, var.gateway_version)
 }
diff --git a/terraform/aws/qs-autoscale/main.tf b/terraform/aws/qs-autoscale/main.tf
@@ -37,8 +37,8 @@ module "external_load_balancer" {
   target_group_port = local.encrypted_protocol_condition ? 9443 : 9080
   listener_port = local.provided_port_condition ? var.service_port : local.encrypted_protocol_condition ? "443" : "80"
   certificate_arn = local.encrypted_protocol_condition ? var.certificate : ""
-  health_check_port = var.load_balancers_type == "Network Load Balancer" && !local.is_gw_version_r81_below ? 8117 : null
-  health_check_protocol = var.load_balancers_type == "Network Load Balancer" && !local.is_gw_version_r81_below ? "TCP" : null
+  health_check_port = var.load_balancers_type == "Network Load Balancer" ? 8117 : null
+  health_check_protocol = var.load_balancers_type == "Network Load Balancer" ? "TCP" : null
 }
 
 module "autoscale" {
diff --git a/terraform/aws/qs-autoscale/terraform.tfvars b/terraform/aws/qs-autoscale/terraform.tfvars
@@ -25,7 +25,7 @@ gateways_min_group_size = 2
 gateways_max_group_size = 8
 gateway_version = "R81.20-BYOL"
 gateway_password_hash = ""
-gateway_maintenance_mode_password_hash = "" # For R81.10 and below the gateway_password_hash is used also as maintenance-mode password.
+gateway_maintenance_mode_password_hash = "" # For R81.10 the gateway_password_hash is used also as maintenance-mode password.
 gateway_SICKey = "12345678"
 enable_cloudwatch = true
 
@@ -34,7 +34,7 @@ management_deploy = true
 management_instance_type = "m5.xlarge"
 management_version = "R81.20-BYOL"
 management_password_hash = ""
-management_maintenance_mode_password_hash = "" # For R81.10 and below the management_password_hash is used also as maintenance-mode password.
+management_maintenance_mode_password_hash = "" # For R81.10 the management_password_hash is used also as maintenance-mode password.
 gateways_policy = "Standard"
 gateways_blades = true
 admin_cidr = "0.0.0.0/0"
diff --git a/terraform/aws/qs-autoscale/variables.tf b/terraform/aws/qs-autoscale/variables.tf
@@ -128,7 +128,7 @@ variable "gateway_password_hash" {
   default = ""
 }
 variable "gateway_maintenance_mode_password_hash" {
-  description = "(optional) Check Point recommends setting Admin user's password and maintenance-mode password for recovery purposes. For R81.10 and below the Admin user's password is used also as maintenance-mode password. (To generate a password hash use the command 'grub2-mkpasswd-pbkdf2' on Linux and paste it here)."
+  description = "(optional) Check Point recommends setting Admin user's password and maintenance-mode password for recovery purposes. For R81.10 the Admin user's password is used also as maintenance-mode password. (To generate a password hash use the command 'grub2-mkpasswd-pbkdf2' on Linux and paste it here)."
   type = string
   default = ""
 }
@@ -176,7 +176,7 @@ variable "management_password_hash" {
   default = ""
 }
 variable "management_maintenance_mode_password_hash" {
-  description = "(optional) Check Point recommends setting Admin user's password and maintenance-mode password for recovery purposes. For R81.10 and below the Admin user's password is used also as maintenance-mode password. (To generate a password hash use the command 'grub2-mkpasswd-pbkdf2' on Linux and paste it here)."
+  description = "(optional) Check Point recommends setting Admin user's password and maintenance-mode password for recovery purposes. For R81.10 the Admin user's password is used also as maintenance-mode password. (To generate a password hash use the command 'grub2-mkpasswd-pbkdf2' on Linux and paste it here)."
   type = string
   default = ""
 }

Original file line number	Diff line number	Diff line change
`@@ -141,7 +141,7 @@ variable "gateway_password_hash" {`
`141`	`141`	`default = ""`
`142`	`142`	`}`
`143`	`143`	`variable "gateway_maintenance_mode_password_hash" {`
`144`		`- description = "(optional) Check Point recommends setting Admin user's password and maintenance-mode password for recovery purposes. For R81.10 and below the Admin user's password is used also as maintenance-mode password. (To generate a password hash use the command 'grub2-mkpasswd-pbkdf2' on Linux and paste it here)."`
	`144`	`+ description = "(optional) Check Point recommends setting Admin user's password and maintenance-mode password for recovery purposes. For R81.10 the Admin user's password is used also as maintenance-mode password. (To generate a password hash use the command 'grub2-mkpasswd-pbkdf2' on Linux and paste it here)."`
`145`	`145`	`type = string`
`146`	`146`	`default = ""`
`147`	`147`	`}`
`@@ -189,7 +189,7 @@ variable "management_password_hash" {`
`189`	`189`	`default = ""`
`190`	`190`	`}`
`191`	`191`	`variable "management_maintenance_mode_password_hash" {`
`192`		`- description = "(optional) Check Point recommends setting Admin user's password and maintenance-mode password for recovery purposes. For R81.10 and below the Admin user's password is used also as maintenance-mode password. (To generate a password hash use the command 'grub2-mkpasswd-pbkdf2' on Linux and paste it here)."`
	`192`	`+ description = "(optional) Check Point recommends setting Admin user's password and maintenance-mode password for recovery purposes. For R81.10 the Admin user's password is used also as maintenance-mode password. (To generate a password hash use the command 'grub2-mkpasswd-pbkdf2' on Linux and paste it here)."`
`193`	`193`	`type = string`
`194`	`194`	`default = ""`
`195`	`195`	`}`
Original file line number	Diff line number	Diff line change
`@@ -68,6 +68,4 @@ locals {`
`68`	`68`	`encrypted_protocol_condition = (local.alb_condition && var.load_balancer_protocol == "HTTPS") \|\| (local.nlb_condition && var.load_balancer_protocol == "TLS") ? true : false`
`69`	`69`	`deploy_management_condition = var.management_deploy == true`
`70`	`70`	`deploy_servers_condition = var.servers_deploy == true`
`71`		`- r81_below_gw_versions = ["R80.40-BYOL", "R80.40-PAYG-NGTP", "R80.40-PAYG-NGTX", "R81-BYOL", "R81-PAYG-NGTP", "R81-PAYG-NGTX"]`
`72`		`- is_gw_version_r81_below = contains(local.r81_below_gw_versions, var.gateway_version)`
`73`	`71`	`}`
Original file line number	Diff line number	Diff line change
`@@ -128,7 +128,7 @@ variable "gateway_password_hash" {`
`128`	`128`	`default = ""`
`129`	`129`	`}`
`130`	`130`	`variable "gateway_maintenance_mode_password_hash" {`
`131`		`- description = "(optional) Check Point recommends setting Admin user's password and maintenance-mode password for recovery purposes. For R81.10 and below the Admin user's password is used also as maintenance-mode password. (To generate a password hash use the command 'grub2-mkpasswd-pbkdf2' on Linux and paste it here)."`
	`131`	`+ description = "(optional) Check Point recommends setting Admin user's password and maintenance-mode password for recovery purposes. For R81.10 the Admin user's password is used also as maintenance-mode password. (To generate a password hash use the command 'grub2-mkpasswd-pbkdf2' on Linux and paste it here)."`
`132`	`132`	`type = string`
`133`	`133`	`default = ""`
`134`	`134`	`}`
`@@ -176,7 +176,7 @@ variable "management_password_hash" {`
`176`	`176`	`default = ""`
`177`	`177`	`}`
`178`	`178`	`variable "management_maintenance_mode_password_hash" {`
`179`		`- description = "(optional) Check Point recommends setting Admin user's password and maintenance-mode password for recovery purposes. For R81.10 and below the Admin user's password is used also as maintenance-mode password. (To generate a password hash use the command 'grub2-mkpasswd-pbkdf2' on Linux and paste it here)."`
	`179`	`+ description = "(optional) Check Point recommends setting Admin user's password and maintenance-mode password for recovery purposes. For R81.10 the Admin user's password is used also as maintenance-mode password. (To generate a password hash use the command 'grub2-mkpasswd-pbkdf2' on Linux and paste it here)."`
`180`	`180`	`type = string`
`181`	`181`	`default = ""`
`182`	`182`	`}`