Skip to content

K
k3s
Commit 20b50426 authored by galal-hussein's avatar galal-hussein Committed by Derek Nola
Browse files
Options

Update to v1.31.0

Signed-off-by: 's avatargalal-hussein <hussein.galal.ahmed.11@gmail.com>
parent 876d54cf
Hide whitespace changes
Inline Side-by-side
Showing with 433 additions and 318 deletions
cmd/server/main.go
View file @ 20b50426
...@@ -22,9 +22,9 @@ import ( ...@@ -22,9 +22,9 @@ import (
"github.com/k3s-io/k3s/pkg/containerd" "github.com/k3s-io/k3s/pkg/containerd"
ctr2 "github.com/k3s-io/k3s/pkg/ctr" ctr2 "github.com/k3s-io/k3s/pkg/ctr"
kubectl2 "github.com/k3s-io/k3s/pkg/kubectl" kubectl2 "github.com/k3s-io/k3s/pkg/kubectl"
crictl2 "github.com/kubernetes-sigs/cri-tools/cmd/crictl"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"github.com/urfave/cli" "github.com/urfave/cli"
crictl2 "sigs.k8s.io/cri-tools/cmd/crictl"
) )
func init() { func init() {
......
go.mod
View file @ 20b50426
module github.com/k3s-io/k3s module github.com/k3s-io/k3s
go 1.22.4 go 1.22.5
replace ( replace (
github.com/Microsoft/hcsshim => github.com/Microsoft/hcsshim v0.11.0 github.com/Microsoft/hcsshim => github.com/Microsoft/hcsshim v0.11.0
github.com/Mirantis/cri-dockerd => github.com/k3s-io/cri-dockerd v0.3.12-k3s1.30-3 // k3s/release-1.30 github.com/Mirantis/cri-dockerd => github.com/k3s-io/cri-dockerd v0.3.15-k3s1.31-2 //v1.31
github.com/cloudnativelabs/kube-router/v2 => github.com/k3s-io/kube-router/v2 v2.1.2 github.com/cloudnativelabs/kube-router/v2 => github.com/k3s-io/kube-router/v2 v2.1.2
github.com/containerd/containerd => github.com/k3s-io/containerd v1.7.20-k3s1 github.com/containerd/containerd => github.com/k3s-io/containerd v1.7.20-k3s1
github.com/distribution/reference => github.com/distribution/reference v0.5.0 github.com/distribution/reference => github.com/distribution/reference v0.5.0
...@@ -13,12 +13,11 @@ replace ( ...@@ -13,12 +13,11 @@ replace (
github.com/emicklei/go-restful/v3 => github.com/emicklei/go-restful/v3 v3.9.0 github.com/emicklei/go-restful/v3 => github.com/emicklei/go-restful/v3 v3.9.0
github.com/golang/protobuf => github.com/golang/protobuf v1.5.4 github.com/golang/protobuf => github.com/golang/protobuf v1.5.4
github.com/googleapis/gax-go/v2 => github.com/googleapis/gax-go/v2 v2.12.0 github.com/googleapis/gax-go/v2 => github.com/googleapis/gax-go/v2 v2.12.0
github.com/kubernetes-sigs/cri-tools => github.com/k3s-io/cri-tools v1.29.0-k3s1
github.com/open-policy-agent/opa => github.com/open-policy-agent/opa v0.59.0 // github.com/Microsoft/hcsshim using bad version v0.42.2 github.com/open-policy-agent/opa => github.com/open-policy-agent/opa v0.59.0 // github.com/Microsoft/hcsshim using bad version v0.42.2
github.com/opencontainers/runc => github.com/k3s-io/runc v1.1.12-k3s1 github.com/opencontainers/runc => github.com/k3s-io/runc v1.1.12-k3s1
github.com/opencontainers/selinux => github.com/opencontainers/selinux v1.11.0 github.com/opencontainers/selinux => github.com/opencontainers/selinux v1.11.0
github.com/prometheus/client_golang => github.com/prometheus/client_golang v1.18.0 github.com/prometheus/client_golang => github.com/prometheus/client_golang v1.19.1
github.com/prometheus/common => github.com/prometheus/common v0.45.0 github.com/prometheus/common => github.com/prometheus/common v0.55.0
github.com/spegel-org/spegel => github.com/k3s-io/spegel v0.0.23-0.20240516234953-f3d2c4072314 github.com/spegel-org/spegel => github.com/k3s-io/spegel v0.0.23-0.20240516234953-f3d2c4072314
github.com/ugorji/go => github.com/ugorji/go v1.2.11 github.com/ugorji/go => github.com/ugorji/go v1.2.11
go.etcd.io/etcd/api/v3 => github.com/k3s-io/etcd/api/v3 v3.5.13-k3s1 go.etcd.io/etcd/api/v3 => github.com/k3s-io/etcd/api/v3 v3.5.13-k3s1
...@@ -35,42 +34,42 @@ replace ( ...@@ -35,42 +34,42 @@ replace (
golang.org/x/net => golang.org/x/net v0.17.0 golang.org/x/net => golang.org/x/net v0.17.0
golang.org/x/sys => golang.org/x/sys v0.18.0 golang.org/x/sys => golang.org/x/sys v0.18.0
google.golang.org/genproto => google.golang.org/genproto v0.0.0-20230525234035-dd9d682886f9 google.golang.org/genproto => google.golang.org/genproto v0.0.0-20230525234035-dd9d682886f9
google.golang.org/grpc => google.golang.org/grpc v1.58.3 google.golang.org/grpc => google.golang.org/grpc v1.64.0
gopkg.in/square/go-jose.v2 => gopkg.in/square/go-jose.v2 v2.6.0 gopkg.in/square/go-jose.v2 => gopkg.in/square/go-jose.v2 v2.6.0
k8s.io/api => github.com/k3s-io/kubernetes/staging/src/k8s.io/api v1.30.3-k3s1 k8s.io/api => github.com/galal-hussein/kubernetes/staging/src/k8s.io/api v1.31.0-k3s2
k8s.io/apiextensions-apiserver => github.com/k3s-io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v1.30.3-k3s1 k8s.io/apiextensions-apiserver => github.com/galal-hussein/kubernetes/staging/src/k8s.io/apiextensions-apiserver v1.31.0-k3s2
k8s.io/apimachinery => github.com/k3s-io/kubernetes/staging/src/k8s.io/apimachinery v1.30.3-k3s1 k8s.io/apimachinery => github.com/galal-hussein/kubernetes/staging/src/k8s.io/apimachinery v1.31.0-k3s2
k8s.io/apiserver => github.com/k3s-io/kubernetes/staging/src/k8s.io/apiserver v1.30.3-k3s1 k8s.io/apiserver => github.com/galal-hussein/kubernetes/staging/src/k8s.io/apiserver v1.31.0-k3s2
k8s.io/cli-runtime => github.com/k3s-io/kubernetes/staging/src/k8s.io/cli-runtime v1.30.3-k3s1 k8s.io/cli-runtime => github.com/galal-hussein/kubernetes/staging/src/k8s.io/cli-runtime v1.31.0-k3s2
k8s.io/client-go => github.com/k3s-io/kubernetes/staging/src/k8s.io/client-go v1.30.3-k3s1 k8s.io/client-go => github.com/galal-hussein/kubernetes/staging/src/k8s.io/client-go v1.31.0-k3s2
k8s.io/cloud-provider => github.com/k3s-io/kubernetes/staging/src/k8s.io/cloud-provider v1.30.3-k3s1 k8s.io/cloud-provider => github.com/galal-hussein/kubernetes/staging/src/k8s.io/cloud-provider v1.31.0-k3s2
k8s.io/cluster-bootstrap => github.com/k3s-io/kubernetes/staging/src/k8s.io/cluster-bootstrap v1.30.3-k3s1 k8s.io/cluster-bootstrap => github.com/galal-hussein/kubernetes/staging/src/k8s.io/cluster-bootstrap v1.31.0-k3s2
k8s.io/code-generator => github.com/k3s-io/kubernetes/staging/src/k8s.io/code-generator v1.30.3-k3s1 k8s.io/code-generator => github.com/galal-hussein/kubernetes/staging/src/k8s.io/code-generator v1.31.0-k3s2
k8s.io/component-base => github.com/k3s-io/kubernetes/staging/src/k8s.io/component-base v1.30.3-k3s1 k8s.io/component-base => github.com/galal-hussein/kubernetes/staging/src/k8s.io/component-base v1.31.0-k3s2
k8s.io/component-helpers => github.com/k3s-io/kubernetes/staging/src/k8s.io/component-helpers v1.30.3-k3s1 k8s.io/component-helpers => github.com/galal-hussein/kubernetes/staging/src/k8s.io/component-helpers v1.31.0-k3s2
k8s.io/controller-manager => github.com/k3s-io/kubernetes/staging/src/k8s.io/controller-manager v1.30.3-k3s1 k8s.io/controller-manager => github.com/galal-hussein/kubernetes/staging/src/k8s.io/controller-manager v1.31.0-k3s2
k8s.io/cri-api => github.com/k3s-io/kubernetes/staging/src/k8s.io/cri-api v1.30.3-k3s1 k8s.io/cri-api => github.com/galal-hussein/kubernetes/staging/src/k8s.io/cri-api v1.31.0-k3s2
k8s.io/csi-translation-lib => github.com/k3s-io/kubernetes/staging/src/k8s.io/csi-translation-lib v1.30.3-k3s1 k8s.io/csi-translation-lib => github.com/galal-hussein/kubernetes/staging/src/k8s.io/csi-translation-lib v1.31.0-k3s2
k8s.io/dynamic-resource-allocation => github.com/k3s-io/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v1.30.3-k3s1 k8s.io/dynamic-resource-allocation => github.com/galal-hussein/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v1.31.0-k3s2
k8s.io/endpointslice => github.com/k3s-io/kubernetes/staging/src/k8s.io/endpointslice v1.30.3-k3s1 k8s.io/endpointslice => github.com/galal-hussein/kubernetes/staging/src/k8s.io/endpointslice v1.31.0-k3s2
k8s.io/klog => github.com/k3s-io/klog v1.0.0-k3s2 // k3s-release-1.x k8s.io/klog => github.com/k3s-io/klog v1.0.0-k3s2 // k3s-release-1.x
k8s.io/klog/v2 => github.com/k3s-io/klog/v2 v2.120.1-k3s1 // k3s-main k8s.io/klog/v2 => github.com/k3s-io/klog/v2 v2.120.1-k3s1 // k3s-main
k8s.io/kms => github.com/k3s-io/kubernetes/staging/src/k8s.io/kms v1.30.3-k3s1 k8s.io/kms => github.com/galal-hussein/kubernetes/staging/src/k8s.io/kms v1.31.0-k3s2
k8s.io/kube-aggregator => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-aggregator v1.30.3-k3s1 k8s.io/kube-aggregator => github.com/galal-hussein/kubernetes/staging/src/k8s.io/kube-aggregator v1.31.0-k3s2
k8s.io/kube-controller-manager => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-controller-manager v1.30.3-k3s1 k8s.io/kube-controller-manager => github.com/galal-hussein/kubernetes/staging/src/k8s.io/kube-controller-manager v1.31.0-k3s2
k8s.io/kube-proxy => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-proxy v1.30.3-k3s1 k8s.io/kube-proxy => github.com/galal-hussein/kubernetes/staging/src/k8s.io/kube-proxy v1.31.0-k3s2
k8s.io/kube-scheduler => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-scheduler v1.30.3-k3s1 k8s.io/kube-scheduler => github.com/galal-hussein/kubernetes/staging/src/k8s.io/kube-scheduler v1.31.0-k3s2
k8s.io/kubectl => github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl v1.30.3-k3s1 k8s.io/kubectl => github.com/galal-hussein/kubernetes/staging/src/k8s.io/kubectl v1.31.0-k3s2
k8s.io/kubelet => github.com/k3s-io/kubernetes/staging/src/k8s.io/kubelet v1.30.3-k3s1 k8s.io/kubelet => github.com/galal-hussein/kubernetes/staging/src/k8s.io/kubelet v1.31.0-k3s2
k8s.io/kubernetes => github.com/k3s-io/kubernetes v1.30.3-k3s1 k8s.io/kubernetes => github.com/galal-hussein/kubernetes v1.31.0-k3s2
k8s.io/legacy-cloud-providers => github.com/k3s-io/kubernetes/staging/src/k8s.io/legacy-cloud-providers v1.30.3-k3s1 k8s.io/metrics => github.com/galal-hussein/kubernetes/staging/src/k8s.io/metrics v1.31.0-k3s2
k8s.io/metrics => github.com/k3s-io/kubernetes/staging/src/k8s.io/metrics v1.30.3-k3s1 k8s.io/mount-utils => github.com/galal-hussein/kubernetes/staging/src/k8s.io/mount-utils v1.31.0-k3s2
k8s.io/mount-utils => github.com/k3s-io/kubernetes/staging/src/k8s.io/mount-utils v1.30.3-k3s1 k8s.io/node-api => github.com/galal-hussein/kubernetes/staging/src/k8s.io/node-api v1.31.0-k3s2
k8s.io/node-api => github.com/k3s-io/kubernetes/staging/src/k8s.io/node-api v1.30.3-k3s1 k8s.io/pod-security-admission => github.com/galal-hussein/kubernetes/staging/src/k8s.io/pod-security-admission v1.31.0-k3s2
k8s.io/pod-security-admission => github.com/k3s-io/kubernetes/staging/src/k8s.io/pod-security-admission v1.30.3-k3s1 k8s.io/sample-apiserver => github.com/galal-hussein/kubernetes/staging/src/k8s.io/sample-apiserver v1.31.0-k3s2
k8s.io/sample-apiserver => github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-apiserver v1.30.3-k3s1 k8s.io/sample-cli-plugin => github.com/galal-hussein/kubernetes/staging/src/k8s.io/sample-cli-plugin v1.31.0-k3s2
k8s.io/sample-cli-plugin => github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-cli-plugin v1.30.3-k3s1 k8s.io/sample-controller => github.com/galal-hussein/kubernetes/staging/src/k8s.io/sample-controller v1.31.0-k3s2
k8s.io/sample-controller => github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-controller v1.30.3-k3s1 sigs.k8s.io/cri-tools => github.com/k3s-io/cri-tools v1.31.0-k3s2
sourcegraph.com/sourcegraph/go-diff => github.com/sourcegraph/go-diff v0.6.0 sourcegraph.com/sourcegraph/go-diff => github.com/sourcegraph/go-diff v0.6.0
) )
...@@ -87,11 +86,11 @@ require ( ...@@ -87,11 +86,11 @@ require (
github.com/containerd/zfs v1.1.0 github.com/containerd/zfs v1.1.0
github.com/coreos/go-iptables v0.7.0 github.com/coreos/go-iptables v0.7.0
github.com/coreos/go-systemd/v22 v22.5.0 github.com/coreos/go-systemd/v22 v22.5.0
github.com/docker/docker v25.0.5+incompatible github.com/docker/docker v27.1.1+incompatible
github.com/erikdubbelboer/gspt v0.0.0-20190125194910-e68493906b83 github.com/erikdubbelboer/gspt v0.0.0-20190125194910-e68493906b83
github.com/flannel-io/flannel v0.25.4 github.com/flannel-io/flannel v0.25.4
github.com/go-bindata/go-bindata v3.1.2+incompatible github.com/go-bindata/go-bindata v3.1.2+incompatible
github.com/go-logr/logr v1.4.1 github.com/go-logr/logr v1.4.2
github.com/go-logr/stdr v1.2.3-0.20220714215716-96bad1d688c5 github.com/go-logr/stdr v1.2.3-0.20220714215716-96bad1d688c5
github.com/go-sql-driver/mysql v1.7.1 github.com/go-sql-driver/mysql v1.7.1
github.com/go-test/deep v1.0.7 github.com/go-test/deep v1.0.7
...@@ -107,21 +106,20 @@ require ( ...@@ -107,21 +106,20 @@ require (
github.com/k3s-io/helm-controller v0.16.3 github.com/k3s-io/helm-controller v0.16.3
github.com/k3s-io/kine v0.11.11 github.com/k3s-io/kine v0.11.11
github.com/klauspost/compress v1.17.7 github.com/klauspost/compress v1.17.7
github.com/kubernetes-sigs/cri-tools v0.0.0-00010101000000-000000000000
github.com/lib/pq v1.10.2 github.com/lib/pq v1.10.2
github.com/libp2p/go-libp2p v0.33.2 github.com/libp2p/go-libp2p v0.33.2
github.com/mattn/go-sqlite3 v1.14.19 github.com/mattn/go-sqlite3 v1.14.19
github.com/minio/minio-go/v7 v7.0.70 github.com/minio/minio-go/v7 v7.0.70
github.com/mwitkow/go-http-dialer v0.0.0-20161116154839-378f744fb2b8 github.com/mwitkow/go-http-dialer v0.0.0-20161116154839-378f744fb2b8
github.com/natefinch/lumberjack v2.0.0+incompatible github.com/natefinch/lumberjack v2.0.0+incompatible
github.com/onsi/ginkgo/v2 v2.16.0 github.com/onsi/ginkgo/v2 v2.20.0
github.com/onsi/gomega v1.32.0 github.com/onsi/gomega v1.34.1
github.com/opencontainers/runc v1.1.12 github.com/opencontainers/runc v1.1.13
github.com/opencontainers/selinux v1.11.0 github.com/opencontainers/selinux v1.11.0
github.com/otiai10/copy v1.7.0 github.com/otiai10/copy v1.7.0
github.com/pkg/errors v0.9.1 github.com/pkg/errors v0.9.1
github.com/prometheus/client_golang v1.19.1 github.com/prometheus/client_golang v1.19.1
github.com/prometheus/common v0.49.0 github.com/prometheus/common v0.55.0
github.com/rancher/dynamiclistener v0.6.0-rc1 github.com/rancher/dynamiclistener v0.6.0-rc1
github.com/rancher/lasso v0.0.0-20240724174736-24ab3dbf26f0 github.com/rancher/lasso v0.0.0-20240724174736-24ab3dbf26f0
github.com/rancher/permissions v0.0.0-20240523180510-4001d3d637f7 github.com/rancher/permissions v0.0.0-20240523180510-4001d3d637f7
...@@ -137,49 +135,60 @@ require ( ...@@ -137,49 +135,60 @@ require (
github.com/urfave/cli v1.22.14 github.com/urfave/cli v1.22.14
github.com/vishvananda/netlink v1.2.1-beta.2 github.com/vishvananda/netlink v1.2.1-beta.2
github.com/yl2chen/cidranger v1.0.2 github.com/yl2chen/cidranger v1.0.2
go.etcd.io/etcd/api/v3 v3.5.13 go.etcd.io/etcd/api/v3 v3.5.14
go.etcd.io/etcd/client/v3 v3.5.13 go.etcd.io/etcd/client/v3 v3.5.14
go.etcd.io/etcd/etcdutl/v3 v3.5.13 go.etcd.io/etcd/etcdutl/v3 v3.5.13
go.etcd.io/etcd/server/v3 v3.5.13 go.etcd.io/etcd/server/v3 v3.5.13
golang.org/x/crypto v0.23.0 golang.org/x/crypto v0.24.0
golang.org/x/net v0.25.0 golang.org/x/net v0.28.0
golang.org/x/sync v0.7.0 golang.org/x/sync v0.8.0
golang.org/x/sys v0.20.0 golang.org/x/sys v0.23.0
google.golang.org/grpc v1.63.2 google.golang.org/grpc v1.65.0
gopkg.in/yaml.v2 v2.4.0 gopkg.in/yaml.v2 v2.4.0
inet.af/tcpproxy v0.0.0-20200125044825-b6bb9b5b8252 inet.af/tcpproxy v0.0.0-20200125044825-b6bb9b5b8252
k8s.io/api v0.30.3 k8s.io/api v0.31.0
k8s.io/apimachinery v0.30.3 k8s.io/apimachinery v0.31.0
k8s.io/apiserver v0.30.3 k8s.io/apiserver v0.31.0
k8s.io/cli-runtime v0.22.2 k8s.io/cli-runtime v0.31.0-rc.1
k8s.io/client-go v11.0.1-0.20190409021438-1a26190bd76a+incompatible k8s.io/client-go v11.0.1-0.20190409021438-1a26190bd76a+incompatible
k8s.io/cloud-provider v0.30.3 k8s.io/cloud-provider v0.31.0
k8s.io/cluster-bootstrap v0.0.0 k8s.io/cluster-bootstrap v0.0.0
k8s.io/component-base v0.30.3 k8s.io/component-base v0.31.0
k8s.io/component-helpers v0.30.3 k8s.io/component-helpers v0.31.0
k8s.io/cri-api v0.30.3 k8s.io/cri-api v0.31.0
k8s.io/klog/v2 v2.120.1 k8s.io/cri-client v0.31.0
k8s.io/klog/v2 v2.130.1
k8s.io/kube-proxy v0.0.0 k8s.io/kube-proxy v0.0.0
k8s.io/kubectl v0.25.0 k8s.io/kubectl v0.31.0-rc.1
k8s.io/kubernetes v1.30.3 k8s.io/kubernetes v1.31.0
k8s.io/utils v0.0.0-20240310230437-4693a0247e57 k8s.io/utils v0.0.0-20240711033017-18e509b52bc8
sigs.k8s.io/cri-tools v0.0.0-00010101000000-000000000000
sigs.k8s.io/yaml v1.4.0 sigs.k8s.io/yaml v1.4.0
) )
require ( require (
cloud.google.com/go/compute v1.23.3 // indirect github.com/antlr4-go/antlr/v4 v4.13.0 // indirect
cloud.google.com/go/compute/metadata v0.2.3 // indirect github.com/bahlo/generic-list-go v0.2.0 // indirect
github.com/buger/jsonparser v1.1.1 // indirect
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
github.com/invopop/jsonschema v0.12.0 // indirect
github.com/stretchr/objx v0.5.2 // indirect
github.com/wk8/go-ordered-map/v2 v2.1.8 // indirect
github.com/x448/float16 v0.8.4 // indirect
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
)
require (
dario.cat/mergo v1.0.0 // indirect dario.cat/mergo v1.0.0 // indirect
github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 // indirect github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 // indirect
github.com/AdamKorcz/go-118-fuzz-build v0.0.0-20230306123547-8075edf89bb0 // indirect github.com/AdamKorcz/go-118-fuzz-build v0.0.0-20230306123547-8075edf89bb0 // indirect
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
github.com/GoogleCloudPlatform/k8s-cloud-provider v1.18.1-0.20220218231025-f11817397a1b // indirect
github.com/JeffAshton/win_pdh v0.0.0-20161109143554-76bb4ee9f0ab // indirect github.com/JeffAshton/win_pdh v0.0.0-20161109143554-76bb4ee9f0ab // indirect
github.com/MakeNowJust/heredoc v1.0.0 // indirect github.com/MakeNowJust/heredoc v1.0.0 // indirect
github.com/Microsoft/go-winio v0.6.2 // indirect github.com/Microsoft/go-winio v0.6.2 // indirect
github.com/NYTimes/gziphandler v1.1.1 // indirect github.com/NYTimes/gziphandler v1.1.1 // indirect
github.com/Rican7/retry v0.1.0 // indirect github.com/Rican7/retry v0.1.0 // indirect
github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df // indirect
github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e // indirect github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e // indirect
github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a // indirect github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a // indirect
github.com/avast/retry-go/v4 v4.6.0 // indirect github.com/avast/retry-go/v4 v4.6.0 // indirect
...@@ -188,12 +197,12 @@ require ( ...@@ -188,12 +197,12 @@ require (
github.com/blang/semver v3.5.1+incompatible // indirect github.com/blang/semver v3.5.1+incompatible // indirect
github.com/bronze1man/goStrongswanVici v0.0.0-20221114103242-3f6dc524986c // indirect github.com/bronze1man/goStrongswanVici v0.0.0-20221114103242-3f6dc524986c // indirect
github.com/canonical/go-dqlite v1.5.1 // indirect github.com/canonical/go-dqlite v1.5.1 // indirect
github.com/cenkalti/backoff/v4 v4.2.1 // indirect github.com/cenkalti/backoff/v4 v4.3.0 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect github.com/cespare/xxhash/v2 v2.3.0 // indirect
github.com/chai2010/gettext-go v1.0.2 // indirect github.com/chai2010/gettext-go v1.0.2 // indirect
github.com/checkpoint-restore/go-criu/v5 v5.3.0 // indirect github.com/checkpoint-restore/go-criu/v5 v5.3.0 // indirect
github.com/cilium/ebpf v0.9.1 // indirect github.com/cilium/ebpf v0.9.1 // indirect
github.com/container-storage-interface/spec v1.8.0 // indirect github.com/container-storage-interface/spec v1.9.0 // indirect
github.com/containerd/btrfs/v2 v2.0.0 // indirect github.com/containerd/btrfs/v2 v2.0.0 // indirect
github.com/containerd/cgroups v1.1.0 // indirect github.com/containerd/cgroups v1.1.0 // indirect
github.com/containerd/console v1.0.3 // indirect github.com/containerd/console v1.0.3 // indirect
...@@ -242,14 +251,12 @@ require ( ...@@ -242,14 +251,12 @@ require (
github.com/flynn/noise v1.1.0 // indirect github.com/flynn/noise v1.1.0 // indirect
github.com/francoispqt/gojay v1.2.13 // indirect github.com/francoispqt/gojay v1.2.13 // indirect
github.com/fsnotify/fsnotify v1.7.0 // indirect github.com/fsnotify/fsnotify v1.7.0 // indirect
github.com/fvbommel/sortorder v1.1.0 // indirect
github.com/ghodss/yaml v1.0.0 // indirect github.com/ghodss/yaml v1.0.0 // indirect
github.com/go-errors/errors v1.4.2 // indirect github.com/go-errors/errors v1.4.2 // indirect
github.com/go-jose/go-jose/v3 v3.0.3 // indirect github.com/go-jose/go-jose/v3 v3.0.3 // indirect
github.com/go-openapi/jsonpointer v0.20.2 // indirect github.com/go-openapi/jsonpointer v0.20.2 // indirect
github.com/go-openapi/jsonreference v0.20.4 // indirect github.com/go-openapi/jsonreference v0.20.4 // indirect
github.com/go-openapi/swag v0.22.9 // indirect github.com/go-openapi/swag v0.22.9 // indirect
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
github.com/goccy/go-json v0.10.2 // indirect github.com/goccy/go-json v0.10.2 // indirect
github.com/godbus/dbus/v5 v5.1.0 // indirect github.com/godbus/dbus/v5 v5.1.0 // indirect
github.com/gofrs/flock v0.8.1 // indirect github.com/gofrs/flock v0.8.1 // indirect
...@@ -259,22 +266,19 @@ require ( ...@@ -259,22 +266,19 @@ require (
github.com/golang/protobuf v1.5.4 // indirect github.com/golang/protobuf v1.5.4 // indirect
github.com/golang/snappy v0.0.4 // indirect github.com/golang/snappy v0.0.4 // indirect
github.com/google/btree v1.1.2 // indirect github.com/google/btree v1.1.2 // indirect
github.com/google/cel-go v0.17.8 // indirect github.com/google/cel-go v0.20.1 // indirect
github.com/google/gnostic-models v0.6.9-0.20230804172637-c7be7c783f49 // indirect github.com/google/gnostic-models v0.6.9-0.20230804172637-c7be7c783f49 // indirect
github.com/google/go-cmp v0.6.0 // indirect github.com/google/go-cmp v0.6.0 // indirect
github.com/google/go-containerregistry v0.14.0 // indirect github.com/google/go-containerregistry v0.14.0 // indirect
github.com/google/gofuzz v1.2.0 // indirect github.com/google/gofuzz v1.2.0 // indirect
github.com/google/gopacket v1.1.19 // indirect github.com/google/gopacket v1.1.19 // indirect
github.com/google/pprof v0.0.0-20240207164012-fb44976bdcd5 // indirect github.com/google/pprof v0.0.0-20240727154555-813a5fbdbec8 // indirect
github.com/google/s2a-go v0.1.7 // indirect
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect
github.com/googleapis/gax-go/v2 v2.12.0 // indirect
github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7 // indirect github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7 // indirect
github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 // indirect github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 // indirect
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 // indirect github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 // indirect
github.com/hanwen/go-fuse/v2 v2.4.0 // indirect github.com/hanwen/go-fuse/v2 v2.4.0 // indirect
github.com/hashicorp/errwrap v1.1.0 // indirect github.com/hashicorp/errwrap v1.1.0 // indirect
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
...@@ -327,7 +331,6 @@ require ( ...@@ -327,7 +331,6 @@ require (
github.com/mailru/easyjson v0.7.7 // indirect github.com/mailru/easyjson v0.7.7 // indirect
github.com/marten-seemann/tcp v0.0.0-20210406111302-dfbc87cc63fd // indirect github.com/marten-seemann/tcp v0.0.0-20210406111302-dfbc87cc63fd // indirect
github.com/mattn/go-isatty v0.0.20 // indirect github.com/mattn/go-isatty v0.0.20 // indirect
github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
github.com/mdlayher/genetlink v1.3.2 // indirect github.com/mdlayher/genetlink v1.3.2 // indirect
github.com/mdlayher/netlink v1.7.2 // indirect github.com/mdlayher/netlink v1.7.2 // indirect
github.com/mdlayher/socket v0.4.1 // indirect github.com/mdlayher/socket v0.4.1 // indirect
...@@ -344,8 +347,8 @@ require ( ...@@ -344,8 +347,8 @@ require (
github.com/mitchellh/go-wordwrap v1.0.1 // indirect github.com/mitchellh/go-wordwrap v1.0.1 // indirect
github.com/moby/ipvs v1.1.0 // indirect github.com/moby/ipvs v1.1.0 // indirect
github.com/moby/locker v1.0.1 // indirect github.com/moby/locker v1.0.1 // indirect
github.com/moby/spdystream v0.2.0 // indirect github.com/moby/spdystream v0.4.0 // indirect
github.com/moby/sys/mountinfo v0.6.2 // indirect github.com/moby/sys/mountinfo v0.7.1 // indirect
github.com/moby/sys/sequential v0.5.0 // indirect github.com/moby/sys/sequential v0.5.0 // indirect
github.com/moby/sys/signal v0.7.0 // indirect github.com/moby/sys/signal v0.7.0 // indirect
github.com/moby/sys/symlink v0.2.0 // indirect github.com/moby/sys/symlink v0.2.0 // indirect
...@@ -389,8 +392,8 @@ require ( ...@@ -389,8 +392,8 @@ require (
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
github.com/polydawn/refmt v0.89.0 // indirect github.com/polydawn/refmt v0.89.0 // indirect
github.com/pquerna/cachecontrol v0.1.0 // indirect github.com/pquerna/cachecontrol v0.1.0 // indirect
github.com/prometheus/client_model v0.6.0 // indirect github.com/prometheus/client_model v0.6.1 // indirect
github.com/prometheus/procfs v0.12.0 // indirect github.com/prometheus/procfs v0.15.1 // indirect
github.com/quic-go/qpack v0.4.0 // indirect github.com/quic-go/qpack v0.4.0 // indirect
github.com/quic-go/quic-go v0.42.0 // indirect github.com/quic-go/quic-go v0.42.0 // indirect
github.com/quic-go/webtransport-go v0.6.0 // indirect github.com/quic-go/webtransport-go v0.6.0 // indirect
...@@ -402,7 +405,7 @@ require ( ...@@ -402,7 +405,7 @@ require (
github.com/soheilhy/cmux v0.1.5 // indirect github.com/soheilhy/cmux v0.1.5 // indirect
github.com/spaolacci/murmur3 v1.1.0 // indirect github.com/spaolacci/murmur3 v1.1.0 // indirect
github.com/spf13/afero v1.11.0 // indirect github.com/spf13/afero v1.11.0 // indirect
github.com/spf13/cobra v1.8.0 // indirect github.com/spf13/cobra v1.8.1 // indirect
github.com/stefanberger/go-pkcs11uri v0.0.0-20230803200340-78284954bff6 // indirect github.com/stefanberger/go-pkcs11uri v0.0.0-20230803200340-78284954bff6 // indirect
github.com/stoewer/go-strcase v1.2.0 // indirect github.com/stoewer/go-strcase v1.2.0 // indirect
github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635 // indirect github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635 // indirect
...@@ -410,61 +413,57 @@ require ( ...@@ -410,61 +413,57 @@ require (
github.com/tchap/go-patricia/v2 v2.3.1 // indirect github.com/tchap/go-patricia/v2 v2.3.1 // indirect
github.com/tidwall/btree v1.6.0 // indirect github.com/tidwall/btree v1.6.0 // indirect
github.com/tmc/grpc-websocket-proxy v0.0.0-20220101234140-673ab2c3ae75 // indirect github.com/tmc/grpc-websocket-proxy v0.0.0-20220101234140-673ab2c3ae75 // indirect
github.com/urfave/cli/v2 v2.27.2 // indirect github.com/urfave/cli/v2 v2.27.3 // indirect
github.com/vbatts/tar-split v0.11.5 // indirect github.com/vbatts/tar-split v0.11.5 // indirect
github.com/vishvananda/netns v0.0.4 // indirect github.com/vishvananda/netns v0.0.4 // indirect
github.com/whyrusleeping/go-keyspace v0.0.0-20160322163242-5b898ac5add1 // indirect github.com/whyrusleeping/go-keyspace v0.0.0-20160322163242-5b898ac5add1 // indirect
github.com/xiang90/probing v0.0.0-20221125231312-a49e3df8f510 // indirect github.com/xiang90/probing v0.0.0-20221125231312-a49e3df8f510 // indirect
github.com/xlab/treeprint v1.2.0 // indirect github.com/xlab/treeprint v1.2.0 // indirect
github.com/xrash/smetrics v0.0.0-20240312152122-5f08fbb34913 // indirect github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 // indirect
go.etcd.io/bbolt v1.3.10 // indirect go.etcd.io/bbolt v1.3.10 // indirect
go.etcd.io/etcd/client/pkg/v3 v3.5.13 // indirect go.etcd.io/etcd/client/pkg/v3 v3.5.14 // indirect
go.etcd.io/etcd/client/v2 v2.305.13 // indirect go.etcd.io/etcd/client/v2 v2.305.13 // indirect
go.etcd.io/etcd/pkg/v3 v3.5.13 // indirect go.etcd.io/etcd/pkg/v3 v3.5.13 // indirect
go.etcd.io/etcd/raft/v3 v3.5.13 // indirect go.etcd.io/etcd/raft/v3 v3.5.13 // indirect
go.mozilla.org/pkcs7 v0.0.0-20200128120323-432b2356ecb1 // indirect go.mozilla.org/pkcs7 v0.0.0-20200128120323-432b2356ecb1 // indirect
go.opencensus.io v0.24.0 // indirect go.opencensus.io v0.24.0 // indirect
go.opentelemetry.io/contrib/instrumentation/github.com/emicklei/go-restful/otelrestful v0.42.0 // indirect go.opentelemetry.io/contrib/instrumentation/github.com/emicklei/go-restful/otelrestful v0.42.0 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.1 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.53.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect
go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel v1.28.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.21.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.21.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.28.0 // indirect
go.opentelemetry.io/otel/metric v1.24.0 // indirect go.opentelemetry.io/otel/metric v1.28.0 // indirect
go.opentelemetry.io/otel/sdk v1.24.0 // indirect go.opentelemetry.io/otel/sdk v1.28.0 // indirect
go.opentelemetry.io/otel/trace v1.24.0 // indirect go.opentelemetry.io/otel/trace v1.28.0 // indirect
go.opentelemetry.io/proto/otlp v1.0.0 // indirect go.opentelemetry.io/proto/otlp v1.3.1 // indirect
go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // indirect go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // indirect
go.uber.org/dig v1.17.1 // indirect go.uber.org/dig v1.17.1 // indirect
go.uber.org/fx v1.20.1 // indirect go.uber.org/fx v1.20.1 // indirect
go.uber.org/mock v0.4.0 // indirect go.uber.org/mock v0.4.0 // indirect
go.uber.org/multierr v1.11.0 // indirect go.uber.org/multierr v1.11.0 // indirect
go.uber.org/zap v1.27.0 // indirect go.uber.org/zap v1.27.0 // indirect
golang.org/x/exp v0.0.0-20240222234643-814bf88cf225 // indirect golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
golang.org/x/mod v0.17.0 // indirect golang.org/x/mod v0.20.0 // indirect
golang.org/x/oauth2 v0.17.0 // indirect golang.org/x/oauth2 v0.21.0 // indirect
golang.org/x/term v0.20.0 // indirect golang.org/x/term v0.23.0 // indirect
golang.org/x/text v0.15.0 // indirect golang.org/x/text v0.17.0 // indirect
golang.org/x/time v0.5.0 // indirect golang.org/x/time v0.5.0 // indirect
golang.org/x/tools v0.20.0 // indirect golang.org/x/tools v0.24.0 // indirect
golang.zx2c4.com/wireguard v0.0.0-20230325221338-052af4a8072b // indirect golang.zx2c4.com/wireguard v0.0.0-20230325221338-052af4a8072b // indirect
golang.zx2c4.com/wireguard/wgctrl v0.0.0-20230429144221-925a1e7659e6 // indirect golang.zx2c4.com/wireguard/wgctrl v0.0.0-20230429144221-925a1e7659e6 // indirect
gonum.org/v1/gonum v0.13.0 // indirect gonum.org/v1/gonum v0.13.0 // indirect
google.golang.org/api v0.152.0 // indirect google.golang.org/genproto v0.0.0-20240213162025-012b6fc9bca9 // indirect
google.golang.org/appengine v1.6.8 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094 // indirect
google.golang.org/genproto v0.0.0-20240123012728-ef4313101c80 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240123012728-ef4313101c80 // indirect google.golang.org/protobuf v1.34.2 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240228224816-df926f6c8641 // indirect
google.golang.org/protobuf v1.33.0 // indirect
gopkg.in/gcfg.v1 v1.2.3 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/ini.v1 v1.67.0 // indirect
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
gopkg.in/square/go-jose.v2 v2.6.0 // indirect gopkg.in/square/go-jose.v2 v2.6.0 // indirect
gopkg.in/warnings.v0 v0.1.2 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/apiextensions-apiserver v0.30.3 // indirect k8s.io/apiextensions-apiserver v0.31.0 // indirect
k8s.io/code-generator v0.30.3 // indirect k8s.io/code-generator v0.31.0 // indirect
k8s.io/controller-manager v0.25.4 // indirect k8s.io/controller-manager v0.25.4 // indirect
k8s.io/csi-translation-lib v0.0.0 // indirect k8s.io/csi-translation-lib v0.0.0 // indirect
k8s.io/dynamic-resource-allocation v0.0.0 // indirect k8s.io/dynamic-resource-allocation v0.0.0 // indirect
...@@ -472,22 +471,21 @@ require ( ...@@ -472,22 +471,21 @@ require (
k8s.io/gengo v0.0.0-20240228010128-51d4e06bde70 // indirect k8s.io/gengo v0.0.0-20240228010128-51d4e06bde70 // indirect
k8s.io/gengo/v2 v2.0.0-20240228010128-51d4e06bde70 // indirect k8s.io/gengo/v2 v2.0.0-20240228010128-51d4e06bde70 // indirect
k8s.io/kms v0.0.0 // indirect k8s.io/kms v0.0.0 // indirect
k8s.io/kube-aggregator v0.30.3 // indirect k8s.io/kube-aggregator v0.31.0 // indirect
k8s.io/kube-controller-manager v0.0.0 // indirect k8s.io/kube-controller-manager v0.0.0 // indirect
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
k8s.io/kube-scheduler v0.0.0 // indirect k8s.io/kube-scheduler v0.0.0 // indirect
k8s.io/kubelet v0.28.6 // indirect k8s.io/kubelet v0.31.0 // indirect
k8s.io/legacy-cloud-providers v0.0.0 // indirect
k8s.io/metrics v0.0.0 // indirect k8s.io/metrics v0.0.0 // indirect
k8s.io/mount-utils v0.30.3 // indirect k8s.io/mount-utils v0.31.0 // indirect
k8s.io/pod-security-admission v0.0.0 // indirect k8s.io/pod-security-admission v0.0.0 // indirect
lukechampine.com/blake3 v1.2.1 // indirect lukechampine.com/blake3 v1.2.1 // indirect
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.29.0 // indirect sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3 // indirect
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
sigs.k8s.io/knftables v0.0.16 // indirect sigs.k8s.io/knftables v0.0.17 // indirect
sigs.k8s.io/kustomize/api v0.13.5-0.20230601165947-6ce0bf390ce3 // indirect sigs.k8s.io/kustomize/api v0.17.2 // indirect
sigs.k8s.io/kustomize/kustomize/v5 v5.0.4-0.20230601165947-6ce0bf390ce3 // indirect sigs.k8s.io/kustomize/kustomize/v5 v5.4.2 // indirect
sigs.k8s.io/kustomize/kyaml v0.14.3-0.20230601165947-6ce0bf390ce3 // indirect sigs.k8s.io/kustomize/kyaml v0.17.1 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
tags.cncf.io/container-device-interface v0.7.2 // indirect tags.cncf.io/container-device-interface v0.7.2 // indirect
tags.cncf.io/container-device-interface/specs-go v0.7.0 // indirect tags.cncf.io/container-device-interface/specs-go v0.7.0 // indirect
......
go.sum
View file @ 20b50426
This source diff could not be displayed because it is too large. You can view the blob instead.
pkg/agent/containerd/config_linux.go
View file @ 20b50426
...@@ -19,7 +19,7 @@ import ( ...@@ -19,7 +19,7 @@ import (
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"golang.org/x/sys/unix" "golang.org/x/sys/unix"
"k8s.io/kubernetes/pkg/kubelet/util" "k8s.io/cri-client/pkg/util"
) )
const ( const (
......
pkg/agent/cri/cri_linux.go
View file @ 20b50426
...@@ -9,7 +9,7 @@ import ( ...@@ -9,7 +9,7 @@ import (
"google.golang.org/grpc" "google.golang.org/grpc"
runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1" runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1"
k8sutil "k8s.io/kubernetes/pkg/kubelet/util" k8sutil "k8s.io/cri-client/pkg/util"
) )
const socketPrefix = "unix://" const socketPrefix = "unix://"
......
pkg/agent/https/https.go
View file @ 20b50426
...@@ -11,6 +11,7 @@ import ( ...@@ -11,6 +11,7 @@ import (
"github.com/k3s-io/k3s/pkg/generated/clientset/versioned/scheme" "github.com/k3s-io/k3s/pkg/generated/clientset/versioned/scheme"
"github.com/k3s-io/k3s/pkg/util" "github.com/k3s-io/k3s/pkg/util"
"github.com/k3s-io/k3s/pkg/version" "github.com/k3s-io/k3s/pkg/version"
"k8s.io/apiserver/pkg/apis/apiserver"
"k8s.io/apiserver/pkg/authentication/authenticator" "k8s.io/apiserver/pkg/authentication/authenticator"
"k8s.io/apiserver/pkg/authorization/authorizer" "k8s.io/apiserver/pkg/authorization/authorizer"
genericapifilters "k8s.io/apiserver/pkg/endpoints/filters" genericapifilters "k8s.io/apiserver/pkg/endpoints/filters"
...@@ -63,7 +64,9 @@ func Start(ctx context.Context, nodeConfig *config.Node, runtime *config.Control ...@@ -63,7 +64,9 @@ func Start(ctx context.Context, nodeConfig *config.Node, runtime *config.Control
} }
authn := options.NewDelegatingAuthenticationOptions() authn := options.NewDelegatingAuthenticationOptions()
authn.DisableAnonymous = true authn.Anonymous = &apiserver.AnonymousAuthConfig{
Enabled: false,
}
authn.SkipInClusterLookup = true authn.SkipInClusterLookup = true
authn.ClientCert = options.ClientCertAuthenticationOptions{ authn.ClientCert = options.ClientCertAuthenticationOptions{
ClientCA: nodeConfig.AgentConfig.ClientCA, ClientCA: nodeConfig.AgentConfig.ClientCA,
......
pkg/agent/run_test.go
View file @ 20b50426
...@@ -23,8 +23,8 @@ func Test_UnitGetConntrackConfig(t *testing.T) { ...@@ -23,8 +23,8 @@ func Test_UnitGetConntrackConfig(t *testing.T) {
} }
customConfig := defaultConfig.DeepCopy() customConfig := defaultConfig.DeepCopy()
customConfig.Conntrack.Min = utilsptr.To(int32(100)) customConfig.Linux.Conntrack.Min = utilsptr.To(int32(100))
customConfig.Conntrack.TCPCloseWaitTimeout.Duration = 42 * time.Second customConfig.Linux.Conntrack.TCPCloseWaitTimeout.Duration = 42 * time.Second
type args struct { type args struct {
nodeConfig *daemonconfig.Node nodeConfig *daemonconfig.Node
...@@ -44,7 +44,7 @@ func Test_UnitGetConntrackConfig(t *testing.T) { ...@@ -44,7 +44,7 @@ func Test_UnitGetConntrackConfig(t *testing.T) {
}, },
}, },
}, },
want: &defaultConfig.Conntrack, want: &defaultConfig.Linux.Conntrack,
wantErr: false, wantErr: false,
}, },
{ {
...@@ -56,7 +56,7 @@ func Test_UnitGetConntrackConfig(t *testing.T) { ...@@ -56,7 +56,7 @@ func Test_UnitGetConntrackConfig(t *testing.T) {
}, },
}, },
}, },
want: &defaultConfig.Conntrack, want: &defaultConfig.Linux.Conntrack,
wantErr: false, wantErr: false,
}, },
{ {
...@@ -80,7 +80,7 @@ func Test_UnitGetConntrackConfig(t *testing.T) { ...@@ -80,7 +80,7 @@ func Test_UnitGetConntrackConfig(t *testing.T) {
}, },
}, },
}, },
want: &customConfig.Conntrack, want: &customConfig.Linux.Conntrack,
wantErr: false, wantErr: false,
}, },
} }
......
pkg/cli/crictl/crictl.go
View file @ 20b50426
...@@ -4,8 +4,8 @@ import ( ...@@ -4,8 +4,8 @@ import (
"os" "os"
"runtime" "runtime"
"github.com/kubernetes-sigs/cri-tools/cmd/crictl"
"github.com/urfave/cli" "github.com/urfave/cli"
"sigs.k8s.io/cri-tools/cmd/crictl"
) )
func Run(ctx *cli.Context) error { func Run(ctx *cli.Context) error {
......
scripts/build
View file @ 20b50426
...@@ -9,7 +9,7 @@ GO=${GO-go} ...@@ -9,7 +9,7 @@ GO=${GO-go}
PKG="github.com/k3s-io/k3s" PKG="github.com/k3s-io/k3s"
PKG_CONTAINERD="github.com/containerd/containerd" PKG_CONTAINERD="github.com/containerd/containerd"
PKG_CRICTL="github.com/kubernetes-sigs/cri-tools/pkg" PKG_CRICTL="sigs.k8s.io/cri-tools/pkg"
PKG_K8S_BASE="k8s.io/component-base" PKG_K8S_BASE="k8s.io/component-base"
PKG_K8S_CLIENT="k8s.io/client-go/pkg" PKG_K8S_CLIENT="k8s.io/client-go/pkg"
PKG_CNI_PLUGINS="github.com/containernetworking/plugins" PKG_CNI_PLUGINS="github.com/containernetworking/plugins"
......
scripts/validate-cross-compilation
View file @ 20b50426
...@@ -10,7 +10,7 @@ GO=${GO-go} ...@@ -10,7 +10,7 @@ GO=${GO-go}
PKG="github.com/k3s-io/k3s" PKG="github.com/k3s-io/k3s"
PKG_CONTAINERD="github.com/containerd/containerd" PKG_CONTAINERD="github.com/containerd/containerd"
PKG_K3S_CONTAINERD="github.com/k3s-io/containerd" PKG_K3S_CONTAINERD="github.com/k3s-io/containerd"
PKG_CRICTL="github.com/kubernetes-sigs/cri-tools/pkg" PKG_CRICTL="sigs.k8s.io/cri-tools/pkg"
PKG_K8S_BASE="k8s.io/component-base" PKG_K8S_BASE="k8s.io/component-base"
PKG_K8S_CLIENT="k8s.io/client-go/pkg" PKG_K8S_CLIENT="k8s.io/client-go/pkg"
......
scripts/version.sh
View file @ 20b50426
...@@ -37,13 +37,13 @@ if [ -z "$VERSION_CONTAINERD" ]; then ...@@ -37,13 +37,13 @@ if [ -z "$VERSION_CONTAINERD" ]; then
VERSION_CONTAINERD="v0.0.0" VERSION_CONTAINERD="v0.0.0"
fi fi
VERSION_CRICTL=$(get-module-version github.com/kubernetes-sigs/cri-tools) VERSION_CRICTL=$(get-module-version sigs.k8s.io/cri-tools)
if [ -z "$VERSION_CRICTL" ]; then if [ -z "$VERSION_CRICTL" ]; then
VERSION_CRICTL="v0.0.0" VERSION_CRICTL="v0.0.0"
fi fi
VERSION_K8S_K3S=$(get-module-version k8s.io/kubernetes) VERSION_K8S_K3S=$(get-module-version k8s.io/kubernetes)
VERSION_K8S=${VERSION_K8S_K3S%"-k3s1"} VERSION_K8S=${VERSION_K8S_K3S%"-k3s2"}
if [ -z "$VERSION_K8S" ]; then if [ -z "$VERSION_K8S" ]; then
VERSION_K8S="v0.0.0" VERSION_K8S="v0.0.0"
fi fi
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment