diff --git a/README.md b/README.md index 6f28454f02..a0fa348857 100644 --- a/README.md +++ b/README.md @@ -35,7 +35,7 @@ K3s bundles the following technologies together into a single cohesive distribut * [Traefik](https://containo.us/traefik/) for ingress * [Klipper-lb](https://github.com/rancher/klipper-lb) as an embedded service loadbalancer provider * [Kube-router](https://www.kube-router.io/) for network policy -* [Helm-controller](https://github.com/rancher/helm-controller) to allow for CRD-driven deployment of helm manifests +* [Helm-controller](https://github.com/k3s-io/helm-controller) to allow for CRD-driven deployment of helm manifests * [Kine](https://github.com/k3s-io/kine) as a datastore shim that allows etcd to be replaced with other databases * [Local-path-provisioner](https://github.com/rancher/local-path-provisioner) for provisioning volumes using local storage * [Host utilities](https://github.com/rancher/k3s-root) such as iptables/nftables, ebtables, ethtool, & socat diff --git a/go.mod b/go.mod index 676a6d4491..363513c6ea 100644 --- a/go.mod +++ b/go.mod @@ -79,6 +79,7 @@ require ( github.com/google/uuid v1.1.1 github.com/gorilla/mux v1.7.4 github.com/gorilla/websocket v1.4.1 + github.com/k3s-io/helm-controller v0.8.0 github.com/k3s-io/kine v0.6.0 github.com/kubernetes-sigs/cri-tools v0.0.0-00010101000000-000000000000 github.com/lib/pq v1.8.0 @@ -89,7 +90,6 @@ require ( github.com/pierrec/lz4 v2.5.2+incompatible github.com/pkg/errors v0.9.1 github.com/rancher/dynamiclistener v0.2.1 - github.com/rancher/helm-controller v0.7.3 github.com/rancher/remotedialer v0.2.0 github.com/rancher/wrangler v0.6.1 github.com/rancher/wrangler-api v0.6.0 diff --git a/go.sum b/go.sum index 4e06b2cd56..de5b1ac5be 100644 --- a/go.sum +++ b/go.sum @@ -478,6 +478,8 @@ github.com/k3s-io/go-powershell v0.0.0-20200701182037-6845e6fcfa79 h1:9naOL3iARE github.com/k3s-io/go-powershell v0.0.0-20200701182037-6845e6fcfa79/go.mod h1:lsDHcxq5ugFJff6YHEwpzLh31NDv0B2cIKki1ViQ65o= github.com/k3s-io/go-powershell v0.0.0-20201118222746-51f4c451fbd7 h1:C+6IIP6yECS10qkq2EeGQjr2ts0k7UxrutGF+pLPSnU= github.com/k3s-io/go-powershell v0.0.0-20201118222746-51f4c451fbd7/go.mod h1:wJnuh+xbDmskSfAM3UikTsGO8kaWLu3iycSgUKAiYjQ= +github.com/k3s-io/helm-controller v0.8.0 h1:ZxnXRMiVjerBqpTkZeR0soEtsC3Bcv3Sbq2AIZQPlhk= +github.com/k3s-io/helm-controller v0.8.0/go.mod h1:nZP8FH3KZrNNUf5r+SwwiMR63HS6lxdHdpHijgPfF74= github.com/k3s-io/kine v0.6.0 h1:4l7wjgCxb2oD+7Hyf3xIhkGd/6s1sXpRFdQiyy+7Ki8= github.com/k3s-io/kine v0.6.0/go.mod h1:rzCs93+rQHZGOiewMd84PDrER92QeZ6eeHbWkfEy4+w= github.com/k3s-io/kubernetes v1.19.4-k3s1 h1:6ehWJYzSUobbOoKaSnt9O0vbpunkVKeH7kU38ZtWEno= @@ -705,8 +707,6 @@ github.com/rakelkar/gonetsh v0.0.0-20190930180311-e5c5ffe4bdf0 h1:iXE9kmlAqhusXx github.com/rakelkar/gonetsh v0.0.0-20190930180311-e5c5ffe4bdf0/go.mod h1:4XHkfaUj+URzGO9sohoAgt2V9Y8nIW7fugpu0E6gShk= github.com/rancher/dynamiclistener v0.2.1 h1:QiY1jxs2TOLrKB04G36vE2ehEvPMPGiWp8zEHLKB1nE= github.com/rancher/dynamiclistener v0.2.1/go.mod h1:9WusTANoiRr8cDWCTtf5txieulezHbpv4vhLADPp0zU= -github.com/rancher/helm-controller v0.7.3 h1:WTQHcNF2vl9w6Xd1eBtXDe0JUsYMFFstqX9ghGhI5Ac= -github.com/rancher/helm-controller v0.7.3/go.mod h1:ZylsxIMGNADRPRNW+NiBWhrwwks9vnKLQiCHYWb6Bi0= github.com/rancher/moq v0.0.0-20190404221404-ee5226d43009/go.mod h1:wpITyDPTi/Na5h73XkbuEf2AP9fbgrIGqqxVzFhYD6U= github.com/rancher/remotedialer v0.2.0 h1:xD7t3K6JYwTdAsxmGtTHQMkEkFgKouQ1foLxVW424Dc= github.com/rancher/remotedialer v0.2.0/go.mod h1:tkU8ZvrR5lRgaKWaX71nAy6daeqvPFx/lJEnbW7tXSI= diff --git a/pkg/server/context.go b/pkg/server/context.go index a0d5808b72..60a097e24a 100644 --- a/pkg/server/context.go +++ b/pkg/server/context.go @@ -3,7 +3,7 @@ package server import ( "context" - "github.com/rancher/helm-controller/pkg/generated/controllers/helm.cattle.io" + "github.com/k3s-io/helm-controller/pkg/generated/controllers/helm.cattle.io" "github.com/rancher/k3s/pkg/generated/controllers/k3s.cattle.io" "github.com/rancher/wrangler-api/pkg/generated/controllers/apps" "github.com/rancher/wrangler-api/pkg/generated/controllers/batch" diff --git a/pkg/server/server.go b/pkg/server/server.go index 6909cb7da7..300458180d 100644 --- a/pkg/server/server.go +++ b/pkg/server/server.go @@ -15,8 +15,8 @@ import ( corev1 "k8s.io/api/core/v1" + "github.com/k3s-io/helm-controller/pkg/helm" "github.com/pkg/errors" - "github.com/rancher/helm-controller/pkg/helm" "github.com/rancher/k3s/pkg/clientaccess" "github.com/rancher/k3s/pkg/daemons/config" "github.com/rancher/k3s/pkg/daemons/control" diff --git a/scripts/airgap/image-list.txt b/scripts/airgap/image-list.txt index 829df1e460..a235dcccea 100644 --- a/scripts/airgap/image-list.txt +++ b/scripts/airgap/image-list.txt @@ -1,5 +1,5 @@ docker.io/rancher/coredns-coredns:1.6.9 -docker.io/rancher/klipper-helm:v0.3.0 +docker.io/rancher/klipper-helm:v0.3.2 docker.io/rancher/klipper-lb:v0.1.2 docker.io/rancher/library-busybox:1.31.1 docker.io/rancher/library-traefik:1.7.19 diff --git a/vendor/github.com/rancher/helm-controller/LICENSE b/vendor/github.com/k3s-io/helm-controller/LICENSE similarity index 100% rename from vendor/github.com/rancher/helm-controller/LICENSE rename to vendor/github.com/k3s-io/helm-controller/LICENSE diff --git a/vendor/github.com/rancher/helm-controller/pkg/apis/helm.cattle.io/v1/doc.go b/vendor/github.com/k3s-io/helm-controller/pkg/apis/helm.cattle.io/v1/doc.go similarity index 100% rename from vendor/github.com/rancher/helm-controller/pkg/apis/helm.cattle.io/v1/doc.go rename to vendor/github.com/k3s-io/helm-controller/pkg/apis/helm.cattle.io/v1/doc.go diff --git a/vendor/github.com/rancher/helm-controller/pkg/apis/helm.cattle.io/v1/types.go b/vendor/github.com/k3s-io/helm-controller/pkg/apis/helm.cattle.io/v1/types.go similarity index 100% rename from vendor/github.com/rancher/helm-controller/pkg/apis/helm.cattle.io/v1/types.go rename to vendor/github.com/k3s-io/helm-controller/pkg/apis/helm.cattle.io/v1/types.go diff --git a/vendor/github.com/rancher/helm-controller/pkg/apis/helm.cattle.io/v1/zz_generated_deepcopy.go b/vendor/github.com/k3s-io/helm-controller/pkg/apis/helm.cattle.io/v1/zz_generated_deepcopy.go similarity index 100% rename from vendor/github.com/rancher/helm-controller/pkg/apis/helm.cattle.io/v1/zz_generated_deepcopy.go rename to vendor/github.com/k3s-io/helm-controller/pkg/apis/helm.cattle.io/v1/zz_generated_deepcopy.go diff --git a/vendor/github.com/rancher/helm-controller/pkg/apis/helm.cattle.io/v1/zz_generated_list_types.go b/vendor/github.com/k3s-io/helm-controller/pkg/apis/helm.cattle.io/v1/zz_generated_list_types.go similarity index 100% rename from vendor/github.com/rancher/helm-controller/pkg/apis/helm.cattle.io/v1/zz_generated_list_types.go rename to vendor/github.com/k3s-io/helm-controller/pkg/apis/helm.cattle.io/v1/zz_generated_list_types.go diff --git a/vendor/github.com/rancher/helm-controller/pkg/apis/helm.cattle.io/v1/zz_generated_register.go b/vendor/github.com/k3s-io/helm-controller/pkg/apis/helm.cattle.io/v1/zz_generated_register.go similarity index 96% rename from vendor/github.com/rancher/helm-controller/pkg/apis/helm.cattle.io/v1/zz_generated_register.go rename to vendor/github.com/k3s-io/helm-controller/pkg/apis/helm.cattle.io/v1/zz_generated_register.go index 8cfa18c1bc..1998efb639 100644 --- a/vendor/github.com/rancher/helm-controller/pkg/apis/helm.cattle.io/v1/zz_generated_register.go +++ b/vendor/github.com/k3s-io/helm-controller/pkg/apis/helm.cattle.io/v1/zz_generated_register.go @@ -21,7 +21,7 @@ limitations under the License. package v1 import ( - helm "github.com/rancher/helm-controller/pkg/apis/helm.cattle.io" + helm "github.com/k3s-io/helm-controller/pkg/apis/helm.cattle.io" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/vendor/github.com/rancher/helm-controller/pkg/apis/helm.cattle.io/zz_generated_register.go b/vendor/github.com/k3s-io/helm-controller/pkg/apis/helm.cattle.io/zz_generated_register.go similarity index 100% rename from vendor/github.com/rancher/helm-controller/pkg/apis/helm.cattle.io/zz_generated_register.go rename to vendor/github.com/k3s-io/helm-controller/pkg/apis/helm.cattle.io/zz_generated_register.go diff --git a/vendor/github.com/rancher/helm-controller/pkg/generated/clientset/versioned/clientset.go b/vendor/github.com/k3s-io/helm-controller/pkg/generated/clientset/versioned/clientset.go similarity index 96% rename from vendor/github.com/rancher/helm-controller/pkg/generated/clientset/versioned/clientset.go rename to vendor/github.com/k3s-io/helm-controller/pkg/generated/clientset/versioned/clientset.go index 08e2f9fe35..fbc977bb15 100644 --- a/vendor/github.com/rancher/helm-controller/pkg/generated/clientset/versioned/clientset.go +++ b/vendor/github.com/k3s-io/helm-controller/pkg/generated/clientset/versioned/clientset.go @@ -21,7 +21,7 @@ package versioned import ( "fmt" - helmv1 "github.com/rancher/helm-controller/pkg/generated/clientset/versioned/typed/helm.cattle.io/v1" + helmv1 "github.com/k3s-io/helm-controller/pkg/generated/clientset/versioned/typed/helm.cattle.io/v1" discovery "k8s.io/client-go/discovery" rest "k8s.io/client-go/rest" flowcontrol "k8s.io/client-go/util/flowcontrol" diff --git a/vendor/github.com/rancher/helm-controller/pkg/generated/clientset/versioned/doc.go b/vendor/github.com/k3s-io/helm-controller/pkg/generated/clientset/versioned/doc.go similarity index 100% rename from vendor/github.com/rancher/helm-controller/pkg/generated/clientset/versioned/doc.go rename to vendor/github.com/k3s-io/helm-controller/pkg/generated/clientset/versioned/doc.go diff --git a/vendor/github.com/rancher/helm-controller/pkg/generated/clientset/versioned/scheme/doc.go b/vendor/github.com/k3s-io/helm-controller/pkg/generated/clientset/versioned/scheme/doc.go similarity index 100% rename from vendor/github.com/rancher/helm-controller/pkg/generated/clientset/versioned/scheme/doc.go rename to vendor/github.com/k3s-io/helm-controller/pkg/generated/clientset/versioned/scheme/doc.go diff --git a/vendor/github.com/rancher/helm-controller/pkg/generated/clientset/versioned/scheme/register.go b/vendor/github.com/k3s-io/helm-controller/pkg/generated/clientset/versioned/scheme/register.go similarity index 96% rename from vendor/github.com/rancher/helm-controller/pkg/generated/clientset/versioned/scheme/register.go rename to vendor/github.com/k3s-io/helm-controller/pkg/generated/clientset/versioned/scheme/register.go index 337ab87a8e..0f3e2263b7 100644 --- a/vendor/github.com/rancher/helm-controller/pkg/generated/clientset/versioned/scheme/register.go +++ b/vendor/github.com/k3s-io/helm-controller/pkg/generated/clientset/versioned/scheme/register.go @@ -19,7 +19,7 @@ limitations under the License. package scheme import ( - helmv1 "github.com/rancher/helm-controller/pkg/apis/helm.cattle.io/v1" + helmv1 "github.com/k3s-io/helm-controller/pkg/apis/helm.cattle.io/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/vendor/github.com/rancher/helm-controller/pkg/generated/clientset/versioned/typed/helm.cattle.io/v1/doc.go b/vendor/github.com/k3s-io/helm-controller/pkg/generated/clientset/versioned/typed/helm.cattle.io/v1/doc.go similarity index 100% rename from vendor/github.com/rancher/helm-controller/pkg/generated/clientset/versioned/typed/helm.cattle.io/v1/doc.go rename to vendor/github.com/k3s-io/helm-controller/pkg/generated/clientset/versioned/typed/helm.cattle.io/v1/doc.go diff --git a/vendor/github.com/rancher/helm-controller/pkg/generated/clientset/versioned/typed/helm.cattle.io/v1/generated_expansion.go b/vendor/github.com/k3s-io/helm-controller/pkg/generated/clientset/versioned/typed/helm.cattle.io/v1/generated_expansion.go similarity index 100% rename from vendor/github.com/rancher/helm-controller/pkg/generated/clientset/versioned/typed/helm.cattle.io/v1/generated_expansion.go rename to vendor/github.com/k3s-io/helm-controller/pkg/generated/clientset/versioned/typed/helm.cattle.io/v1/generated_expansion.go diff --git a/vendor/github.com/rancher/helm-controller/pkg/generated/clientset/versioned/typed/helm.cattle.io/v1/helm.cattle.io_client.go b/vendor/github.com/k3s-io/helm-controller/pkg/generated/clientset/versioned/typed/helm.cattle.io/v1/helm.cattle.io_client.go similarity index 94% rename from vendor/github.com/rancher/helm-controller/pkg/generated/clientset/versioned/typed/helm.cattle.io/v1/helm.cattle.io_client.go rename to vendor/github.com/k3s-io/helm-controller/pkg/generated/clientset/versioned/typed/helm.cattle.io/v1/helm.cattle.io_client.go index 30133b373d..a45e3f55a2 100644 --- a/vendor/github.com/rancher/helm-controller/pkg/generated/clientset/versioned/typed/helm.cattle.io/v1/helm.cattle.io_client.go +++ b/vendor/github.com/k3s-io/helm-controller/pkg/generated/clientset/versioned/typed/helm.cattle.io/v1/helm.cattle.io_client.go @@ -19,8 +19,8 @@ limitations under the License. package v1 import ( - v1 "github.com/rancher/helm-controller/pkg/apis/helm.cattle.io/v1" - "github.com/rancher/helm-controller/pkg/generated/clientset/versioned/scheme" + v1 "github.com/k3s-io/helm-controller/pkg/apis/helm.cattle.io/v1" + "github.com/k3s-io/helm-controller/pkg/generated/clientset/versioned/scheme" rest "k8s.io/client-go/rest" ) diff --git a/vendor/github.com/rancher/helm-controller/pkg/generated/clientset/versioned/typed/helm.cattle.io/v1/helmchart.go b/vendor/github.com/k3s-io/helm-controller/pkg/generated/clientset/versioned/typed/helm.cattle.io/v1/helmchart.go similarity index 97% rename from vendor/github.com/rancher/helm-controller/pkg/generated/clientset/versioned/typed/helm.cattle.io/v1/helmchart.go rename to vendor/github.com/k3s-io/helm-controller/pkg/generated/clientset/versioned/typed/helm.cattle.io/v1/helmchart.go index 370eba3f7c..b1e495463d 100644 --- a/vendor/github.com/rancher/helm-controller/pkg/generated/clientset/versioned/typed/helm.cattle.io/v1/helmchart.go +++ b/vendor/github.com/k3s-io/helm-controller/pkg/generated/clientset/versioned/typed/helm.cattle.io/v1/helmchart.go @@ -22,8 +22,8 @@ import ( "context" "time" - v1 "github.com/rancher/helm-controller/pkg/apis/helm.cattle.io/v1" - scheme "github.com/rancher/helm-controller/pkg/generated/clientset/versioned/scheme" + v1 "github.com/k3s-io/helm-controller/pkg/apis/helm.cattle.io/v1" + scheme "github.com/k3s-io/helm-controller/pkg/generated/clientset/versioned/scheme" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" diff --git a/vendor/github.com/rancher/helm-controller/pkg/generated/clientset/versioned/typed/helm.cattle.io/v1/helmchartconfig.go b/vendor/github.com/k3s-io/helm-controller/pkg/generated/clientset/versioned/typed/helm.cattle.io/v1/helmchartconfig.go similarity index 97% rename from vendor/github.com/rancher/helm-controller/pkg/generated/clientset/versioned/typed/helm.cattle.io/v1/helmchartconfig.go rename to vendor/github.com/k3s-io/helm-controller/pkg/generated/clientset/versioned/typed/helm.cattle.io/v1/helmchartconfig.go index 6d5fb5c50d..4255a562f2 100644 --- a/vendor/github.com/rancher/helm-controller/pkg/generated/clientset/versioned/typed/helm.cattle.io/v1/helmchartconfig.go +++ b/vendor/github.com/k3s-io/helm-controller/pkg/generated/clientset/versioned/typed/helm.cattle.io/v1/helmchartconfig.go @@ -22,8 +22,8 @@ import ( "context" "time" - v1 "github.com/rancher/helm-controller/pkg/apis/helm.cattle.io/v1" - scheme "github.com/rancher/helm-controller/pkg/generated/clientset/versioned/scheme" + v1 "github.com/k3s-io/helm-controller/pkg/apis/helm.cattle.io/v1" + scheme "github.com/k3s-io/helm-controller/pkg/generated/clientset/versioned/scheme" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" diff --git a/vendor/github.com/rancher/helm-controller/pkg/generated/controllers/helm.cattle.io/factory.go b/vendor/github.com/k3s-io/helm-controller/pkg/generated/controllers/helm.cattle.io/factory.go similarity index 92% rename from vendor/github.com/rancher/helm-controller/pkg/generated/controllers/helm.cattle.io/factory.go rename to vendor/github.com/k3s-io/helm-controller/pkg/generated/controllers/helm.cattle.io/factory.go index a77b70c221..e3d11f22c0 100644 --- a/vendor/github.com/rancher/helm-controller/pkg/generated/controllers/helm.cattle.io/factory.go +++ b/vendor/github.com/k3s-io/helm-controller/pkg/generated/controllers/helm.cattle.io/factory.go @@ -22,9 +22,9 @@ import ( "context" "time" - clientset "github.com/rancher/helm-controller/pkg/generated/clientset/versioned" - scheme "github.com/rancher/helm-controller/pkg/generated/clientset/versioned/scheme" - informers "github.com/rancher/helm-controller/pkg/generated/informers/externalversions" + clientset "github.com/k3s-io/helm-controller/pkg/generated/clientset/versioned" + scheme "github.com/k3s-io/helm-controller/pkg/generated/clientset/versioned/scheme" + informers "github.com/k3s-io/helm-controller/pkg/generated/informers/externalversions" "github.com/rancher/wrangler/pkg/generic" "github.com/rancher/wrangler/pkg/schemes" "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/vendor/github.com/rancher/helm-controller/pkg/generated/controllers/helm.cattle.io/interface.go b/vendor/github.com/k3s-io/helm-controller/pkg/generated/controllers/helm.cattle.io/interface.go similarity index 82% rename from vendor/github.com/rancher/helm-controller/pkg/generated/controllers/helm.cattle.io/interface.go rename to vendor/github.com/k3s-io/helm-controller/pkg/generated/controllers/helm.cattle.io/interface.go index 926b9f1c69..9956ba4653 100644 --- a/vendor/github.com/rancher/helm-controller/pkg/generated/controllers/helm.cattle.io/interface.go +++ b/vendor/github.com/k3s-io/helm-controller/pkg/generated/controllers/helm.cattle.io/interface.go @@ -19,9 +19,9 @@ limitations under the License. package helm import ( - clientset "github.com/rancher/helm-controller/pkg/generated/clientset/versioned" - v1 "github.com/rancher/helm-controller/pkg/generated/controllers/helm.cattle.io/v1" - informers "github.com/rancher/helm-controller/pkg/generated/informers/externalversions/helm.cattle.io" + clientset "github.com/k3s-io/helm-controller/pkg/generated/clientset/versioned" + v1 "github.com/k3s-io/helm-controller/pkg/generated/controllers/helm.cattle.io/v1" + informers "github.com/k3s-io/helm-controller/pkg/generated/informers/externalversions/helm.cattle.io" "github.com/rancher/wrangler/pkg/generic" ) diff --git a/vendor/github.com/rancher/helm-controller/pkg/generated/controllers/helm.cattle.io/v1/helmchart.go b/vendor/github.com/k3s-io/helm-controller/pkg/generated/controllers/helm.cattle.io/v1/helmchart.go similarity index 96% rename from vendor/github.com/rancher/helm-controller/pkg/generated/controllers/helm.cattle.io/v1/helmchart.go rename to vendor/github.com/k3s-io/helm-controller/pkg/generated/controllers/helm.cattle.io/v1/helmchart.go index 0650a6a4c9..a4d266c582 100644 --- a/vendor/github.com/rancher/helm-controller/pkg/generated/controllers/helm.cattle.io/v1/helmchart.go +++ b/vendor/github.com/k3s-io/helm-controller/pkg/generated/controllers/helm.cattle.io/v1/helmchart.go @@ -22,10 +22,10 @@ import ( "context" "time" - v1 "github.com/rancher/helm-controller/pkg/apis/helm.cattle.io/v1" - clientset "github.com/rancher/helm-controller/pkg/generated/clientset/versioned/typed/helm.cattle.io/v1" - informers "github.com/rancher/helm-controller/pkg/generated/informers/externalversions/helm.cattle.io/v1" - listers "github.com/rancher/helm-controller/pkg/generated/listers/helm.cattle.io/v1" + v1 "github.com/k3s-io/helm-controller/pkg/apis/helm.cattle.io/v1" + clientset "github.com/k3s-io/helm-controller/pkg/generated/clientset/versioned/typed/helm.cattle.io/v1" + informers "github.com/k3s-io/helm-controller/pkg/generated/informers/externalversions/helm.cattle.io/v1" + listers "github.com/k3s-io/helm-controller/pkg/generated/listers/helm.cattle.io/v1" "github.com/rancher/wrangler/pkg/apply" "github.com/rancher/wrangler/pkg/condition" "github.com/rancher/wrangler/pkg/generic" diff --git a/vendor/github.com/rancher/helm-controller/pkg/generated/controllers/helm.cattle.io/v1/helmchartconfig.go b/vendor/github.com/k3s-io/helm-controller/pkg/generated/controllers/helm.cattle.io/v1/helmchartconfig.go similarity index 95% rename from vendor/github.com/rancher/helm-controller/pkg/generated/controllers/helm.cattle.io/v1/helmchartconfig.go rename to vendor/github.com/k3s-io/helm-controller/pkg/generated/controllers/helm.cattle.io/v1/helmchartconfig.go index 55f3937b30..9d120a1399 100644 --- a/vendor/github.com/rancher/helm-controller/pkg/generated/controllers/helm.cattle.io/v1/helmchartconfig.go +++ b/vendor/github.com/k3s-io/helm-controller/pkg/generated/controllers/helm.cattle.io/v1/helmchartconfig.go @@ -22,10 +22,10 @@ import ( "context" "time" - v1 "github.com/rancher/helm-controller/pkg/apis/helm.cattle.io/v1" - clientset "github.com/rancher/helm-controller/pkg/generated/clientset/versioned/typed/helm.cattle.io/v1" - informers "github.com/rancher/helm-controller/pkg/generated/informers/externalversions/helm.cattle.io/v1" - listers "github.com/rancher/helm-controller/pkg/generated/listers/helm.cattle.io/v1" + v1 "github.com/k3s-io/helm-controller/pkg/apis/helm.cattle.io/v1" + clientset "github.com/k3s-io/helm-controller/pkg/generated/clientset/versioned/typed/helm.cattle.io/v1" + informers "github.com/k3s-io/helm-controller/pkg/generated/informers/externalversions/helm.cattle.io/v1" + listers "github.com/k3s-io/helm-controller/pkg/generated/listers/helm.cattle.io/v1" "github.com/rancher/wrangler/pkg/generic" "k8s.io/apimachinery/pkg/api/equality" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/vendor/github.com/rancher/helm-controller/pkg/generated/controllers/helm.cattle.io/v1/interface.go b/vendor/github.com/k3s-io/helm-controller/pkg/generated/controllers/helm.cattle.io/v1/interface.go similarity index 85% rename from vendor/github.com/rancher/helm-controller/pkg/generated/controllers/helm.cattle.io/v1/interface.go rename to vendor/github.com/k3s-io/helm-controller/pkg/generated/controllers/helm.cattle.io/v1/interface.go index d798433ae0..d3decb6cd2 100644 --- a/vendor/github.com/rancher/helm-controller/pkg/generated/controllers/helm.cattle.io/v1/interface.go +++ b/vendor/github.com/k3s-io/helm-controller/pkg/generated/controllers/helm.cattle.io/v1/interface.go @@ -19,9 +19,9 @@ limitations under the License. package v1 import ( - v1 "github.com/rancher/helm-controller/pkg/apis/helm.cattle.io/v1" - clientset "github.com/rancher/helm-controller/pkg/generated/clientset/versioned/typed/helm.cattle.io/v1" - informers "github.com/rancher/helm-controller/pkg/generated/informers/externalversions/helm.cattle.io/v1" + v1 "github.com/k3s-io/helm-controller/pkg/apis/helm.cattle.io/v1" + clientset "github.com/k3s-io/helm-controller/pkg/generated/clientset/versioned/typed/helm.cattle.io/v1" + informers "github.com/k3s-io/helm-controller/pkg/generated/informers/externalversions/helm.cattle.io/v1" "github.com/rancher/wrangler/pkg/generic" ) diff --git a/vendor/github.com/rancher/helm-controller/pkg/generated/informers/externalversions/factory.go b/vendor/github.com/k3s-io/helm-controller/pkg/generated/informers/externalversions/factory.go similarity index 95% rename from vendor/github.com/rancher/helm-controller/pkg/generated/informers/externalversions/factory.go rename to vendor/github.com/k3s-io/helm-controller/pkg/generated/informers/externalversions/factory.go index 1f03994ee4..cab6834c71 100644 --- a/vendor/github.com/rancher/helm-controller/pkg/generated/informers/externalversions/factory.go +++ b/vendor/github.com/k3s-io/helm-controller/pkg/generated/informers/externalversions/factory.go @@ -23,9 +23,9 @@ import ( sync "sync" time "time" - versioned "github.com/rancher/helm-controller/pkg/generated/clientset/versioned" - helmcattleio "github.com/rancher/helm-controller/pkg/generated/informers/externalversions/helm.cattle.io" - internalinterfaces "github.com/rancher/helm-controller/pkg/generated/informers/externalversions/internalinterfaces" + versioned "github.com/k3s-io/helm-controller/pkg/generated/clientset/versioned" + helmcattleio "github.com/k3s-io/helm-controller/pkg/generated/informers/externalversions/helm.cattle.io" + internalinterfaces "github.com/k3s-io/helm-controller/pkg/generated/informers/externalversions/internalinterfaces" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/vendor/github.com/rancher/helm-controller/pkg/generated/informers/externalversions/generic.go b/vendor/github.com/k3s-io/helm-controller/pkg/generated/informers/externalversions/generic.go similarity index 96% rename from vendor/github.com/rancher/helm-controller/pkg/generated/informers/externalversions/generic.go rename to vendor/github.com/k3s-io/helm-controller/pkg/generated/informers/externalversions/generic.go index 2b9192b21e..edb7ac4203 100644 --- a/vendor/github.com/rancher/helm-controller/pkg/generated/informers/externalversions/generic.go +++ b/vendor/github.com/k3s-io/helm-controller/pkg/generated/informers/externalversions/generic.go @@ -21,7 +21,7 @@ package externalversions import ( "fmt" - v1 "github.com/rancher/helm-controller/pkg/apis/helm.cattle.io/v1" + v1 "github.com/k3s-io/helm-controller/pkg/apis/helm.cattle.io/v1" schema "k8s.io/apimachinery/pkg/runtime/schema" cache "k8s.io/client-go/tools/cache" ) diff --git a/vendor/github.com/rancher/helm-controller/pkg/generated/informers/externalversions/helm.cattle.io/interface.go b/vendor/github.com/k3s-io/helm-controller/pkg/generated/informers/externalversions/helm.cattle.io/interface.go similarity index 86% rename from vendor/github.com/rancher/helm-controller/pkg/generated/informers/externalversions/helm.cattle.io/interface.go rename to vendor/github.com/k3s-io/helm-controller/pkg/generated/informers/externalversions/helm.cattle.io/interface.go index b2ce3331f2..2e2f4cacb0 100644 --- a/vendor/github.com/rancher/helm-controller/pkg/generated/informers/externalversions/helm.cattle.io/interface.go +++ b/vendor/github.com/k3s-io/helm-controller/pkg/generated/informers/externalversions/helm.cattle.io/interface.go @@ -19,8 +19,8 @@ limitations under the License. package helm import ( - v1 "github.com/rancher/helm-controller/pkg/generated/informers/externalversions/helm.cattle.io/v1" - internalinterfaces "github.com/rancher/helm-controller/pkg/generated/informers/externalversions/internalinterfaces" + v1 "github.com/k3s-io/helm-controller/pkg/generated/informers/externalversions/helm.cattle.io/v1" + internalinterfaces "github.com/k3s-io/helm-controller/pkg/generated/informers/externalversions/internalinterfaces" ) // Interface provides access to each of this group's versions. diff --git a/vendor/github.com/rancher/helm-controller/pkg/generated/informers/externalversions/helm.cattle.io/v1/helmchart.go b/vendor/github.com/k3s-io/helm-controller/pkg/generated/informers/externalversions/helm.cattle.io/v1/helmchart.go similarity index 90% rename from vendor/github.com/rancher/helm-controller/pkg/generated/informers/externalversions/helm.cattle.io/v1/helmchart.go rename to vendor/github.com/k3s-io/helm-controller/pkg/generated/informers/externalversions/helm.cattle.io/v1/helmchart.go index 9be90da6cd..24952b07e1 100644 --- a/vendor/github.com/rancher/helm-controller/pkg/generated/informers/externalversions/helm.cattle.io/v1/helmchart.go +++ b/vendor/github.com/k3s-io/helm-controller/pkg/generated/informers/externalversions/helm.cattle.io/v1/helmchart.go @@ -22,10 +22,10 @@ import ( "context" time "time" - helmcattleiov1 "github.com/rancher/helm-controller/pkg/apis/helm.cattle.io/v1" - versioned "github.com/rancher/helm-controller/pkg/generated/clientset/versioned" - internalinterfaces "github.com/rancher/helm-controller/pkg/generated/informers/externalversions/internalinterfaces" - v1 "github.com/rancher/helm-controller/pkg/generated/listers/helm.cattle.io/v1" + helmcattleiov1 "github.com/k3s-io/helm-controller/pkg/apis/helm.cattle.io/v1" + versioned "github.com/k3s-io/helm-controller/pkg/generated/clientset/versioned" + internalinterfaces "github.com/k3s-io/helm-controller/pkg/generated/informers/externalversions/internalinterfaces" + v1 "github.com/k3s-io/helm-controller/pkg/generated/listers/helm.cattle.io/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" diff --git a/vendor/github.com/rancher/helm-controller/pkg/generated/informers/externalversions/helm.cattle.io/v1/helmchartconfig.go b/vendor/github.com/k3s-io/helm-controller/pkg/generated/informers/externalversions/helm.cattle.io/v1/helmchartconfig.go similarity index 90% rename from vendor/github.com/rancher/helm-controller/pkg/generated/informers/externalversions/helm.cattle.io/v1/helmchartconfig.go rename to vendor/github.com/k3s-io/helm-controller/pkg/generated/informers/externalversions/helm.cattle.io/v1/helmchartconfig.go index 98f23575bc..29b0163063 100644 --- a/vendor/github.com/rancher/helm-controller/pkg/generated/informers/externalversions/helm.cattle.io/v1/helmchartconfig.go +++ b/vendor/github.com/k3s-io/helm-controller/pkg/generated/informers/externalversions/helm.cattle.io/v1/helmchartconfig.go @@ -22,10 +22,10 @@ import ( "context" time "time" - helmcattleiov1 "github.com/rancher/helm-controller/pkg/apis/helm.cattle.io/v1" - versioned "github.com/rancher/helm-controller/pkg/generated/clientset/versioned" - internalinterfaces "github.com/rancher/helm-controller/pkg/generated/informers/externalversions/internalinterfaces" - v1 "github.com/rancher/helm-controller/pkg/generated/listers/helm.cattle.io/v1" + helmcattleiov1 "github.com/k3s-io/helm-controller/pkg/apis/helm.cattle.io/v1" + versioned "github.com/k3s-io/helm-controller/pkg/generated/clientset/versioned" + internalinterfaces "github.com/k3s-io/helm-controller/pkg/generated/informers/externalversions/internalinterfaces" + v1 "github.com/k3s-io/helm-controller/pkg/generated/listers/helm.cattle.io/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" diff --git a/vendor/github.com/rancher/helm-controller/pkg/generated/informers/externalversions/helm.cattle.io/v1/interface.go b/vendor/github.com/k3s-io/helm-controller/pkg/generated/informers/externalversions/helm.cattle.io/v1/interface.go similarity index 93% rename from vendor/github.com/rancher/helm-controller/pkg/generated/informers/externalversions/helm.cattle.io/v1/interface.go rename to vendor/github.com/k3s-io/helm-controller/pkg/generated/informers/externalversions/helm.cattle.io/v1/interface.go index e5b1a64f6a..ca4db2fbad 100644 --- a/vendor/github.com/rancher/helm-controller/pkg/generated/informers/externalversions/helm.cattle.io/v1/interface.go +++ b/vendor/github.com/k3s-io/helm-controller/pkg/generated/informers/externalversions/helm.cattle.io/v1/interface.go @@ -19,7 +19,7 @@ limitations under the License. package v1 import ( - internalinterfaces "github.com/rancher/helm-controller/pkg/generated/informers/externalversions/internalinterfaces" + internalinterfaces "github.com/k3s-io/helm-controller/pkg/generated/informers/externalversions/internalinterfaces" ) // Interface provides access to all the informers in this group version. diff --git a/vendor/github.com/rancher/helm-controller/pkg/generated/informers/externalversions/internalinterfaces/factory_interfaces.go b/vendor/github.com/k3s-io/helm-controller/pkg/generated/informers/externalversions/internalinterfaces/factory_interfaces.go similarity index 94% rename from vendor/github.com/rancher/helm-controller/pkg/generated/informers/externalversions/internalinterfaces/factory_interfaces.go rename to vendor/github.com/k3s-io/helm-controller/pkg/generated/informers/externalversions/internalinterfaces/factory_interfaces.go index 938b038854..ceb8abdce6 100644 --- a/vendor/github.com/rancher/helm-controller/pkg/generated/informers/externalversions/internalinterfaces/factory_interfaces.go +++ b/vendor/github.com/k3s-io/helm-controller/pkg/generated/informers/externalversions/internalinterfaces/factory_interfaces.go @@ -21,7 +21,7 @@ package internalinterfaces import ( time "time" - versioned "github.com/rancher/helm-controller/pkg/generated/clientset/versioned" + versioned "github.com/k3s-io/helm-controller/pkg/generated/clientset/versioned" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" cache "k8s.io/client-go/tools/cache" diff --git a/vendor/github.com/rancher/helm-controller/pkg/generated/listers/helm.cattle.io/v1/expansion_generated.go b/vendor/github.com/k3s-io/helm-controller/pkg/generated/listers/helm.cattle.io/v1/expansion_generated.go similarity index 100% rename from vendor/github.com/rancher/helm-controller/pkg/generated/listers/helm.cattle.io/v1/expansion_generated.go rename to vendor/github.com/k3s-io/helm-controller/pkg/generated/listers/helm.cattle.io/v1/expansion_generated.go diff --git a/vendor/github.com/rancher/helm-controller/pkg/generated/listers/helm.cattle.io/v1/helmchart.go b/vendor/github.com/k3s-io/helm-controller/pkg/generated/listers/helm.cattle.io/v1/helmchart.go similarity index 97% rename from vendor/github.com/rancher/helm-controller/pkg/generated/listers/helm.cattle.io/v1/helmchart.go rename to vendor/github.com/k3s-io/helm-controller/pkg/generated/listers/helm.cattle.io/v1/helmchart.go index 6c3c316bc7..3a74af99f1 100644 --- a/vendor/github.com/rancher/helm-controller/pkg/generated/listers/helm.cattle.io/v1/helmchart.go +++ b/vendor/github.com/k3s-io/helm-controller/pkg/generated/listers/helm.cattle.io/v1/helmchart.go @@ -19,7 +19,7 @@ limitations under the License. package v1 import ( - v1 "github.com/rancher/helm-controller/pkg/apis/helm.cattle.io/v1" + v1 "github.com/k3s-io/helm-controller/pkg/apis/helm.cattle.io/v1" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" diff --git a/vendor/github.com/rancher/helm-controller/pkg/generated/listers/helm.cattle.io/v1/helmchartconfig.go b/vendor/github.com/k3s-io/helm-controller/pkg/generated/listers/helm.cattle.io/v1/helmchartconfig.go similarity index 98% rename from vendor/github.com/rancher/helm-controller/pkg/generated/listers/helm.cattle.io/v1/helmchartconfig.go rename to vendor/github.com/k3s-io/helm-controller/pkg/generated/listers/helm.cattle.io/v1/helmchartconfig.go index cf26c5f503..0dfe286738 100644 --- a/vendor/github.com/rancher/helm-controller/pkg/generated/listers/helm.cattle.io/v1/helmchartconfig.go +++ b/vendor/github.com/k3s-io/helm-controller/pkg/generated/listers/helm.cattle.io/v1/helmchartconfig.go @@ -19,7 +19,7 @@ limitations under the License. package v1 import ( - v1 "github.com/rancher/helm-controller/pkg/apis/helm.cattle.io/v1" + v1 "github.com/k3s-io/helm-controller/pkg/apis/helm.cattle.io/v1" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" diff --git a/vendor/github.com/rancher/helm-controller/pkg/helm/controller.go b/vendor/github.com/k3s-io/helm-controller/pkg/helm/controller.go similarity index 97% rename from vendor/github.com/rancher/helm-controller/pkg/helm/controller.go rename to vendor/github.com/k3s-io/helm-controller/pkg/helm/controller.go index dd72aa93b2..51c30d3dad 100644 --- a/vendor/github.com/rancher/helm-controller/pkg/helm/controller.go +++ b/vendor/github.com/k3s-io/helm-controller/pkg/helm/controller.go @@ -8,8 +8,8 @@ import ( "sort" "strings" - helmv1 "github.com/rancher/helm-controller/pkg/apis/helm.cattle.io/v1" - helmcontroller "github.com/rancher/helm-controller/pkg/generated/controllers/helm.cattle.io/v1" + helmv1 "github.com/k3s-io/helm-controller/pkg/apis/helm.cattle.io/v1" + helmcontroller "github.com/k3s-io/helm-controller/pkg/generated/controllers/helm.cattle.io/v1" batchcontroller "github.com/rancher/wrangler-api/pkg/generated/controllers/batch/v1" corecontroller "github.com/rancher/wrangler-api/pkg/generated/controllers/core/v1" rbaccontroller "github.com/rancher/wrangler-api/pkg/generated/controllers/rbac/v1" @@ -39,7 +39,7 @@ type Controller struct { } const ( - DefaultJobImage = "rancher/klipper-helm:v0.3.0" + DefaultJobImage = "rancher/klipper-helm:v0.3.2" Label = "helmcharts.helm.cattle.io/chart" Annotation = "helmcharts.helm.cattle.io/configHash" CRDName = "helmcharts.helm.cattle.io" @@ -282,6 +282,9 @@ func job(chart *helmv1.HelmChart) (*batch.Job, *core.ConfigMap, *core.ConfigMap) { Name: "KUBERNETES_SERVICE_PORT", Value: "6443"}, + { + Name: "BOOTSTRAP", + Value: "true"}, }...) job.Spec.Template.Spec.NodeSelector = make(map[string]string) job.Spec.Template.Spec.NodeSelector["node-role.kubernetes.io/master"] = "true" diff --git a/vendor/modules.txt b/vendor/modules.txt index 7d86fdbe16..a1174ce8ff 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -681,6 +681,21 @@ github.com/json-iterator/go # github.com/k3s-io/go-powershell v0.0.0-20200701182037-6845e6fcfa79 github.com/k3s-io/go-powershell/backend github.com/k3s-io/go-powershell/utils +# github.com/k3s-io/helm-controller v0.8.0 +## explicit +github.com/k3s-io/helm-controller/pkg/apis/helm.cattle.io +github.com/k3s-io/helm-controller/pkg/apis/helm.cattle.io/v1 +github.com/k3s-io/helm-controller/pkg/generated/clientset/versioned +github.com/k3s-io/helm-controller/pkg/generated/clientset/versioned/scheme +github.com/k3s-io/helm-controller/pkg/generated/clientset/versioned/typed/helm.cattle.io/v1 +github.com/k3s-io/helm-controller/pkg/generated/controllers/helm.cattle.io +github.com/k3s-io/helm-controller/pkg/generated/controllers/helm.cattle.io/v1 +github.com/k3s-io/helm-controller/pkg/generated/informers/externalversions +github.com/k3s-io/helm-controller/pkg/generated/informers/externalversions/helm.cattle.io +github.com/k3s-io/helm-controller/pkg/generated/informers/externalversions/helm.cattle.io/v1 +github.com/k3s-io/helm-controller/pkg/generated/informers/externalversions/internalinterfaces +github.com/k3s-io/helm-controller/pkg/generated/listers/helm.cattle.io/v1 +github.com/k3s-io/helm-controller/pkg/helm # github.com/k3s-io/kine v0.6.0 ## explicit github.com/k3s-io/kine/pkg/broadcaster @@ -835,21 +850,6 @@ github.com/rancher/dynamiclistener/factory github.com/rancher/dynamiclistener/storage/file github.com/rancher/dynamiclistener/storage/kubernetes github.com/rancher/dynamiclistener/storage/memory -# github.com/rancher/helm-controller v0.7.3 -## explicit -github.com/rancher/helm-controller/pkg/apis/helm.cattle.io -github.com/rancher/helm-controller/pkg/apis/helm.cattle.io/v1 -github.com/rancher/helm-controller/pkg/generated/clientset/versioned -github.com/rancher/helm-controller/pkg/generated/clientset/versioned/scheme -github.com/rancher/helm-controller/pkg/generated/clientset/versioned/typed/helm.cattle.io/v1 -github.com/rancher/helm-controller/pkg/generated/controllers/helm.cattle.io -github.com/rancher/helm-controller/pkg/generated/controllers/helm.cattle.io/v1 -github.com/rancher/helm-controller/pkg/generated/informers/externalversions -github.com/rancher/helm-controller/pkg/generated/informers/externalversions/helm.cattle.io -github.com/rancher/helm-controller/pkg/generated/informers/externalversions/helm.cattle.io/v1 -github.com/rancher/helm-controller/pkg/generated/informers/externalversions/internalinterfaces -github.com/rancher/helm-controller/pkg/generated/listers/helm.cattle.io/v1 -github.com/rancher/helm-controller/pkg/helm # github.com/rancher/remotedialer v0.2.0 ## explicit github.com/rancher/remotedialer