Skip to content
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.

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

[dev-2.10] January K3s patch release #1590

Open
wants to merge 3 commits into
base: dev-v2.10
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions Dockerfile.dapper
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ ARG RANCHER_VERSION=v2.10-head

FROM rancher/rancher:$RANCHER_VERSION as rancher

FROM registry.suse.com/bci/golang:1.22
FROM registry.suse.com/bci/golang:1.23

RUN mkdir -p /var/lib/rancher
COPY --from=rancher /var/lib/rancher /var/lib/rancher
Expand Down Expand Up @@ -66,7 +66,7 @@ RUN ln -s /usr/bin/cni /usr/bin/bridge && \

ARG DAPPER_HOST_ARCH
ENV ARCH $DAPPER_HOST_ARCH
ENV GOLANGCI_LINT v1.59.0
ENV GOLANGCI_LINT v1.60.3

RUN zypper -n install git docker vim less file curl wget jq awk && rpm -e --nodeps --noscripts containerd
RUN go install golang.org/x/tools/cmd/goimports@latest
Expand Down
18 changes: 18 additions & 0 deletions channels.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -716,6 +716,12 @@ releases:
node-external-dns:
type: array
featureVersions: *featureVersions-v1
- version: v1.29.13-rc2+k3s1
minChannelServerVersion: v2.9.0-alpha1
maxChannelServerVersion: v2.10.99
serverArgs: *serverArgs-v9
agentArgs: *agentArgs-v7
featureVersions: *featureVersions-v1
- version: v1.30.1+k3s1
minChannelServerVersion: v2.9.0-alpha1
maxChannelServerVersion: v2.9.99
Expand Down Expand Up @@ -764,6 +770,12 @@ releases:
serverArgs: *serverArgs-v9
agentArgs: *agentArgs-v7
featureVersions: *featureVersions-v1
- version: v1.30.9-rc1+k3s1
minChannelServerVersion: v2.9.0-alpha1
maxChannelServerVersion: v2.10.99
serverArgs: *serverArgs-v9
agentArgs: *agentArgs-v7
featureVersions: *featureVersions-v1
- version: v1.31.1+k3s1
minChannelServerVersion: v2.9.0-alpha1
maxChannelServerVersion: v2.10.99
Expand All @@ -788,3 +800,9 @@ releases:
serverArgs: *serverArgs-v9
agentArgs: *agentArgs-v7
featureVersions: *featureVersions-v1
- version: v1.31.5-rc1+k3s1
minChannelServerVersion: v2.9.0-alpha1
maxChannelServerVersion: v2.10.99
serverArgs: *serverArgs-v9
agentArgs: *agentArgs-v7
featureVersions: *featureVersions-v1
Loading
Loading