Skip to content

K
k3s
Unverified Commit 1c905b42 authored by Erik Wilson's avatar Erik Wilson Committed by GitHub
Browse files
Options

Merge pull request #1220 from galal-hussein/update_helmcontroller

Update helm controller and vendor udpate
parents ab273a7f b624e363
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 7 deletions
go.mod
View file @ 1c905b42
...@@ -98,7 +98,7 @@ require ( ...@@ -98,7 +98,7 @@ require (
github.com/pkg/errors v0.8.1 github.com/pkg/errors v0.8.1
github.com/rakelkar/gonetsh v0.0.0-20190719023240-501daadcadf8 // indirect github.com/rakelkar/gonetsh v0.0.0-20190719023240-501daadcadf8 // indirect
github.com/rancher/dynamiclistener v0.2.0 github.com/rancher/dynamiclistener v0.2.0
github.com/rancher/helm-controller v0.4.0 github.com/rancher/helm-controller v0.4.1-0.20191219210749-b81cad6ffd60
github.com/rancher/kine v0.3.2 github.com/rancher/kine v0.3.2
github.com/rancher/remotedialer v0.2.0 github.com/rancher/remotedialer v0.2.0
github.com/rancher/wrangler v0.4.0 github.com/rancher/wrangler v0.4.0
......
go.sum
View file @ 1c905b42
...@@ -717,6 +717,8 @@ github.com/rancher/helm-controller v0.3.0 h1:sYRpOiJc4+NmSEkft3lR2pwaEPOrPzZOTo2 ...@@ -717,6 +717,8 @@ github.com/rancher/helm-controller v0.3.0 h1:sYRpOiJc4+NmSEkft3lR2pwaEPOrPzZOTo2
github.com/rancher/helm-controller v0.3.0/go.mod h1:194LHuZRrxcD82bG1rJtOWsw98U4JbPhDWqvL7l3PAw= github.com/rancher/helm-controller v0.3.0/go.mod h1:194LHuZRrxcD82bG1rJtOWsw98U4JbPhDWqvL7l3PAw=
github.com/rancher/helm-controller v0.4.0 h1:VO7TqMsMWh3TJK7U38LLht1uHiDy0fSYWSywT0bE5lY= github.com/rancher/helm-controller v0.4.0 h1:VO7TqMsMWh3TJK7U38LLht1uHiDy0fSYWSywT0bE5lY=
github.com/rancher/helm-controller v0.4.0/go.mod h1:194LHuZRrxcD82bG1rJtOWsw98U4JbPhDWqvL7l3PAw= github.com/rancher/helm-controller v0.4.0/go.mod h1:194LHuZRrxcD82bG1rJtOWsw98U4JbPhDWqvL7l3PAw=
github.com/rancher/helm-controller v0.4.1-0.20191219210749-b81cad6ffd60 h1:c4UL7AcwFGoZIit6EoVS9S1ylj4IGhPCtQM23iFXBzA=
github.com/rancher/helm-controller v0.4.1-0.20191219210749-b81cad6ffd60/go.mod h1:194LHuZRrxcD82bG1rJtOWsw98U4JbPhDWqvL7l3PAw=
github.com/rancher/kine v0.3.2 h1:2kP48ojBWVoZ6vlzixc9jc9uKRk7Yn1a7kWoOsJi7Sg= github.com/rancher/kine v0.3.2 h1:2kP48ojBWVoZ6vlzixc9jc9uKRk7Yn1a7kWoOsJi7Sg=
github.com/rancher/kine v0.3.2/go.mod h1:xEMl0tLCva9/9me7mXJ3m9Vo6yqHgC4OU3NiK4CPrGQ= github.com/rancher/kine v0.3.2/go.mod h1:xEMl0tLCva9/9me7mXJ3m9Vo6yqHgC4OU3NiK4CPrGQ=
github.com/rancher/kubernetes v1.17.0-k3s.1 h1:g1xvTHOHMJxwWtseblor0gighLRHpL7Bf9MwX8HR3W0= github.com/rancher/kubernetes v1.17.0-k3s.1 h1:g1xvTHOHMJxwWtseblor0gighLRHpL7Bf9MwX8HR3W0=
......
vendor/github.com/rancher/helm-controller/pkg/helm/controller.go
View file @ 1c905b42
...@@ -8,7 +8,6 @@ import ( ...@@ -8,7 +8,6 @@ import (
"os" "os"
"sort" "sort"
"k8s.io/apimachinery/pkg/types"
helmv1 "github.com/rancher/helm-controller/pkg/apis/helm.cattle.io/v1" 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" helmcontroller "github.com/rancher/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"
...@@ -24,6 +23,7 @@ import ( ...@@ -24,6 +23,7 @@ import (
meta "k8s.io/apimachinery/pkg/apis/meta/v1" meta "k8s.io/apimachinery/pkg/apis/meta/v1"
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/types"
"k8s.io/apimachinery/pkg/util/intstr" "k8s.io/apimachinery/pkg/util/intstr"
) )
...@@ -39,7 +39,7 @@ type Controller struct { ...@@ -39,7 +39,7 @@ type Controller struct {
} }
const ( const (
image = "rancher/klipper-helm:v0.2.0" image = "rancher/klipper-helm:v0.2.1"
label = "helmcharts.helm.cattle.io/chart" label = "helmcharts.helm.cattle.io/chart"
name = "helm-controller" name = "helm-controller"
) )
...@@ -204,15 +204,15 @@ func job(chart *helmv1.HelmChart) (*batch.Job, *core.ConfigMap) { ...@@ -204,15 +204,15 @@ func job(chart *helmv1.HelmChart) (*batch.Job, *core.ConfigMap) {
Value: "secret", Value: "secret",
}, },
{ {
Name: "CHART_NAMESPACE", Name: "CHART_NAMESPACE",
Value: chart.Namespace, Value: chart.Namespace,
}, },
{ {
Name: "CHART", Name: "CHART",
Value: chart.Spec.Chart, Value: chart.Spec.Chart,
}, },
{ {
Name: "HELM_VERSION", Name: "HELM_VERSION",
Value: chart.Spec.HelmVersion, Value: chart.Spec.HelmVersion,
}, },
}, },
......
vendor/modules.txt
View file @ 1c905b42
...@@ -711,7 +711,7 @@ github.com/rancher/dynamiclistener/factory ...@@ -711,7 +711,7 @@ 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.4.0 # github.com/rancher/helm-controller v0.4.1-0.20191219210749-b81cad6ffd60
github.com/rancher/helm-controller/pkg/apis/helm.cattle.io 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/apis/helm.cattle.io/v1
github.com/rancher/helm-controller/pkg/generated/clientset/versioned github.com/rancher/helm-controller/pkg/generated/clientset/versioned
......
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