Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
b67207a1
Commit
b67207a1
authored
Aug 20, 2019
by
William Zhang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update helm-controller to v0.2.2
Signed-off-by:
William Zhang
<
warmchang@outlook.com
>
parent
70a42477
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
11 additions
and
3 deletions
+11
-3
trash.lock
trash.lock
+1
-1
vendor.conf
vendor.conf
+1
-1
go.sum
vendor/github.com/rancher/helm-controller/go.sum
+0
-0
controller.go
...github.com/rancher/helm-controller/pkg/helm/controller.go
+9
-1
No files found.
trash.lock
View file @
b67207a1
...
...
@@ -230,7 +230,7 @@ import:
version: c08b499d17195fbc2c1764b21c322951811629a5
repo: https://github.com/erikwilson/rancher-dynamiclistener.git
- package: github.com/rancher/helm-controller
version: v0.2.
1
version: v0.2.
2
- package: github.com/rancher/remotedialer
version: 7c71ffa8f5d7a181704d92bb8a33b0c7d07dccaa
repo: https://github.com/erikwilson/rancher-remotedialer.git
...
...
vendor.conf
View file @
b67207a1
...
...
@@ -16,7 +16,7 @@ github.com/rancher/wrangler 7737c167e16514a38229bc64c839cee8cd14e6d3
github
.
com
/
rancher
/
wrangler
-
api
v0
.
1
.
4
github
.
com
/
rancher
/
dynamiclistener
c08b499d17195fbc2c1764b21c322951811629a5
https
://
github
.
com
/
erikwilson
/
rancher
-
dynamiclistener
.
git
github
.
com
/
rancher
/
remotedialer
7
c71ffa8f5d7a181704d92bb8a33b0c7d07dccaa
https
://
github
.
com
/
erikwilson
/
rancher
-
remotedialer
.
git
github
.
com
/
rancher
/
helm
-
controller
v0
.
2
.
1
github
.
com
/
rancher
/
helm
-
controller
v0
.
2
.
2
github
.
com
/
matryer
/
moq
ee5226d43009
https
://
github
.
com
/
rancher
/
moq
.
git
github
.
com
/
coreos
/
flannel
823
afe66b2266bf71f5bec24e6e28b26d70cfc7c
https
://
github
.
com
/
ibuildthecloud
/
flannel
.
git
github
.
com
/
natefinch
/
lumberjack
aee4629129445bbdfb69aa565537dcfa16544311
...
...
vendor/github.com/rancher/helm-controller/go.sum
View file @
b67207a1
This diff is collapsed.
Click to expand it.
vendor/github.com/rancher/helm-controller/pkg/helm/controller.go
View file @
b67207a1
...
...
@@ -8,6 +8,7 @@ import (
"os"
"sort"
"k8s.io/apimachinery/pkg/types"
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"
batchcontroller
"github.com/rancher/wrangler-api/pkg/generated/controllers/batch/v1"
...
...
@@ -21,6 +22,7 @@ import (
rbac
"k8s.io/api/rbac/v1"
"k8s.io/apimachinery/pkg/api/errors"
meta
"k8s.io/apimachinery/pkg/apis/meta/v1"
metav1
"k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/util/intstr"
)
...
...
@@ -50,7 +52,13 @@ func Register(ctx context.Context, apply apply.Apply,
cm
corecontroller
.
ConfigMapController
)
{
apply
=
apply
.
WithSetID
(
name
)
.
WithCacheTypes
(
helms
,
jobs
,
crbs
,
sas
,
cm
)
.
WithStrictCaching
()
WithStrictCaching
()
.
WithPatcher
(
batch
.
SchemeGroupVersion
.
WithKind
(
"Job"
),
func
(
namespace
,
name
string
,
pt
types
.
PatchType
,
data
[]
byte
)
(
runtime
.
Object
,
error
)
{
err
:=
jobs
.
Delete
(
namespace
,
name
,
&
metav1
.
DeleteOptions
{})
if
err
==
nil
{
return
nil
,
fmt
.
Errorf
(
"replace job"
)
}
return
nil
,
err
})
relatedresource
.
Watch
(
ctx
,
"helm-pod-watch"
,
func
(
namespace
,
name
string
,
obj
runtime
.
Object
)
([]
relatedresource
.
Key
,
error
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment