[5.5] Remove CONFIG_NF_NAT_IPV4 check (#2338)

* Bump planet
* Revendor satellite
* Add redhat 8.3 testing.
(cherry picked from commit 174e457)
* Specify minor version for CentOS/RHEL.
(cherry picked from commit 5816d56)

Gopkg.toml

@@ -64,7 +64,7 @@ version = "=v1.2.2"
 
 [[constraint]]
 name = "github.com/gravitational/satellite"
-version = "=5.5.24"
+version = "=5.5.27"
 
 [[constraint]]
 name = "github.com/xtgo/set"

Makefile

@@ -44,7 +44,7 @@ RELEASE_OUT ?=
 TELEPORT_TAG = 3.0.6
 # TELEPORT_REPOTAG adapts TELEPORT_TAG to the teleport tagging scheme
 TELEPORT_REPOTAG := v$(TELEPORT_TAG)
-PLANET_TAG := 5.5.62-$(K8S_VER_SUFFIX)
+PLANET_TAG := 5.5.63-$(K8S_VER_SUFFIX)
 PLANET_BRANCH := $(PLANET_TAG)
 K8S_APP_TAG := $(GRAVITY_TAG)
 TELEKUBE_APP_TAG := $(GRAVITY_TAG)

build.assets/robotest/pr_config.sh

@@ -10,21 +10,21 @@ declare -A UPGRADE_MAP
 
 UPGRADE_MAP[$(recommended_upgrade_tag $(branch 5.5.x))]="ubuntu:18" # this branch
 UPGRADE_MAP[5.5.0]="ubuntu:16"
-UPGRADE_MAP[$(recommended_upgrade_tag $(branch 5.2.x))]="redhat:7" # compatible LTS version
-UPGRADE_MAP[5.2.0]="centos:7"
+UPGRADE_MAP[$(recommended_upgrade_tag $(branch 5.2.x))]="redhat:7.9" # compatible LTS version
+UPGRADE_MAP[5.2.0]="centos:7.9"
 # 5.4.x upgrade testing disabled on PRs because it has been out of support for over a year
 # UPGRADE_MAP[$(recommended_upgrade_tag $(branch 5.4.x))]="debian:9" # compatible non-LTS version
 # UPGRADE_MAP[5.4.0]="debian:8"
 
 # via intermediate upgrade
-UPGRADE_MAP[5.0.36]="centos:7"
+UPGRADE_MAP[5.0.36]="centos:7.9"
 
 # customer specific scenarios, these versions have traction in the field
-UPGRADE_MAP[5.5.41]="centos:7"
-UPGRADE_MAP[5.5.40]="centos:7"
-UPGRADE_MAP[5.5.38]="centos:7"
-UPGRADE_MAP[5.5.36]="centos:7"
-UPGRADE_MAP[5.5.28]="centos:7"
+UPGRADE_MAP[5.5.41]="centos:7.9"
+UPGRADE_MAP[5.5.40]="centos:7.9"
+UPGRADE_MAP[5.5.38]="centos:7.9"
+UPGRADE_MAP[5.5.36]="centos:7.9"
+UPGRADE_MAP[5.5.28]="centos:7.9"
 
 UPGRADE_VERSIONS=${!UPGRADE_MAP[@]}
 
@@ -45,7 +45,7 @@ function build_upgrade_suite {
 function build_resize_suite {
   local suite=$(cat <<EOF
  resize={"to":3,"flavor":"one","nodes":1,"role":"node","state_dir":"/var/lib/telekube","os":"ubuntu:18","storage_driver":"overlay2"}
- shrink={"nodes":3,"flavor":"three","role":"node","os":"redhat:7"}
+ shrink={"nodes":3,"flavor":"three","role":"node","os":"redhat:7.9"}
 EOF
 )
     echo -n $suite
@@ -61,7 +61,7 @@ EOF
 
 function build_install_suite {
   local suite=''
-  local test_os="redhat:7"
+  local test_os="redhat:8.3"
   local cluster_size='"flavor":"three","nodes":3,"role":"node"'
   suite+=$(cat <<EOF
  install={${cluster_size},"os":"${test_os}","storage_driver":"overlay2"}

build.assets/robotest/run.sh

@@ -11,7 +11,7 @@ readonly ROBOTEST_SCRIPT=$(mktemp -d)/runsuite.sh
 
 # a number of environment variables are expected to be set
 # see https://github.com/gravitational/robotest/blob/v2.0.0/suite/README.md
-export ROBOTEST_VERSION=${ROBOTEST_VERSION:-2.1.1}
+export ROBOTEST_VERSION=${ROBOTEST_VERSION:-2.2.0}
 export ROBOTEST_REPO=quay.io/gravitational/robotest-suite:$ROBOTEST_VERSION
 export INSTALLER_URL=$GRAVITY_BUILDDIR/telekube.tar
 export GRAVITY_URL=$GRAVITY_BUILDDIR/gravity