Merge pull request #742 from warmchang/traefik,helm-controller

manifests/traefik.yaml

@@ -4,7 +4,7 @@ metadata:
   name: traefik
   namespace: kube-system
 spec:
-  chart: https://%{KUBERNETES_API}%/static/charts/traefik-1.64.0.tgz
+  chart: https://%{KUBERNETES_API}%/static/charts/traefik-1.76.1.tgz
   set:
     rbac.enabled: "true"
     ssl.enabled: "true"

pkg/deploy/zz_generated_bindata.go

@@ -119,7 +119,7 @@ func rolebindingsYaml() (*asset, error) {
 	return a, nil
 }
 
-var _traefikYaml = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x6c\xcf\x4f\x4b\xc3\x40\x10\x05\xf0\x7b\x3e\xc5\x50\xe8\xb1\xbb\x16\xc4\xc3\xde\xfc\x13\x50\x04\x29\x56\xbd\xca\x64\xf3\xda\x0c\xdd\x6c\xc2\xce\xa4\xa0\xe2\x77\x97\x94\x1c\x3d\xce\xcc\xe3\xc7\x3c\x1e\xe5\x03\x45\x65\xc8\x81\x3a\xa4\xde\x45\x36\x4b\x70\x32\xf8\xf3\xb6\x3a\x49\x6e\x03\x3d\x22\xf5\xf7\x1d\x17\xab\x7a\x18\xb7\x6c\x1c\x2a\xa2\xcc\x3d\x02\x59\x61\x1c\xe4\xb4\xcc\x3a\x72\x44\xa0\xd3\xd4\x60\xa3\x5f\x6a\xe8\x2b\x1d\x11\xe7\x78\x9c\x81\x40\x9d\xd9\xa8\xc1\xfb\xf5\xcf\xf3\xfb\x5d\xfd\xfa\x52\xbf\xd5\xfb\xcf\xdb\xdd\xd3\xef\xda\xab\xb1\x49\xf4\x97\xa0\xfa\x05\xde\x6c\xdd\xcd\xb5\xbb\x72\x76\xfc\xae\x88\x14\x36\x5b\x44\xa5\xe1\xe8\x90\xb9\x49\x68\x03\xad\xac\x4c\x58\x5d\x0e\xaa\xe9\xdf\xfd\xfc\x52\xc9\x30\xa8\x93\x7c\x2c\x50\xad\x73\x3b\x0e\x92\xcd\x4d\x8a\x07\x1c\x78\x4a\xb6\x9b\x9a\x24\xda\xa1\xdd\xa3\x9c\x65\x6e\xb2\x08\x7f\x01\x00\x00\xff\xff\x90\xbb\x64\x2c\x26\x01\x00\x00")
+var _traefikYaml = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x6c\xcf\x4f\x4b\xc3\x40\x10\x05\xf0\x7b\x3e\xc5\x50\xe8\xb1\xbb\xe4\xa2\xb0\x37\xff\x04\x14\x41\x8a\x55\xaf\x32\xd9\xbc\x36\x4b\x36\x9b\xb0\x33\x29\xa8\xf8\xdd\x65\x4b\x8e\x3d\xce\xcc\xe3\xc7\x3c\x9e\xc3\x27\xb2\x84\x29\x39\xea\x11\x47\xe3\x59\x35\xc2\x84\xc9\x9e\xeb\x6a\x08\xa9\x73\xf4\x84\x38\x3e\xf4\x9c\xb5\x1a\xa1\xdc\xb1\xb2\xab\x88\x12\x8f\x70\xa4\x99\x71\x0c\xc3\x3a\xcb\xcc\x1e\x8e\x86\xa5\xc5\x4e\xbe\x45\x31\x56\x32\xc3\x97\xb8\x2f\x80\xa3\x5e\x75\x16\x67\xed\xf6\xf7\xe5\xe3\xbe\x79\x7b\x6d\xde\x9b\xc3\xd7\xdd\xfe\xf9\x6f\x6b\x45\x59\x83\xb7\x97\xa0\xd8\x15\xde\xd5\xe6\xf6\xc6\xd4\x46\x4f\x3f\x15\x91\x40\x8b\x45\x94\x5b\xf6\x06\x89\xdb\x88\xce\xd1\x46\xf3\x82\xcd\xe5\x20\x12\xaf\xee\xcb\x4b\x39\x41\x21\x26\xa4\x53\x86\x48\x93\xba\x79\x0a\x49\xcd\x22\x78\xc4\x91\x97\xa8\xfb\xa5\x8d\x41\x7a\x74\x07\xe4\x73\x28\x4d\x56\xe1\x3f\x00\x00\xff\xff\x94\x4f\x07\x0e\x26\x01\x00\x00")
 
 func traefikYamlBytes() ([]byte, error) {
 	return bindataRead(

scripts/airgap/image-list.txt

 docker.io/coredns/coredns:1.3.0
-docker.io/library/traefik:1.7.9
+docker.io/library/traefik:1.7.12
 docker.io/rancher/klipper-helm:v0.1.5
 docker.io/rancher/klipper-lb:v0.1.1
 k8s.gcr.io/pause:3.1

scripts/download

@@ -5,7 +5,7 @@ source $(dirname $0)/version.sh
 cd $(dirname $0)/..
 
 ROOT_VERSION=v0.1.1
-TRAEFIK_VERSION=1.64.0
+TRAEFIK_VERSION=1.76.1
 CHARTS_DIR=build/static/charts
 
 mkdir -p ${CHARTS_DIR}

trash.lock

@@ -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

@@ -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     7c71ffa8f5d7a181704d92bb8a33b0c7d07dccaa  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           823afe66b2266bf71f5bec24e6e28b26d70cfc7c  https://github.com/ibuildthecloud/flannel.git
 github.com/natefinch/lumberjack     aee4629129445bbdfb69aa565537dcfa16544311

vendor/github.com/rancher/helm-controller/pkg/helm/controller.go

@@ -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) {