github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

[master] changing package to k3s-io (#4846) 

* changing package to k3s-io

Signed-off-by: Luther Monson <luther.monson@gmail.com>

Co-authored-by: Derek Nola <derek.nola@suse.com>
pull/5205/head
Luther Monson 3 years ago committed by GitHub
parent
a82ac4fdc7
commit
9a849b1bb7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
142 changed files with 371 additions and 341 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      .github/PULL_REQUEST_TEMPLATE.md
  2. 2
      BUILDING.md
  3. 5
      Dockerfile.dapper
  4. 2
      Dockerfile.test.dapper
  5. 2
      Dockerfile.test.mod.dapper
  6. 6
      cmd/agent/main.go
  7. 6
      cmd/cert/main.go
  8. 2
      cmd/containerd/main.go
  9. 2
      cmd/ctr/main.go
  10. 6
      cmd/encrypt/main.go
  11. 6
      cmd/etcdsnapshot/main.go
  12. 16
      cmd/k3s/main.go
  13. 2
      cmd/kubectl/main.go
  14. 26
      cmd/server/main.go
  15. 2
      contrib/ansible/README.md
  16. 3
      go.mod
  17. 18
      main.go
  18. 2
      package/rpm/install.sh
  19. 16
      pkg/agent/config/config.go
  20. 3
      pkg/agent/config/config_linux.go
  21. 3
      pkg/agent/config/config_windows.go
  22. 10
      pkg/agent/containerd/config_linux.go
  23. 7
      pkg/agent/containerd/config_windows.go
  24. 6
      pkg/agent/containerd/containerd.go
  25. 3
      pkg/agent/containerd/nvidia.go
  26. 3
      pkg/agent/containerd/nvidia_test.go
  27. 6
      pkg/agent/flannel/setup.go
  28. 2
      pkg/agent/flannel/setup_test.go
  29. 2
      pkg/agent/loadbalancer/config.go
  30. 2
      pkg/agent/loadbalancer/loadbalancer.go
  31. 2
      pkg/agent/loadbalancer/loadbalancer_test.go
  32. 2
      pkg/agent/netpol/netpol.go
  33. 2
      pkg/agent/netpol/netpol_windows.go
  34. 2
      pkg/agent/proxy/apiproxy.go
  35. 34
      pkg/agent/run.go
  36. 5
      pkg/agent/run_linux.go
  37. 5
      pkg/agent/run_windows.go
  38. 2
      pkg/agent/templates/templates.go
  39. 8
      pkg/agent/tunnel/tunnel.go
  40. 8
      pkg/apiaddresses/controller.go
  41. 2
      pkg/apis/k3s.cattle.io/v1/zz_generated_register.go
  42. 2
      pkg/authenticator/basicauth/basicauth.go
  43. 2
      pkg/bootstrap/bootstrap.go
  44. 2
      pkg/bootstrap/bootstrap_test.go
  45. 3
      pkg/cgroups/cgroups_linux.go
  46. 12
      pkg/cli/agent/agent.go
  47. 12
      pkg/cli/cert/cert.go
  48. 2
      pkg/cli/cmds/agent.go
  49. 2
      pkg/cli/cmds/certs.go
  50. 2
      pkg/cli/cmds/config.go
  51. 2
      pkg/cli/cmds/etcd_snapshot.go
  52. 3
      pkg/cli/cmds/log_linux.go
  53. 2
      pkg/cli/cmds/root.go
  54. 2
      pkg/cli/cmds/secrets_encrypt.go
  55. 2
      pkg/cli/cmds/server.go
  56. 2
      pkg/cli/ctr/ctr.go
  57. 12
      pkg/cli/etcdsnapshot/etcd_snapshot.go
  58. 2
      pkg/cli/kubectl/kubectl.go
  59. 10
      pkg/cli/secretsencrypt/secrets_encrypt.go
  60. 26
      pkg/cli/server/server.go
  61. 4
      pkg/clientaccess/token_test.go
  62. 2
      pkg/cloudprovider/cloudprovider.go
  63. 2
      pkg/cloudprovider/instances.go
  64. 10
      pkg/cluster/bootstrap.go
  65. 8
      pkg/cluster/bootstrap_test.go
  66. 8
      pkg/cluster/cluster.go
  67. 2
      pkg/cluster/encrypt.go
  68. 4
      pkg/cluster/etcd.go
  69. 6
      pkg/cluster/https.go
  70. 8
      pkg/cluster/managed.go
  71. 4
      pkg/cluster/managed/drivers.go
  72. 6
      pkg/cluster/storage.go
  73. 6
      pkg/codegen/main.go
  74. 4
      pkg/configfilearg/defaultparser.go
  75. 2
      pkg/configfilearg/parser.go
  76. 3
      pkg/containerd/utility_windows.go
  77. 8
      pkg/daemons/agent/agent.go
  78. 7
      pkg/daemons/agent/agent_linux.go
  79. 5
      pkg/daemons/agent/agent_windows.go
  80. 3
      pkg/daemons/agent/agent_windows_test.go
  81. 4
      pkg/daemons/control/auth.go
  82. 10
      pkg/daemons/control/deps/deps.go
  83. 12
      pkg/daemons/control/server.go
  84. 9
      pkg/daemons/executor/embed.go
  85. 4
      pkg/daemons/executor/etcd.go
  86. 4
      pkg/daemons/executor/executor.go
  87. 2
      pkg/datadir/datadir.go
  88. 8
      pkg/deploy/controller.go
  89. 10
      pkg/etcd/etcd.go
  90. 6
      pkg/etcd/etcd_test.go
  91. 2
      pkg/etcd/etcdproxy.go
  92. 2
      pkg/etcd/member_controller.go
  93. 2
      pkg/etcd/s3.go
  94. 5
      pkg/flock/flock_int_test.go
  95. 12
      pkg/flock/flock_other.go
  96. 2
      pkg/generated/clientset/versioned/clientset.go
  97. 6
      pkg/generated/clientset/versioned/fake/clientset_generated.go
  98. 2
      pkg/generated/clientset/versioned/fake/register.go
  99. 2
      pkg/generated/clientset/versioned/scheme/register.go
  100. 4
      pkg/generated/clientset/versioned/typed/k3s.cattle.io/v1/addon.go
  101. Some files were not shown because too many files have changed in this diff Show More

4
.github/PULL_REQUEST_TEMPLATE.md
Unescape View File

@ -1,5 +1,5 @@
<!-- HTML Comments can be left in place or removed. --> <!-- HTML Comments can be left in place or removed. -->
<!-- Please see our contributing guide at https://github.com/rancher/k3s/blob/master/CONTRIBUTING.md for guidance on opening pull requests --> <!-- Please see our contributing guide at https://github.com/k3s-io/k3s/blob/master/CONTRIBUTING.md for guidance on opening pull requests -->
#### Proposed Changes #### #### Proposed Changes ####
@ -15,7 +15,7 @@
#### Linked Issues #### #### Linked Issues ####
<!-- Link any related issues, pull-requests, or commit hashes that are relevant to this pull request. If you are opening a PR without a corresponding issue please consider creating one first, at https://github.com/rancher/k3s/issues . A functional example will greatly help QA with verifying/reproducing a bug or testing new features. --> <!-- Link any related issues, pull-requests, or commit hashes that are relevant to this pull request. If you are opening a PR without a corresponding issue please consider creating one first, at https://github.com/k3s-io/k3s/issues . A functional example will greatly help QA with verifying/reproducing a bug or testing new features. -->
#### User-Facing Change #### #### User-Facing Change ####
<!-- <!--

2
BUILDING.md
Unescape View File

@ -5,7 +5,7 @@
Before getting started, bear in mind that this repository includes all of Kubernetes history, so consider shallow cloning with (`--depth 1`) to speed up the process. Before getting started, bear in mind that this repository includes all of Kubernetes history, so consider shallow cloning with (`--depth 1`) to speed up the process.
```bash ```bash
git clone --depth 1 https://github.com/rancher/k3s.git git clone --depth 1 https://github.com/k3s-io/k3s.git
``` ```
The k3s build process requires some autogenerated code and remote artifacts that are not checked in to version control. To prepare these resources for your build environment, run: The k3s build process requires some autogenerated code and remote artifacts that are not checked in to version control. To prepare these resources for your build environment, run:

5
Dockerfile.dapper
Unescape View File

@ -39,10 +39,11 @@ RUN wget -O - ${YQ_URL}_$(go env GOARCH) > /usr/bin/yq && chmod +x /usr/bin/yq
ARG SELINUX=true ARG SELINUX=true
ENV SELINUX $SELINUX ENV SELINUX $SELINUX
ENV DAPPER_RUN_ARGS --privileged -v k3s-cache:/go/src/github.com/rancher/k3s/.cache -v trivy-cache:/root/.cache/trivy 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
ENV DAPPER_SOURCE /go/src/github.com/rancher/k3s/ ENV DAPPER_SOURCE /go/src/github.com/k3s-io/k3s/
ENV DAPPER_OUTPUT ./bin ./dist ./build/out ./build/static ./pkg/static ./pkg/deploy ENV DAPPER_OUTPUT ./bin ./dist ./build/out ./build/static ./pkg/static ./pkg/deploy
ENV DAPPER_DOCKER_SOCKET true ENV DAPPER_DOCKER_SOCKET true
ENV HOME ${DAPPER_SOURCE} ENV HOME ${DAPPER_SOURCE}
ENV CROSS true ENV CROSS true

2
Dockerfile.test.dapper
Unescape View File

@ -20,7 +20,7 @@ ENV TEST_CLEANUP true
ENV DAPPER_RUN_ARGS --privileged --network host -v /tmp:/tmp ENV DAPPER_RUN_ARGS --privileged --network host -v /tmp:/tmp
ENV DAPPER_ENV REPO TAG DRONE_TAG DRONE_BUILD_EVENT IMAGE_NAME GCLOUD_AUTH SONOBUOY_VERSION ENABLE_REGISTRY ENV DAPPER_ENV REPO TAG DRONE_TAG DRONE_BUILD_EVENT IMAGE_NAME GCLOUD_AUTH SONOBUOY_VERSION ENABLE_REGISTRY
ENV DAPPER_SOURCE /go/src/github.com/rancher/k3s/ ENV DAPPER_SOURCE /go/src/github.com/k3s-io/k3s/
ENV DAPPER_OUTPUT ./dist ENV DAPPER_OUTPUT ./dist
ENV DAPPER_DOCKER_SOCKET true ENV DAPPER_DOCKER_SOCKET true
ENV HOME ${DAPPER_SOURCE} ENV HOME ${DAPPER_SOURCE}

2
Dockerfile.test.mod.dapper
Unescape View File

@ -2,7 +2,7 @@ ARG GOLANG=golang:1.17.5-alpine3.15
FROM ${GOLANG} FROM ${GOLANG}
RUN apk -U --no-cache add bash jq RUN apk -U --no-cache add bash jq
ENV DAPPER_SOURCE /go/src/github.com/rancher/k3s/ ENV DAPPER_SOURCE /go/src/github.com/k3s-io/k3s/
ENV HOME ${DAPPER_SOURCE} ENV HOME ${DAPPER_SOURCE}
WORKDIR ${DAPPER_SOURCE} WORKDIR ${DAPPER_SOURCE}

6
cmd/agent/main.go
Unescape View File

@ -5,9 +5,9 @@ import (
"errors" "errors"
"os" "os"
"github.com/rancher/k3s/pkg/cli/agent" "github.com/k3s-io/k3s/pkg/cli/agent"
"github.com/rancher/k3s/pkg/cli/cmds" "github.com/k3s-io/k3s/pkg/cli/cmds"
"github.com/rancher/k3s/pkg/configfilearg" "github.com/k3s-io/k3s/pkg/configfilearg"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"github.com/urfave/cli" "github.com/urfave/cli"
) )

6
cmd/cert/main.go
Unescape View File

@ -5,9 +5,9 @@ import (
"errors" "errors"
"os" "os"
"github.com/rancher/k3s/pkg/cli/cert" "github.com/k3s-io/k3s/pkg/cli/cert"
"github.com/rancher/k3s/pkg/cli/cmds" "github.com/k3s-io/k3s/pkg/cli/cmds"
"github.com/rancher/k3s/pkg/configfilearg" "github.com/k3s-io/k3s/pkg/configfilearg"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"github.com/urfave/cli" "github.com/urfave/cli"
) )

2
cmd/containerd/main.go
Unescape View File

@ -1,7 +1,7 @@
package main package main
import ( import (
"github.com/rancher/k3s/pkg/containerd" "github.com/k3s-io/k3s/pkg/containerd"
"k8s.io/klog" "k8s.io/klog"
) )

2
cmd/ctr/main.go
Unescape View File

@ -1,6 +1,6 @@
package main package main
import "github.com/rancher/k3s/pkg/ctr" import "github.com/k3s-io/k3s/pkg/ctr"
func main() { func main() {
ctr.Main() ctr.Main()

6
cmd/encrypt/main.go
Unescape View File

@ -5,9 +5,9 @@ import (
"errors" "errors"
"os" "os"
"github.com/rancher/k3s/pkg/cli/cmds" "github.com/k3s-io/k3s/pkg/cli/cmds"
"github.com/rancher/k3s/pkg/cli/secretsencrypt" "github.com/k3s-io/k3s/pkg/cli/secretsencrypt"
"github.com/rancher/k3s/pkg/configfilearg" "github.com/k3s-io/k3s/pkg/configfilearg"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"github.com/urfave/cli" "github.com/urfave/cli"
) )

6
cmd/etcdsnapshot/main.go
Unescape View File

@ -5,9 +5,9 @@ import (
"errors" "errors"
"os" "os"
"github.com/rancher/k3s/pkg/cli/cmds" "github.com/k3s-io/k3s/pkg/cli/cmds"
"github.com/rancher/k3s/pkg/cli/etcdsnapshot" "github.com/k3s-io/k3s/pkg/cli/etcdsnapshot"
"github.com/rancher/k3s/pkg/configfilearg" "github.com/k3s-io/k3s/pkg/configfilearg"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"github.com/urfave/cli" "github.com/urfave/cli"
) )

16
cmd/k3s/main.go
Unescape View File

@ -9,15 +9,15 @@ import (
"strings" "strings"
"syscall" "syscall"
"github.com/k3s-io/k3s/pkg/cli/cmds"
"github.com/k3s-io/k3s/pkg/configfilearg"
"github.com/k3s-io/k3s/pkg/data"
"github.com/k3s-io/k3s/pkg/datadir"
"github.com/k3s-io/k3s/pkg/dataverify"
"github.com/k3s-io/k3s/pkg/flock"
"github.com/k3s-io/k3s/pkg/untar"
"github.com/k3s-io/k3s/pkg/version"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/rancher/k3s/pkg/cli/cmds"
"github.com/rancher/k3s/pkg/configfilearg"
"github.com/rancher/k3s/pkg/data"
"github.com/rancher/k3s/pkg/datadir"
"github.com/rancher/k3s/pkg/dataverify"
"github.com/rancher/k3s/pkg/flock"
"github.com/rancher/k3s/pkg/untar"
"github.com/rancher/k3s/pkg/version"
"github.com/rancher/wrangler/pkg/resolvehome" "github.com/rancher/wrangler/pkg/resolvehome"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"github.com/urfave/cli" "github.com/urfave/cli"

2
cmd/kubectl/main.go
Unescape View File

@ -1,6 +1,6 @@
package main package main
import "github.com/rancher/k3s/pkg/kubectl" import "github.com/k3s-io/k3s/pkg/kubectl"
func main() { func main() {
kubectl.Main() kubectl.Main()

26
cmd/server/main.go
Unescape View File

@ -7,20 +7,20 @@ import (
"path/filepath" "path/filepath"
"github.com/docker/docker/pkg/reexec" "github.com/docker/docker/pkg/reexec"
"github.com/k3s-io/k3s/pkg/cli/agent"
"github.com/k3s-io/k3s/pkg/cli/cert"
"github.com/k3s-io/k3s/pkg/cli/cmds"
"github.com/k3s-io/k3s/pkg/cli/crictl"
"github.com/k3s-io/k3s/pkg/cli/ctr"
"github.com/k3s-io/k3s/pkg/cli/etcdsnapshot"
"github.com/k3s-io/k3s/pkg/cli/kubectl"
"github.com/k3s-io/k3s/pkg/cli/secretsencrypt"
"github.com/k3s-io/k3s/pkg/cli/server"
"github.com/k3s-io/k3s/pkg/configfilearg"
"github.com/k3s-io/k3s/pkg/containerd"
ctr2 "github.com/k3s-io/k3s/pkg/ctr"
kubectl2 "github.com/k3s-io/k3s/pkg/kubectl"
crictl2 "github.com/kubernetes-sigs/cri-tools/cmd/crictl" crictl2 "github.com/kubernetes-sigs/cri-tools/cmd/crictl"
"github.com/rancher/k3s/pkg/cli/agent"
"github.com/rancher/k3s/pkg/cli/cert"
"github.com/rancher/k3s/pkg/cli/cmds"
"github.com/rancher/k3s/pkg/cli/crictl"
"github.com/rancher/k3s/pkg/cli/ctr"
"github.com/rancher/k3s/pkg/cli/etcdsnapshot"
"github.com/rancher/k3s/pkg/cli/kubectl"
"github.com/rancher/k3s/pkg/cli/secretsencrypt"
"github.com/rancher/k3s/pkg/cli/server"
"github.com/rancher/k3s/pkg/configfilearg"
"github.com/rancher/k3s/pkg/containerd"
ctr2 "github.com/rancher/k3s/pkg/ctr"
kubectl2 "github.com/rancher/k3s/pkg/kubectl"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"github.com/urfave/cli" "github.com/urfave/cli"
) )

2
contrib/ansible/README.md
Unescape View File

@ -1,3 +1,3 @@
# Build a Kubernetes cluster using k3s via Ansible # Build a Kubernetes cluster using k3s via Ansible
The ansible playbook was moved to https://github.com/rancher/k3s-ansible The ansible playbook was moved to https://github.com/k3s-io/k3s-ansible

3
go.mod
Unescape View File

@ -1,4 +1,4 @@
module github.com/rancher/k3s module github.com/k3s-io/k3s
go 1.16 go 1.16
@ -15,7 +15,6 @@ replace (
github.com/googleapis/gax-go/v2 => github.com/googleapis/gax-go/v2 v2.0.5 github.com/googleapis/gax-go/v2 => github.com/googleapis/gax-go/v2 v2.0.5
github.com/juju/errors => github.com/k3s-io/nocode v0.0.0-20200630202308-cb097102c09f github.com/juju/errors => github.com/k3s-io/nocode v0.0.0-20200630202308-cb097102c09f
github.com/kubernetes-sigs/cri-tools => github.com/k3s-io/cri-tools v1.22.0-k3s1 github.com/kubernetes-sigs/cri-tools => github.com/k3s-io/cri-tools v1.22.0-k3s1
github.com/matryer/moq => github.com/rancher/moq v0.0.0-20190404221404-ee5226d43009
github.com/opencontainers/runc => github.com/opencontainers/runc v1.0.3 github.com/opencontainers/runc => github.com/opencontainers/runc v1.0.3
github.com/opencontainers/runtime-spec => github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417 github.com/opencontainers/runtime-spec => github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417
github.com/rancher/wrangler => github.com/rancher/wrangler v0.8.11-0.20220211163748-d5a8ee98be5f github.com/rancher/wrangler => github.com/rancher/wrangler v0.8.11-0.20220211163748-d5a8ee98be5f

18
main.go
Unescape View File

@ -11,15 +11,15 @@ import (
"errors" "errors"
"os" "os"
"github.com/rancher/k3s/pkg/cli/agent" "github.com/k3s-io/k3s/pkg/cli/agent"
"github.com/rancher/k3s/pkg/cli/cert" "github.com/k3s-io/k3s/pkg/cli/cert"
"github.com/rancher/k3s/pkg/cli/cmds" "github.com/k3s-io/k3s/pkg/cli/cmds"
"github.com/rancher/k3s/pkg/cli/crictl" "github.com/k3s-io/k3s/pkg/cli/crictl"
"github.com/rancher/k3s/pkg/cli/etcdsnapshot" "github.com/k3s-io/k3s/pkg/cli/etcdsnapshot"
"github.com/rancher/k3s/pkg/cli/kubectl" "github.com/k3s-io/k3s/pkg/cli/kubectl"
"github.com/rancher/k3s/pkg/cli/secretsencrypt" "github.com/k3s-io/k3s/pkg/cli/secretsencrypt"
"github.com/rancher/k3s/pkg/cli/server" "github.com/k3s-io/k3s/pkg/cli/server"
"github.com/rancher/k3s/pkg/configfilearg" "github.com/k3s-io/k3s/pkg/configfilearg"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"github.com/urfave/cli" "github.com/urfave/cli"
) )

2
package/rpm/install.sh
Unescape View File

@ -93,7 +93,7 @@ if [ "$INSTALL_K3S_DEBUG" = "true" ]; then
set -x set -x
fi fi
GITHUB_URL=https://github.com/rancher/k3s/releases GITHUB_URL=https://github.com/k3s-io/k3s/releases
STORAGE_URL=https://storage.googleapis.com/k3s-ci-builds STORAGE_URL=https://storage.googleapis.com/k3s-ci-builds
DOWNLOADER= DOWNLOADER=

16
pkg/agent/config/config.go
Unescape View File

@ -19,15 +19,15 @@ import (
"strings" "strings"
"time" "time"
"github.com/k3s-io/k3s/pkg/agent/proxy"
"github.com/k3s-io/k3s/pkg/cli/cmds"
"github.com/k3s-io/k3s/pkg/clientaccess"
"github.com/k3s-io/k3s/pkg/containerd"
"github.com/k3s-io/k3s/pkg/daemons/config"
"github.com/k3s-io/k3s/pkg/daemons/control/deps"
"github.com/k3s-io/k3s/pkg/util"
"github.com/k3s-io/k3s/pkg/version"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/rancher/k3s/pkg/agent/proxy"
"github.com/rancher/k3s/pkg/cli/cmds"
"github.com/rancher/k3s/pkg/clientaccess"
"github.com/rancher/k3s/pkg/containerd"
"github.com/rancher/k3s/pkg/daemons/config"
"github.com/rancher/k3s/pkg/daemons/control/deps"
"github.com/rancher/k3s/pkg/util"
"github.com/rancher/k3s/pkg/version"
"github.com/rancher/wrangler/pkg/slice" "github.com/rancher/wrangler/pkg/slice"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"k8s.io/apimachinery/pkg/util/json" "k8s.io/apimachinery/pkg/util/json"

3
pkg/agent/config/config_linux.go
Unescape View File

@ -1,3 +1,4 @@
//go:build linux
// +build linux // +build linux
package config package config
@ -5,7 +6,7 @@ package config
import ( import (
"path/filepath" "path/filepath"
"github.com/rancher/k3s/pkg/daemons/config" "github.com/k3s-io/k3s/pkg/daemons/config"
) )
func applyContainerdStateAndAddress(nodeConfig *config.Node) { func applyContainerdStateAndAddress(nodeConfig *config.Node) {

3
pkg/agent/config/config_windows.go
Unescape View File

@ -1,3 +1,4 @@
//go:build windows
// +build windows // +build windows
package config package config
@ -5,7 +6,7 @@ package config
import ( import (
"path/filepath" "path/filepath"
"github.com/rancher/k3s/pkg/daemons/config" "github.com/k3s-io/k3s/pkg/daemons/config"
) )
func applyContainerdStateAndAddress(nodeConfig *config.Node) { func applyContainerdStateAndAddress(nodeConfig *config.Node) {

10
pkg/agent/containerd/config_linux.go
Unescape View File

@ -9,13 +9,13 @@ import (
"os" "os"
"time" "time"
"github.com/k3s-io/k3s/pkg/agent/templates"
util2 "github.com/k3s-io/k3s/pkg/agent/util"
"github.com/k3s-io/k3s/pkg/cgroups"
"github.com/k3s-io/k3s/pkg/daemons/config"
"github.com/k3s-io/k3s/pkg/version"
"github.com/opencontainers/runc/libcontainer/userns" "github.com/opencontainers/runc/libcontainer/userns"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/rancher/k3s/pkg/agent/templates"
util2 "github.com/rancher/k3s/pkg/agent/util"
"github.com/rancher/k3s/pkg/cgroups"
"github.com/rancher/k3s/pkg/daemons/config"
"github.com/rancher/k3s/pkg/version"
"github.com/rancher/wharfie/pkg/registries" "github.com/rancher/wharfie/pkg/registries"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"golang.org/x/sys/unix" "golang.org/x/sys/unix"

7
pkg/agent/containerd/config_windows.go
Unescape View File

@ -1,3 +1,4 @@
//go:build windows
// +build windows // +build windows
package containerd package containerd
@ -8,9 +9,9 @@ import (
"os" "os"
"time" "time"
"github.com/rancher/k3s/pkg/agent/templates" "github.com/k3s-io/k3s/pkg/agent/templates"
util2 "github.com/rancher/k3s/pkg/agent/util" util2 "github.com/k3s-io/k3s/pkg/agent/util"
"github.com/rancher/k3s/pkg/daemons/config" "github.com/k3s-io/k3s/pkg/daemons/config"
"github.com/rancher/wharfie/pkg/registries" "github.com/rancher/wharfie/pkg/registries"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"google.golang.org/grpc" "google.golang.org/grpc"

6
pkg/agent/containerd/containerd.go
Unescape View File

@ -19,11 +19,11 @@ import (
"github.com/containerd/containerd/namespaces" "github.com/containerd/containerd/namespaces"
"github.com/containerd/containerd/pkg/cri/constants" "github.com/containerd/containerd/pkg/cri/constants"
"github.com/containerd/containerd/reference/docker" "github.com/containerd/containerd/reference/docker"
util2 "github.com/k3s-io/k3s/pkg/agent/util"
"github.com/k3s-io/k3s/pkg/daemons/config"
"github.com/k3s-io/k3s/pkg/version"
"github.com/natefinch/lumberjack" "github.com/natefinch/lumberjack"
"github.com/pkg/errors" "github.com/pkg/errors"
util2 "github.com/rancher/k3s/pkg/agent/util"
"github.com/rancher/k3s/pkg/daemons/config"
"github.com/rancher/k3s/pkg/version"
"github.com/rancher/wharfie/pkg/tarfile" "github.com/rancher/wharfie/pkg/tarfile"
"github.com/rancher/wrangler/pkg/merr" "github.com/rancher/wrangler/pkg/merr"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"

3
pkg/agent/containerd/nvidia.go
Unescape View File

@ -1,3 +1,4 @@
//go:build linux
// +build linux // +build linux
package containerd package containerd
@ -7,7 +8,7 @@ import (
"io/fs" "io/fs"
"path/filepath" "path/filepath"
"github.com/rancher/k3s/pkg/agent/templates" "github.com/k3s-io/k3s/pkg/agent/templates"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
) )

3
pkg/agent/containerd/nvidia_test.go
Unescape View File

@ -1,3 +1,4 @@
//go:build linux
// +build linux // +build linux
package containerd package containerd
@ -8,7 +9,7 @@ import (
"testing" "testing"
"testing/fstest" "testing/fstest"
"github.com/rancher/k3s/pkg/agent/templates" "github.com/k3s-io/k3s/pkg/agent/templates"
) )
func Test_UnitFindNvidiaContainerRuntimes(t *testing.T) { func Test_UnitFindNvidiaContainerRuntimes(t *testing.T) {

6
pkg/agent/flannel/setup.go
Unescape View File

@ -8,10 +8,10 @@ import (
"path/filepath" "path/filepath"
"strings" "strings"
"github.com/k3s-io/k3s/pkg/agent/util"
"github.com/k3s-io/k3s/pkg/daemons/config"
"github.com/k3s-io/k3s/pkg/version"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/rancher/k3s/pkg/agent/util"
"github.com/rancher/k3s/pkg/daemons/config"
"github.com/rancher/k3s/pkg/version"
"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"

2
pkg/agent/flannel/setup_test.go
Unescape View File

@ -7,7 +7,7 @@ import (
"strings" "strings"
"testing" "testing"
"github.com/rancher/k3s/pkg/daemons/config" "github.com/k3s-io/k3s/pkg/daemons/config"
) )
func stringToCIDR(s string) []*net.IPNet { func stringToCIDR(s string) []*net.IPNet {

2
pkg/agent/loadbalancer/config.go
Unescape View File

@ -4,7 +4,7 @@ import (
"encoding/json" "encoding/json"
"io/ioutil" "io/ioutil"
"github.com/rancher/k3s/pkg/agent/util" "github.com/k3s-io/k3s/pkg/agent/util"
) )
func (lb *LoadBalancer) writeConfig() error { func (lb *LoadBalancer) writeConfig() error {

2
pkg/agent/loadbalancer/loadbalancer.go
Unescape View File

@ -9,7 +9,7 @@ import (
"strconv" "strconv"
"sync" "sync"
"github.com/rancher/k3s/pkg/version" "github.com/k3s-io/k3s/pkg/version"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"inet.af/tcpproxy" "inet.af/tcpproxy"
) )

2
pkg/agent/loadbalancer/loadbalancer_test.go
Unescape View File

@ -13,7 +13,7 @@ import (
"testing" "testing"
"time" "time"
"github.com/rancher/k3s/pkg/cli/cmds" "github.com/k3s-io/k3s/pkg/cli/cmds"
) )
type server struct { type server struct {

2
pkg/agent/netpol/netpol.go
Unescape View File

@ -15,7 +15,7 @@ import (
"github.com/cloudnativelabs/kube-router/pkg/healthcheck" "github.com/cloudnativelabs/kube-router/pkg/healthcheck"
"github.com/cloudnativelabs/kube-router/pkg/options" "github.com/cloudnativelabs/kube-router/pkg/options"
"github.com/cloudnativelabs/kube-router/pkg/utils" "github.com/cloudnativelabs/kube-router/pkg/utils"
"github.com/rancher/k3s/pkg/daemons/config" "github.com/k3s-io/k3s/pkg/daemons/config"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"k8s.io/client-go/informers" "k8s.io/client-go/informers"
"k8s.io/client-go/kubernetes" "k8s.io/client-go/kubernetes"

2
pkg/agent/netpol/netpol_windows.go
Unescape View File

@ -3,7 +3,7 @@ package netpol
import ( import (
"context" "context"
daemonconfig "github.com/rancher/k3s/pkg/daemons/config" daemonconfig "github.com/k3s-io/k3s/pkg/daemons/config"
) )
func Run(ctx context.Context, nodeConfig *daemonconfig.Node) error { func Run(ctx context.Context, nodeConfig *daemonconfig.Node) error {

2
pkg/agent/proxy/apiproxy.go
Unescape View File

@ -8,8 +8,8 @@ import (
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"github.com/k3s-io/k3s/pkg/agent/loadbalancer"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/rancher/k3s/pkg/agent/loadbalancer"
) )
type Proxy interface { type Proxy interface {

34
pkg/agent/run.go
Unescape View File

@ -11,24 +11,24 @@ import (
"time" "time"
systemd "github.com/coreos/go-systemd/daemon" systemd "github.com/coreos/go-systemd/daemon"
"github.com/k3s-io/k3s/pkg/agent/config"
"github.com/k3s-io/k3s/pkg/agent/containerd"
"github.com/k3s-io/k3s/pkg/agent/flannel"
"github.com/k3s-io/k3s/pkg/agent/netpol"
"github.com/k3s-io/k3s/pkg/agent/proxy"
"github.com/k3s-io/k3s/pkg/agent/syssetup"
"github.com/k3s-io/k3s/pkg/agent/tunnel"
"github.com/k3s-io/k3s/pkg/cgroups"
"github.com/k3s-io/k3s/pkg/cli/cmds"
"github.com/k3s-io/k3s/pkg/clientaccess"
cp "github.com/k3s-io/k3s/pkg/cloudprovider"
"github.com/k3s-io/k3s/pkg/daemons/agent"
daemonconfig "github.com/k3s-io/k3s/pkg/daemons/config"
"github.com/k3s-io/k3s/pkg/daemons/executor"
"github.com/k3s-io/k3s/pkg/nodeconfig"
"github.com/k3s-io/k3s/pkg/rootless"
"github.com/k3s-io/k3s/pkg/util"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/rancher/k3s/pkg/agent/config"
"github.com/rancher/k3s/pkg/agent/containerd"
"github.com/rancher/k3s/pkg/agent/flannel"
"github.com/rancher/k3s/pkg/agent/netpol"
"github.com/rancher/k3s/pkg/agent/proxy"
"github.com/rancher/k3s/pkg/agent/syssetup"
"github.com/rancher/k3s/pkg/agent/tunnel"
"github.com/rancher/k3s/pkg/cgroups"
"github.com/rancher/k3s/pkg/cli/cmds"
"github.com/rancher/k3s/pkg/clientaccess"
cp "github.com/rancher/k3s/pkg/cloudprovider"
"github.com/rancher/k3s/pkg/daemons/agent"
daemonconfig "github.com/rancher/k3s/pkg/daemons/config"
"github.com/rancher/k3s/pkg/daemons/executor"
"github.com/rancher/k3s/pkg/nodeconfig"
"github.com/rancher/k3s/pkg/rootless"
"github.com/rancher/k3s/pkg/util"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
corev1 "k8s.io/api/core/v1" corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/equality" "k8s.io/apimachinery/pkg/api/equality"

5
pkg/agent/run_linux.go
Unescape View File

@ -1,3 +1,4 @@
//go:build linux
// +build linux // +build linux
package agent package agent
@ -7,8 +8,8 @@ import (
"os" "os"
"path/filepath" "path/filepath"
"github.com/rancher/k3s/pkg/cli/cmds" "github.com/k3s-io/k3s/pkg/cli/cmds"
"github.com/rancher/k3s/pkg/daemons/config" "github.com/k3s-io/k3s/pkg/daemons/config"
) )
const ( const (

5
pkg/agent/run_windows.go
Unescape View File

@ -1,3 +1,4 @@
//go:build windows
// +build windows // +build windows
package agent package agent
@ -8,8 +9,8 @@ import (
"path/filepath" "path/filepath"
"strings" "strings"
"github.com/rancher/k3s/pkg/cli/cmds" "github.com/k3s-io/k3s/pkg/cli/cmds"
"github.com/rancher/k3s/pkg/daemons/config" "github.com/k3s-io/k3s/pkg/daemons/config"
) )
const ( const (

2
pkg/agent/templates/templates.go
Unescape View File

@ -3,7 +3,7 @@ package templates
import ( import (
"github.com/rancher/wharfie/pkg/registries" "github.com/rancher/wharfie/pkg/registries"
"github.com/rancher/k3s/pkg/daemons/config" "github.com/k3s-io/k3s/pkg/daemons/config"
) )
type ContainerdRuntimeConfig struct { type ContainerdRuntimeConfig struct {

8
pkg/agent/tunnel/tunnel.go
Unescape View File

@ -10,10 +10,10 @@ import (
"time" "time"
"github.com/gorilla/websocket" "github.com/gorilla/websocket"
"github.com/rancher/k3s/pkg/agent/proxy" "github.com/k3s-io/k3s/pkg/agent/proxy"
"github.com/rancher/k3s/pkg/daemons/config" "github.com/k3s-io/k3s/pkg/daemons/config"
"github.com/rancher/k3s/pkg/util" "github.com/k3s-io/k3s/pkg/util"
"github.com/rancher/k3s/pkg/version" "github.com/k3s-io/k3s/pkg/version"
"github.com/rancher/remotedialer" "github.com/rancher/remotedialer"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
v1 "k8s.io/api/core/v1" v1 "k8s.io/api/core/v1"

8
pkg/apiaddresses/controller.go
Unescape View File

@ -5,10 +5,10 @@ import (
"context" "context"
"encoding/json" "encoding/json"
"github.com/rancher/k3s/pkg/daemons/config" "github.com/k3s-io/k3s/pkg/daemons/config"
"github.com/rancher/k3s/pkg/etcd" "github.com/k3s-io/k3s/pkg/etcd"
"github.com/rancher/k3s/pkg/util" "github.com/k3s-io/k3s/pkg/util"
"github.com/rancher/k3s/pkg/version" "github.com/k3s-io/k3s/pkg/version"
controllerv1 "github.com/rancher/wrangler/pkg/generated/controllers/core/v1" controllerv1 "github.com/rancher/wrangler/pkg/generated/controllers/core/v1"
clientv3 "go.etcd.io/etcd/client/v3" clientv3 "go.etcd.io/etcd/client/v3"
v1 "k8s.io/api/core/v1" v1 "k8s.io/api/core/v1"

2
pkg/apis/k3s.cattle.io/v1/zz_generated_register.go
Unescape View File

@ -21,7 +21,7 @@ limitations under the License.
package v1 package v1
import ( import (
k3s "github.com/rancher/k3s/pkg/apis/k3s.cattle.io" k3s "github.com/k3s-io/k3s/pkg/apis/k3s.cattle.io"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/runtime/schema"

2
pkg/authenticator/basicauth/basicauth.go
Unescape View File

@ -20,7 +20,7 @@ import (
"errors" "errors"
"net/http" "net/http"
localAuthenticator "github.com/rancher/k3s/pkg/authenticator" localAuthenticator "github.com/k3s-io/k3s/pkg/authenticator"
"k8s.io/apiserver/pkg/authentication/authenticator" "k8s.io/apiserver/pkg/authentication/authenticator"
) )

2
pkg/bootstrap/bootstrap.go
Unescape View File

@ -9,8 +9,8 @@ import (
"path/filepath" "path/filepath"
"time" "time"
"github.com/k3s-io/k3s/pkg/daemons/config"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/rancher/k3s/pkg/daemons/config"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
) )

2
pkg/bootstrap/bootstrap_test.go
Unescape View File

@ -3,7 +3,7 @@ package bootstrap
import ( import (
"testing" "testing"
"github.com/rancher/k3s/pkg/daemons/config" "github.com/k3s-io/k3s/pkg/daemons/config"
) )
func TestObjToMap(t *testing.T) { func TestObjToMap(t *testing.T) {

3
pkg/cgroups/cgroups_linux.go
Unescape View File

@ -1,3 +1,4 @@
//go:build linux
// +build linux // +build linux
package cgroups package cgroups
@ -13,7 +14,7 @@ import (
"github.com/containerd/cgroups" "github.com/containerd/cgroups"
cgroupsv2 "github.com/containerd/cgroups/v2" cgroupsv2 "github.com/containerd/cgroups/v2"
"github.com/rancher/k3s/pkg/version" "github.com/k3s-io/k3s/pkg/version"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
) )

12
pkg/cli/agent/agent.go
Unescape View File

@ -6,12 +6,12 @@ import (
"runtime" "runtime"
"github.com/erikdubbelboer/gspt" "github.com/erikdubbelboer/gspt"
"github.com/rancher/k3s/pkg/agent" "github.com/k3s-io/k3s/pkg/agent"
"github.com/rancher/k3s/pkg/cli/cmds" "github.com/k3s-io/k3s/pkg/cli/cmds"
"github.com/rancher/k3s/pkg/datadir" "github.com/k3s-io/k3s/pkg/datadir"
"github.com/rancher/k3s/pkg/netutil" "github.com/k3s-io/k3s/pkg/netutil"
"github.com/rancher/k3s/pkg/token" "github.com/k3s-io/k3s/pkg/token"
"github.com/rancher/k3s/pkg/version" "github.com/k3s-io/k3s/pkg/version"
"github.com/rancher/wrangler/pkg/signals" "github.com/rancher/wrangler/pkg/signals"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"github.com/urfave/cli" "github.com/urfave/cli"

12
pkg/cli/cert/cert.go
Unescape View File

@ -9,13 +9,13 @@ import (
"time" "time"
"github.com/erikdubbelboer/gspt" "github.com/erikdubbelboer/gspt"
"github.com/k3s-io/k3s/pkg/cli/cmds"
"github.com/k3s-io/k3s/pkg/daemons/config"
"github.com/k3s-io/k3s/pkg/daemons/control/deps"
"github.com/k3s-io/k3s/pkg/datadir"
"github.com/k3s-io/k3s/pkg/server"
"github.com/k3s-io/k3s/pkg/version"
"github.com/otiai10/copy" "github.com/otiai10/copy"
"github.com/rancher/k3s/pkg/cli/cmds"
"github.com/rancher/k3s/pkg/daemons/config"
"github.com/rancher/k3s/pkg/daemons/control/deps"
"github.com/rancher/k3s/pkg/datadir"
"github.com/rancher/k3s/pkg/server"
"github.com/rancher/k3s/pkg/version"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"github.com/urfave/cli" "github.com/urfave/cli"
) )

2
pkg/cli/cmds/agent.go
Unescape View File

@ -4,8 +4,8 @@ import (
"os" "os"
"path/filepath" "path/filepath"
"github.com/k3s-io/k3s/pkg/version"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/rancher/k3s/pkg/version"
"github.com/urfave/cli" "github.com/urfave/cli"
) )

2
pkg/cli/cmds/certs.go
Unescape View File

@ -1,7 +1,7 @@
package cmds package cmds
import ( import (
"github.com/rancher/k3s/pkg/version" "github.com/k3s-io/k3s/pkg/version"
"github.com/urfave/cli" "github.com/urfave/cli"
) )

2
pkg/cli/cmds/config.go
Unescape View File

@ -1,7 +1,7 @@
package cmds package cmds
import ( import (
"github.com/rancher/k3s/pkg/version" "github.com/k3s-io/k3s/pkg/version"
"github.com/urfave/cli" "github.com/urfave/cli"
) )

2
pkg/cli/cmds/etcd_snapshot.go
Unescape View File

@ -3,7 +3,7 @@ package cmds
import ( import (
"time" "time"
"github.com/rancher/k3s/pkg/version" "github.com/k3s-io/k3s/pkg/version"
"github.com/urfave/cli" "github.com/urfave/cli"
) )

3
pkg/cli/cmds/log_linux.go
Unescape View File

@ -1,3 +1,4 @@
//go:build linux && cgo
// +build linux,cgo // +build linux,cgo
package cmds package cmds
@ -11,9 +12,9 @@ import (
systemd "github.com/coreos/go-systemd/daemon" systemd "github.com/coreos/go-systemd/daemon"
"github.com/erikdubbelboer/gspt" "github.com/erikdubbelboer/gspt"
"github.com/k3s-io/k3s/pkg/version"
"github.com/natefinch/lumberjack" "github.com/natefinch/lumberjack"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/rancher/k3s/pkg/version"
"golang.org/x/sys/unix" "golang.org/x/sys/unix"
) )

2
pkg/cli/cmds/root.go
Unescape View File

@ -5,7 +5,7 @@ import (
"os" "os"
"runtime" "runtime"
"github.com/rancher/k3s/pkg/version" "github.com/k3s-io/k3s/pkg/version"
"github.com/urfave/cli" "github.com/urfave/cli"
) )

2
pkg/cli/cmds/secrets_encrypt.go
Unescape View File

@ -1,7 +1,7 @@
package cmds package cmds
import ( import (
"github.com/rancher/k3s/pkg/version" "github.com/k3s-io/k3s/pkg/version"
"github.com/urfave/cli" "github.com/urfave/cli"
) )

2
pkg/cli/cmds/server.go
Unescape View File

@ -5,7 +5,7 @@ import (
"sync" "sync"
"time" "time"
"github.com/rancher/k3s/pkg/version" "github.com/k3s-io/k3s/pkg/version"
"github.com/urfave/cli" "github.com/urfave/cli"
) )

2
pkg/cli/ctr/ctr.go
Unescape View File

@ -1,7 +1,7 @@
package ctr package ctr
import ( import (
"github.com/rancher/k3s/pkg/ctr" "github.com/k3s-io/k3s/pkg/ctr"
"github.com/urfave/cli" "github.com/urfave/cli"
) )

12
pkg/cli/etcdsnapshot/etcd_snapshot.go
Unescape View File

@ -11,12 +11,12 @@ import (
"time" "time"
"github.com/erikdubbelboer/gspt" "github.com/erikdubbelboer/gspt"
"github.com/rancher/k3s/pkg/cli/cmds" "github.com/k3s-io/k3s/pkg/cli/cmds"
"github.com/rancher/k3s/pkg/cluster" "github.com/k3s-io/k3s/pkg/cluster"
"github.com/rancher/k3s/pkg/daemons/config" "github.com/k3s-io/k3s/pkg/daemons/config"
"github.com/rancher/k3s/pkg/etcd" "github.com/k3s-io/k3s/pkg/etcd"
"github.com/rancher/k3s/pkg/server" "github.com/k3s-io/k3s/pkg/server"
util2 "github.com/rancher/k3s/pkg/util" util2 "github.com/k3s-io/k3s/pkg/util"
"github.com/rancher/wrangler/pkg/signals" "github.com/rancher/wrangler/pkg/signals"
"github.com/urfave/cli" "github.com/urfave/cli"
"gopkg.in/yaml.v2" "gopkg.in/yaml.v2"

2
pkg/cli/kubectl/kubectl.go
Unescape View File

@ -1,7 +1,7 @@
package kubectl package kubectl
import ( import (
"github.com/rancher/k3s/pkg/kubectl" "github.com/k3s-io/k3s/pkg/kubectl"
"github.com/urfave/cli" "github.com/urfave/cli"
) )

10
pkg/cli/secretsencrypt/secrets_encrypt.go
Unescape View File

@ -11,11 +11,11 @@ import (
"text/tabwriter" "text/tabwriter"
"github.com/erikdubbelboer/gspt" "github.com/erikdubbelboer/gspt"
"github.com/rancher/k3s/pkg/cli/cmds" "github.com/k3s-io/k3s/pkg/cli/cmds"
"github.com/rancher/k3s/pkg/clientaccess" "github.com/k3s-io/k3s/pkg/clientaccess"
"github.com/rancher/k3s/pkg/secretsencrypt" "github.com/k3s-io/k3s/pkg/secretsencrypt"
"github.com/rancher/k3s/pkg/server" "github.com/k3s-io/k3s/pkg/server"
"github.com/rancher/k3s/pkg/version" "github.com/k3s-io/k3s/pkg/version"
"github.com/urfave/cli" "github.com/urfave/cli"
"k8s.io/utils/pointer" "k8s.io/utils/pointer"
) )

26
pkg/cli/server/server.go
Unescape View File

@ -11,20 +11,20 @@ import (
systemd "github.com/coreos/go-systemd/daemon" systemd "github.com/coreos/go-systemd/daemon"
"github.com/erikdubbelboer/gspt" "github.com/erikdubbelboer/gspt"
"github.com/k3s-io/k3s/pkg/agent"
"github.com/k3s-io/k3s/pkg/agent/loadbalancer"
"github.com/k3s-io/k3s/pkg/cli/cmds"
"github.com/k3s-io/k3s/pkg/clientaccess"
"github.com/k3s-io/k3s/pkg/daemons/config"
"github.com/k3s-io/k3s/pkg/datadir"
"github.com/k3s-io/k3s/pkg/etcd"
"github.com/k3s-io/k3s/pkg/netutil"
"github.com/k3s-io/k3s/pkg/rootless"
"github.com/k3s-io/k3s/pkg/server"
"github.com/k3s-io/k3s/pkg/token"
"github.com/k3s-io/k3s/pkg/util"
"github.com/k3s-io/k3s/pkg/version"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/rancher/k3s/pkg/agent"
"github.com/rancher/k3s/pkg/agent/loadbalancer"
"github.com/rancher/k3s/pkg/cli/cmds"
"github.com/rancher/k3s/pkg/clientaccess"
"github.com/rancher/k3s/pkg/daemons/config"
"github.com/rancher/k3s/pkg/datadir"
"github.com/rancher/k3s/pkg/etcd"
"github.com/rancher/k3s/pkg/netutil"
"github.com/rancher/k3s/pkg/rootless"
"github.com/rancher/k3s/pkg/server"
"github.com/rancher/k3s/pkg/token"
"github.com/rancher/k3s/pkg/util"
"github.com/rancher/k3s/pkg/version"
"github.com/rancher/wrangler/pkg/signals" "github.com/rancher/wrangler/pkg/signals"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"github.com/urfave/cli" "github.com/urfave/cli"

4
pkg/clientaccess/token_test.go
Unescape View File

@ -11,10 +11,10 @@ import (
"testing" "testing"
"time" "time"
"github.com/k3s-io/k3s/pkg/bootstrap"
"github.com/k3s-io/k3s/pkg/daemons/config"
"github.com/rancher/dynamiclistener/cert" "github.com/rancher/dynamiclistener/cert"
"github.com/rancher/dynamiclistener/factory" "github.com/rancher/dynamiclistener/factory"
"github.com/rancher/k3s/pkg/bootstrap"
"github.com/rancher/k3s/pkg/daemons/config"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
) )

2
pkg/cloudprovider/cloudprovider.go
Unescape View File

@ -3,7 +3,7 @@ package cloudprovider
import ( import (
"io" "io"
"github.com/rancher/k3s/pkg/version" "github.com/k3s-io/k3s/pkg/version"
"k8s.io/client-go/informers" "k8s.io/client-go/informers"
informercorev1 "k8s.io/client-go/informers/core/v1" informercorev1 "k8s.io/client-go/informers/core/v1"
"k8s.io/client-go/tools/cache" "k8s.io/client-go/tools/cache"

2
pkg/cloudprovider/instances.go
Unescape View File

@ -5,8 +5,8 @@ import (
"fmt" "fmt"
"strings" "strings"
"github.com/k3s-io/k3s/pkg/version"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/rancher/k3s/pkg/version"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
corev1 "k8s.io/api/core/v1" corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/types"

10
pkg/cluster/bootstrap.go
Unescape View File

@ -15,15 +15,15 @@ import (
"strings" "strings"
"time" "time"
"github.com/k3s-io/k3s/pkg/bootstrap"
"github.com/k3s-io/k3s/pkg/clientaccess"
"github.com/k3s-io/k3s/pkg/daemons/config"
"github.com/k3s-io/k3s/pkg/etcd"
"github.com/k3s-io/k3s/pkg/version"
"github.com/k3s-io/kine/pkg/client" "github.com/k3s-io/kine/pkg/client"
"github.com/k3s-io/kine/pkg/endpoint" "github.com/k3s-io/kine/pkg/endpoint"
"github.com/otiai10/copy" "github.com/otiai10/copy"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/rancher/k3s/pkg/bootstrap"
"github.com/rancher/k3s/pkg/clientaccess"
"github.com/rancher/k3s/pkg/daemons/config"
"github.com/rancher/k3s/pkg/etcd"
"github.com/rancher/k3s/pkg/version"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
) )

8
pkg/cluster/bootstrap_test.go
Unescape View File

@ -8,10 +8,10 @@ import (
"testing" "testing"
"time" "time"
"github.com/rancher/k3s/pkg/bootstrap" "github.com/k3s-io/k3s/pkg/bootstrap"
"github.com/rancher/k3s/pkg/clientaccess" "github.com/k3s-io/k3s/pkg/clientaccess"
"github.com/rancher/k3s/pkg/cluster/managed" "github.com/k3s-io/k3s/pkg/cluster/managed"
"github.com/rancher/k3s/pkg/daemons/config" "github.com/k3s-io/k3s/pkg/daemons/config"
) )
func Test_isDirEmpty(t *testing.T) { func Test_isDirEmpty(t *testing.T) {

8
pkg/cluster/cluster.go
Unescape View File

@ -6,12 +6,12 @@ import (
"runtime" "runtime"
"strings" "strings"
"github.com/k3s-io/k3s/pkg/clientaccess"
"github.com/k3s-io/k3s/pkg/cluster/managed"
"github.com/k3s-io/k3s/pkg/daemons/config"
"github.com/k3s-io/k3s/pkg/etcd"
"github.com/k3s-io/kine/pkg/endpoint" "github.com/k3s-io/kine/pkg/endpoint"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/rancher/k3s/pkg/clientaccess"
"github.com/rancher/k3s/pkg/cluster/managed"
"github.com/rancher/k3s/pkg/daemons/config"
"github.com/rancher/k3s/pkg/etcd"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
) )

2
pkg/cluster/encrypt.go
Unescape View File

@ -12,7 +12,7 @@ import (
"io" "io"
"strings" "strings"
"github.com/rancher/k3s/pkg/token" "github.com/k3s-io/k3s/pkg/token"
"golang.org/x/crypto/pbkdf2" "golang.org/x/crypto/pbkdf2"
) )

4
pkg/cluster/etcd.go
Unescape View File

@ -1,8 +1,8 @@
package cluster package cluster
import ( import (
"github.com/rancher/k3s/pkg/cluster/managed" "github.com/k3s-io/k3s/pkg/cluster/managed"
"github.com/rancher/k3s/pkg/etcd" "github.com/k3s-io/k3s/pkg/etcd"
) )
func init() { func init() {

6
pkg/cluster/https.go
Unescape View File

@ -11,14 +11,14 @@ import (
"os" "os"
"path/filepath" "path/filepath"
"github.com/k3s-io/k3s/pkg/daemons/config"
"github.com/k3s-io/k3s/pkg/etcd"
"github.com/k3s-io/k3s/pkg/version"
"github.com/rancher/dynamiclistener" "github.com/rancher/dynamiclistener"
"github.com/rancher/dynamiclistener/factory" "github.com/rancher/dynamiclistener/factory"
"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/k3s/pkg/daemons/config"
"github.com/rancher/k3s/pkg/etcd"
"github.com/rancher/k3s/pkg/version"
"github.com/rancher/wrangler/pkg/generated/controllers/core" "github.com/rancher/wrangler/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"

8
pkg/cluster/managed.go
Unescape View File

@ -12,11 +12,11 @@ import (
"strings" "strings"
"time" "time"
"github.com/k3s-io/k3s/pkg/cluster/managed"
"github.com/k3s-io/k3s/pkg/etcd"
"github.com/k3s-io/k3s/pkg/nodepassword"
"github.com/k3s-io/k3s/pkg/version"
"github.com/k3s-io/kine/pkg/endpoint" "github.com/k3s-io/kine/pkg/endpoint"
"github.com/rancher/k3s/pkg/cluster/managed"
"github.com/rancher/k3s/pkg/etcd"
"github.com/rancher/k3s/pkg/nodepassword"
"github.com/rancher/k3s/pkg/version"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
apierrors "k8s.io/apimachinery/pkg/api/errors" apierrors "k8s.io/apimachinery/pkg/api/errors"
) )

4
pkg/cluster/managed/drivers.go
Unescape View File

@ -4,8 +4,8 @@ import (
"context" "context"
"net/http" "net/http"
"github.com/rancher/k3s/pkg/clientaccess" "github.com/k3s-io/k3s/pkg/clientaccess"
"github.com/rancher/k3s/pkg/daemons/config" "github.com/k3s-io/k3s/pkg/daemons/config"
) )
var ( var (

6
pkg/cluster/storage.go
Unescape View File

@ -9,10 +9,10 @@ import (
"path/filepath" "path/filepath"
"strings" "strings"
"github.com/k3s-io/k3s/pkg/bootstrap"
"github.com/k3s-io/k3s/pkg/clientaccess"
"github.com/k3s-io/k3s/pkg/daemons/config"
"github.com/k3s-io/kine/pkg/client" "github.com/k3s-io/kine/pkg/client"
"github.com/rancher/k3s/pkg/bootstrap"
"github.com/rancher/k3s/pkg/clientaccess"
"github.com/rancher/k3s/pkg/daemons/config"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
) )

6
pkg/codegen/main.go
Unescape View File

@ -4,14 +4,14 @@ import (
"os" "os"
bindata "github.com/go-bindata/go-bindata" bindata "github.com/go-bindata/go-bindata"
v1 "github.com/rancher/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/pkg/controller-gen"
"github.com/rancher/wrangler/pkg/controller-gen/args" "github.com/rancher/wrangler/pkg/controller-gen/args"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
) )
var ( var (
basePackage = "github.com/rancher/k3s/types" basePackage = "github.com/k3s-io/k3s/types"
) )
func main() { func main() {
@ -68,7 +68,7 @@ func main() {
} }
controllergen.Run(args.Options{ controllergen.Run(args.Options{
OutputPackage: "github.com/rancher/k3s/pkg/generated", OutputPackage: "github.com/k3s-io/k3s/pkg/generated",
Boilerplate: "scripts/boilerplate.go.txt", Boilerplate: "scripts/boilerplate.go.txt",
Groups: map[string]args.Group{ Groups: map[string]args.Group{
"k3s.cattle.io": { "k3s.cattle.io": {

4
pkg/configfilearg/defaultparser.go
Unescape View File

@ -1,8 +1,8 @@
package configfilearg package configfilearg
import ( import (
"github.com/rancher/k3s/pkg/cli/cmds" "github.com/k3s-io/k3s/pkg/cli/cmds"
"github.com/rancher/k3s/pkg/version" "github.com/k3s-io/k3s/pkg/version"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"github.com/urfave/cli" "github.com/urfave/cli"
) )

2
pkg/configfilearg/parser.go
Unescape View File

@ -11,7 +11,7 @@ import (
"strconv" "strconv"
"strings" "strings"
"github.com/rancher/k3s/pkg/agent/util" "github.com/k3s-io/k3s/pkg/agent/util"
"github.com/rancher/wrangler/pkg/data/convert" "github.com/rancher/wrangler/pkg/data/convert"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"github.com/urfave/cli" "github.com/urfave/cli"

3
pkg/containerd/utility_windows.go
Unescape View File

@ -1,10 +1,11 @@
//go:build windows
// +build windows // +build windows
package containerd package containerd
import ( import (
util2 "github.com/k3s-io/k3s/pkg/util"
"github.com/pkg/errors" "github.com/pkg/errors"
util2 "github.com/rancher/k3s/pkg/util"
) )
func OverlaySupported(root string) error { func OverlaySupported(root string) error {

8
pkg/daemons/agent/agent.go
Unescape View File

@ -6,10 +6,10 @@ import (
"os" "os"
"time" "time"
"github.com/rancher/k3s/pkg/agent/config" "github.com/k3s-io/k3s/pkg/agent/config"
"github.com/rancher/k3s/pkg/agent/proxy" "github.com/k3s-io/k3s/pkg/agent/proxy"
daemonconfig "github.com/rancher/k3s/pkg/daemons/config" daemonconfig "github.com/k3s-io/k3s/pkg/daemons/config"
"github.com/rancher/k3s/pkg/daemons/executor" "github.com/k3s-io/k3s/pkg/daemons/executor"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"k8s.io/component-base/logs" "k8s.io/component-base/logs"
_ "k8s.io/component-base/metrics/prometheus/restclient" // for client metric registration _ "k8s.io/component-base/metrics/prometheus/restclient" // for client metric registration

7
pkg/daemons/agent/agent_linux.go
Unescape View File

@ -1,3 +1,4 @@
//go:build linux
// +build linux // +build linux
package agent package agent
@ -7,10 +8,10 @@ import (
"path/filepath" "path/filepath"
"strings" "strings"
"github.com/k3s-io/k3s/pkg/cgroups"
"github.com/k3s-io/k3s/pkg/daemons/config"
"github.com/k3s-io/k3s/pkg/util"
"github.com/opencontainers/runc/libcontainer/userns" "github.com/opencontainers/runc/libcontainer/userns"
"github.com/rancher/k3s/pkg/cgroups"
"github.com/rancher/k3s/pkg/daemons/config"
"github.com/rancher/k3s/pkg/util"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"golang.org/x/sys/unix" "golang.org/x/sys/unix"
"k8s.io/apimachinery/pkg/util/net" "k8s.io/apimachinery/pkg/util/net"

5
pkg/daemons/agent/agent_windows.go
Unescape View File

@ -1,3 +1,4 @@
//go:build windows
// +build windows // +build windows
package agent package agent
@ -9,8 +10,8 @@ import (
"time" "time"
"github.com/Microsoft/hcsshim" "github.com/Microsoft/hcsshim"
"github.com/rancher/k3s/pkg/daemons/config" "github.com/k3s-io/k3s/pkg/daemons/config"
"github.com/rancher/k3s/pkg/util" "github.com/k3s-io/k3s/pkg/util"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"k8s.io/apimachinery/pkg/util/net" "k8s.io/apimachinery/pkg/util/net"
"k8s.io/kubernetes/pkg/kubeapiserver/authorizer/modes" "k8s.io/kubernetes/pkg/kubeapiserver/authorizer/modes"

3
pkg/daemons/agent/agent_windows_test.go
Unescape View File

@ -1,3 +1,4 @@
//go:build windows
// +build windows // +build windows
package agent package agent
@ -5,7 +6,7 @@ package agent
import ( import (
"testing" "testing"
"github.com/rancher/k3s/pkg/daemons/config" "github.com/k3s-io/k3s/pkg/daemons/config"
) )
func TestCheckRuntimeEndpoint(t *testing.T) { func TestCheckRuntimeEndpoint(t *testing.T) {

4
pkg/daemons/control/auth.go
Unescape View File

@ -1,8 +1,8 @@
package control package control
import ( import (
"github.com/rancher/k3s/pkg/authenticator/basicauth" "github.com/k3s-io/k3s/pkg/authenticator/basicauth"
"github.com/rancher/k3s/pkg/authenticator/passwordfile" "github.com/k3s-io/k3s/pkg/authenticator/passwordfile"
"k8s.io/apiserver/pkg/authentication/authenticator" "k8s.io/apiserver/pkg/authentication/authenticator"
"k8s.io/apiserver/pkg/authentication/group" "k8s.io/apiserver/pkg/authentication/group"
"k8s.io/apiserver/pkg/authentication/request/union" "k8s.io/apiserver/pkg/authentication/request/union"

10
pkg/daemons/control/deps/deps.go vendored
Unescape View File

@ -18,12 +18,12 @@ import (
"text/template" "text/template"
"time" "time"
"github.com/k3s-io/k3s/pkg/clientaccess"
"github.com/k3s-io/k3s/pkg/daemons/config"
"github.com/k3s-io/k3s/pkg/passwd"
"github.com/k3s-io/k3s/pkg/token"
"github.com/k3s-io/k3s/pkg/version"
certutil "github.com/rancher/dynamiclistener/cert" certutil "github.com/rancher/dynamiclistener/cert"
"github.com/rancher/k3s/pkg/clientaccess"
"github.com/rancher/k3s/pkg/daemons/config"
"github.com/rancher/k3s/pkg/passwd"
"github.com/rancher/k3s/pkg/token"
"github.com/rancher/k3s/pkg/version"
"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/sets" "k8s.io/apimachinery/pkg/util/sets"

12
pkg/daemons/control/server.go
Unescape View File

@ -10,13 +10,13 @@ import (
"strings" "strings"
"time" "time"
"github.com/k3s-io/k3s/pkg/cluster"
"github.com/k3s-io/k3s/pkg/daemons/config"
"github.com/k3s-io/k3s/pkg/daemons/control/deps"
"github.com/k3s-io/k3s/pkg/daemons/executor"
"github.com/k3s-io/k3s/pkg/util"
"github.com/k3s-io/k3s/pkg/version"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/rancher/k3s/pkg/cluster"
"github.com/rancher/k3s/pkg/daemons/config"
"github.com/rancher/k3s/pkg/daemons/control/deps"
"github.com/rancher/k3s/pkg/daemons/executor"
"github.com/rancher/k3s/pkg/util"
"github.com/rancher/k3s/pkg/version"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
authorizationv1 "k8s.io/api/authorization/v1" authorizationv1 "k8s.io/api/authorization/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

9
pkg/daemons/executor/embed.go
Unescape View File

@ -1,3 +1,4 @@
//go:build !no_embedded_executor
// +build !no_embedded_executor // +build !no_embedded_executor
package executor package executor
@ -9,9 +10,9 @@ import (
"net/http" "net/http"
"runtime" "runtime"
"github.com/rancher/k3s/pkg/cli/cmds" "github.com/k3s-io/k3s/pkg/cli/cmds"
daemonconfig "github.com/rancher/k3s/pkg/daemons/config" daemonconfig "github.com/k3s-io/k3s/pkg/daemons/config"
"github.com/rancher/k3s/pkg/version" "github.com/k3s-io/k3s/pkg/version"
"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"
@ -34,7 +35,7 @@ import (
kubelet "k8s.io/kubernetes/cmd/kubelet/app" kubelet "k8s.io/kubernetes/cmd/kubelet/app"
// registering k3s cloud provider // registering k3s cloud provider
_ "github.com/rancher/k3s/pkg/cloudprovider" _ "github.com/k3s-io/k3s/pkg/cloudprovider"
) )
func init() { func init() {

4
pkg/daemons/executor/etcd.go
Unescape View File

@ -6,8 +6,8 @@ import (
"io/ioutil" "io/ioutil"
"path/filepath" "path/filepath"
daemonconfig "github.com/rancher/k3s/pkg/daemons/config" daemonconfig "github.com/k3s-io/k3s/pkg/daemons/config"
"github.com/rancher/k3s/pkg/version" "github.com/k3s-io/k3s/pkg/version"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"go.etcd.io/etcd/server/v3/embed" "go.etcd.io/etcd/server/v3/embed"
"go.etcd.io/etcd/server/v3/etcdserver/api/rafthttp" "go.etcd.io/etcd/server/v3/etcdserver/api/rafthttp"

4
pkg/daemons/executor/executor.go
Unescape View File

@ -10,8 +10,8 @@ import (
"strings" "strings"
"time" "time"
"github.com/rancher/k3s/pkg/cli/cmds" "github.com/k3s-io/k3s/pkg/cli/cmds"
daemonconfig "github.com/rancher/k3s/pkg/daemons/config" daemonconfig "github.com/k3s-io/k3s/pkg/daemons/config"
yaml2 "gopkg.in/yaml.v2" yaml2 "gopkg.in/yaml.v2"
"k8s.io/apiserver/pkg/authentication/authenticator" "k8s.io/apiserver/pkg/authentication/authenticator"
"sigs.k8s.io/yaml" "sigs.k8s.io/yaml"

2
pkg/datadir/datadir.go
Unescape View File

@ -4,8 +4,8 @@ import (
"os" "os"
"path/filepath" "path/filepath"
"github.com/k3s-io/k3s/pkg/version"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/rancher/k3s/pkg/version"
"github.com/rancher/wrangler/pkg/resolvehome" "github.com/rancher/wrangler/pkg/resolvehome"
) )

8
pkg/deploy/controller.go
Unescape View File

@ -14,11 +14,11 @@ import (
"strings" "strings"
"time" "time"
"github.com/k3s-io/k3s/pkg/agent/util"
apisv1 "github.com/k3s-io/k3s/pkg/apis/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"
errors2 "github.com/pkg/errors" errors2 "github.com/pkg/errors"
"github.com/rancher/k3s/pkg/agent/util"
apisv1 "github.com/rancher/k3s/pkg/apis/k3s.cattle.io/v1"
controllersv1 "github.com/rancher/k3s/pkg/generated/controllers/k3s.cattle.io/v1"
pkgutil "github.com/rancher/k3s/pkg/util"
"github.com/rancher/wrangler/pkg/apply" "github.com/rancher/wrangler/pkg/apply"
"github.com/rancher/wrangler/pkg/merr" "github.com/rancher/wrangler/pkg/merr"
"github.com/rancher/wrangler/pkg/objectset" "github.com/rancher/wrangler/pkg/objectset"

10
pkg/etcd/etcd.go
Unescape View File

@ -22,17 +22,17 @@ import (
"github.com/google/uuid" "github.com/google/uuid"
"github.com/gorilla/mux" "github.com/gorilla/mux"
"github.com/k3s-io/k3s/pkg/clientaccess"
"github.com/k3s-io/k3s/pkg/daemons/config"
"github.com/k3s-io/k3s/pkg/daemons/control/deps"
"github.com/k3s-io/k3s/pkg/daemons/executor"
"github.com/k3s-io/k3s/pkg/version"
"github.com/k3s-io/kine/pkg/client" "github.com/k3s-io/kine/pkg/client"
endpoint2 "github.com/k3s-io/kine/pkg/endpoint" endpoint2 "github.com/k3s-io/kine/pkg/endpoint"
"github.com/minio/minio-go/v7" "github.com/minio/minio-go/v7"
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"
"github.com/rancher/k3s/pkg/clientaccess"
"github.com/rancher/k3s/pkg/daemons/config"
"github.com/rancher/k3s/pkg/daemons/control/deps"
"github.com/rancher/k3s/pkg/daemons/executor"
"github.com/rancher/k3s/pkg/version"
controllerv1 "github.com/rancher/wrangler/pkg/generated/controllers/core/v1" controllerv1 "github.com/rancher/wrangler/pkg/generated/controllers/core/v1"
"github.com/robfig/cron/v3" "github.com/robfig/cron/v3"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"

6
pkg/etcd/etcd_test.go
Unescape View File

@ -9,9 +9,9 @@ import (
"testing" "testing"
"time" "time"
"github.com/rancher/k3s/pkg/clientaccess" "github.com/k3s-io/k3s/pkg/clientaccess"
"github.com/rancher/k3s/pkg/daemons/config" "github.com/k3s-io/k3s/pkg/daemons/config"
testutil "github.com/rancher/k3s/tests/util" testutil "github.com/k3s-io/k3s/tests/util"
"github.com/robfig/cron/v3" "github.com/robfig/cron/v3"
clientv3 "go.etcd.io/etcd/client/v3" clientv3 "go.etcd.io/etcd/client/v3"
"go.etcd.io/etcd/server/v3/etcdserver" "go.etcd.io/etcd/server/v3/etcdserver"

2
pkg/etcd/etcdproxy.go
Unescape View File

@ -4,8 +4,8 @@ import (
"context" "context"
"net/url" "net/url"
"github.com/k3s-io/k3s/pkg/agent/loadbalancer"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/rancher/k3s/pkg/agent/loadbalancer"
) )
type Proxy interface { type Proxy interface {

2
pkg/etcd/member_controller.go
Unescape View File

@ -5,7 +5,7 @@ import (
"fmt" "fmt"
"strings" "strings"
"github.com/rancher/k3s/pkg/version" "github.com/k3s-io/k3s/pkg/version"
controllerv1 "github.com/rancher/wrangler/pkg/generated/controllers/core/v1" controllerv1 "github.com/rancher/wrangler/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"

2
pkg/etcd/s3.go
Unescape View File

@ -16,10 +16,10 @@ import (
"strings" "strings"
"time" "time"
"github.com/k3s-io/k3s/pkg/daemons/config"
"github.com/minio/minio-go/v7" "github.com/minio/minio-go/v7"
"github.com/minio/minio-go/v7/pkg/credentials" "github.com/minio/minio-go/v7/pkg/credentials"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/rancher/k3s/pkg/daemons/config"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
) )

5
pkg/flock/flock_int_test.go
Unescape View File

@ -1,11 +1,14 @@
//go:build linux || darwin || freebsd || openbsd || netbsd || dragonfly
// +build linux darwin freebsd openbsd netbsd dragonfly
package flock_test package flock_test
import ( import (
"testing" "testing"
"github.com/k3s-io/k3s/pkg/flock"
. "github.com/onsi/ginkgo/v2" . "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega" . "github.com/onsi/gomega"
"github.com/rancher/k3s/pkg/flock"
) )
const lockfile = "/tmp/testlock.test" const lockfile = "/tmp/testlock.test"

12
pkg/flock/flock_other.go
Unescape View File

@ -1,3 +1,4 @@
//go:build !linux && !darwin && !freebsd && !openbsd && !netbsd && !dragonfly
// +build !linux,!darwin,!freebsd,!openbsd,!netbsd,!dragonfly // +build !linux,!darwin,!freebsd,!openbsd,!netbsd,!dragonfly
/* /*
@ -23,7 +24,18 @@ func Acquire(path string) (int, error) {
return -1, nil return -1, nil
} }
// AcquireShared creates a shared lock on a file for the duration of the process, or until Release(d).
// This method is reentrant.
func AcquireShared(path string) (int, error) {
return 0, nil
}
// Release is not implemented on non-unix systems. // Release is not implemented on non-unix systems.
func Release(lock int) error { func Release(lock int) error {
return nil return nil
} }
// CheckLock checks whether any process is using the lock
func CheckLock(path string) bool {
return false
}

2
pkg/generated/clientset/versioned/clientset.go
Unescape View File

@ -22,7 +22,7 @@ import (
"fmt" "fmt"
"net/http" "net/http"
k3sv1 "github.com/rancher/k3s/pkg/generated/clientset/versioned/typed/k3s.cattle.io/v1" k3sv1 "github.com/k3s-io/k3s/pkg/generated/clientset/versioned/typed/k3s.cattle.io/v1"
discovery "k8s.io/client-go/discovery" discovery "k8s.io/client-go/discovery"
rest "k8s.io/client-go/rest" rest "k8s.io/client-go/rest"
flowcontrol "k8s.io/client-go/util/flowcontrol" flowcontrol "k8s.io/client-go/util/flowcontrol"

6
pkg/generated/clientset/versioned/fake/clientset_generated.go
Unescape View File

@ -19,9 +19,9 @@ limitations under the License.
package fake package fake
import ( import (
clientset "github.com/rancher/k3s/pkg/generated/clientset/versioned" clientset "github.com/k3s-io/k3s/pkg/generated/clientset/versioned"
k3sv1 "github.com/rancher/k3s/pkg/generated/clientset/versioned/typed/k3s.cattle.io/v1" k3sv1 "github.com/k3s-io/k3s/pkg/generated/clientset/versioned/typed/k3s.cattle.io/v1"
fakek3sv1 "github.com/rancher/k3s/pkg/generated/clientset/versioned/typed/k3s.cattle.io/v1/fake" fakek3sv1 "github.com/k3s-io/k3s/pkg/generated/clientset/versioned/typed/k3s.cattle.io/v1/fake"
"k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/watch" "k8s.io/apimachinery/pkg/watch"
"k8s.io/client-go/discovery" "k8s.io/client-go/discovery"

2
pkg/generated/clientset/versioned/fake/register.go
Unescape View File

@ -19,7 +19,7 @@ limitations under the License.
package fake package fake
import ( import (
k3sv1 "github.com/rancher/k3s/pkg/apis/k3s.cattle.io/v1" k3sv1 "github.com/k3s-io/k3s/pkg/apis/k3s.cattle.io/v1"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
runtime "k8s.io/apimachinery/pkg/runtime" runtime "k8s.io/apimachinery/pkg/runtime"
schema "k8s.io/apimachinery/pkg/runtime/schema" schema "k8s.io/apimachinery/pkg/runtime/schema"

2
pkg/generated/clientset/versioned/scheme/register.go
Unescape View File

@ -19,7 +19,7 @@ limitations under the License.
package scheme package scheme
import ( import (
k3sv1 "github.com/rancher/k3s/pkg/apis/k3s.cattle.io/v1" k3sv1 "github.com/k3s-io/k3s/pkg/apis/k3s.cattle.io/v1"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
runtime "k8s.io/apimachinery/pkg/runtime" runtime "k8s.io/apimachinery/pkg/runtime"
schema "k8s.io/apimachinery/pkg/runtime/schema" schema "k8s.io/apimachinery/pkg/runtime/schema"

4
pkg/generated/clientset/versioned/typed/k3s.cattle.io/v1/addon.go
Unescape View File

@ -22,8 +22,8 @@ import (
"context" "context"
"time" "time"
v1 "github.com/rancher/k3s/pkg/apis/k3s.cattle.io/v1" v1 "github.com/k3s-io/k3s/pkg/apis/k3s.cattle.io/v1"
scheme "github.com/rancher/k3s/pkg/generated/clientset/versioned/scheme" scheme "github.com/k3s-io/k3s/pkg/generated/clientset/versioned/scheme"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
types "k8s.io/apimachinery/pkg/types" types "k8s.io/apimachinery/pkg/types"
watch "k8s.io/apimachinery/pkg/watch" watch "k8s.io/apimachinery/pkg/watch"

Some files were not shown because too many files have changed in this diff Show More

Write Preview
Loading…
Cancel
Save