Skip to content
This repository has been archived by the owner on Feb 9, 2024. It is now read-only.

[7.0] Remove CONFIG_NF_NAT_IPV4 check #2335

Merged
merged 3 commits into from Nov 20, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 6 additions & 5 deletions Gopkg.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Gopkg.toml
Expand Up @@ -83,7 +83,7 @@ ignored = [

[[constraint]]
name = "github.com/gravitational/satellite"
version = "=7.0.19"
version = "=7.0.24"

[[constraint]]
name = "github.com/gravitational/coordinate"
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Expand Up @@ -46,7 +46,7 @@ RELEASE_OUT ?=
TELEPORT_TAG = 3.2.16
# TELEPORT_REPOTAG adapts TELEPORT_TAG to the teleport tagging scheme
TELEPORT_REPOTAG := v$(TELEPORT_TAG)
PLANET_TAG := 7.0.52-$(K8S_VER_SUFFIX)
PLANET_TAG := 7.0.53-$(K8S_VER_SUFFIX)
PLANET_BRANCH := $(PLANET_TAG)
K8S_APP_TAG := $(GRAVITY_TAG)
TELEKUBE_APP_TAG := $(GRAVITY_TAG)
Expand Down
2 changes: 1 addition & 1 deletion assets/robotest/Makefile
Expand Up @@ -30,7 +30,7 @@ ROBOTEST_CONFIG_SCRIPT = $(TOP)/config/$(ROBOTEST_CONFIG).sh
# End variables expected to be set outside this Makefile.
# Everything below is Robotest specific.

ROBOTEST_VERSION ?= 2.1.0
ROBOTEST_VERSION ?= 2.2.0
ROBOTEST_DOCKER_IMAGE ?= quay.io/gravitational/robotest-suite:$(ROBOTEST_VERSION)

# ROBOTEST_BUILDDIR is the root of all robotest build artifacts for this build
Expand Down
2 changes: 1 addition & 1 deletion assets/robotest/config/pr.sh
Expand Up @@ -88,7 +88,7 @@ EOF

function build_install_suite {
local suite=''
local test_os="centos:7"
local test_os="redhat:8.3"
local cluster_size='"flavor":"three","nodes":3,"role":"node"'
suite+=$(cat <<EOF
install={"installer_url":"${INSTALLER_URL}",${cluster_size},"os":"${test_os}","storage_driver":"overlay2"}
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.