Skip to content

K
k3s
Unverified Commit 144f5ad3 authored by Hussein Galal's avatar Hussein Galal Committed by GitHub
Browse files
Options

Kubernetes V1.30.0-k3s1 (#10063)

* kubernetes 1.30.0-k3s1 Signed-off-by: 's avatargalal-hussein <hussein.galal.ahmed.11@gmail.com> * Update go version to v1.22.2 Signed-off-by: 's avatargalal-hussein <hussein.galal.ahmed.11@gmail.com> * update dynamiclistener and helm-controller Signed-off-by: 's avatargalal-hussein <hussein.galal.ahmed.11@gmail.com> * update go in go.mod to 1.22.2 Signed-off-by: 's avatargalal-hussein <hussein.galal.ahmed.11@gmail.com> * update go in Dockerfiles Signed-off-by: 's avatargalal-hussein <hussein.galal.ahmed.11@gmail.com> * update cri-dockerd Signed-off-by: 's avatargalal-hussein <hussein.galal.ahmed.11@gmail.com> * Add proctitle package with linux and windows constraints Signed-off-by: 's avatargalal-hussein <hussein.galal.ahmed.11@gmail.com> * go mod tidy Signed-off-by: 's avatargalal-hussein <hussein.galal.ahmed.11@gmail.com> * Fixing setproctitle function Signed-off-by: 's avatargalal-hussein <hussein.galal.ahmed.11@gmail.com> * update dynamiclistener to v0.6.0-rc1 Signed-off-by: 's avatargalal-hussein <hussein.galal.ahmed.11@gmail.com> --------- Signed-off-by: 's avatargalal-hussein <hussein.galal.ahmed.11@gmail.com>
parent fe7d114c
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 157 additions and 91 deletions
Dockerfile.dapper
View file @ 144f5ad3
ARG GOLANG=golang:1.21.9-alpine3.18 ARG GOLANG=golang:1.22.2-alpine3.18
FROM ${GOLANG} FROM ${GOLANG}
# Set proxy environment variables # Set proxy environment variables
......
Dockerfile.local
View file @ 144f5ad3
ARG GOLANG=golang:1.21.9-alpine3.18 ARG GOLANG=golang:1.22.2-alpine3.18
FROM ${GOLANG} as infra FROM ${GOLANG} as infra
ARG http_proxy=$http_proxy ARG http_proxy=$http_proxy
......
Dockerfile.manifest
View file @ 144f5ad3
ARG GOLANG=golang:1.21.9-alpine3.18 ARG GOLANG=golang:1.22.2-alpine3.18
FROM ${GOLANG} FROM ${GOLANG}
COPY --from=plugins/manifest:1.2.3 /bin/* /bin/ COPY --from=plugins/manifest:1.2.3 /bin/* /bin/
......
Dockerfile.test
View file @ 144f5ad3
ARG GOLANG=golang:1.21.9-alpine3.18 ARG GOLANG=golang:1.22.2-alpine3.18
FROM ${GOLANG} as test-base FROM ${GOLANG} as test-base
RUN apk -U --no-cache add bash jq RUN apk -U --no-cache add bash jq
......
cmd/k3s/main.go
View file @ 144f5ad3
...@@ -19,7 +19,7 @@ import ( ...@@ -19,7 +19,7 @@ import (
"github.com/k3s-io/k3s/pkg/untar" "github.com/k3s-io/k3s/pkg/untar"
"github.com/k3s-io/k3s/pkg/version" "github.com/k3s-io/k3s/pkg/version"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/rancher/wrangler/pkg/resolvehome" "github.com/rancher/wrangler/v3/pkg/resolvehome"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"github.com/spf13/pflag" "github.com/spf13/pflag"
"github.com/urfave/cli" "github.com/urfave/cli"
......
hack/crdgen.go
View file @ 144f5ad3
...@@ -5,7 +5,7 @@ import ( ...@@ -5,7 +5,7 @@ import (
k3scrd "github.com/k3s-io/k3s/pkg/crd" k3scrd "github.com/k3s-io/k3s/pkg/crd"
_ "github.com/k3s-io/k3s/pkg/generated/controllers/k3s.cattle.io/v1" _ "github.com/k3s-io/k3s/pkg/generated/controllers/k3s.cattle.io/v1"
"github.com/rancher/wrangler/pkg/crd" "github.com/rancher/wrangler/v3/pkg/crd"
) )
func main() { func main() {
......
main.go
View file @ 144f5ad3
...@@ -48,6 +48,7 @@ func main() { ...@@ -48,6 +48,7 @@ func main() {
secretsencrypt.RotateKeys, secretsencrypt.RotateKeys,
), ),
cmds.NewCertCommands( cmds.NewCertCommands(
cert.Check,
cert.Rotate, cert.Rotate,
cert.RotateCA, cert.RotateCA,
), ),
......
pkg/agent/config/config.go
View file @ 144f5ad3
...@@ -33,7 +33,7 @@ import ( ...@@ -33,7 +33,7 @@ import (
"github.com/k3s-io/k3s/pkg/vpn" "github.com/k3s-io/k3s/pkg/vpn"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/rancher/wharfie/pkg/registries" "github.com/rancher/wharfie/pkg/registries"
"github.com/rancher/wrangler/pkg/slice" "github.com/rancher/wrangler/v3/pkg/slice"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"k8s.io/apimachinery/pkg/util/json" "k8s.io/apimachinery/pkg/util/json"
"k8s.io/apimachinery/pkg/util/wait" "k8s.io/apimachinery/pkg/util/wait"
......
pkg/agent/containerd/containerd.go
View file @ 144f5ad3
...@@ -25,7 +25,7 @@ import ( ...@@ -25,7 +25,7 @@ import (
"github.com/natefinch/lumberjack" "github.com/natefinch/lumberjack"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/rancher/wharfie/pkg/tarfile" "github.com/rancher/wharfie/pkg/tarfile"
"github.com/rancher/wrangler/pkg/merr" "github.com/rancher/wrangler/v3/pkg/merr"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1" runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1"
) )
......
pkg/certmonitor/certmonitor.go
View file @ 144f5ad3
...@@ -16,7 +16,7 @@ import ( ...@@ -16,7 +16,7 @@ import (
"github.com/k3s-io/k3s/pkg/version" "github.com/k3s-io/k3s/pkg/version"
"github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus"
certutil "github.com/rancher/dynamiclistener/cert" certutil "github.com/rancher/dynamiclistener/cert"
"github.com/rancher/wrangler/pkg/merr" "github.com/rancher/wrangler/v3/pkg/merr"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
corev1 "k8s.io/api/core/v1" corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
......
pkg/cli/agent/agent.go
View file @ 144f5ad3
...@@ -9,17 +9,17 @@ import ( ...@@ -9,17 +9,17 @@ import (
"path/filepath" "path/filepath"
"runtime" "runtime"
"github.com/erikdubbelboer/gspt"
"github.com/gorilla/mux" "github.com/gorilla/mux"
"github.com/k3s-io/k3s/pkg/agent" "github.com/k3s-io/k3s/pkg/agent"
"github.com/k3s-io/k3s/pkg/authenticator" "github.com/k3s-io/k3s/pkg/authenticator"
"github.com/k3s-io/k3s/pkg/cli/cmds" "github.com/k3s-io/k3s/pkg/cli/cmds"
"github.com/k3s-io/k3s/pkg/datadir" "github.com/k3s-io/k3s/pkg/datadir"
"github.com/k3s-io/k3s/pkg/proctitle"
"github.com/k3s-io/k3s/pkg/spegel" "github.com/k3s-io/k3s/pkg/spegel"
"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"
"github.com/k3s-io/k3s/pkg/vpn" "github.com/k3s-io/k3s/pkg/vpn"
"github.com/rancher/wrangler/pkg/signals" "github.com/rancher/wrangler/v3/pkg/signals"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"github.com/urfave/cli" "github.com/urfave/cli"
apiauth "k8s.io/apiserver/pkg/authentication/authenticator" apiauth "k8s.io/apiserver/pkg/authentication/authenticator"
...@@ -31,7 +31,7 @@ func Run(ctx *cli.Context) error { ...@@ -31,7 +31,7 @@ func Run(ctx *cli.Context) error {
// hide process arguments from ps output, since they may contain // hide process arguments from ps output, since they may contain
// database credentials or other secrets. // database credentials or other secrets.
gspt.SetProcTitle(os.Args[0] + " agent") proctitle.SetProcTitle(os.Args[0] + " agent")
// Evacuate cgroup v2 before doing anything else that may fork. // Evacuate cgroup v2 before doing anything else that may fork.
if err := cmds.EvacuateCgroup2(); err != nil { if err := cmds.EvacuateCgroup2(); err != nil {
......
pkg/cli/cert/cert.go
View file @ 144f5ad3
...@@ -8,7 +8,6 @@ import ( ...@@ -8,7 +8,6 @@ import (
"strings" "strings"
"time" "time"
"github.com/erikdubbelboer/gspt"
"github.com/k3s-io/k3s/pkg/agent/util" "github.com/k3s-io/k3s/pkg/agent/util"
"github.com/k3s-io/k3s/pkg/bootstrap" "github.com/k3s-io/k3s/pkg/bootstrap"
"github.com/k3s-io/k3s/pkg/cli/cmds" "github.com/k3s-io/k3s/pkg/cli/cmds"
...@@ -16,6 +15,7 @@ import ( ...@@ -16,6 +15,7 @@ import (
"github.com/k3s-io/k3s/pkg/daemons/config" "github.com/k3s-io/k3s/pkg/daemons/config"
"github.com/k3s-io/k3s/pkg/daemons/control/deps" "github.com/k3s-io/k3s/pkg/daemons/control/deps"
"github.com/k3s-io/k3s/pkg/datadir" "github.com/k3s-io/k3s/pkg/datadir"
"github.com/k3s-io/k3s/pkg/proctitle"
"github.com/k3s-io/k3s/pkg/server" "github.com/k3s-io/k3s/pkg/server"
"github.com/k3s-io/k3s/pkg/util/services" "github.com/k3s-io/k3s/pkg/util/services"
"github.com/k3s-io/k3s/pkg/version" "github.com/k3s-io/k3s/pkg/version"
...@@ -27,7 +27,7 @@ import ( ...@@ -27,7 +27,7 @@ import (
) )
func commandSetup(app *cli.Context, cfg *cmds.Server, sc *server.Config) (string, error) { func commandSetup(app *cli.Context, cfg *cmds.Server, sc *server.Config) (string, error) {
gspt.SetProcTitle(os.Args[0]) proctitle.SetProcTitle(os.Args[0])
dataDir, err := datadir.Resolve(cfg.DataDir) dataDir, err := datadir.Resolve(cfg.DataDir)
if err != nil { if err != nil {
......
pkg/cli/cmds/log_linux.go
View file @ 144f5ad3
...@@ -11,7 +11,7 @@ import ( ...@@ -11,7 +11,7 @@ import (
"syscall" "syscall"
systemd "github.com/coreos/go-systemd/v22/daemon" systemd "github.com/coreos/go-systemd/v22/daemon"
"github.com/erikdubbelboer/gspt" "github.com/k3s-io/k3s/pkg/proctitle"
"github.com/k3s-io/k3s/pkg/version" "github.com/k3s-io/k3s/pkg/version"
"github.com/natefinch/lumberjack" "github.com/natefinch/lumberjack"
"github.com/pkg/errors" "github.com/pkg/errors"
...@@ -42,7 +42,7 @@ func forkIfLoggingOrReaping() error { ...@@ -42,7 +42,7 @@ func forkIfLoggingOrReaping() error {
} }
if enableLogRedirect || enableReaping { if enableLogRedirect || enableReaping {
gspt.SetProcTitle(os.Args[0] + " init") proctitle.SetProcTitle(os.Args[0] + " init")
pwd, err := os.Getwd() pwd, err := os.Getwd()
if err != nil { if err != nil {
......
pkg/cli/etcdsnapshot/etcd_snapshot.go
View file @ 144f5ad3
...@@ -12,12 +12,12 @@ import ( ...@@ -12,12 +12,12 @@ import (
"text/tabwriter" "text/tabwriter"
"time" "time"
"github.com/erikdubbelboer/gspt"
k3s "github.com/k3s-io/k3s/pkg/apis/k3s.cattle.io/v1" k3s "github.com/k3s-io/k3s/pkg/apis/k3s.cattle.io/v1"
"github.com/k3s-io/k3s/pkg/cli/cmds" "github.com/k3s-io/k3s/pkg/cli/cmds"
"github.com/k3s-io/k3s/pkg/clientaccess" "github.com/k3s-io/k3s/pkg/clientaccess"
"github.com/k3s-io/k3s/pkg/cluster/managed" "github.com/k3s-io/k3s/pkg/cluster/managed"
"github.com/k3s-io/k3s/pkg/etcd" "github.com/k3s-io/k3s/pkg/etcd"
"github.com/k3s-io/k3s/pkg/proctitle"
"github.com/k3s-io/k3s/pkg/server" "github.com/k3s-io/k3s/pkg/server"
util2 "github.com/k3s-io/k3s/pkg/util" util2 "github.com/k3s-io/k3s/pkg/util"
"github.com/pkg/errors" "github.com/pkg/errors"
...@@ -34,7 +34,7 @@ var timeout = 2 * time.Minute ...@@ -34,7 +34,7 @@ var timeout = 2 * time.Minute
func commandSetup(app *cli.Context, cfg *cmds.Server) (*etcd.SnapshotRequest, *clientaccess.Info, error) { func commandSetup(app *cli.Context, cfg *cmds.Server) (*etcd.SnapshotRequest, *clientaccess.Info, error) {
// hide process arguments from ps output, since they may contain // hide process arguments from ps output, since they may contain
// database credentials or other secrets. // database credentials or other secrets.
gspt.SetProcTitle(os.Args[0] + " etcd-snapshot") proctitle.SetProcTitle(os.Args[0] + " etcd-snapshot")
sr := &etcd.SnapshotRequest{} sr := &etcd.SnapshotRequest{}
// Operation and name are set by the command handler. // Operation and name are set by the command handler.
......
pkg/cli/secretsencrypt/secrets_encrypt.go
View file @ 144f5ad3
...@@ -10,9 +10,9 @@ import ( ...@@ -10,9 +10,9 @@ import (
"text/tabwriter" "text/tabwriter"
"time" "time"
"github.com/erikdubbelboer/gspt"
"github.com/k3s-io/k3s/pkg/cli/cmds" "github.com/k3s-io/k3s/pkg/cli/cmds"
"github.com/k3s-io/k3s/pkg/clientaccess" "github.com/k3s-io/k3s/pkg/clientaccess"
"github.com/k3s-io/k3s/pkg/proctitle"
"github.com/k3s-io/k3s/pkg/secretsencrypt" "github.com/k3s-io/k3s/pkg/secretsencrypt"
"github.com/k3s-io/k3s/pkg/server" "github.com/k3s-io/k3s/pkg/server"
"github.com/k3s-io/k3s/pkg/version" "github.com/k3s-io/k3s/pkg/version"
...@@ -24,7 +24,7 @@ import ( ...@@ -24,7 +24,7 @@ import (
func commandPrep(cfg *cmds.Server) (*clientaccess.Info, error) { func commandPrep(cfg *cmds.Server) (*clientaccess.Info, error) {
// hide process arguments from ps output, since they may contain // hide process arguments from ps output, since they may contain
// database credentials or other secrets. // database credentials or other secrets.
gspt.SetProcTitle(os.Args[0] + " secrets-encrypt") proctitle.SetProcTitle(os.Args[0] + " secrets-encrypt")
dataDir, err := server.ResolveDataDir(cfg.DataDir) dataDir, err := server.ResolveDataDir(cfg.DataDir)
if err != nil { if err != nil {
......
pkg/cli/server/server.go
View file @ 144f5ad3
...@@ -10,7 +10,6 @@ import ( ...@@ -10,7 +10,6 @@ import (
"time" "time"
systemd "github.com/coreos/go-systemd/v22/daemon" systemd "github.com/coreos/go-systemd/v22/daemon"
"github.com/erikdubbelboer/gspt"
"github.com/gorilla/mux" "github.com/gorilla/mux"
"github.com/k3s-io/k3s/pkg/agent" "github.com/k3s-io/k3s/pkg/agent"
"github.com/k3s-io/k3s/pkg/agent/loadbalancer" "github.com/k3s-io/k3s/pkg/agent/loadbalancer"
...@@ -19,6 +18,7 @@ import ( ...@@ -19,6 +18,7 @@ import (
"github.com/k3s-io/k3s/pkg/daemons/config" "github.com/k3s-io/k3s/pkg/daemons/config"
"github.com/k3s-io/k3s/pkg/datadir" "github.com/k3s-io/k3s/pkg/datadir"
"github.com/k3s-io/k3s/pkg/etcd" "github.com/k3s-io/k3s/pkg/etcd"
"github.com/k3s-io/k3s/pkg/proctitle"
"github.com/k3s-io/k3s/pkg/rootless" "github.com/k3s-io/k3s/pkg/rootless"
"github.com/k3s-io/k3s/pkg/server" "github.com/k3s-io/k3s/pkg/server"
"github.com/k3s-io/k3s/pkg/spegel" "github.com/k3s-io/k3s/pkg/spegel"
...@@ -26,7 +26,7 @@ import ( ...@@ -26,7 +26,7 @@ import (
"github.com/k3s-io/k3s/pkg/version" "github.com/k3s-io/k3s/pkg/version"
"github.com/k3s-io/k3s/pkg/vpn" "github.com/k3s-io/k3s/pkg/vpn"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/rancher/wrangler/pkg/signals" "github.com/rancher/wrangler/v3/pkg/signals"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"github.com/urfave/cli" "github.com/urfave/cli"
utilnet "k8s.io/apimachinery/pkg/util/net" utilnet "k8s.io/apimachinery/pkg/util/net"
...@@ -55,7 +55,7 @@ func run(app *cli.Context, cfg *cmds.Server, leaderControllers server.CustomCont ...@@ -55,7 +55,7 @@ func run(app *cli.Context, cfg *cmds.Server, leaderControllers server.CustomCont
// hide process arguments from ps output, since they may contain // hide process arguments from ps output, since they may contain
// database credentials or other secrets. // database credentials or other secrets.
gspt.SetProcTitle(os.Args[0] + " server") proctitle.SetProcTitle(os.Args[0] + " server")
// If the agent is enabled, evacuate cgroup v2 before doing anything else that may fork. // If the agent is enabled, evacuate cgroup v2 before doing anything else that may fork.
// If the agent is disabled, we don't need to bother doing this as it is only the kubelet // If the agent is disabled, we don't need to bother doing this as it is only the kubelet
......
pkg/cli/token/token.go
View file @ 144f5ad3
...@@ -11,10 +11,10 @@ import ( ...@@ -11,10 +11,10 @@ import (
"text/tabwriter" "text/tabwriter"
"time" "time"
"github.com/erikdubbelboer/gspt"
"github.com/k3s-io/k3s/pkg/cli/cmds" "github.com/k3s-io/k3s/pkg/cli/cmds"
"github.com/k3s-io/k3s/pkg/clientaccess" "github.com/k3s-io/k3s/pkg/clientaccess"
"github.com/k3s-io/k3s/pkg/kubeadm" "github.com/k3s-io/k3s/pkg/kubeadm"
"github.com/k3s-io/k3s/pkg/proctitle"
"github.com/k3s-io/k3s/pkg/server" "github.com/k3s-io/k3s/pkg/server"
"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"
...@@ -171,7 +171,7 @@ func Rotate(app *cli.Context) error { ...@@ -171,7 +171,7 @@ func Rotate(app *cli.Context) error {
func serverAccess(cfg *cmds.Token) (*clientaccess.Info, error) { func serverAccess(cfg *cmds.Token) (*clientaccess.Info, error) {
// hide process arguments from ps output, since they likely contain tokens. // hide process arguments from ps output, since they likely contain tokens.
gspt.SetProcTitle(os.Args[0] + " token") proctitle.SetProcTitle(os.Args[0] + " token")
dataDir, err := server.ResolveDataDir("") dataDir, err := server.ResolveDataDir("")
if err != nil { if err != nil {
......
pkg/cloudprovider/cloudprovider.go
View file @ 144f5ad3
...@@ -7,15 +7,15 @@ import ( ...@@ -7,15 +7,15 @@ import (
"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"
"github.com/rancher/wrangler/pkg/apply" "github.com/rancher/wrangler/v3/pkg/apply"
"github.com/rancher/wrangler/pkg/generated/controllers/apps" "github.com/rancher/wrangler/v3/pkg/generated/controllers/apps"
appsclient "github.com/rancher/wrangler/pkg/generated/controllers/apps/v1" appsclient "github.com/rancher/wrangler/v3/pkg/generated/controllers/apps/v1"
"github.com/rancher/wrangler/pkg/generated/controllers/core" "github.com/rancher/wrangler/v3/pkg/generated/controllers/core"
coreclient "github.com/rancher/wrangler/pkg/generated/controllers/core/v1" coreclient "github.com/rancher/wrangler/v3/pkg/generated/controllers/core/v1"
"github.com/rancher/wrangler/pkg/generated/controllers/discovery" "github.com/rancher/wrangler/v3/pkg/generated/controllers/discovery"
discoveryclient "github.com/rancher/wrangler/pkg/generated/controllers/discovery/v1" discoveryclient "github.com/rancher/wrangler/v3/pkg/generated/controllers/discovery/v1"
"github.com/rancher/wrangler/pkg/generic" "github.com/rancher/wrangler/v3/pkg/generic"
"github.com/rancher/wrangler/pkg/start" "github.com/rancher/wrangler/v3/pkg/start"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
meta "k8s.io/apimachinery/pkg/apis/meta/v1" meta "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/util/wait" "k8s.io/apimachinery/pkg/util/wait"
......
pkg/cloudprovider/servicelb.go
View file @ 144f5ad3
...@@ -10,11 +10,11 @@ import ( ...@@ -10,11 +10,11 @@ import (
"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"
"github.com/rancher/wrangler/pkg/condition" "github.com/rancher/wrangler/v3/pkg/condition"
coreclient "github.com/rancher/wrangler/pkg/generated/controllers/core/v1" coreclient "github.com/rancher/wrangler/v3/pkg/generated/controllers/core/v1"
discoveryclient "github.com/rancher/wrangler/pkg/generated/controllers/discovery/v1" discoveryclient "github.com/rancher/wrangler/v3/pkg/generated/controllers/discovery/v1"
"github.com/rancher/wrangler/pkg/merr" "github.com/rancher/wrangler/v3/pkg/merr"
"github.com/rancher/wrangler/pkg/objectset" "github.com/rancher/wrangler/v3/pkg/objectset"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
apps "k8s.io/api/apps/v1" apps "k8s.io/api/apps/v1"
core "k8s.io/api/core/v1" core "k8s.io/api/core/v1"
......
pkg/cluster/address_controller.go
View file @ 144f5ad3
...@@ -5,7 +5,7 @@ import ( ...@@ -5,7 +5,7 @@ import (
"sync" "sync"
"github.com/k3s-io/k3s/pkg/util" "github.com/k3s-io/k3s/pkg/util"
controllerv1 "github.com/rancher/wrangler/pkg/generated/controllers/core/v1" controllerv1 "github.com/rancher/wrangler/v3/pkg/generated/controllers/core/v1"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
v1 "k8s.io/api/core/v1" v1 "k8s.io/api/core/v1"
) )
......
pkg/cluster/https.go
View file @ 144f5ad3
...@@ -21,7 +21,7 @@ import ( ...@@ -21,7 +21,7 @@ import (
"github.com/rancher/dynamiclistener/storage/file" "github.com/rancher/dynamiclistener/storage/file"
"github.com/rancher/dynamiclistener/storage/kubernetes" "github.com/rancher/dynamiclistener/storage/kubernetes"
"github.com/rancher/dynamiclistener/storage/memory" "github.com/rancher/dynamiclistener/storage/memory"
"github.com/rancher/wrangler/pkg/generated/controllers/core" "github.com/rancher/wrangler/v3/pkg/generated/controllers/core"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
utilsnet "k8s.io/utils/net" utilsnet "k8s.io/utils/net"
......
pkg/codegen/cleanup/main.go
View file @ 144f5ad3
package main package main
import ( import (
"github.com/rancher/wrangler/pkg/cleanup" "github.com/rancher/wrangler/v3/pkg/cleanup"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
) )
......
pkg/codegen/main.go
View file @ 144f5ad3
...@@ -5,8 +5,8 @@ import ( ...@@ -5,8 +5,8 @@ import (
bindata "github.com/go-bindata/go-bindata" bindata "github.com/go-bindata/go-bindata"
v1 "github.com/k3s-io/k3s/pkg/apis/k3s.cattle.io/v1" v1 "github.com/k3s-io/k3s/pkg/apis/k3s.cattle.io/v1"
controllergen "github.com/rancher/wrangler/pkg/controller-gen" controllergen "github.com/rancher/wrangler/v3/pkg/controller-gen"
"github.com/rancher/wrangler/pkg/controller-gen/args" "github.com/rancher/wrangler/v3/pkg/controller-gen/args"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
) )
......
pkg/configfilearg/parser.go
View file @ 144f5ad3
...@@ -12,7 +12,7 @@ import ( ...@@ -12,7 +12,7 @@ import (
"strings" "strings"
"github.com/k3s-io/k3s/pkg/agent/util" "github.com/k3s-io/k3s/pkg/agent/util"
"github.com/rancher/wrangler/pkg/data/convert" "github.com/rancher/wrangler/v3/pkg/data/convert"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"github.com/urfave/cli" "github.com/urfave/cli"
"gopkg.in/yaml.v2" "gopkg.in/yaml.v2"
......
pkg/crd/crds.go
View file @ 144f5ad3
...@@ -2,7 +2,7 @@ package crd ...@@ -2,7 +2,7 @@ package crd
import ( import (
v1 "github.com/k3s-io/k3s/pkg/apis/k3s.cattle.io/v1" v1 "github.com/k3s-io/k3s/pkg/apis/k3s.cattle.io/v1"
"github.com/rancher/wrangler/pkg/crd" "github.com/rancher/wrangler/v3/pkg/crd"
) )
func List() []crd.CRD { func List() []crd.CRD {
......
pkg/daemons/config/types.go
View file @ 144f5ad3
...@@ -13,8 +13,8 @@ import ( ...@@ -13,8 +13,8 @@ import (
"github.com/k3s-io/k3s/pkg/generated/controllers/k3s.cattle.io" "github.com/k3s-io/k3s/pkg/generated/controllers/k3s.cattle.io"
"github.com/k3s-io/kine/pkg/endpoint" "github.com/k3s-io/kine/pkg/endpoint"
"github.com/rancher/wharfie/pkg/registries" "github.com/rancher/wharfie/pkg/registries"
"github.com/rancher/wrangler/pkg/generated/controllers/core" "github.com/rancher/wrangler/v3/pkg/generated/controllers/core"
"github.com/rancher/wrangler/pkg/leader" "github.com/rancher/wrangler/v3/pkg/leader"
utilnet "k8s.io/apimachinery/pkg/util/net" utilnet "k8s.io/apimachinery/pkg/util/net"
"k8s.io/apiserver/pkg/authentication/authenticator" "k8s.io/apiserver/pkg/authentication/authenticator"
"k8s.io/client-go/tools/record" "k8s.io/client-go/tools/record"
......
pkg/daemons/control/deps/deps.go
View file @ 144f5ad3
...@@ -30,7 +30,7 @@ import ( ...@@ -30,7 +30,7 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/util/sets" "k8s.io/apimachinery/pkg/util/sets"
"k8s.io/apiserver/pkg/apis/apiserver" "k8s.io/apiserver/pkg/apis/apiserver"
apiserverconfigv1 "k8s.io/apiserver/pkg/apis/config/v1" apiserverconfigv1 "k8s.io/apiserver/pkg/apis/apiserver/v1"
"k8s.io/apiserver/pkg/authentication/user" "k8s.io/apiserver/pkg/authentication/user"
"k8s.io/client-go/util/keyutil" "k8s.io/client-go/util/keyutil"
) )
......
pkg/datadir/datadir.go
View file @ 144f5ad3
...@@ -6,7 +6,7 @@ import ( ...@@ -6,7 +6,7 @@ import (
"github.com/k3s-io/k3s/pkg/version" "github.com/k3s-io/k3s/pkg/version"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/rancher/wrangler/pkg/resolvehome" "github.com/rancher/wrangler/v3/pkg/resolvehome"
) )
var ( var (
......
pkg/deploy/controller.go
View file @ 144f5ad3
...@@ -20,10 +20,10 @@ import ( ...@@ -20,10 +20,10 @@ import (
controllersv1 "github.com/k3s-io/k3s/pkg/generated/controllers/k3s.cattle.io/v1" controllersv1 "github.com/k3s-io/k3s/pkg/generated/controllers/k3s.cattle.io/v1"
pkgutil "github.com/k3s-io/k3s/pkg/util" pkgutil "github.com/k3s-io/k3s/pkg/util"
errors2 "github.com/pkg/errors" errors2 "github.com/pkg/errors"
"github.com/rancher/wrangler/pkg/apply" "github.com/rancher/wrangler/v3/pkg/apply"
"github.com/rancher/wrangler/pkg/kv" "github.com/rancher/wrangler/v3/pkg/kv"
"github.com/rancher/wrangler/pkg/merr" "github.com/rancher/wrangler/v3/pkg/merr"
"github.com/rancher/wrangler/pkg/objectset" "github.com/rancher/wrangler/v3/pkg/objectset"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
corev1 "k8s.io/api/core/v1" corev1 "k8s.io/api/core/v1"
apierrors "k8s.io/apimachinery/pkg/api/errors" apierrors "k8s.io/apimachinery/pkg/api/errors"
......
pkg/etcd/etcd.go
View file @ 144f5ad3
...@@ -33,7 +33,7 @@ import ( ...@@ -33,7 +33,7 @@ import (
cp "github.com/otiai10/copy" cp "github.com/otiai10/copy"
"github.com/pkg/errors" "github.com/pkg/errors"
certutil "github.com/rancher/dynamiclistener/cert" certutil "github.com/rancher/dynamiclistener/cert"
controllerv1 "github.com/rancher/wrangler/pkg/generated/controllers/core/v1" controllerv1 "github.com/rancher/wrangler/v3/pkg/generated/controllers/core/v1"
"github.com/robfig/cron/v3" "github.com/robfig/cron/v3"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"go.etcd.io/etcd/api/v3/etcdserverpb" "go.etcd.io/etcd/api/v3/etcdserverpb"
......
pkg/etcd/member_controller.go
View file @ 144f5ad3
...@@ -8,7 +8,7 @@ import ( ...@@ -8,7 +8,7 @@ import (
"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"
"github.com/pkg/errors" "github.com/pkg/errors"
controllerv1 "github.com/rancher/wrangler/pkg/generated/controllers/core/v1" controllerv1 "github.com/rancher/wrangler/v3/pkg/generated/controllers/core/v1"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"go.etcd.io/etcd/api/v3/v3rpc/rpctypes" "go.etcd.io/etcd/api/v3/v3rpc/rpctypes"
v1 "k8s.io/api/core/v1" v1 "k8s.io/api/core/v1"
......
pkg/etcd/metadata_controller.go
View file @ 144f5ad3
...@@ -7,7 +7,7 @@ import ( ...@@ -7,7 +7,7 @@ import (
"time" "time"
"github.com/k3s-io/k3s/pkg/util" "github.com/k3s-io/k3s/pkg/util"
controllerv1 "github.com/rancher/wrangler/pkg/generated/controllers/core/v1" controllerv1 "github.com/rancher/wrangler/v3/pkg/generated/controllers/core/v1"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
v1 "k8s.io/api/core/v1" v1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
......
pkg/etcd/snapshot_controller.go
View file @ 144f5ad3
...@@ -13,7 +13,7 @@ import ( ...@@ -13,7 +13,7 @@ import (
"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"
"github.com/pkg/errors" "github.com/pkg/errors"
controllerv1 "github.com/rancher/wrangler/pkg/generated/controllers/core/v1" controllerv1 "github.com/rancher/wrangler/v3/pkg/generated/controllers/core/v1"
v1 "k8s.io/api/core/v1" v1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/equality" "k8s.io/apimachinery/pkg/api/equality"
apierrors "k8s.io/apimachinery/pkg/api/errors" apierrors "k8s.io/apimachinery/pkg/api/errors"
......
pkg/generated/controllers/k3s.cattle.io/factory.go
View file @ 144f5ad3
...@@ -20,7 +20,7 @@ package k3s ...@@ -20,7 +20,7 @@ package k3s
import ( import (
"github.com/rancher/lasso/pkg/controller" "github.com/rancher/lasso/pkg/controller"
"github.com/rancher/wrangler/pkg/generic" "github.com/rancher/wrangler/v3/pkg/generic"
"k8s.io/client-go/rest" "k8s.io/client-go/rest"
) )
......
pkg/generated/controllers/k3s.cattle.io/v1/addon.go
View file @ 144f5ad3
...@@ -20,7 +20,7 @@ package v1 ...@@ -20,7 +20,7 @@ package v1
import ( import (
v1 "github.com/k3s-io/k3s/pkg/apis/k3s.cattle.io/v1" v1 "github.com/k3s-io/k3s/pkg/apis/k3s.cattle.io/v1"
"github.com/rancher/wrangler/pkg/generic" "github.com/rancher/wrangler/v3/pkg/generic"
) )
// AddonController interface for managing Addon resources. // AddonController interface for managing Addon resources.
......
pkg/generated/controllers/k3s.cattle.io/v1/etcdsnapshotfile.go
View file @ 144f5ad3
...@@ -20,13 +20,14 @@ package v1 ...@@ -20,13 +20,14 @@ package v1
import ( import (
"context" "context"
"sync"
"time" "time"
v1 "github.com/k3s-io/k3s/pkg/apis/k3s.cattle.io/v1" v1 "github.com/k3s-io/k3s/pkg/apis/k3s.cattle.io/v1"
"github.com/rancher/wrangler/pkg/apply" "github.com/rancher/wrangler/v3/pkg/apply"
"github.com/rancher/wrangler/pkg/condition" "github.com/rancher/wrangler/v3/pkg/condition"
"github.com/rancher/wrangler/pkg/generic" "github.com/rancher/wrangler/v3/pkg/generic"
"github.com/rancher/wrangler/pkg/kv" "github.com/rancher/wrangler/v3/pkg/kv"
"k8s.io/apimachinery/pkg/api/equality" "k8s.io/apimachinery/pkg/api/equality"
"k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime"
...@@ -48,10 +49,14 @@ type ETCDSnapshotFileCache interface { ...@@ -48,10 +49,14 @@ type ETCDSnapshotFileCache interface {
generic.NonNamespacedCacheInterface[*v1.ETCDSnapshotFile] generic.NonNamespacedCacheInterface[*v1.ETCDSnapshotFile]
} }
// ETCDSnapshotFileStatusHandler is executed for every added or modified ETCDSnapshotFile. Should return the new status to be updated
type ETCDSnapshotFileStatusHandler func(obj *v1.ETCDSnapshotFile, status v1.ETCDSnapshotStatus) (v1.ETCDSnapshotStatus, error) type ETCDSnapshotFileStatusHandler func(obj *v1.ETCDSnapshotFile, status v1.ETCDSnapshotStatus) (v1.ETCDSnapshotStatus, error)
// ETCDSnapshotFileGeneratingHandler is the top-level handler that is executed for every ETCDSnapshotFile event. It extends ETCDSnapshotFileStatusHandler by a returning a slice of child objects to be passed to apply.Apply
type ETCDSnapshotFileGeneratingHandler func(obj *v1.ETCDSnapshotFile, status v1.ETCDSnapshotStatus) ([]runtime.Object, v1.ETCDSnapshotStatus, error) type ETCDSnapshotFileGeneratingHandler func(obj *v1.ETCDSnapshotFile, status v1.ETCDSnapshotStatus) ([]runtime.Object, v1.ETCDSnapshotStatus, error)
// RegisterETCDSnapshotFileStatusHandler configures a ETCDSnapshotFileController to execute a ETCDSnapshotFileStatusHandler for every events observed.
// If a non-empty condition is provided, it will be updated in the status conditions for every handler execution
func RegisterETCDSnapshotFileStatusHandler(ctx context.Context, controller ETCDSnapshotFileController, condition condition.Cond, name string, handler ETCDSnapshotFileStatusHandler) { func RegisterETCDSnapshotFileStatusHandler(ctx context.Context, controller ETCDSnapshotFileController, condition condition.Cond, name string, handler ETCDSnapshotFileStatusHandler) {
statusHandler := &eTCDSnapshotFileStatusHandler{ statusHandler := &eTCDSnapshotFileStatusHandler{
client: controller, client: controller,
...@@ -61,6 +66,8 @@ func RegisterETCDSnapshotFileStatusHandler(ctx context.Context, controller ETCDS ...@@ -61,6 +66,8 @@ func RegisterETCDSnapshotFileStatusHandler(ctx context.Context, controller ETCDS
controller.AddGenericHandler(ctx, name, generic.FromObjectHandlerToHandler(statusHandler.sync)) controller.AddGenericHandler(ctx, name, generic.FromObjectHandlerToHandler(statusHandler.sync))
} }
// RegisterETCDSnapshotFileGeneratingHandler configures a ETCDSnapshotFileController to execute a ETCDSnapshotFileGeneratingHandler for every events observed, passing the returned objects to the provided apply.Apply.
// If a non-empty condition is provided, it will be updated in the status conditions for every handler execution
func RegisterETCDSnapshotFileGeneratingHandler(ctx context.Context, controller ETCDSnapshotFileController, apply apply.Apply, func RegisterETCDSnapshotFileGeneratingHandler(ctx context.Context, controller ETCDSnapshotFileController, apply apply.Apply,
condition condition.Cond, name string, handler ETCDSnapshotFileGeneratingHandler, opts *generic.GeneratingHandlerOptions) { condition condition.Cond, name string, handler ETCDSnapshotFileGeneratingHandler, opts *generic.GeneratingHandlerOptions) {
statusHandler := &eTCDSnapshotFileGeneratingHandler{ statusHandler := &eTCDSnapshotFileGeneratingHandler{
...@@ -82,6 +89,7 @@ type eTCDSnapshotFileStatusHandler struct { ...@@ -82,6 +89,7 @@ type eTCDSnapshotFileStatusHandler struct {
handler ETCDSnapshotFileStatusHandler handler ETCDSnapshotFileStatusHandler
} }
// sync is executed on every resource addition or modification. Executes the configured handlers and sends the updated status to the Kubernetes API
func (a *eTCDSnapshotFileStatusHandler) sync(key string, obj *v1.ETCDSnapshotFile) (*v1.ETCDSnapshotFile, error) { func (a *eTCDSnapshotFileStatusHandler) sync(key string, obj *v1.ETCDSnapshotFile) (*v1.ETCDSnapshotFile, error) {
if obj == nil { if obj == nil {
return obj, nil return obj, nil
...@@ -127,8 +135,10 @@ type eTCDSnapshotFileGeneratingHandler struct { ...@@ -127,8 +135,10 @@ type eTCDSnapshotFileGeneratingHandler struct {
opts generic.GeneratingHandlerOptions opts generic.GeneratingHandlerOptions
gvk schema.GroupVersionKind gvk schema.GroupVersionKind
name string name string
seen sync.Map
} }
// Remove handles the observed deletion of a resource, cascade deleting every associated resource previously applied
func (a *eTCDSnapshotFileGeneratingHandler) Remove(key string, obj *v1.ETCDSnapshotFile) (*v1.ETCDSnapshotFile, error) { func (a *eTCDSnapshotFileGeneratingHandler) Remove(key string, obj *v1.ETCDSnapshotFile) (*v1.ETCDSnapshotFile, error) {
if obj != nil { if obj != nil {
return obj, nil return obj, nil
...@@ -138,12 +148,17 @@ func (a *eTCDSnapshotFileGeneratingHandler) Remove(key string, obj *v1.ETCDSnaps ...@@ -138,12 +148,17 @@ func (a *eTCDSnapshotFileGeneratingHandler) Remove(key string, obj *v1.ETCDSnaps
obj.Namespace, obj.Name = kv.RSplit(key, "/") obj.Namespace, obj.Name = kv.RSplit(key, "/")
obj.SetGroupVersionKind(a.gvk) obj.SetGroupVersionKind(a.gvk)
if a.opts.UniqueApplyForResourceVersion {
a.seen.Delete(key)
}
return nil, generic.ConfigureApplyForObject(a.apply, obj, &a.opts). return nil, generic.ConfigureApplyForObject(a.apply, obj, &a.opts).
WithOwner(obj). WithOwner(obj).
WithSetID(a.name). WithSetID(a.name).
ApplyObjects() ApplyObjects()
} }
// Handle executes the configured ETCDSnapshotFileGeneratingHandler and pass the resulting objects to apply.Apply, finally returning the new status of the resource
func (a *eTCDSnapshotFileGeneratingHandler) Handle(obj *v1.ETCDSnapshotFile, status v1.ETCDSnapshotStatus) (v1.ETCDSnapshotStatus, error) { func (a *eTCDSnapshotFileGeneratingHandler) Handle(obj *v1.ETCDSnapshotFile, status v1.ETCDSnapshotStatus) (v1.ETCDSnapshotStatus, error) {
if !obj.DeletionTimestamp.IsZero() { if !obj.DeletionTimestamp.IsZero() {
return status, nil return status, nil
...@@ -153,9 +168,41 @@ func (a *eTCDSnapshotFileGeneratingHandler) Handle(obj *v1.ETCDSnapshotFile, sta ...@@ -153,9 +168,41 @@ func (a *eTCDSnapshotFileGeneratingHandler) Handle(obj *v1.ETCDSnapshotFile, sta
if err != nil { if err != nil {
return newStatus, err return newStatus, err
} }
if !a.isNewResourceVersion(obj) {
return newStatus, nil
}
return newStatus, generic.ConfigureApplyForObject(a.apply, obj, &a.opts). err = generic.ConfigureApplyForObject(a.apply, obj, &a.opts).
WithOwner(obj). WithOwner(obj).
WithSetID(a.name). WithSetID(a.name).
ApplyObjects(objs...) ApplyObjects(objs...)
if err != nil {
return newStatus, err
}
a.storeResourceVersion(obj)
return newStatus, nil
}
// isNewResourceVersion detects if a specific resource version was already successfully processed.
// Only used if UniqueApplyForResourceVersion is set in generic.GeneratingHandlerOptions
func (a *eTCDSnapshotFileGeneratingHandler) isNewResourceVersion(obj *v1.ETCDSnapshotFile) bool {
if !a.opts.UniqueApplyForResourceVersion {
return true
}
// Apply once per resource version
key := obj.Namespace + "/" + obj.Name
previous, ok := a.seen.Load(key)
return !ok || previous != obj.ResourceVersion
}
// storeResourceVersion keeps track of the latest resource version of an object for which Apply was executed
// Only used if UniqueApplyForResourceVersion is set in generic.GeneratingHandlerOptions
func (a *eTCDSnapshotFileGeneratingHandler) storeResourceVersion(obj *v1.ETCDSnapshotFile) {
if !a.opts.UniqueApplyForResourceVersion {
return
}
key := obj.Namespace + "/" + obj.Name
a.seen.Store(key, obj.ResourceVersion)
} }
pkg/generated/controllers/k3s.cattle.io/v1/interface.go
View file @ 144f5ad3
...@@ -21,8 +21,8 @@ package v1 ...@@ -21,8 +21,8 @@ package v1
import ( import (
v1 "github.com/k3s-io/k3s/pkg/apis/k3s.cattle.io/v1" v1 "github.com/k3s-io/k3s/pkg/apis/k3s.cattle.io/v1"
"github.com/rancher/lasso/pkg/controller" "github.com/rancher/lasso/pkg/controller"
"github.com/rancher/wrangler/pkg/generic" "github.com/rancher/wrangler/v3/pkg/generic"
"github.com/rancher/wrangler/pkg/schemes" "github.com/rancher/wrangler/v3/pkg/schemes"
"k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/runtime/schema"
) )
......
pkg/node/controller.go
View file @ 144f5ad3
...@@ -9,7 +9,7 @@ import ( ...@@ -9,7 +9,7 @@ import (
"github.com/k3s-io/k3s/pkg/nodepassword" "github.com/k3s-io/k3s/pkg/nodepassword"
"github.com/pkg/errors" "github.com/pkg/errors"
coreclient "github.com/rancher/wrangler/pkg/generated/controllers/core/v1" coreclient "github.com/rancher/wrangler/v3/pkg/generated/controllers/core/v1"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
core "k8s.io/api/core/v1" core "k8s.io/api/core/v1"
v1 "k8s.io/api/core/v1" v1 "k8s.io/api/core/v1"
......
pkg/nodepassword/nodepassword.go
View file @ 144f5ad3
...@@ -10,7 +10,7 @@ import ( ...@@ -10,7 +10,7 @@ import (
"github.com/k3s-io/k3s/pkg/passwd" "github.com/k3s-io/k3s/pkg/passwd"
"github.com/k3s-io/k3s/pkg/version" "github.com/k3s-io/k3s/pkg/version"
"github.com/pkg/errors" "github.com/pkg/errors"
coreclient "github.com/rancher/wrangler/pkg/generated/controllers/core/v1" coreclient "github.com/rancher/wrangler/v3/pkg/generated/controllers/core/v1"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
v1 "k8s.io/api/core/v1" v1 "k8s.io/api/core/v1"
apierrors "k8s.io/apimachinery/pkg/api/errors" apierrors "k8s.io/apimachinery/pkg/api/errors"
......
pkg/nodepassword/nodepassword_test.go
View file @ 144f5ad3
...@@ -9,7 +9,7 @@ import ( ...@@ -9,7 +9,7 @@ import (
"testing" "testing"
"github.com/golang/mock/gomock" "github.com/golang/mock/gomock"
"github.com/rancher/wrangler/pkg/generic/fake" "github.com/rancher/wrangler/v3/pkg/generic/fake"
v1 "k8s.io/api/core/v1" v1 "k8s.io/api/core/v1"
apierrors "k8s.io/apimachinery/pkg/api/errors" apierrors "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
......
pkg/proctitle/proctile.go 0 → 100644
View file @ 144f5ad3
//go:build linux
// +build linux
package proctitle
import (
"github.com/erikdubbelboer/gspt"
)
func SetProcTitle(cmd string) {
gspt.SetProcTitle(cmd)
}
pkg/proctitle/proctile_windows.go 0 → 100644
View file @ 144f5ad3
//go:build windows
// +build windows
package proctitle
func SetProcTitle(cmd string) {}
pkg/rootlessports/controller.go
View file @ 144f5ad3
...@@ -8,7 +8,7 @@ import ( ...@@ -8,7 +8,7 @@ import (
"time" "time"
"github.com/k3s-io/k3s/pkg/rootless" "github.com/k3s-io/k3s/pkg/rootless"
coreClients "github.com/rancher/wrangler/pkg/generated/controllers/core/v1" coreClients "github.com/rancher/wrangler/v3/pkg/generated/controllers/core/v1"
"github.com/rootless-containers/rootlesskit/pkg/api/client" "github.com/rootless-containers/rootlesskit/pkg/api/client"
"github.com/rootless-containers/rootlesskit/pkg/port" "github.com/rootless-containers/rootlesskit/pkg/port"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
......
pkg/rootlessports/controller_windows.go
View file @ 144f5ad3
...@@ -3,7 +3,7 @@ package rootlessports ...@@ -3,7 +3,7 @@ package rootlessports
import ( import (
"context" "context"
coreClients "github.com/rancher/wrangler/pkg/generated/controllers/core/v1" coreClients "github.com/rancher/wrangler/v3/pkg/generated/controllers/core/v1"
) )
func Register(ctx context.Context, serviceController coreClients.ServiceController, enabled bool, httpsPort int) error { func Register(ctx context.Context, serviceController coreClients.ServiceController, enabled bool, httpsPort int) error {
......
pkg/secretsencrypt/config.go
View file @ 144f5ad3
...@@ -21,7 +21,7 @@ import ( ...@@ -21,7 +21,7 @@ import (
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/util/wait" "k8s.io/apimachinery/pkg/util/wait"
apiserverconfigv1 "k8s.io/apiserver/pkg/apis/config/v1" apiserverconfigv1 "k8s.io/apiserver/pkg/apis/apiserver/v1"
"k8s.io/client-go/rest" "k8s.io/client-go/rest"
) )
......
pkg/secretsencrypt/controller.go
View file @ 144f5ad3
...@@ -8,7 +8,7 @@ import ( ...@@ -8,7 +8,7 @@ import (
"github.com/k3s-io/k3s/pkg/cluster" "github.com/k3s-io/k3s/pkg/cluster"
"github.com/k3s-io/k3s/pkg/daemons/config" "github.com/k3s-io/k3s/pkg/daemons/config"
"github.com/k3s-io/k3s/pkg/util" "github.com/k3s-io/k3s/pkg/util"
coreclient "github.com/rancher/wrangler/pkg/generated/controllers/core/v1" coreclient "github.com/rancher/wrangler/v3/pkg/generated/controllers/core/v1"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
corev1 "k8s.io/api/core/v1" corev1 "k8s.io/api/core/v1"
apierrors "k8s.io/apimachinery/pkg/api/errors" apierrors "k8s.io/apimachinery/pkg/api/errors"
......
pkg/server/cert.go
View file @ 144f5ad3
...@@ -23,7 +23,7 @@ import ( ...@@ -23,7 +23,7 @@ import (
"github.com/k3s-io/k3s/pkg/version" "github.com/k3s-io/k3s/pkg/version"
"github.com/pkg/errors" "github.com/pkg/errors"
certutil "github.com/rancher/dynamiclistener/cert" certutil "github.com/rancher/dynamiclistener/cert"
"github.com/rancher/wrangler/pkg/merr" "github.com/rancher/wrangler/v3/pkg/merr"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"k8s.io/client-go/util/keyutil" "k8s.io/client-go/util/keyutil"
) )
......
pkg/server/context.go
View file @ 144f5ad3
...@@ -10,12 +10,12 @@ import ( ...@@ -10,12 +10,12 @@ import (
"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"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/rancher/wrangler/pkg/crd" "github.com/rancher/wrangler/v3/pkg/crd"
"github.com/rancher/wrangler/pkg/generated/controllers/apps" "github.com/rancher/wrangler/v3/pkg/generated/controllers/apps"
"github.com/rancher/wrangler/pkg/generated/controllers/batch" "github.com/rancher/wrangler/v3/pkg/generated/controllers/batch"
"github.com/rancher/wrangler/pkg/generated/controllers/core" "github.com/rancher/wrangler/v3/pkg/generated/controllers/core"
"github.com/rancher/wrangler/pkg/generated/controllers/rbac" "github.com/rancher/wrangler/v3/pkg/generated/controllers/rbac"
"github.com/rancher/wrangler/pkg/start" "github.com/rancher/wrangler/v3/pkg/start"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/client-go/kubernetes" "k8s.io/client-go/kubernetes"
"k8s.io/client-go/rest" "k8s.io/client-go/rest"
......
pkg/server/router.go
View file @ 144f5ad3
...@@ -25,7 +25,7 @@ import ( ...@@ -25,7 +25,7 @@ import (
"github.com/k3s-io/k3s/pkg/version" "github.com/k3s-io/k3s/pkg/version"
"github.com/pkg/errors" "github.com/pkg/errors"
certutil "github.com/rancher/dynamiclistener/cert" certutil "github.com/rancher/dynamiclistener/cert"
coreclient "github.com/rancher/wrangler/pkg/generated/controllers/core/v1" coreclient "github.com/rancher/wrangler/v3/pkg/generated/controllers/core/v1"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
corev1 "k8s.io/api/core/v1" corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
......
pkg/server/secrets-encrypt.go
View file @ 144f5ad3
...@@ -17,11 +17,11 @@ import ( ...@@ -17,11 +17,11 @@ import (
"github.com/k3s-io/k3s/pkg/daemons/config" "github.com/k3s-io/k3s/pkg/daemons/config"
"github.com/k3s-io/k3s/pkg/secretsencrypt" "github.com/k3s-io/k3s/pkg/secretsencrypt"
"github.com/k3s-io/k3s/pkg/util" "github.com/k3s-io/k3s/pkg/util"
"github.com/rancher/wrangler/pkg/generated/controllers/core" "github.com/rancher/wrangler/v3/pkg/generated/controllers/core"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/labels"
apiserverconfigv1 "k8s.io/apiserver/pkg/apis/config/v1" apiserverconfigv1 "k8s.io/apiserver/pkg/apis/apiserver/v1"
"k8s.io/client-go/util/retry" "k8s.io/client-go/util/retry"
"k8s.io/utils/ptr" "k8s.io/utils/ptr"
) )
......
pkg/server/server.go
View file @ 144f5ad3
...@@ -28,10 +28,10 @@ import ( ...@@ -28,10 +28,10 @@ import (
"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"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/rancher/wrangler/pkg/apply" "github.com/rancher/wrangler/v3/pkg/apply"
v1 "github.com/rancher/wrangler/pkg/generated/controllers/core/v1" v1 "github.com/rancher/wrangler/v3/pkg/generated/controllers/core/v1"
"github.com/rancher/wrangler/pkg/leader" "github.com/rancher/wrangler/v3/pkg/leader"
"github.com/rancher/wrangler/pkg/resolvehome" "github.com/rancher/wrangler/v3/pkg/resolvehome"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
corev1 "k8s.io/api/core/v1" corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
......
pkg/spegel/bootstrap.go
View file @ 144f5ad3
...@@ -13,7 +13,7 @@ import ( ...@@ -13,7 +13,7 @@ import (
"github.com/k3s-io/k3s/pkg/version" "github.com/k3s-io/k3s/pkg/version"
"github.com/libp2p/go-libp2p/core/peer" "github.com/libp2p/go-libp2p/core/peer"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/rancher/wrangler/pkg/merr" "github.com/rancher/wrangler/v3/pkg/merr"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"github.com/spegel-org/spegel/pkg/routing" "github.com/spegel-org/spegel/pkg/routing"
v1 "k8s.io/api/core/v1" v1 "k8s.io/api/core/v1"
......
pkg/util/api.go
View file @ 144f5ad3
...@@ -10,8 +10,8 @@ import ( ...@@ -10,8 +10,8 @@ import (
"time" "time"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/rancher/wrangler/pkg/merr" "github.com/rancher/wrangler/v3/pkg/merr"
"github.com/rancher/wrangler/pkg/schemes" "github.com/rancher/wrangler/v3/pkg/schemes"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
authorizationv1 "k8s.io/api/authorization/v1" authorizationv1 "k8s.io/api/authorization/v1"
v1 "k8s.io/api/core/v1" v1 "k8s.io/api/core/v1"
......
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