Skip to content

Commit f6c45f3

Browse files
committed
feat(alpine): revert 3.19 -> 3.18
Revert because of issue with iptables v1.8.10 no longer working with -C check.
1 parent e980a17 commit f6c45f3

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

.github/workflows/ci.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,10 @@ on:
1515
- prep-v[1-9].*
1616

1717
env:
18-
# Upgrading to Go 1.21.{0,1,2} seems to in cause some sort of race condition that causes tests to fail sporadically.
19-
# Sometimes they fail in apparent race conditions, other times they end up with nil pointer and SIGSEGV errors. We'll
20-
# either need to try with a future bug fix release or do some in-depth debugging before we upgrade.
21-
BUILDTIME_BASE: "golang:1.21.7-alpine3.19"
22-
RUNTIME_BASE: "alpine:3.19"
18+
BUILDTIME_BASE: "golang:1.21.7-alpine3.18"
19+
# Do not bump past Alpine 3.18 until upstream netfilter problems in iptables v1.8.10 are resolved. See:
20+
# https://github.com/cloudnativelabs/kube-router/issues/1676
21+
RUNTIME_BASE: "alpine:3.18"
2322
GO_VERSION: "~1.21.7"
2423
GO_CACHE: "/home/runner/.cache/go-build"
2524
GO_MOD_CACHE: "/home/runner/go/pkg/mod"

Dockerfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ FROM ${RUNTIME_BASE}
2525

2626
RUN apk add --no-cache \
2727
iptables \
28-
iptables-legacy \
2928
ipset \
3029
iproute2 \
3130
ipvsadm \

Makefile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,15 @@ DOCKER=$(if $(or $(IN_DOCKER_GROUP),$(IS_ROOT),$(OSX)),docker,sudo docker)
1717
MAKEFILE_DIR=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
1818
UPSTREAM_IMPORT_PATH=$(GOPATH)/src/github.com/cloudnativelabs/kube-router/
1919
BUILD_IN_DOCKER?=true
20-
DOCKER_BUILD_IMAGE?=golang:1.21.7-alpine3.19
20+
DOCKER_BUILD_IMAGE?=golang:1.21.7-alpine3.18
2121
## These variables are used by the Dockerfile as the bases for building and creating the runtime container
2222
## During CI these come from .github/workflows/ci.yaml below we define for local builds as well
2323
GO_CACHE?=$(shell go env GOCACHE)
2424
GO_MOD_CACHE?=$(shell go env GOMODCACHE)
2525
BUILDTIME_BASE?=$(DOCKER_BUILD_IMAGE)
26-
RUNTIME_BASE?=alpine:3.19
26+
# Do not bump past Alpine 3.18 until upstream netfilter problems in iptables v1.8.10 are resolved. See:
27+
# https://github.com/cloudnativelabs/kube-router/issues/1676
28+
RUNTIME_BASE?=alpine:3.18
2729
DOCKER_LINT_IMAGE?=golangci/golangci-lint:v1.56.2
2830
DOCKER_MARKDOWNLINT_IMAGE?=tmknom/markdownlint:0.39.0
2931
GOBGP_VERSION=v3.23.0

0 commit comments

Comments
 (0)