Skip to content

Commit

Permalink
Bump calico version to v3.28.0 (rancher#83)
Browse files Browse the repository at this point in the history
* chore: Bump to latest calico version in Dockerfile

Made with ❤️️ by updatecli

* chore: Bump to latest calico version in Makefile

Made with ❤️️ by updatecli

---------

Co-authored-by: UPDATECLI_GITHUB_ACTOR <41898282+github-actions[bot]@users.noreply.github.com>
  • Loading branch information
github-actions[bot] committed May 24, 2024
1 parent 5ee5a43 commit 0db8b87
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
12 changes: 6 additions & 6 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ RUN set -x && \
xx-apk --no-cache add musl-dev gcc

FROM base-builder as builder
ARG TAG=v3.27.3
ARG TAG=v3.28.0
RUN git clone --depth=1 https://github.com/projectcalico/calico.git $GOPATH/src/github.com/projectcalico/calico
WORKDIR $GOPATH/src/github.com/projectcalico/calico
RUN git fetch --all --tags --prune
Expand All @@ -49,7 +49,7 @@ FROM calico/bird:v0.3.3-184-g202a2186-${TARGETARCH} AS calico_bird

### BEGIN CALICOCTL ###
FROM builder AS calico_ctl
ARG TAG=v3.27.3
ARG TAG=v3.28.0
ARG GOEXPERIMENT
WORKDIR $GOPATH/src/github.com/projectcalico/calico/calicoctl
ARG TARGETARCH
Expand All @@ -67,7 +67,7 @@ RUN calicoctl --version

### BEGIN CALICO CNI ###
FROM builder AS calico_cni
ARG TAG=v3.27.3
ARG TAG=v3.28.0
ARG GOEXPERIMENT
WORKDIR $GOPATH/src/github.com/projectcalico/calico/cni-plugin
COPY dualStack-changes.patch .
Expand All @@ -92,7 +92,7 @@ RUN install bin/* /opt/cni/bin/
### so we need a need a dedicated builder for emulated build
FROM ${GO_IMAGE} as nodebuilder
# setup required packages
ARG TAG=v3.27.3
ARG TAG=v3.28.0
RUN set -x && \
apk --no-cache add \
bash \
Expand All @@ -116,7 +116,7 @@ RUN git checkout tags/${TAG} -b ${TAG}
### Can't use go-build-static.sh due to -Wl and --fatal-warnings flags ###
FROM nodebuilder AS calico_node
ARG ARCH
ARG TAG=v3.27.3
ARG TAG=v3.28.0
ARG GOEXPERIMENT
WORKDIR $GOPATH/src/github.com/projectcalico/calico/node
RUN go mod download
Expand Down Expand Up @@ -150,7 +150,7 @@ RUN install -D bin/flexvoldriver /usr/local/bin/flexvol/flexvoldriver

### BEGIN CALICO KUBE-CONTROLLERS ###
FROM builder AS calico_kubecontrollers
ARG TAG=v3.27.3
ARG TAG=v3.28.0
ARG GOEXPERIMENT
WORKDIR $GOPATH/src/github.com/projectcalico/calico/kube-controllers
ARG TARGETPLATFORM
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ endif

BUILD_META=-build$(shell date +%Y%m%d)
ORG ?= rancher
TAG ?= v3.27.3$(BUILD_META)
TAG ?= v3.28.0$(BUILD_META)

K3S_ROOT_VERSION ?= v0.13.0

Expand Down

0 comments on commit 0db8b87

Please sign in to comment.