Skip to content

K
k3s
Commit 4079e460 authored by Brad Davidson's avatar Brad Davidson Committed by Brad Davidson
Browse files
Options

Update helm-controller to v0.8.3

Signed-off-by: 's avatarBrad Davidson <brad.davidson@rancher.com>
parent ec9a05f5
Hide whitespace changes
Inline Side-by-side
Showing with 84 additions and 68 deletions
go.mod
View file @ 4079e460
......@@ -77,6 +77,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.3
github.com/kubernetes-sigs/cri-tools v0.0.0-00010101000000-000000000000
github.com/lib/pq v1.8.0
github.com/mattn/go-sqlite3 v1.14.4
......@@ -86,7 +87,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/kine v0.5.1
github.com/rancher/remotedialer v0.2.0
github.com/rancher/wrangler v0.6.1
......
go.sum
View file @ 4079e460
......@@ -470,6 +470,8 @@ github.com/k3s-io/containerd v1.4.3-k3s1 h1:4n8gpBDXa6IpinjzSl+uJsTPfg0l0Dus6zZB
github.com/k3s-io/containerd v1.4.3-k3s1/go.mod h1:SQt4M1HhVTRsIIYHCfaelw8OGnk1FAkZbfiCx1WpkvE=
github.com/k3s-io/etcd v0.5.0-alpha.5.0.20201208200253-50621aee4aea h1:7cwby0GoNAi8IsVrT0q+JfQpB6V76ZaEGhj6qts/mvU=
github.com/k3s-io/etcd v0.5.0-alpha.5.0.20201208200253-50621aee4aea/go.mod h1:yVHk9ub3CSBatqGNg7GRmsnfLWtoW60w4eDYfh7vHDg=
github.com/k3s-io/helm-controller v0.8.3 h1:GWxavyMz7Bw2ClxH5okkeOL8o5U6IBK7uauc44SDCjU=
github.com/k3s-io/helm-controller v0.8.3/go.mod h1:nZP8FH3KZrNNUf5r+SwwiMR63HS6lxdHdpHijgPfF74=
github.com/k3s-io/kubernetes v1.19.7-k3s1 h1:eHp4p64Wg8KbtPW0kfakunWcDDkfFF1h1i5MCCUq17g=
github.com/k3s-io/kubernetes v1.19.7-k3s1/go.mod h1:gKuOq0UXDNqdLqmNMmMqFebiI7OUIcvh7XYngH4Oy2s=
github.com/k3s-io/kubernetes/staging/src/k8s.io/api v1.19.7-k3s1 h1:KbLOeUOueG9Hw/FP17RVFzF7ZwG/7AbErcAnKiIcJXk=
......@@ -706,8 +708,6 @@ github.com/rancher/go-powershell v0.0.0-20200701182037-6845e6fcfa79 h1:UeC0rjrIe
github.com/rancher/go-powershell v0.0.0-20200701182037-6845e6fcfa79/go.mod h1:xi4WpK6Op4m1Lknq61/e+VSjYlTs9bulVOaDNyBdzvk=
github.com/rancher/go-powershell v0.0.0-20200701184732-233247d45373 h1:BePi97poJ4hXnkP9yX96EmNQgMg+dGScvB1sqIheJ7w=
github.com/rancher/go-powershell v0.0.0-20200701184732-233247d45373/go.mod h1:Vz8oLnHgttpo/aZrTpjbcpZEDzzElqNau2zmorToY0E=
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/kine v0.5.1 h1:pBAD9LVU3oCuRWzY6lKEVqhNi1nZlJV3bbD4G2mrE1c=
github.com/rancher/kine v0.5.1/go.mod h1:NoqDMfN0Q+Wu23Kk3MfXfgLO2fE6abLaetejZs9HAYo=
github.com/rancher/moq v0.0.0-20190404221404-ee5226d43009/go.mod h1:wpITyDPTi/Na5h73XkbuEf2AP9fbgrIGqqxVzFhYD6U=
......
pkg/server/context.go
View file @ 4079e460
......@@ -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
View file @ 4079e460
......@@ -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
View file @ 4079e460
docker.io/rancher/coredns-coredns:1.6.9
docker.io/rancher/klipper-helm:v0.3.0
docker.io/rancher/klipper-helm:v0.4.3
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
View file @ 4079e460
......@@ -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
View file @ 4079e460
......@@ -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
View file @ 4079e460
......@@ -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
View file @ 4079e460
......@@ -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
View file @ 4079e460
......@@ -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
View file @ 4079e460
......@@ -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
View file @ 4079e460
......@@ -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
View file @ 4079e460
......@@ -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
View file @ 4079e460
......@@ -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
View file @ 4079e460
......@@ -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
View file @ 4079e460
......@@ -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
View file @ 4079e460
......@@ -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
View file @ 4079e460
......@@ -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
View file @ 4079e460
......@@ -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
View file @ 4079e460
......@@ -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
View file @ 4079e460
......@@ -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
View file @ 4079e460
......@@ -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
View file @ 4079e460
......@@ -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
View file @ 4079e460
......@@ -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
View file @ 4079e460
......@@ -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
View file @ 4079e460
......@@ -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.4.3"
Label = "helmcharts.helm.cattle.io/chart"
Annotation = "helmcharts.helm.cattle.io/configHash"
CRDName = "helmcharts.helm.cattle.io"
......@@ -194,6 +194,11 @@ func job(chart *helmv1.HelmChart) (*batch.Job, *core.ConfigMap, *core.ConfigMap)
action = "delete"
}
targetNamespace := chart.Namespace
if len(chart.Spec.TargetNamespace) != 0 {
targetNamespace = chart.Spec.TargetNamespace
}
job := &batch.Job{
TypeMeta: meta.TypeMeta{
APIVersion: "batch/v1",
......@@ -252,6 +257,10 @@ func job(chart *helmv1.HelmChart) (*batch.Job, *core.ConfigMap, *core.ConfigMap)
Name: "HELM_VERSION",
Value: chart.Spec.HelmVersion,
},
{
Name: "TARGET_NAMESPACE",
Value: targetNamespace,
},
},
},
},
......@@ -274,6 +283,10 @@ func job(chart *helmv1.HelmChart) (*batch.Job, *core.ConfigMap, *core.ConfigMap)
Value: "true",
Effect: "NoSchedule",
},
{
Key: "CriticalAddonsOnly",
Operator: core.TolerationOpExists,
},
}
job.Spec.Template.Spec.Containers[0].Env = append(job.Spec.Template.Spec.Containers[0].Env, []core.EnvVar{
{
......@@ -282,6 +295,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
View file @ 4079e460
......@@ -673,6 +673,21 @@ github.com/jmespath/go-jmespath
github.com/jonboulle/clockwork
# github.com/json-iterator/go v1.1.10
github.com/json-iterator/go
# github.com/k3s-io/helm-controller v0.8.3
## 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/karrick/godirwalk v1.7.5
github.com/karrick/godirwalk
# github.com/konsorten/go-windows-terminal-sequences v1.0.3
......@@ -818,21 +833,6 @@ github.com/rancher/dynamiclistener/storage/memory
# github.com/rancher/go-powershell v0.0.0-20200701182037-6845e6fcfa79
github.com/rancher/go-powershell/backend
github.com/rancher/go-powershell/utils
# 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/kine v0.5.1
## explicit
github.com/rancher/kine/pkg/broadcaster
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment