Mirror/k3s
1
0
Fork 0
mirror of https://github.com/k3s-io/k3s.git synced 2024-06-07 19:41:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
rancher/helm-controller ➡️ k3s-io/helm-controller

Part of https://github.com/rancher/k3s/issues/2189

Signed-off-by: Jacob Blain Christen <jacob@rancher.com>
This commit is contained in:
Jacob Blain Christen 2020-12-01 08:59:10 -07:00 committed by GitHub
parent b4a51f2b9a
commit 3647654fe4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
39 changed files with 72 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -35,7 +35,7 @@ K3s bundles the following technologies together into a single cohesive distribut
* [Traefik](https://containo.us/traefik/) for ingress * [Traefik](https://containo.us/traefik/) for ingress
* [Klipper-lb](https://github.com/rancher/klipper-lb) as an embedded service loadbalancer provider * [Klipper-lb](https://github.com/rancher/klipper-lb) as an embedded service loadbalancer provider
* [Kube-router](https://www.kube-router.io/) for network policy * [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 * [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 * [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 * [Host utilities](https://github.com/rancher/k3s-root) such as iptables/nftables, ebtables, ethtool, & socat

2
go.mod
View File

@ -79,6 +79,7 @@ require (
github.com/google/uuid v1.1.1 github.com/google/uuid v1.1.1
github.com/gorilla/mux v1.7.4 github.com/gorilla/mux v1.7.4
github.com/gorilla/websocket v1.4.1 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/k3s-io/kine v0.6.0
github.com/kubernetes-sigs/cri-tools v0.0.0-00010101000000-000000000000 github.com/kubernetes-sigs/cri-tools v0.0.0-00010101000000-000000000000
github.com/lib/pq v1.8.0 github.com/lib/pq v1.8.0
@ -89,7 +90,6 @@ require (
github.com/pierrec/lz4 v2.5.2+incompatible github.com/pierrec/lz4 v2.5.2+incompatible
github.com/pkg/errors v0.9.1 github.com/pkg/errors v0.9.1
github.com/rancher/dynamiclistener v0.2.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/remotedialer v0.2.0
github.com/rancher/wrangler v0.6.1 github.com/rancher/wrangler v0.6.1
github.com/rancher/wrangler-api v0.6.0 github.com/rancher/wrangler-api v0.6.0

4
go.sum
View File

@ -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-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 h1:C+6IIP6yECS10qkq2EeGQjr2ts0k7UxrutGF+pLPSnU=
github.com/k3s-io/go-powershell v0.0.0-20201118222746-51f4c451fbd7/go.mod h1:wJnuh+xbDmskSfAM3UikTsGO8kaWLu3iycSgUKAiYjQ= 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 h1:4l7wjgCxb2oD+7Hyf3xIhkGd/6s1sXpRFdQiyy+7Ki8=
github.com/k3s-io/kine v0.6.0/go.mod h1:rzCs93+rQHZGOiewMd84PDrER92QeZ6eeHbWkfEy4+w= 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= 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/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 h1:QiY1jxs2TOLrKB04G36vE2ehEvPMPGiWp8zEHLKB1nE=
github.com/rancher/dynamiclistener v0.2.1/go.mod h1:9WusTANoiRr8cDWCTtf5txieulezHbpv4vhLADPp0zU= 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/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 h1:xD7t3K6JYwTdAsxmGtTHQMkEkFgKouQ1foLxVW424Dc=
github.com/rancher/remotedialer v0.2.0/go.mod h1:tkU8ZvrR5lRgaKWaX71nAy6daeqvPFx/lJEnbW7tXSI= github.com/rancher/remotedialer v0.2.0/go.mod h1:tkU8ZvrR5lRgaKWaX71nAy6daeqvPFx/lJEnbW7tXSI=

2
pkg/server/context.go
View File

@ -3,7 +3,7 @@ package server
import ( import (
"context" "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/k3s/pkg/generated/controllers/k3s.cattle.io"
"github.com/rancher/wrangler-api/pkg/generated/controllers/apps" "github.com/rancher/wrangler-api/pkg/generated/controllers/apps"
"github.com/rancher/wrangler-api/pkg/generated/controllers/batch" "github.com/rancher/wrangler-api/pkg/generated/controllers/batch"

2
pkg/server/server.go
View File

@ -15,8 +15,8 @@ import (
corev1 "k8s.io/api/core/v1" corev1 "k8s.io/api/core/v1"
"github.com/k3s-io/helm-controller/pkg/helm"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/rancher/helm-controller/pkg/helm"
"github.com/rancher/k3s/pkg/clientaccess" "github.com/rancher/k3s/pkg/clientaccess"
"github.com/rancher/k3s/pkg/daemons/config" "github.com/rancher/k3s/pkg/daemons/config"
"github.com/rancher/k3s/pkg/daemons/control" "github.com/rancher/k3s/pkg/daemons/control"

2
scripts/airgap/image-list.txt
View File

@ -1,5 +1,5 @@
docker.io/rancher/coredns-coredns:1.6.9 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/klipper-lb:v0.1.2
docker.io/rancher/library-busybox:1.31.1 docker.io/rancher/library-busybox:1.31.1
docker.io/rancher/library-traefik:1.7.19 docker.io/rancher/library-traefik:1.7.19

0
vendor/github.com/rancher/helm-controller/LICENSE → vendor/github.com/k3s-io/helm-controller/LICENSE generated vendored
View File

0
vendor/github.com/rancher/helm-controller/pkg/apis/helm.cattle.io/v1/doc.go → vendor/github.com/k3s-io/helm-controller/pkg/apis/helm.cattle.io/v1/doc.go generated vendored
View File

0
vendor/github.com/rancher/helm-controller/pkg/apis/helm.cattle.io/v1/types.go → vendor/github.com/k3s-io/helm-controller/pkg/apis/helm.cattle.io/v1/types.go generated vendored
View File

0
vendor/github.com/rancher/helm-controller/pkg/apis/helm.cattle.io/v1/zz_generated_deepcopy.go → vendor/github.com/k3s-io/helm-controller/pkg/apis/helm.cattle.io/v1/zz_generated_deepcopy.go generated vendored
View File

0
vendor/github.com/rancher/helm-controller/pkg/apis/helm.cattle.io/v1/zz_generated_list_types.go → vendor/github.com/k3s-io/helm-controller/pkg/apis/helm.cattle.io/v1/zz_generated_list_types.go generated vendored
View File

2
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 generated vendored
View File

@ -21,7 +21,7 @@ limitations under the License.
package v1 package v1
import ( 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" 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"

0
vendor/github.com/rancher/helm-controller/pkg/apis/helm.cattle.io/zz_generated_register.go → vendor/github.com/k3s-io/helm-controller/pkg/apis/helm.cattle.io/zz_generated_register.go generated vendored
View File

2
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 generated vendored
View File

@ -21,7 +21,7 @@ package versioned
import ( import (
"fmt" "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" 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"

0
vendor/github.com/rancher/helm-controller/pkg/generated/clientset/versioned/doc.go → vendor/github.com/k3s-io/helm-controller/pkg/generated/clientset/versioned/doc.go generated vendored
View File

0
vendor/github.com/rancher/helm-controller/pkg/generated/clientset/versioned/scheme/doc.go → vendor/github.com/k3s-io/helm-controller/pkg/generated/clientset/versioned/scheme/doc.go generated vendored
View File

2
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 generated vendored
View File

@ -19,7 +19,7 @@ limitations under the License.
package scheme package scheme
import ( 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" 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"

0
vendor/github.com/rancher/helm-controller/pkg/generated/clientset/versioned/typed/helm.cattle.io/v1/doc.go → vendor/github.com/k3s-io/helm-controller/pkg/generated/clientset/versioned/typed/helm.cattle.io/v1/doc.go generated vendored
View File

0
vendor/github.com/rancher/helm-controller/pkg/generated/clientset/versioned/typed/helm.cattle.io/v1/generated_expansion.go → vendor/github.com/k3s-io/helm-controller/pkg/generated/clientset/versioned/typed/helm.cattle.io/v1/generated_expansion.go generated vendored
View File

4
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 generated vendored
View File

@ -19,8 +19,8 @@ limitations under the License.
package v1 package v1
import ( 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"
"github.com/rancher/helm-controller/pkg/generated/clientset/versioned/scheme" "github.com/k3s-io/helm-controller/pkg/generated/clientset/versioned/scheme"
rest "k8s.io/client-go/rest" rest "k8s.io/client-go/rest"
) )

4
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 generated vendored
View File

@ -22,8 +22,8 @@ import (
"context" "context"
"time" "time"
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"
scheme "github.com/rancher/helm-controller/pkg/generated/clientset/versioned/scheme" scheme "github.com/k3s-io/helm-controller/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"

4
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 generated vendored
View File

@ -22,8 +22,8 @@ import (
"context" "context"
"time" "time"
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"
scheme "github.com/rancher/helm-controller/pkg/generated/clientset/versioned/scheme" scheme "github.com/k3s-io/helm-controller/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"

6
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 generated vendored
View File

@ -22,9 +22,9 @@ import (
"context" "context"
"time" "time"
clientset "github.com/rancher/helm-controller/pkg/generated/clientset/versioned" clientset "github.com/k3s-io/helm-controller/pkg/generated/clientset/versioned"
scheme "github.com/rancher/helm-controller/pkg/generated/clientset/versioned/scheme" scheme "github.com/k3s-io/helm-controller/pkg/generated/clientset/versioned/scheme"
informers "github.com/rancher/helm-controller/pkg/generated/informers/externalversions" informers "github.com/k3s-io/helm-controller/pkg/generated/informers/externalversions"
"github.com/rancher/wrangler/pkg/generic" "github.com/rancher/wrangler/pkg/generic"
"github.com/rancher/wrangler/pkg/schemes" "github.com/rancher/wrangler/pkg/schemes"
"k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/runtime/schema"

6
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 generated vendored
View File

@ -19,9 +19,9 @@ limitations under the License.
package helm package helm
import ( import (
clientset "github.com/rancher/helm-controller/pkg/generated/clientset/versioned" clientset "github.com/k3s-io/helm-controller/pkg/generated/clientset/versioned"
v1 "github.com/rancher/helm-controller/pkg/generated/controllers/helm.cattle.io/v1" v1 "github.com/k3s-io/helm-controller/pkg/generated/controllers/helm.cattle.io/v1"
informers "github.com/rancher/helm-controller/pkg/generated/informers/externalversions/helm.cattle.io" informers "github.com/k3s-io/helm-controller/pkg/generated/informers/externalversions/helm.cattle.io"
"github.com/rancher/wrangler/pkg/generic" "github.com/rancher/wrangler/pkg/generic"
) )

8
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 generated vendored
View File

@ -22,10 +22,10 @@ import (
"context" "context"
"time" "time"
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"
clientset "github.com/rancher/helm-controller/pkg/generated/clientset/versioned/typed/helm.cattle.io/v1" clientset "github.com/k3s-io/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" informers "github.com/k3s-io/helm-controller/pkg/generated/informers/externalversions/helm.cattle.io/v1"
listers "github.com/rancher/helm-controller/pkg/generated/listers/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/apply"
"github.com/rancher/wrangler/pkg/condition" "github.com/rancher/wrangler/pkg/condition"
"github.com/rancher/wrangler/pkg/generic" "github.com/rancher/wrangler/pkg/generic"

8
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 generated vendored
View File

@ -22,10 +22,10 @@ import (
"context" "context"
"time" "time"
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"
clientset "github.com/rancher/helm-controller/pkg/generated/clientset/versioned/typed/helm.cattle.io/v1" clientset "github.com/k3s-io/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" informers "github.com/k3s-io/helm-controller/pkg/generated/informers/externalversions/helm.cattle.io/v1"
listers "github.com/rancher/helm-controller/pkg/generated/listers/helm.cattle.io/v1" listers "github.com/k3s-io/helm-controller/pkg/generated/listers/helm.cattle.io/v1"
"github.com/rancher/wrangler/pkg/generic" "github.com/rancher/wrangler/pkg/generic"
"k8s.io/apimachinery/pkg/api/equality" "k8s.io/apimachinery/pkg/api/equality"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

6
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 generated vendored
View File

@ -19,9 +19,9 @@ limitations under the License.
package v1 package v1
import ( 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"
clientset "github.com/rancher/helm-controller/pkg/generated/clientset/versioned/typed/helm.cattle.io/v1" clientset "github.com/k3s-io/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" informers "github.com/k3s-io/helm-controller/pkg/generated/informers/externalversions/helm.cattle.io/v1"
"github.com/rancher/wrangler/pkg/generic" "github.com/rancher/wrangler/pkg/generic"
) )

6
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 generated vendored
View File

@ -23,9 +23,9 @@ import (
sync "sync" sync "sync"
time "time" time "time"
versioned "github.com/rancher/helm-controller/pkg/generated/clientset/versioned" versioned "github.com/k3s-io/helm-controller/pkg/generated/clientset/versioned"
helmcattleio "github.com/rancher/helm-controller/pkg/generated/informers/externalversions/helm.cattle.io" helmcattleio "github.com/k3s-io/helm-controller/pkg/generated/informers/externalversions/helm.cattle.io"
internalinterfaces "github.com/rancher/helm-controller/pkg/generated/informers/externalversions/internalinterfaces" internalinterfaces "github.com/k3s-io/helm-controller/pkg/generated/informers/externalversions/internalinterfaces"
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
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 generated vendored
View File

@ -21,7 +21,7 @@ package externalversions
import ( import (
"fmt" "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" schema "k8s.io/apimachinery/pkg/runtime/schema"
cache "k8s.io/client-go/tools/cache" cache "k8s.io/client-go/tools/cache"
) )

4
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 generated vendored
View File

@ -19,8 +19,8 @@ limitations under the License.
package helm package helm
import ( import (
v1 "github.com/rancher/helm-controller/pkg/generated/informers/externalversions/helm.cattle.io/v1" v1 "github.com/k3s-io/helm-controller/pkg/generated/informers/externalversions/helm.cattle.io/v1"
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 each of this group's versions. // Interface provides access to each of this group's versions.

8
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 generated vendored
View File

@ -22,10 +22,10 @@ import (
"context" "context"
time "time" time "time"
helmcattleiov1 "github.com/rancher/helm-controller/pkg/apis/helm.cattle.io/v1" helmcattleiov1 "github.com/k3s-io/helm-controller/pkg/apis/helm.cattle.io/v1"
versioned "github.com/rancher/helm-controller/pkg/generated/clientset/versioned" versioned "github.com/k3s-io/helm-controller/pkg/generated/clientset/versioned"
internalinterfaces "github.com/rancher/helm-controller/pkg/generated/informers/externalversions/internalinterfaces" internalinterfaces "github.com/k3s-io/helm-controller/pkg/generated/informers/externalversions/internalinterfaces"
v1 "github.com/rancher/helm-controller/pkg/generated/listers/helm.cattle.io/v1" v1 "github.com/k3s-io/helm-controller/pkg/generated/listers/helm.cattle.io/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
runtime "k8s.io/apimachinery/pkg/runtime" runtime "k8s.io/apimachinery/pkg/runtime"
watch "k8s.io/apimachinery/pkg/watch" watch "k8s.io/apimachinery/pkg/watch"

8
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 generated vendored
View File

@ -22,10 +22,10 @@ import (
"context" "context"
time "time" time "time"
helmcattleiov1 "github.com/rancher/helm-controller/pkg/apis/helm.cattle.io/v1" helmcattleiov1 "github.com/k3s-io/helm-controller/pkg/apis/helm.cattle.io/v1"
versioned "github.com/rancher/helm-controller/pkg/generated/clientset/versioned" versioned "github.com/k3s-io/helm-controller/pkg/generated/clientset/versioned"
internalinterfaces "github.com/rancher/helm-controller/pkg/generated/informers/externalversions/internalinterfaces" internalinterfaces "github.com/k3s-io/helm-controller/pkg/generated/informers/externalversions/internalinterfaces"
v1 "github.com/rancher/helm-controller/pkg/generated/listers/helm.cattle.io/v1" v1 "github.com/k3s-io/helm-controller/pkg/generated/listers/helm.cattle.io/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
runtime "k8s.io/apimachinery/pkg/runtime" runtime "k8s.io/apimachinery/pkg/runtime"
watch "k8s.io/apimachinery/pkg/watch" watch "k8s.io/apimachinery/pkg/watch"

2
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 generated vendored
View File

@ -19,7 +19,7 @@ limitations under the License.
package v1 package v1
import ( 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. // Interface provides access to all the informers in this group version.

2
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 generated vendored
View File

@ -21,7 +21,7 @@ package internalinterfaces
import ( import (
time "time" 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" v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
runtime "k8s.io/apimachinery/pkg/runtime" runtime "k8s.io/apimachinery/pkg/runtime"
cache "k8s.io/client-go/tools/cache" cache "k8s.io/client-go/tools/cache"

0
vendor/github.com/rancher/helm-controller/pkg/generated/listers/helm.cattle.io/v1/expansion_generated.go → vendor/github.com/k3s-io/helm-controller/pkg/generated/listers/helm.cattle.io/v1/expansion_generated.go generated vendored
View File

2
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 generated vendored
View File

@ -19,7 +19,7 @@ limitations under the License.
package v1 package v1
import ( 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/api/errors"
"k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/labels"
"k8s.io/client-go/tools/cache" "k8s.io/client-go/tools/cache"

2
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 generated vendored
View File

@ -19,7 +19,7 @@ limitations under the License.
package v1 package v1
import ( 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/api/errors"
"k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/labels"
"k8s.io/client-go/tools/cache" "k8s.io/client-go/tools/cache"

9
vendor/github.com/rancher/helm-controller/pkg/helm/controller.go → vendor/github.com/k3s-io/helm-controller/pkg/helm/controller.go generated vendored
View File

@ -8,8 +8,8 @@ import (
"sort" "sort"
"strings" "strings"
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"
helmcontroller "github.com/rancher/helm-controller/pkg/generated/controllers/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" batchcontroller "github.com/rancher/wrangler-api/pkg/generated/controllers/batch/v1"
corecontroller "github.com/rancher/wrangler-api/pkg/generated/controllers/core/v1" corecontroller "github.com/rancher/wrangler-api/pkg/generated/controllers/core/v1"
rbaccontroller "github.com/rancher/wrangler-api/pkg/generated/controllers/rbac/v1" rbaccontroller "github.com/rancher/wrangler-api/pkg/generated/controllers/rbac/v1"
@ -39,7 +39,7 @@ type Controller struct {
} }
const ( const (
DefaultJobImage = "rancher/klipper-helm:v0.3.0" DefaultJobImage = "rancher/klipper-helm:v0.3.2"
Label = "helmcharts.helm.cattle.io/chart" Label = "helmcharts.helm.cattle.io/chart"
Annotation = "helmcharts.helm.cattle.io/configHash" Annotation = "helmcharts.helm.cattle.io/configHash"
CRDName = "helmcharts.helm.cattle.io" CRDName = "helmcharts.helm.cattle.io"
@ -282,6 +282,9 @@ func job(chart *helmv1.HelmChart) (*batch.Job, *core.ConfigMap, *core.ConfigMap)
{ {
Name: "KUBERNETES_SERVICE_PORT", Name: "KUBERNETES_SERVICE_PORT",
Value: "6443"}, Value: "6443"},
{
Name: "BOOTSTRAP",
Value: "true"},
}...) }...)
job.Spec.Template.Spec.NodeSelector = make(map[string]string) job.Spec.Template.Spec.NodeSelector = make(map[string]string)
job.Spec.Template.Spec.NodeSelector["node-role.kubernetes.io/master"] = "true" job.Spec.Template.Spec.NodeSelector["node-role.kubernetes.io/master"] = "true"

30
vendor/modules.txt vendored
View File

@ -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 v0.0.0-20200701182037-6845e6fcfa79
github.com/k3s-io/go-powershell/backend github.com/k3s-io/go-powershell/backend
github.com/k3s-io/go-powershell/utils 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 # github.com/k3s-io/kine v0.6.0
## explicit ## explicit
github.com/k3s-io/kine/pkg/broadcaster 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/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/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 # github.com/rancher/remotedialer v0.2.0
## explicit ## explicit
github.com/rancher/remotedialer github.com/rancher/remotedialer