Skip to content

Commit

Permalink
feat(alpine): revert 3.19 -> 3.18
Browse files Browse the repository at this point in the history
Revert because of issue with iptables v1.8.10 no longer working with -C
check.
  • Loading branch information
aauren committed May 27, 2024
1 parent e980a17 commit f6c45f3
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
9 changes: 4 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,10 @@ on:
- prep-v[1-9].*

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

RUN apk add --no-cache \
iptables \
iptables-legacy \
ipset \
iproute2 \
ipvsadm \
Expand Down
6 changes: 4 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,15 @@ DOCKER=$(if $(or $(IN_DOCKER_GROUP),$(IS_ROOT),$(OSX)),docker,sudo docker)
MAKEFILE_DIR=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
UPSTREAM_IMPORT_PATH=$(GOPATH)/src/github.com/cloudnativelabs/kube-router/
BUILD_IN_DOCKER?=true
DOCKER_BUILD_IMAGE?=golang:1.21.7-alpine3.19
DOCKER_BUILD_IMAGE?=golang:1.21.7-alpine3.18
## These variables are used by the Dockerfile as the bases for building and creating the runtime container
## During CI these come from .github/workflows/ci.yaml below we define for local builds as well
GO_CACHE?=$(shell go env GOCACHE)
GO_MOD_CACHE?=$(shell go env GOMODCACHE)
BUILDTIME_BASE?=$(DOCKER_BUILD_IMAGE)
RUNTIME_BASE?=alpine:3.19
# Do not bump past Alpine 3.18 until upstream netfilter problems in iptables v1.8.10 are resolved. See:
# https://github.com/cloudnativelabs/kube-router/issues/1676
RUNTIME_BASE?=alpine:3.18
DOCKER_LINT_IMAGE?=golangci/golangci-lint:v1.56.2
DOCKER_MARKDOWNLINT_IMAGE?=tmknom/markdownlint:0.39.0
GOBGP_VERSION=v3.23.0
Expand Down

0 comments on commit f6c45f3

Please sign in to comment.