Skip to content

Commit

Permalink
Merge pull request rancher#129 from rancher/updatecli_master_6ca2c1d8…
Browse files Browse the repository at this point in the history
…5fd8a872da3ac3c8771e571f734bcab0ed11f6dda8f630efff63d952

Bump calico version to v3.29.1
  • Loading branch information
mgfritch authored Nov 26, 2024
2 parents 206fc00 + 9fb8c3b commit b836498
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
10 changes: 5 additions & 5 deletions Dockerfile
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.29.0
ARG TAG=v3.29.1
RUN set -x && \
apk --no-cache add \
bash \
Expand Down Expand Up @@ -43,7 +43,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.29.0
ARG TAG=v3.29.1
ARG GOEXPERIMENT
WORKDIR $GOPATH/src/github.com/projectcalico/calico/calicoctl
RUN GO_LDFLAGS="-linkmode=external \
Expand All @@ -60,7 +60,7 @@ RUN calicoctl --version
### BEGIN CALICO CNI ###
FROM builder AS calico_cni
ARG ARCH
ARG TAG=v3.29.0
ARG TAG=v3.29.1
ARG GOEXPERIMENT
WORKDIR $GOPATH/src/github.com/projectcalico/calico/cni-plugin
COPY dualStack-changes.patch .
Expand All @@ -81,7 +81,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.29.0
ARG TAG=v3.29.1
ARG GOEXPERIMENT
WORKDIR $GOPATH/src/github.com/projectcalico/calico/node
RUN go mod download
Expand Down Expand Up @@ -123,7 +123,7 @@ RUN install -D -s bin/flexvoldriver /usr/local/bin/flexvol/flexvoldriver

### BEGIN CALICO KUBE-CONTROLLERS ###
FROM builder AS calico_kubecontrollers
ARG TAG=v3.29.0
ARG TAG=v3.29.1
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
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ MACHINE := rancher
TAG ?= ${GITHUB_ACTION_TAG}

ifeq ($(TAG),)
TAG := v3.29.0$(BUILD_META)
TAG := v3.29.1$(BUILD_META)
endif

REPO ?= rancher
Expand Down

0 comments on commit b836498

Please sign in to comment.