Skip to content

Bump to upstream version v3.30.4 #201

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Bump to upstream version v3.30.4 #201

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5728e84
chore: Bump Dockerfile to upstream version v3.30.4
github-actions[bot] Oct 16, 2025
d5e7393
chore: Bump Makefile to upstream version v3.30.4
github-actions[bot] Oct 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ FROM ${BCI_IMAGE} AS bci
FROM ${CNI_IMAGE} AS cni
FROM ${GO_IMAGE} AS builder
# setup required packages
ARG TAG=v3.30.3
ARG TAG=v3.30.4
RUN set -x && \
apk --no-cache add \
bash \
Expand Down Expand Up @@ -50,7 +50,7 @@ FROM calico/bird:v0.3.3-184-g202a2186-${ARCH} AS calico_bird
### BEGIN CALICOCTL ###
FROM builder AS calico_ctl
ARG ARCH
ARG TAG=v3.30.3
ARG TAG=v3.30.4
ARG GOEXPERIMENT
WORKDIR $GOPATH/src/github.com/projectcalico/calico/calicoctl
RUN GIT_COMMIT=$(git rev-parse --short HEAD) \
Expand All @@ -68,7 +68,7 @@ RUN calicoctl --version
### BEGIN CALICO CNI ###
FROM builder AS calico_cni
ARG ARCH
ARG TAG=v3.30.3
ARG TAG=v3.30.4
ARG GOEXPERIMENT
WORKDIR $GOPATH/src/github.com/projectcalico/calico/cni-plugin
COPY dualStack-changes.patch .
Expand All @@ -89,7 +89,7 @@ RUN install -s bin/* /opt/cni/bin/
### Can't use go-build-static.sh due to -Wl and --fatal-warnings flags ###
FROM builder AS calico_node
ARG ARCH
ARG TAG=v3.30.3
ARG TAG=v3.30.4
ARG GOEXPERIMENT
WORKDIR $GOPATH/src/github.com/projectcalico/calico/node
RUN go mod download
Expand Down Expand Up @@ -131,7 +131,7 @@ RUN install -D -s bin/flexvoldriver /usr/local/bin/flexvol/flexvoldriver

### BEGIN CALICO KUBE-CONTROLLERS ###
FROM builder AS calico_kubecontrollers
ARG TAG=v3.30.3
ARG TAG=v3.30.4
ARG GOEXPERIMENT
WORKDIR $GOPATH/src/github.com/projectcalico/calico/kube-controllers
RUN GO_LDFLAGS="-linkmode=external \
Expand Down
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ MACHINE := rancher
TAG ?= ${GITHUB_ACTION_TAG}

ifeq ($(TAG),)
TAG := v3.30.3$(BUILD_META)
TAG := v3.30.4$(BUILD_META)
endif

REPO ?= rancher
Expand Down