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.

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

Jump to bottom

[release-1.23] Backports for 2022-11 #6412

Merged
merged 26 commits into from
Nov 4, 2022
Merged

[release-1.23] Backports for 2022-11 #6412

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
674985b
Bump dynamiclistener
brandond Oct 19, 2022
65bcf24
Add info on libvirt ubuntu 22.04 (#6316)
dereknola Oct 26, 2022
4e0deb4
Bump all alpine images to 3.16 (#6334)
dereknola Oct 26, 2022
cbfe4a2
Bump kine to v0.9.6
brandond Oct 21, 2022
2f37231
Bump test framework versions and add hooks to helpers
brandond Oct 26, 2022
6ff9ab3
Fix flakey traefik upgrade in etcd test
brandond Oct 26, 2022
3633941
Add hardened cluster test
brandond Oct 26, 2022
d1eb037
Add upgrade test
brandond Oct 26, 2022
97395b2
Add new tests to test list
brandond Oct 26, 2022
71a0f52
Bump Traefik helm chart to v18.0.0
brandond Oct 26, 2022
8bb27d6
Update helm-controller to pull in refactor
brandond Oct 18, 2022
eb2bda9
Add GVK lookup to deploy controller
brandond Oct 19, 2022
c1b0dd1
Check for RBAC before starting tunnel controllers
brandond Oct 20, 2022
e0a4dc0
Set default kubeletPort
brandond Oct 20, 2022
3bd02a0
Convert containerd config.toml.tmpl Linux template to v2 syntax
nakamorichi Oct 13, 2022
ab8e376
Disable optimizations and symbol stripping on debug builds (#6147)
moio Oct 28, 2022
fcb85ba
Bump traefik to v2.9.4 / chart v18.3.0
brandond Nov 1, 2022
de0df04
Replace deprecated k8s registry references.
jmhbnz Oct 27, 2022
9d86a07
Fix incorrect defer usage
iyear Oct 19, 2022
d7bb13b
Fix sonobouy tests on v1.25
brandond Nov 1, 2022
aea7386
Bump local-path-provisioner to v0.0.23
brandond Nov 2, 2022
2f81e0b
Bump traefik chart to v19.0.0
brandond Nov 2, 2022
fa6a6df
Bump coredns to v1.9.4
brandond Nov 2, 2022
55599e9
go generate
brandond Nov 2, 2022
79abbb6
Update codespell ignore words
brandond Nov 2, 2022
37cccf9
Fix test-mods to allow for pinning version from k8s.io
brandond Nov 2, 2022
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
7 changes: 7 additions & 0 deletions .codespellignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
aks
ec2
eks
gce
gcp
ro
shouldnot
2 changes: 1 addition & 1 deletion .github/workflows/spellcheck.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@ jobs:
python -m pip install --upgrade pip
pip install codespell
- name: Check spelling
run: codespell --skip=.git,./scripts,MAINTAINERS,LICENSE,go.mod,go.sum --check-filenames --ignore-words-list=ba
run: codespell --skip=.git,./scripts,MAINTAINERS,LICENSE,go.mod,go.sum --check-filenames --ignore-regex=.te# --ignore-words=.codespellignore
2 changes: 1 addition & 1 deletion Dockerfile.dapper
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ ARG SELINUX=true
ENV SELINUX $SELINUX

ENV DAPPER_RUN_ARGS --privileged -v k3s-cache:/go/src/github.com/k3s-io/k3s/.cache -v trivy-cache:/root/.cache/trivy
ENV DAPPER_ENV REPO TAG DRONE_TAG IMAGE_NAME SKIP_VALIDATE SKIP_AIRGAP GCLOUD_AUTH GITHUB_TOKEN GOLANG
ENV DAPPER_ENV REPO TAG DRONE_TAG IMAGE_NAME SKIP_VALIDATE SKIP_AIRGAP GCLOUD_AUTH GITHUB_TOKEN GOLANG DEBUG
ENV DAPPER_SOURCE /go/src/github.com/k3s-io/k3s/
ENV DAPPER_OUTPUT ./bin ./dist ./build/out ./build/static ./pkg/static ./pkg/deploy

Expand Down
4 changes: 2 additions & 2 deletions Dockerfile.test.dapper
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
ARG GOLANG=golang:1.17.13-alpine3.16
FROM ${GOLANG}

RUN apk -U --no-cache add bash git gcc musl-dev docker curl jq coreutils python3 openssl py3-pip procps
RUN apk -U --no-cache add bash git gcc musl-dev docker curl jq coreutils python3 openssl py3-pip procps findutils

ENV SONOBUOY_VERSION 0.56.4
ENV SONOBUOY_VERSION 0.56.10

RUN OS=linux; \
ARCH=$(go env GOARCH); \
Expand Down
4 changes: 2 additions & 2 deletions conformance/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
FROM alpine:3.15
ENV SONOBUOY_VERSION 0.56.4
FROM alpine:3.16
ENV SONOBUOY_VERSION 0.56.10
RUN apk add curl tar gzip
RUN curl -sfL https://github.com/vmware-tanzu/sonobuoy/releases/download/v${SONOBUOY_VERSION}/sonobuoy_${SONOBUOY_VERSION}_linux_amd64.tar.gz | tar xvzf - -C /usr/bin
COPY run-test.sh /usr/bin
Expand Down
19 changes: 10 additions & 9 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ replace (
k8s.io/klog/v2 => github.com/k3s-io/klog/v2 v2.30.0-k3s1 // k3s-main
k8s.io/kube-aggregator => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-aggregator v1.23.13-k3s1
k8s.io/kube-controller-manager => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-controller-manager v1.23.13-k3s1
k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65
k8s.io/kube-proxy => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-proxy v1.23.13-k3s1
k8s.io/kube-scheduler => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-scheduler v1.23.13-k3s1
k8s.io/kubectl => github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl v1.23.13-k3s1
Expand Down Expand Up @@ -89,12 +90,12 @@ require (
github.com/gorilla/mux v1.8.0
github.com/gorilla/websocket v1.4.2
github.com/gruntwork-io/terratest v0.40.6
github.com/k3s-io/helm-controller v0.12.3
github.com/k3s-io/kine v0.9.3
github.com/k3s-io/helm-controller v0.13.0
github.com/k3s-io/kine v0.9.6
github.com/klauspost/compress v1.15.9
github.com/kubernetes-sigs/cri-tools v0.0.0-00010101000000-000000000000
github.com/lib/pq v1.10.2
github.com/mattn/go-sqlite3 v1.14.8
github.com/mattn/go-sqlite3 v1.14.15
github.com/minio/minio-go/v7 v7.0.33
github.com/natefinch/lumberjack v2.0.0+incompatible
github.com/onsi/ginkgo/v2 v2.1.3
Expand All @@ -103,15 +104,15 @@ require (
github.com/opencontainers/selinux v1.10.0
github.com/otiai10/copy v1.7.0
github.com/pkg/errors v0.9.1
github.com/rancher/dynamiclistener v0.3.4-0.20220721210816-8ebd77f8a45a
github.com/rancher/dynamiclistener v0.3.5
github.com/rancher/lasso v0.0.0-20210616224652-fc3ebd901c08
github.com/rancher/remotedialer v0.2.6-0.20220624190122-ea57207bf2b8
github.com/rancher/wharfie v0.5.1
github.com/rancher/wrangler v0.8.10
github.com/rancher/wrangler v0.8.11-0.20220217210408-3ecd23dfea3b
github.com/robfig/cron/v3 v3.0.1
github.com/rootless-containers/rootlesskit v1.0.1
github.com/sirupsen/logrus v1.9.0
github.com/stretchr/testify v1.7.1
github.com/stretchr/testify v1.8.0
github.com/tchap/go-patricia v2.3.0+incompatible // indirect
github.com/urfave/cli v1.22.9
github.com/vishvananda/netlink v1.2.1-beta.2
Expand All @@ -123,9 +124,9 @@ require (
go.etcd.io/etcd/server/v3 v3.5.4
go.uber.org/zap v1.19.0
golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa
golang.org/x/net v0.0.0-20220907135653-1e95f45603a7
golang.org/x/net v0.0.0-20221004154528-8021a29435af
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f
golang.org/x/sys v0.0.0-20221010170243-090e33056c14
google.golang.org/grpc v1.46.2
gopkg.in/yaml.v2 v2.4.0
inet.af/tcpproxy v0.0.0-20200125044825-b6bb9b5b8252
Expand All @@ -141,6 +142,6 @@ require (
k8s.io/klog v1.0.0
k8s.io/kubectl v0.23.13
k8s.io/kubernetes v1.23.13
k8s.io/utils v0.0.0-20211116205334-6203023598ed
k8s.io/utils v0.0.0-20221011040102-427025108f67
sigs.k8s.io/yaml v1.3.0
)
Loading