From b2e969f6df6d28203526ca6f69f433ae245c2f2b Mon Sep 17 00:00:00 2001 From: Brian Downs Date: Tue, 13 Jun 2023 16:45:46 -0700 Subject: [PATCH] update package refs Signed-off-by: Brian Downs --- Dockerfile.dapper | 2 +- README.md | 4 ++-- cli/cmds/cluster/cluster.go | 2 +- cli/cmds/cluster/create.go | 6 +++--- cli/main.go | 6 +++--- go.mod | 2 +- hack/update-codegen.sh | 4 ++-- main.go | 4 ++-- pkg/apis/k3k.io/v1alpha1/register.go | 2 +- pkg/controller/addressallocator/controller.go | 2 +- pkg/controller/cluster/agent/agent.go | 4 ++-- pkg/controller/cluster/cidr_allocation.go | 4 ++-- pkg/controller/cluster/config/agent.go | 4 ++-- pkg/controller/cluster/config/server.go | 4 ++-- pkg/controller/cluster/controller.go | 10 +++++----- pkg/controller/cluster/server/ingress.go | 4 ++-- pkg/controller/cluster/server/kubeconfig.go | 4 ++-- pkg/controller/cluster/server/server.go | 4 ++-- pkg/controller/cluster/server/service.go | 4 ++-- pkg/controller/util/util.go | 2 +- 20 files changed, 39 insertions(+), 39 deletions(-) diff --git a/Dockerfile.dapper b/Dockerfile.dapper index d11e49c..6153e76 100644 --- a/Dockerfile.dapper +++ b/Dockerfile.dapper @@ -11,7 +11,7 @@ RUN if [ "${ARCH}" == "amd64" ]; then \ ENV GO111MODULE on ENV DAPPER_ENV REPO TAG DRONE_TAG CROSS -ENV DAPPER_SOURCE /go/src/github.com/galal-hussein/k3k/ +ENV DAPPER_SOURCE /go/src/github.com/rancher/k3k/ ENV DAPPER_OUTPUT ./bin ./dist ENV DAPPER_DOCKER_SOCKET true ENV HOME ${DAPPER_SOURCE} diff --git a/README.md b/README.md index f84b117..3a6260c 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ Helm's [documentation](https://helm.sh/docs) to get started. Once Helm has been set up correctly, add the repo as follows: ``` - helm repo add k3k https://galal-hussein.github.io/k3k + helm repo add k3k https://rancher.github.io/k3k ``` If you had already added this repo earlier, run `helm repo update` to retrieve @@ -41,7 +41,7 @@ To uninstall the chart: To create a new cluster you need to install and run the cli or create a cluster object, to install the cli: ``` -wget https://github.com/galal-hussein/k3k/releases/download/v0.0.0-alpha2/k3kcli +wget https://github.com/rancher/k3k/releases/download/v0.0.0-alpha2/k3kcli chmod +x k3kcli sudo cp k3kcli /usr/local/bin ``` diff --git a/cli/cmds/cluster/cluster.go b/cli/cmds/cluster/cluster.go index d8146a5..38b109b 100644 --- a/cli/cmds/cluster/cluster.go +++ b/cli/cmds/cluster/cluster.go @@ -1,7 +1,7 @@ package cluster import ( - "github.com/galal-hussein/k3k/cli/cmds" + "github.com/rancher/k3k/cli/cmds" "github.com/urfave/cli" ) diff --git a/cli/cmds/cluster/create.go b/cli/cmds/cluster/create.go index ef9e5e3..fae3e79 100644 --- a/cli/cmds/cluster/create.go +++ b/cli/cmds/cluster/create.go @@ -10,9 +10,9 @@ import ( "strings" "time" - "github.com/galal-hussein/k3k/cli/cmds" - "github.com/galal-hussein/k3k/pkg/apis/k3k.io/v1alpha1" - "github.com/galal-hussein/k3k/pkg/controller/util" + "github.com/rancher/k3k/cli/cmds" + "github.com/rancher/k3k/pkg/apis/k3k.io/v1alpha1" + "github.com/rancher/k3k/pkg/controller/util" "github.com/sirupsen/logrus" "github.com/urfave/cli" v1 "k8s.io/api/core/v1" diff --git a/cli/main.go b/cli/main.go index 3a20669..c5edc7b 100644 --- a/cli/main.go +++ b/cli/main.go @@ -3,9 +3,9 @@ package main import ( "os" - "github.com/galal-hussein/k3k/cli/cmds" - "github.com/galal-hussein/k3k/cli/cmds/cluster" - "github.com/galal-hussein/k3k/pkg/version" + "github.com/rancher/k3k/cli/cmds" + "github.com/rancher/k3k/cli/cmds/cluster" + "github.com/rancher/k3k/pkg/version" "github.com/sirupsen/logrus" "github.com/urfave/cli" ) diff --git a/go.mod b/go.mod index 29f114c..8f51595 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/galal-hussein/k3k +module github.com/rancher/k3k go 1.19 diff --git a/hack/update-codegen.sh b/hack/update-codegen.sh index 18aade5..f22dde4 100755 --- a/hack/update-codegen.sh +++ b/hack/update-codegen.sh @@ -12,8 +12,8 @@ CODEGEN_PKG=./code-generator "${CODEGEN_PKG}/generate-groups.sh" \ "deepcopy" \ - github.com/galal-hussein/k3k/pkg/generated \ - github.com/galal-hussein/k3k/pkg/apis \ + github.com/rancher/k3k/pkg/generated \ + github.com/rancher/k3k/pkg/apis \ "k3k.io:v1alpha1" \ --go-header-file "${SCRIPT_ROOT}"/hack/boilerplate.go.txt \ --output-base "$(dirname "${BASH_SOURCE[0]}")/../../../.." diff --git a/main.go b/main.go index 55632a7..7133a57 100644 --- a/main.go +++ b/main.go @@ -5,8 +5,8 @@ import ( "context" "flag" - "github.com/galal-hussein/k3k/pkg/apis/k3k.io/v1alpha1" - "github.com/galal-hussein/k3k/pkg/controller/cluster" + "github.com/rancher/k3k/pkg/apis/k3k.io/v1alpha1" + "github.com/rancher/k3k/pkg/controller/cluster" "k8s.io/apimachinery/pkg/runtime" clientgoscheme "k8s.io/client-go/kubernetes/scheme" "k8s.io/client-go/tools/clientcmd" diff --git a/pkg/apis/k3k.io/v1alpha1/register.go b/pkg/apis/k3k.io/v1alpha1/register.go index de00c52..bb8a099 100644 --- a/pkg/apis/k3k.io/v1alpha1/register.go +++ b/pkg/apis/k3k.io/v1alpha1/register.go @@ -1,7 +1,7 @@ package v1alpha1 import ( - k3k "github.com/galal-hussein/k3k/pkg/apis/k3k.io" + k3k "github.com/rancher/k3k/pkg/apis/k3k.io" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/pkg/controller/addressallocator/controller.go b/pkg/controller/addressallocator/controller.go index 5239d56..9338596 100644 --- a/pkg/controller/addressallocator/controller.go +++ b/pkg/controller/addressallocator/controller.go @@ -3,7 +3,7 @@ package addressallocator import ( "context" - "github.com/galal-hussein/k3k/pkg/apis/k3k.io/v1alpha1" + "github.com/rancher/k3k/pkg/apis/k3k.io/v1alpha1" "k8s.io/apimachinery/pkg/runtime" "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/controller" diff --git a/pkg/controller/cluster/agent/agent.go b/pkg/controller/cluster/agent/agent.go index 9f510f2..36b5cef 100644 --- a/pkg/controller/cluster/agent/agent.go +++ b/pkg/controller/cluster/agent/agent.go @@ -3,8 +3,8 @@ package agent import ( "strings" - "github.com/galal-hussein/k3k/pkg/apis/k3k.io/v1alpha1" - "github.com/galal-hussein/k3k/pkg/controller/util" + "github.com/rancher/k3k/pkg/apis/k3k.io/v1alpha1" + "github.com/rancher/k3k/pkg/controller/util" apps "k8s.io/api/apps/v1" v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/controller/cluster/cidr_allocation.go b/pkg/controller/cluster/cidr_allocation.go index db6e507..dd408a7 100644 --- a/pkg/controller/cluster/cidr_allocation.go +++ b/pkg/controller/cluster/cidr_allocation.go @@ -6,8 +6,8 @@ import ( "net" "time" - "github.com/galal-hussein/k3k/pkg/apis/k3k.io/v1alpha1" - "github.com/galal-hussein/k3k/pkg/controller/util" + "github.com/rancher/k3k/pkg/apis/k3k.io/v1alpha1" + "github.com/rancher/k3k/pkg/controller/util" "k8s.io/apimachinery/pkg/types" ) diff --git a/pkg/controller/cluster/config/agent.go b/pkg/controller/cluster/config/agent.go index 7780461..43113c6 100644 --- a/pkg/controller/cluster/config/agent.go +++ b/pkg/controller/cluster/config/agent.go @@ -3,8 +3,8 @@ package config import ( "fmt" - "github.com/galal-hussein/k3k/pkg/apis/k3k.io/v1alpha1" - "github.com/galal-hussein/k3k/pkg/controller/util" + "github.com/rancher/k3k/pkg/apis/k3k.io/v1alpha1" + "github.com/rancher/k3k/pkg/controller/util" v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/pkg/controller/cluster/config/server.go b/pkg/controller/cluster/config/server.go index 3c0e650..817fc03 100644 --- a/pkg/controller/cluster/config/server.go +++ b/pkg/controller/cluster/config/server.go @@ -1,8 +1,8 @@ package config import ( - "github.com/galal-hussein/k3k/pkg/apis/k3k.io/v1alpha1" - "github.com/galal-hussein/k3k/pkg/controller/util" + "github.com/rancher/k3k/pkg/apis/k3k.io/v1alpha1" + "github.com/rancher/k3k/pkg/controller/util" v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/pkg/controller/cluster/controller.go b/pkg/controller/cluster/controller.go index ae92d2f..8ee28e8 100644 --- a/pkg/controller/cluster/controller.go +++ b/pkg/controller/cluster/controller.go @@ -3,11 +3,11 @@ package cluster import ( "context" - "github.com/galal-hussein/k3k/pkg/apis/k3k.io/v1alpha1" - "github.com/galal-hussein/k3k/pkg/controller/cluster/agent" - "github.com/galal-hussein/k3k/pkg/controller/cluster/config" - "github.com/galal-hussein/k3k/pkg/controller/cluster/server" - "github.com/galal-hussein/k3k/pkg/controller/util" + "github.com/rancher/k3k/pkg/apis/k3k.io/v1alpha1" + "github.com/rancher/k3k/pkg/controller/cluster/agent" + "github.com/rancher/k3k/pkg/controller/cluster/config" + "github.com/rancher/k3k/pkg/controller/cluster/server" + "github.com/rancher/k3k/pkg/controller/util" v1 "k8s.io/api/core/v1" apierrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/controller/cluster/server/ingress.go b/pkg/controller/cluster/server/ingress.go index 064662b..94e5e6a 100644 --- a/pkg/controller/cluster/server/ingress.go +++ b/pkg/controller/cluster/server/ingress.go @@ -3,8 +3,8 @@ package server import ( "context" - "github.com/galal-hussein/k3k/pkg/apis/k3k.io/v1alpha1" - "github.com/galal-hussein/k3k/pkg/controller/util" + "github.com/rancher/k3k/pkg/apis/k3k.io/v1alpha1" + "github.com/rancher/k3k/pkg/controller/util" networkingv1 "k8s.io/api/networking/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/controller-runtime/pkg/client" diff --git a/pkg/controller/cluster/server/kubeconfig.go b/pkg/controller/cluster/server/kubeconfig.go index bbcce28..60a85ca 100644 --- a/pkg/controller/cluster/server/kubeconfig.go +++ b/pkg/controller/cluster/server/kubeconfig.go @@ -11,9 +11,9 @@ import ( "net/http" "time" - "github.com/galal-hussein/k3k/pkg/apis/k3k.io/v1alpha1" - "github.com/galal-hussein/k3k/pkg/controller/util" certutil "github.com/rancher/dynamiclistener/cert" + "github.com/rancher/k3k/pkg/apis/k3k.io/v1alpha1" + "github.com/rancher/k3k/pkg/controller/util" v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apiserver/pkg/authentication/user" diff --git a/pkg/controller/cluster/server/server.go b/pkg/controller/cluster/server/server.go index d0a2b13..5d90d5d 100644 --- a/pkg/controller/cluster/server/server.go +++ b/pkg/controller/cluster/server/server.go @@ -4,8 +4,8 @@ import ( "strconv" "strings" - "github.com/galal-hussein/k3k/pkg/apis/k3k.io/v1alpha1" - "github.com/galal-hussein/k3k/pkg/controller/util" + "github.com/rancher/k3k/pkg/apis/k3k.io/v1alpha1" + "github.com/rancher/k3k/pkg/controller/util" apps "k8s.io/api/apps/v1" v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/controller/cluster/server/service.go b/pkg/controller/cluster/server/service.go index d312ef9..3b7689c 100644 --- a/pkg/controller/cluster/server/service.go +++ b/pkg/controller/cluster/server/service.go @@ -1,8 +1,8 @@ package server import ( - "github.com/galal-hussein/k3k/pkg/apis/k3k.io/v1alpha1" - "github.com/galal-hussein/k3k/pkg/controller/util" + "github.com/rancher/k3k/pkg/apis/k3k.io/v1alpha1" + "github.com/rancher/k3k/pkg/controller/util" v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/pkg/controller/util/util.go b/pkg/controller/util/util.go index 2891d4f..fd01556 100644 --- a/pkg/controller/util/util.go +++ b/pkg/controller/util/util.go @@ -3,7 +3,7 @@ package util import ( "context" - "github.com/galal-hussein/k3k/pkg/apis/k3k.io/v1alpha1" + "github.com/rancher/k3k/pkg/apis/k3k.io/v1alpha1" v1 "k8s.io/api/core/v1" "k8s.io/klog" "sigs.k8s.io/controller-runtime/pkg/client"