Merge pull request fluxcd#61 from dweomer/fix-toleration

fix uninitialized toleration
jtyr · Aug 16, 2020 · c078893 · c078893
2 parents 2b44dc0 + ca65177
commit c078893
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/pkg/helm/controller.go b/pkg/helm/controller.go
@@ -21,7 +21,6 @@ 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/types"
 	"k8s.io/apimachinery/pkg/util/intstr"
@@ -54,7 +53,7 @@ func Register(ctx context.Context, apply apply.Apply,
 	apply = apply.WithSetID(Name).
 		WithCacheTypes(helms, jobs, crbs, sas, cm).
 		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{})
+		err := jobs.Delete(namespace, name, &meta.DeleteOptions{})
 		if err == nil {
 			return nil, fmt.Errorf("replace job")
 		}
@@ -238,7 +237,7 @@ func job(chart *helmv1.HelmChart) (*batch.Job, *core.ConfigMap, *core.ConfigMap)
 			},
 			{
 				Key:      "node.cloudprovider.kubernetes.io/uninitialized",
-				Operator: "=",
+				Operator: core.TolerationOpEqual,
 				Value:    "true",
 				Effect:   "NoSchedule",
 			},