[migration k3s-io] update helm-controller dependency (#2569)

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

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

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=

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"

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"

scripts/airgap/image-list.txt

 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

vendor/github.com/rancher/helm-controller/pkg/apis/helm.cattle.io/v1/zz_generated_register.go → 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"

vendor/github.com/rancher/helm-controller/pkg/generated/clientset/versioned/clientset.go → 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"

vendor/github.com/rancher/helm-controller/pkg/generated/clientset/versioned/scheme/register.go → 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"

vendor/github.com/rancher/helm-controller/pkg/generated/clientset/versioned/typed/helm.cattle.io/v1/helm.cattle.io_client.go → 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"
 )
 

vendor/github.com/rancher/helm-controller/pkg/generated/clientset/versioned/typed/helm.cattle.io/v1/helmchart.go → 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"

vendor/github.com/rancher/helm-controller/pkg/generated/clientset/versioned/typed/helm.cattle.io/v1/helmchartconfig.go → 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"

vendor/github.com/rancher/helm-controller/pkg/generated/controllers/helm.cattle.io/factory.go → 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"

vendor/github.com/rancher/helm-controller/pkg/generated/controllers/helm.cattle.io/interface.go → 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"
 )
 

vendor/github.com/rancher/helm-controller/pkg/generated/controllers/helm.cattle.io/v1/helmchart.go → 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"

vendor/github.com/rancher/helm-controller/pkg/generated/controllers/helm.cattle.io/v1/helmchartconfig.go → 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"

vendor/github.com/rancher/helm-controller/pkg/generated/controllers/helm.cattle.io/v1/interface.go → 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"
 )
 

vendor/github.com/rancher/helm-controller/pkg/generated/informers/externalversions/factory.go → 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"

vendor/github.com/rancher/helm-controller/pkg/generated/informers/externalversions/generic.go → 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"
 )

vendor/github.com/rancher/helm-controller/pkg/generated/informers/externalversions/helm.cattle.io/interface.go → 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.

vendor/github.com/rancher/helm-controller/pkg/generated/informers/externalversions/helm.cattle.io/v1/helmchart.go → 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"

vendor/github.com/rancher/helm-controller/pkg/generated/informers/externalversions/helm.cattle.io/v1/helmchartconfig.go → 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"

vendor/github.com/rancher/helm-controller/pkg/generated/informers/externalversions/helm.cattle.io/v1/interface.go → 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.

vendor/github.com/rancher/helm-controller/pkg/generated/informers/externalversions/internalinterfaces/factory_interfaces.go → 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"

vendor/github.com/rancher/helm-controller/pkg/generated/listers/helm.cattle.io/v1/helmchart.go → 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"

vendor/github.com/rancher/helm-controller/pkg/generated/listers/helm.cattle.io/v1/helmchartconfig.go → 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"

vendor/github.com/rancher/helm-controller/pkg/helm/controller.go → 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"

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