Bump version to 1.4.2 (#910 )

Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: karl-johan-grahn <6355577+karl-johan-grahn@users.noreply.github.com>
2026-02-14 18:09:50 +00:00 · 2025-04-30 13:42:53 +05:00
17 changed files with 185 additions and 993 deletions
--- a/.vale.ini
+++ b/.vale.ini
@@ -1,7 +1,7 @@
 StylesPath = styles
 MinAlertLevel = warning

-Packages = https://github.com/stakater/vale-package/releases/download/v0.0.62/Stakater.zip
+Packages = https://github.com/stakater/vale-package/releases/download/v0.0.61/Stakater.zip
 Vocab = Stakater

 # Only check MarkDown files
--- a/2
+++ b/2
@@ -2,7 +2,7 @@ ARG BUILDER_IMAGE
 ARG BASE_IMAGE

 # Build the manager binary
-FROM --platform=${BUILDPLATFORM} ${BUILDER_IMAGE:-golang:1.24.4} AS builder
+FROM --platform=${BUILDPLATFORM} ${BUILDER_IMAGE:-golang:1.24.2} AS builder

 ARG TARGETOS
 ARG TARGETARCH
--- a/README.md
+++ b/README.md
@@ -32,7 +32,6 @@ Reloader bridges that gap by ensuring your workloads stay in sync with configura
 flowchart LR
  ExternalSecret -->|Creates| Secret
  SealedSecret -->|Creates| Secret
-  Certificate -->|Creates| Secret
  Secret -->|Watched by| Reloader
  ConfigMap -->|Watched by| Reloader

@@ -45,7 +44,7 @@ flowchart LR
  Reloader -->|Sends Notification| Slack,Teams,Webhook
 ```

- Sources like `ExternalSecret`, `SealedSecret`, or `Certificate` from `cert-manager` can create or manage Kubernetes `Secrets` — but they can also be created manually or delivered through GitOps workflows.
+- Sources like `ExternalSecret` or `SealedSecret` create or manage your Kubernetes Secrets.
 - `Secrets` and `ConfigMaps` are watched by Reloader.
 - When changes are detected, Reloader automatically triggers a rollout of the associated workloads, ensuring your app always runs with the latest configuration.

@@ -305,7 +304,7 @@ Reloader supports multiple strategies for triggering rolling updates when a watc

 | Flag | Description |
 |------|-------------|
-| `--namespace-selector='key=value'` <br /> <br />`--namespace-selector='key1=value1,key2=value2'` <br /> <br />`--namespace-selector='key in (value1,value2)'`| Watch only namespaces with matching labels. See [LIST and WATCH filtering](https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/#list-and-watch-filtering) for more details on label selectors |
+| `--namespace-selector=key=value` | Watch only namespaces with matching labels |
 | `--namespaces-to-ignore=ns1,ns2` | Skip specific namespaces from being watched |

 #### 4. 📝 Annotation Key Overrides
--- a/2
+++ b/2
@@ -1 +1 @@
-1.1.0
+1.4.2
--- a/deployments/kubernetes/chart/reloader/Chart.yaml
+++ b/deployments/kubernetes/chart/reloader/Chart.yaml
@@ -1,8 +1,8 @@
 apiVersion: v1
 name: reloader
 description: Reloader chart that runs on kubernetes
-version: 2.1.3
-appVersion: v1.4.2
+version: 2.1.2
+appVersion: v1.4.1
 keywords:
  - Reloader
  - kubernetes
--- a/deployments/kubernetes/chart/reloader/README.md
+++ b/deployments/kubernetes/chart/reloader/README.md
@@ -52,7 +52,7 @@ helm uninstall {{RELEASE_NAME}} -n {{NAMESPACE}}
 | `reloader.syncAfterRestart`         | Enable sync after Reloader restarts for **Add** events, works only when reloadOnCreate is `true`. Valid value are either `true` or `false`          | boolean     | `false`   |
 | `reloader.reloadStrategy`           | Strategy to trigger resource restart, set to either `default`, `env-vars` or `annotations`                                                          | enumeration | `default` |
 | `reloader.ignoreNamespaces`         | List of comma separated namespaces to ignore, if multiple are provided, they are combined with the AND operator                                     | string      | `""`      |
-| `reloader.namespaceSelector`        | List of comma separated k8s label selectors for namespaces selection. See [LIST and WATCH filtering](https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/#list-and-watch-filtering) for more details on label-selector                                  | string      | `""`      |
+| `reloader.namespaceSelector`        | List of comma separated namespaces to select, if multiple are provided, they are combined with the AND operator                                     | string      | `""`      |
 | `reloader.resourceLabelSelector`    | List of comma separated label selectors, if multiple are provided they are combined with the AND operator                                           | string      | `""`      |
 | `reloader.logFormat`                | Set type of log format. Value could be either `json` or `""`                                                                                        | string      | `""`      |
 | `reloader.watchGlobally`            | Allow Reloader to watch in all namespaces (`true`) or just in a single namespace (`false`)                                                          | boolean     | `true`    |
--- a/deployments/kubernetes/chart/reloader/values.yaml
+++ b/deployments/kubernetes/chart/reloader/values.yaml
@@ -17,7 +17,7 @@ fullnameOverride: ""
 image:
  name: stakater/reloader
  repository: ghcr.io/stakater/reloader
-  tag: v1.4.2
+  tag: v1.4.1
  # digest: sha256:1234567
  pullPolicy: IfNotPresent

@@ -106,7 +106,7 @@ reloader:
    labels:
      provider: stakater
      group: com.stakater.platform
-      version: v1.4.2
+      version: v1.4.1
    # Support for extra environment variables.
    env:
      # Open supports Key value pair as environment variables.
--- a/deployments/kubernetes/manifests/deployment.yaml
+++ b/deployments/kubernetes/manifests/deployment.yaml
@@ -17,7 +17,7 @@ spec:
        app: reloader-reloader
    spec:
      containers:
-        - image: "ghcr.io/stakater/reloader:v1.1.0"
+        - image: "ghcr.io/stakater/reloader:v1.4.2"
          imagePullPolicy: IfNotPresent
          name: reloader-reloader
          env:
--- a/deployments/kubernetes/reloader.yaml
+++ b/deployments/kubernetes/reloader.yaml
@@ -104,7 +104,7 @@ spec:
            resourceFieldRef:
              divisor: "1"
              resource: limits.memory
-        image: "ghcr.io/stakater/reloader:latest"
+        image: ghcr.io/stakater/reloader:v1.4.2
        imagePullPolicy: IfNotPresent
        livenessProbe:
          failureThreshold: 5
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
 module github.com/stakater/Reloader

-go 1.24.4
+go 1.24.2

 require (
 	github.com/argoproj/argo-rollouts v1.8.2
@@ -38,6 +38,7 @@ require (
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
+	github.com/klauspost/compress v1.18.0 // indirect
 	github.com/kylelemons/godebug v1.1.0 // indirect
 	github.com/mailru/easyjson v0.9.0 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
--- a/go.sum
+++ b/go.sum
@@ -76,8 +76,12 @@ github.com/onsi/ginkgo/v2 v2.21.0 h1:7rg/4f3rB88pb5obDgNZrNHrQ4e6WpjonchcpuBRnZM
 github.com/onsi/ginkgo/v2 v2.21.0/go.mod h1:7Du3c42kxCUegi0IImZ1wUQzMBVecgIHjR1C+NkhLQo=
 github.com/onsi/gomega v1.35.1 h1:Cwbd75ZBPxFSuZ6T+rN/WCb/gOc6YgFBXLlZLhC7Ds4=
 github.com/onsi/gomega v1.35.1/go.mod h1:PvZbdDc8J6XJEpDK4HCuRBm8a6Fzp9/DmhC9C7yFlog=
+github.com/openshift/api v0.0.0-20250331192611-6179881b782d h1:Vadr+xFmNi6RzWRTJtqMQJv1hiUe7as1rV2svKQffoY=
+github.com/openshift/api v0.0.0-20250331192611-6179881b782d/go.mod h1:yk60tHAmHhtVpJQo3TwVYq2zpuP70iJIFDCmeKMIzPw=
 github.com/openshift/api v0.0.0-20250411135543-10a8fa583797 h1:8x3G8QOZqo2bRAL8JFlPz/odqQECI/XmlZeRwnFxJ8I=
 github.com/openshift/api v0.0.0-20250411135543-10a8fa583797/go.mod h1:yk60tHAmHhtVpJQo3TwVYq2zpuP70iJIFDCmeKMIzPw=
+github.com/openshift/client-go v0.0.0-20250330132942-bc2e3c2af6e1 h1:9SaT0p5FsRDvz4STV1VnxMyfXXzAXv1PubZ0nczzDYk=
+github.com/openshift/client-go v0.0.0-20250330132942-bc2e3c2af6e1/go.mod h1:6a0Hj32FrkokKMeTck1uStmNV0wHYv46dHWAWER5iis=
 github.com/openshift/client-go v0.0.0-20250402181141-b3bad3b645f2 h1:bPXR0R8zp1o12nSUphN26hSM+OKYq5pMorbDCpApzDQ=
 github.com/openshift/client-go v0.0.0-20250402181141-b3bad3b645f2/go.mod h1:dT1cJyVTperQ53GvVRa+GZ27r02fDZy2k5j+9QoQsCo=
 github.com/parnurzeal/gorequest v0.3.0 h1:SoFyqCDC9COr1xuS6VA8fC8RU7XyrJZN2ona1kEX7FI=
@@ -87,8 +91,12 @@ github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
 github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/prometheus/client_golang v1.21.1 h1:DOvXXTqVzvkIewV/CDPFdejpMCGeMcbGCQ8YOmu+Ibk=
+github.com/prometheus/client_golang v1.21.1/go.mod h1:U9NM32ykUErtVBxdvD3zfi+EuFkkaBvMb09mIfe0Zgg=
 github.com/prometheus/client_golang v1.22.0 h1:rb93p9lokFEsctTys46VnV1kLCDpVZ0a/Y92Vm0Zc6Q=
 github.com/prometheus/client_golang v1.22.0/go.mod h1:R7ljNsLXhuQXYZYtw6GAE9AZg8Y7vEW5scdCXrWRXC0=
+github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E=
+github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY=
 github.com/prometheus/client_model v0.6.2 h1:oBsgwpGs7iVziMvrGhE53c/GrLUsZdHnqNwqPLxwZyk=
 github.com/prometheus/client_model v0.6.2/go.mod h1:y3m2F6Gdpfy6Ut/GBsUqTWZqCUvMVzSfMLjcu6wAwpE=
 github.com/prometheus/common v0.63.0 h1:YR/EIY1o3mEFP/kZCD7iDMnLPlGyuU2Gb3HIcXnA98k=
@@ -129,8 +137,12 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
+golang.org/x/net v0.38.0 h1:vRMAPTMaeGqVhG5QyLJHqNDwecKTomGeqbnfZyKlBI8=
+golang.org/x/net v0.38.0/go.mod h1:ivrbrMbzFq5J41QOQh0siUuly180yBYtLp+CKbEaFx8=
 golang.org/x/net v0.39.0 h1:ZCu7HMWDxpXpaiKdhzIfaltL9Lp31x/3fCP11bc6/fY=
 golang.org/x/net v0.39.0/go.mod h1:X7NRbYVEA+ewNkCNyJ513WmMdQ3BineSwVtN2zD/d+E=
+golang.org/x/oauth2 v0.28.0 h1:CrgCKl8PPAVtLnU3c+EDw6x11699EWlsDeWNWKdIOkc=
+golang.org/x/oauth2 v0.28.0/go.mod h1:onh5ek6nERTohokkhCD/y2cV4Do3fxFHFuAejCkRWT8=
 golang.org/x/oauth2 v0.29.0 h1:WdYw2tdTK1S8olAzWHdgeqfy+Mtm9XNhv/xJsY65d98=
 golang.org/x/oauth2 v0.29.0/go.mod h1:onh5ek6nERTohokkhCD/y2cV4Do3fxFHFuAejCkRWT8=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -140,12 +152,18 @@ golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5h
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.31.0 h1:ioabZlmFYtWhL+TRYpcnNlLwhyxaM9kWTDEmfnprqik=
+golang.org/x/sys v0.31.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
 golang.org/x/sys v0.32.0 h1:s77OFDvIQeibCmezSnk/q6iAfkdiQaJi4VzroCFrN20=
 golang.org/x/sys v0.32.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
+golang.org/x/term v0.30.0 h1:PQ39fJZ+mfadBm0y5WlL4vlM7Sx1Hgf13sMIY2+QS9Y=
+golang.org/x/term v0.30.0/go.mod h1:NYYFdzHoI5wRh/h5tDMdMqCqPJZEuNqVR5xJLd/n67g=
 golang.org/x/term v0.31.0 h1:erwDkOK1Msy6offm1mOgvspSkslFnIGsFnxOKoufg3o=
 golang.org/x/term v0.31.0/go.mod h1:R4BeIy7D95HzImkxGkTW1UQTtP54tio2RyHz7PwK0aw=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/text v0.23.0 h1:D71I7dUrlY+VX0gQShAThNGHFxZ13dGLBHQLVl1mJlY=
+golang.org/x/text v0.23.0/go.mod h1:/BLNzu4aZCJ1+kcD0DNRotWKage4q2rGVAg4o22unh4=
 golang.org/x/text v0.24.0 h1:dd5Bzh4yt5KYA8f9CJHCP4FB4D51c2c6JvN37xJJkJ0=
 golang.org/x/text v0.24.0/go.mod h1:L8rBsPeo2pSS+xqN0d5u2ikmjtmoJbDBT1b7nHvFCdU=
 golang.org/x/time v0.11.0 h1:/bpjEDfN9tkoN/ryeYHnv5hcMlc8ncjMcM4XBk5NWV0=
--- a/internal/pkg/callbacks/rolling_upgrade.go
+++ b/internal/pkg/callbacks/rolling_upgrade.go
@@ -2,7 +2,6 @@ package callbacks

 import (
 	"context"
-	"errors"
 	"fmt"
 	"time"

@@ -20,9 +19,6 @@ import (
 	openshiftv1 "github.com/openshift/api/apps/v1"
 )

-// ItemFunc is a generic function to return a specific resource in given namespace
-type ItemFunc func(kube.Clients, string, string) (runtime.Object, error)
-
 // ItemsFunc is a generic function to return a specific resource array in given namespace
 type ItemsFunc func(kube.Clients, string) []runtime.Object

@@ -38,12 +34,6 @@ type VolumesFunc func(runtime.Object) []v1.Volume
 // UpdateFunc performs the resource update
 type UpdateFunc func(kube.Clients, string, runtime.Object) error

-// PatchFunc performs the resource patch
-type PatchFunc func(kube.Clients, string, runtime.Object, patchtypes.PatchType, []byte) error
-
-// PatchTemplateFunc is a generic func to return strategic merge JSON patch template
-type PatchTemplatesFunc func() PatchTemplates
-
 // AnnotationsFunc is a generic func to return annotations
 type AnnotationsFunc func(runtime.Object) map[string]string

@@ -52,42 +42,14 @@ type PodAnnotationsFunc func(runtime.Object) map[string]string

 // RollingUpgradeFuncs contains generic functions to perform rolling upgrade
 type RollingUpgradeFuncs struct {
-	ItemFunc               ItemFunc
-	ItemsFunc              ItemsFunc
-	AnnotationsFunc        AnnotationsFunc
-	PodAnnotationsFunc     PodAnnotationsFunc
-	ContainersFunc         ContainersFunc
-	ContainerPatchPathFunc ContainersFunc
-	InitContainersFunc     InitContainersFunc
-	UpdateFunc             UpdateFunc
-	PatchFunc              PatchFunc
-	PatchTemplatesFunc     PatchTemplatesFunc
-	VolumesFunc            VolumesFunc
-	ResourceType           string
-	SupportsPatch          bool
-}
-
-// PatchTemplates contains merge JSON patch templates
-type PatchTemplates struct {
-	AnnotationTemplate   string
-	EnvVarTemplate       string
-	DeleteEnvVarTemplate string
-}
-
-// GetDeploymentItem returns the deployment in given namespace
-func GetDeploymentItem(clients kube.Clients, name string, namespace string) (runtime.Object, error) {
-	deployment, err := clients.KubernetesClient.AppsV1().Deployments(namespace).Get(context.TODO(), name, meta_v1.GetOptions{})
-	if err != nil {
-		logrus.Errorf("Failed to get deployment %v", err)
-		return nil, err
-	}
-
-	if deployment.Spec.Template.ObjectMeta.Annotations == nil {
-		annotations := make(map[string]string)
-		deployment.Spec.Template.ObjectMeta.Annotations = annotations
-	}
-
-	return deployment, nil
+	ItemsFunc          ItemsFunc
+	AnnotationsFunc    AnnotationsFunc
+	PodAnnotationsFunc PodAnnotationsFunc
+	ContainersFunc     ContainersFunc
+	InitContainersFunc InitContainersFunc
+	UpdateFunc         UpdateFunc
+	VolumesFunc        VolumesFunc
+	ResourceType       string
 }

 // GetDeploymentItems returns the deployments in given namespace
@@ -110,17 +72,6 @@ func GetDeploymentItems(clients kube.Clients, namespace string) []runtime.Object
 	return items
 }

-// GetCronJobItem returns the job in given namespace
-func GetCronJobItem(clients kube.Clients, name string, namespace string) (runtime.Object, error) {
-	cronjob, err := clients.KubernetesClient.BatchV1().CronJobs(namespace).Get(context.TODO(), name, meta_v1.GetOptions{})
-	if err != nil {
-		logrus.Errorf("Failed to get cronjob %v", err)
-		return nil, err
-	}
-
-	return cronjob, nil
-}
-
 // GetCronJobItems returns the jobs in given namespace
 func GetCronJobItems(clients kube.Clients, namespace string) []runtime.Object {
 	cronjobs, err := clients.KubernetesClient.BatchV1().CronJobs(namespace).List(context.TODO(), meta_v1.ListOptions{})
@@ -141,17 +92,6 @@ func GetCronJobItems(clients kube.Clients, namespace string) []runtime.Object {
 	return items
 }

-// GetJobItem returns the job in given namespace
-func GetJobItem(clients kube.Clients, name string, namespace string) (runtime.Object, error) {
-	job, err := clients.KubernetesClient.BatchV1().Jobs(namespace).Get(context.TODO(), name, meta_v1.GetOptions{})
-	if err != nil {
-		logrus.Errorf("Failed to get job %v", err)
-		return nil, err
-	}
-
-	return job, nil
-}
-
 // GetJobItems returns the jobs in given namespace
 func GetJobItems(clients kube.Clients, namespace string) []runtime.Object {
 	jobs, err := clients.KubernetesClient.BatchV1().Jobs(namespace).List(context.TODO(), meta_v1.ListOptions{})
@@ -172,17 +112,6 @@ func GetJobItems(clients kube.Clients, namespace string) []runtime.Object {
 	return items
 }

-// GetDaemonSetItem returns the daemonSet in given namespace
-func GetDaemonSetItem(clients kube.Clients, name string, namespace string) (runtime.Object, error) {
-	daemonSet, err := clients.KubernetesClient.AppsV1().DaemonSets(namespace).Get(context.TODO(), name, meta_v1.GetOptions{})
-	if err != nil {
-		logrus.Errorf("Failed to get daemonSet %v", err)
-		return nil, err
-	}
-
-	return daemonSet, nil
-}
-
 // GetDaemonSetItems returns the daemonSets in given namespace
 func GetDaemonSetItems(clients kube.Clients, namespace string) []runtime.Object {
 	daemonSets, err := clients.KubernetesClient.AppsV1().DaemonSets(namespace).List(context.TODO(), meta_v1.ListOptions{})
@@ -202,17 +131,6 @@ func GetDaemonSetItems(clients kube.Clients, namespace string) []runtime.Object
 	return items
 }

-// GetStatefulSetItem returns the statefulSet in given namespace
-func GetStatefulSetItem(clients kube.Clients, name string, namespace string) (runtime.Object, error) {
-	statefulSet, err := clients.KubernetesClient.AppsV1().StatefulSets(namespace).Get(context.TODO(), name, meta_v1.GetOptions{})
-	if err != nil {
-		logrus.Errorf("Failed to get statefulSet %v", err)
-		return nil, err
-	}
-
-	return statefulSet, nil
-}
-
 // GetStatefulSetItems returns the statefulSets in given namespace
 func GetStatefulSetItems(clients kube.Clients, namespace string) []runtime.Object {
 	statefulSets, err := clients.KubernetesClient.AppsV1().StatefulSets(namespace).List(context.TODO(), meta_v1.ListOptions{})
@@ -232,17 +150,6 @@ func GetStatefulSetItems(clients kube.Clients, namespace string) []runtime.Objec
 	return items
 }

-// GetDeploymentConfigItem returns the deploymentConfig in given namespace
-func GetDeploymentConfigItem(clients kube.Clients, name string, namespace string) (runtime.Object, error) {
-	deploymentConfig, err := clients.OpenshiftAppsClient.AppsV1().DeploymentConfigs(namespace).Get(context.TODO(), name, meta_v1.GetOptions{})
-	if err != nil {
-		logrus.Errorf("Failed to get deploymentConfig %v", err)
-		return nil, err
-	}
-
-	return deploymentConfig, nil
-}
-
 // GetDeploymentConfigItems returns the deploymentConfigs in given namespace
 func GetDeploymentConfigItems(clients kube.Clients, namespace string) []runtime.Object {
 	deploymentConfigs, err := clients.OpenshiftAppsClient.AppsV1().DeploymentConfigs(namespace).List(context.TODO(), meta_v1.ListOptions{})
@@ -262,17 +169,6 @@ func GetDeploymentConfigItems(clients kube.Clients, namespace string) []runtime.
 	return items
 }

-// GetRolloutItem returns the rollout in given namespace
-func GetRolloutItem(clients kube.Clients, name string, namespace string) (runtime.Object, error) {
-	rollout, err := clients.ArgoRolloutClient.ArgoprojV1alpha1().Rollouts(namespace).Get(context.TODO(), name, meta_v1.GetOptions{})
-	if err != nil {
-		logrus.Errorf("Failed to get Rollout %v", err)
-		return nil, err
-	}
-
-	return rollout, nil
-}
-
 // GetRolloutItems returns the rollouts in given namespace
 func GetRolloutItems(clients kube.Clients, namespace string) []runtime.Object {
 	rollouts, err := clients.ArgoRolloutClient.ArgoprojV1alpha1().Rollouts(namespace).List(context.TODO(), meta_v1.ListOptions{})
@@ -294,113 +190,71 @@ func GetRolloutItems(clients kube.Clients, namespace string) []runtime.Object {

 // GetDeploymentAnnotations returns the annotations of given deployment
 func GetDeploymentAnnotations(item runtime.Object) map[string]string {
-	if item.(*appsv1.Deployment).ObjectMeta.Annotations == nil {
-		item.(*appsv1.Deployment).ObjectMeta.Annotations = make(map[string]string)
-	}
 	return item.(*appsv1.Deployment).ObjectMeta.Annotations
 }

 // GetCronJobAnnotations returns the annotations of given cronjob
 func GetCronJobAnnotations(item runtime.Object) map[string]string {
-	if item.(*batchv1.CronJob).ObjectMeta.Annotations == nil {
-		item.(*batchv1.CronJob).ObjectMeta.Annotations = make(map[string]string)
-	}
 	return item.(*batchv1.CronJob).ObjectMeta.Annotations
 }

 // GetJobAnnotations returns the annotations of given job
 func GetJobAnnotations(item runtime.Object) map[string]string {
-	if item.(*batchv1.Job).ObjectMeta.Annotations == nil {
-		item.(*batchv1.Job).ObjectMeta.Annotations = make(map[string]string)
-	}
 	return item.(*batchv1.Job).ObjectMeta.Annotations
 }

 // GetDaemonSetAnnotations returns the annotations of given daemonSet
 func GetDaemonSetAnnotations(item runtime.Object) map[string]string {
-	if item.(*appsv1.DaemonSet).ObjectMeta.Annotations == nil {
-		item.(*appsv1.DaemonSet).ObjectMeta.Annotations = make(map[string]string)
-	}
 	return item.(*appsv1.DaemonSet).ObjectMeta.Annotations
 }

 // GetStatefulSetAnnotations returns the annotations of given statefulSet
 func GetStatefulSetAnnotations(item runtime.Object) map[string]string {
-	if item.(*appsv1.StatefulSet).ObjectMeta.Annotations == nil {
-		item.(*appsv1.StatefulSet).ObjectMeta.Annotations = make(map[string]string)
-	}
 	return item.(*appsv1.StatefulSet).ObjectMeta.Annotations
 }

 // GetDeploymentConfigAnnotations returns the annotations of given deploymentConfig
 func GetDeploymentConfigAnnotations(item runtime.Object) map[string]string {
-	if item.(*openshiftv1.DeploymentConfig).ObjectMeta.Annotations == nil {
-		item.(*openshiftv1.DeploymentConfig).ObjectMeta.Annotations = make(map[string]string)
-	}
 	return item.(*openshiftv1.DeploymentConfig).ObjectMeta.Annotations
 }

 // GetRolloutAnnotations returns the annotations of given rollout
 func GetRolloutAnnotations(item runtime.Object) map[string]string {
-	if item.(*argorolloutv1alpha1.Rollout).ObjectMeta.Annotations == nil {
-		item.(*argorolloutv1alpha1.Rollout).ObjectMeta.Annotations = make(map[string]string)
-	}
 	return item.(*argorolloutv1alpha1.Rollout).ObjectMeta.Annotations
 }

 // GetDeploymentPodAnnotations returns the pod's annotations of given deployment
 func GetDeploymentPodAnnotations(item runtime.Object) map[string]string {
-	if item.(*appsv1.Deployment).Spec.Template.ObjectMeta.Annotations == nil {
-		item.(*appsv1.Deployment).Spec.Template.ObjectMeta.Annotations = make(map[string]string)
-	}
 	return item.(*appsv1.Deployment).Spec.Template.ObjectMeta.Annotations
 }

 // GetCronJobPodAnnotations returns the pod's annotations of given cronjob
 func GetCronJobPodAnnotations(item runtime.Object) map[string]string {
-	if item.(*batchv1.CronJob).Spec.JobTemplate.Spec.Template.ObjectMeta.Annotations == nil {
-		item.(*batchv1.CronJob).Spec.JobTemplate.Spec.Template.ObjectMeta.Annotations = make(map[string]string)
-	}
 	return item.(*batchv1.CronJob).Spec.JobTemplate.Spec.Template.ObjectMeta.Annotations
 }

 // GetJobPodAnnotations returns the pod's annotations of given job
 func GetJobPodAnnotations(item runtime.Object) map[string]string {
-	if item.(*batchv1.Job).Spec.Template.ObjectMeta.Annotations == nil {
-		item.(*batchv1.Job).Spec.Template.ObjectMeta.Annotations = make(map[string]string)
-	}
 	return item.(*batchv1.Job).Spec.Template.ObjectMeta.Annotations
 }

 // GetDaemonSetPodAnnotations returns the pod's annotations of given daemonSet
 func GetDaemonSetPodAnnotations(item runtime.Object) map[string]string {
-	if item.(*appsv1.DaemonSet).Spec.Template.ObjectMeta.Annotations == nil {
-		item.(*appsv1.DaemonSet).Spec.Template.ObjectMeta.Annotations = make(map[string]string)
-	}
 	return item.(*appsv1.DaemonSet).Spec.Template.ObjectMeta.Annotations
 }

 // GetStatefulSetPodAnnotations returns the pod's annotations of given statefulSet
 func GetStatefulSetPodAnnotations(item runtime.Object) map[string]string {
-	if item.(*appsv1.StatefulSet).Spec.Template.ObjectMeta.Annotations == nil {
-		item.(*appsv1.StatefulSet).Spec.Template.ObjectMeta.Annotations = make(map[string]string)
-	}
 	return item.(*appsv1.StatefulSet).Spec.Template.ObjectMeta.Annotations
 }

 // GetDeploymentConfigPodAnnotations returns the pod's annotations of given deploymentConfig
 func GetDeploymentConfigPodAnnotations(item runtime.Object) map[string]string {
-	if item.(*openshiftv1.DeploymentConfig).Spec.Template.ObjectMeta.Annotations == nil {
-		item.(*openshiftv1.DeploymentConfig).Spec.Template.ObjectMeta.Annotations = make(map[string]string)
-	}
 	return item.(*openshiftv1.DeploymentConfig).Spec.Template.ObjectMeta.Annotations
 }

 // GetRolloutPodAnnotations returns the pod's annotations of given rollout
 func GetRolloutPodAnnotations(item runtime.Object) map[string]string {
-	if item.(*argorolloutv1alpha1.Rollout).Spec.Template.ObjectMeta.Annotations == nil {
-		item.(*argorolloutv1alpha1.Rollout).Spec.Template.ObjectMeta.Annotations = make(map[string]string)
-	}
 	return item.(*argorolloutv1alpha1.Rollout).Spec.Template.ObjectMeta.Annotations
 }

@@ -474,15 +328,6 @@ func GetRolloutInitContainers(item runtime.Object) []v1.Container {
 	return item.(*argorolloutv1alpha1.Rollout).Spec.Template.Spec.InitContainers
 }

-// GetPatchTemplates returns patch templates
-func GetPatchTemplates() PatchTemplates {
-	return PatchTemplates{
-		AnnotationTemplate:   `{"spec":{"template":{"metadata":{"annotations":{"%s":"%s"}}}}}`,                                   // strategic merge patch
-		EnvVarTemplate:       `{"spec":{"template":{"spec":{"containers":[{"name":"%s","env":[{"name":"%s","value":"%s"}]}]}}}}`, // strategic merge patch
-		DeleteEnvVarTemplate: `[{"op":"remove","path":"/spec/template/spec/containers/%d/env/%d"}]`,                              // JSON patch
-	}
-}
-
 // UpdateDeployment performs rolling upgrade on deployment
 func UpdateDeployment(clients kube.Clients, namespace string, resource runtime.Object) error {
 	deployment := resource.(*appsv1.Deployment)
@@ -490,13 +335,6 @@ func UpdateDeployment(clients kube.Clients, namespace string, resource runtime.O
 	return err
 }

-// PatchDeployment performs rolling upgrade on deployment
-func PatchDeployment(clients kube.Clients, namespace string, resource runtime.Object, patchType patchtypes.PatchType, bytes []byte) error {
-	deployment := resource.(*appsv1.Deployment)
-	_, err := clients.KubernetesClient.AppsV1().Deployments(namespace).Patch(context.TODO(), deployment.Name, patchType, bytes, meta_v1.PatchOptions{FieldManager: "Reloader"})
-	return err
-}
-
 // CreateJobFromCronjob performs rolling upgrade on cronjob
 func CreateJobFromCronjob(clients kube.Clients, namespace string, resource runtime.Object) error {
 	cronJob := resource.(*batchv1.CronJob)
@@ -509,10 +347,6 @@ func CreateJobFromCronjob(clients kube.Clients, namespace string, resource runti
 	return err
 }

-func PatchCronJob(clients kube.Clients, namespace string, resource runtime.Object, patchType patchtypes.PatchType, bytes []byte) error {
-	return errors.New("not supported patching: CronJob")
-}
-
 // ReCreateJobFromjob performs rolling upgrade on job
 func ReCreateJobFromjob(clients kube.Clients, namespace string, resource runtime.Object) error {
 	oldJob := resource.(*batchv1.Job)
@@ -545,10 +379,6 @@ func ReCreateJobFromjob(clients kube.Clients, namespace string, resource runtime
 	return err
 }

-func PatchJob(clients kube.Clients, namespace string, resource runtime.Object, patchType patchtypes.PatchType, bytes []byte) error {
-	return errors.New("not supported patching: Job")
-}
-
 // UpdateDaemonSet performs rolling upgrade on daemonSet
 func UpdateDaemonSet(clients kube.Clients, namespace string, resource runtime.Object) error {
 	daemonSet := resource.(*appsv1.DaemonSet)
@@ -556,12 +386,6 @@ func UpdateDaemonSet(clients kube.Clients, namespace string, resource runtime.Ob
 	return err
 }

-func PatchDaemonSet(clients kube.Clients, namespace string, resource runtime.Object, patchType patchtypes.PatchType, bytes []byte) error {
-	daemonSet := resource.(*appsv1.DaemonSet)
-	_, err := clients.KubernetesClient.AppsV1().DaemonSets(namespace).Patch(context.TODO(), daemonSet.Name, patchType, bytes, meta_v1.PatchOptions{FieldManager: "Reloader"})
-	return err
-}
-
 // UpdateStatefulSet performs rolling upgrade on statefulSet
 func UpdateStatefulSet(clients kube.Clients, namespace string, resource runtime.Object) error {
 	statefulSet := resource.(*appsv1.StatefulSet)
@@ -569,12 +393,6 @@ func UpdateStatefulSet(clients kube.Clients, namespace string, resource runtime.
 	return err
 }

-func PatchStatefulSet(clients kube.Clients, namespace string, resource runtime.Object, patchType patchtypes.PatchType, bytes []byte) error {
-	statefulSet := resource.(*appsv1.StatefulSet)
-	_, err := clients.KubernetesClient.AppsV1().StatefulSets(namespace).Patch(context.TODO(), statefulSet.Name, patchType, bytes, meta_v1.PatchOptions{FieldManager: "Reloader"})
-	return err
-}
-
 // UpdateDeploymentConfig performs rolling upgrade on deploymentConfig
 func UpdateDeploymentConfig(clients kube.Clients, namespace string, resource runtime.Object) error {
 	deploymentConfig := resource.(*openshiftv1.DeploymentConfig)
@@ -582,17 +400,11 @@ func UpdateDeploymentConfig(clients kube.Clients, namespace string, resource run
 	return err
 }

-func PatchDeploymentConfig(clients kube.Clients, namespace string, resource runtime.Object, patchType patchtypes.PatchType, bytes []byte) error {
-	deploymentConfig := resource.(*openshiftv1.DeploymentConfig)
-	_, err := clients.OpenshiftAppsClient.AppsV1().DeploymentConfigs(namespace).Patch(context.TODO(), deploymentConfig.Name, patchType, bytes, meta_v1.PatchOptions{FieldManager: "Reloader"})
-	return err
-}
-
 // UpdateRollout performs rolling upgrade on rollout
 func UpdateRollout(clients kube.Clients, namespace string, resource runtime.Object) error {
+	var err error
 	rollout := resource.(*argorolloutv1alpha1.Rollout)
 	strategy := rollout.GetAnnotations()[options.RolloutStrategyAnnotation]
-	var err error
 	switch options.ToArgoRolloutStrategy(strategy) {
 	case options.RestartStrategy:
 		_, err = clients.ArgoRolloutClient.ArgoprojV1alpha1().Rollouts(namespace).Patch(context.TODO(), rollout.Name, patchtypes.MergePatchType, []byte(fmt.Sprintf(`{"spec": {"restartAt": "%s"}}`, time.Now().Format(time.RFC3339))), meta_v1.PatchOptions{FieldManager: "Reloader"})
@@ -602,10 +414,6 @@ func UpdateRollout(clients kube.Clients, namespace string, resource runtime.Obje
 	return err
 }

-func PatchRollout(clients kube.Clients, namespace string, resource runtime.Object, patchType patchtypes.PatchType, bytes []byte) error {
-	return errors.New("not supported patching: Rollout")
-}
-
 // GetDeploymentVolumes returns the Volumes of given deployment
 func GetDeploymentVolumes(item runtime.Object) []v1.Volume {
 	return item.(*appsv1.Deployment).Spec.Template.Spec.Volumes
--- a/internal/pkg/callbacks/rolling_upgrade_test.go
+++ b/internal/pkg/callbacks/rolling_upgrade_test.go
@@ -3,7 +3,6 @@ package callbacks_test
 import (
 	"context"
 	"fmt"
-	"strings"
 	"testing"
 	"time"

@@ -11,7 +10,7 @@ import (
 	appsv1 "k8s.io/api/apps/v1"
 	batchv1 "k8s.io/api/batch/v1"
 	v1 "k8s.io/api/core/v1"
-	"k8s.io/apimachinery/pkg/api/meta"
+	meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	watch "k8s.io/apimachinery/pkg/watch"
@@ -19,7 +18,6 @@ import (

 	argorolloutv1alpha1 "github.com/argoproj/argo-rollouts/pkg/apis/rollouts/v1alpha1"
 	fakeargoclientset "github.com/argoproj/argo-rollouts/pkg/client/clientset/versioned/fake"
-	patchtypes "k8s.io/apimachinery/pkg/types"

 	"github.com/stakater/Reloader/internal/pkg/callbacks"
 	"github.com/stakater/Reloader/internal/pkg/options"
@@ -95,7 +93,7 @@ func TestUpdateRollout(t *testing.T) {
 				t.Errorf("updating rollout: %v", err)
 			}
 			rollout, err = clients.ArgoRolloutClient.ArgoprojV1alpha1().Rollouts(
-				namespace).Get(context.TODO(), rollout.Name, metav1.GetOptions{})
+				namespace).Get(context.TODO(), rollout.Name, meta_v1.GetOptions{})

 			if err != nil {
 				t.Errorf("getting rollout: %v", err)
@@ -113,71 +111,6 @@ func TestUpdateRollout(t *testing.T) {
 	}
 }

-func TestPatchRollout(t *testing.T) {
-	namespace := "test-ns"
-	rollout := testutil.GetRollout(namespace, "test", map[string]string{options.RolloutStrategyAnnotation: ""})
-	err := callbacks.PatchRollout(clients, namespace, rollout, patchtypes.StrategicMergePatchType, []byte(`{"spec": {}}`))
-	assert.EqualError(t, err, "not supported patching: Rollout")
-}
-
-func TestResourceItem(t *testing.T) {
-	fixtures := newTestFixtures()
-
-	tests := []struct {
-		name        string
-		createFunc  func(kube.Clients, string, string) (runtime.Object, error)
-		getItemFunc func(kube.Clients, string, string) (runtime.Object, error)
-		deleteFunc  func(kube.Clients, string, string) error
-	}{
-		{
-			name:        "Deployment",
-			createFunc:  createTestDeploymentWithAnnotations,
-			getItemFunc: callbacks.GetDeploymentItem,
-			deleteFunc:  deleteTestDeployment,
-		},
-		{
-			name:        "CronJob",
-			createFunc:  createTestCronJobWithAnnotations,
-			getItemFunc: callbacks.GetCronJobItem,
-			deleteFunc:  deleteTestCronJob,
-		},
-		{
-			name:        "Job",
-			createFunc:  createTestJobWithAnnotations,
-			getItemFunc: callbacks.GetJobItem,
-			deleteFunc:  deleteTestJob,
-		},
-		{
-			name:        "DaemonSet",
-			createFunc:  createTestDaemonSetWithAnnotations,
-			getItemFunc: callbacks.GetDaemonSetItem,
-			deleteFunc:  deleteTestDaemonSet,
-		},
-		{
-			name:        "StatefulSet",
-			createFunc:  createTestStatefulSetWithAnnotations,
-			getItemFunc: callbacks.GetStatefulSetItem,
-			deleteFunc:  deleteTestStatefulSet,
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			resource, err := tt.createFunc(clients, fixtures.namespace, "1")
-			assert.NoError(t, err)
-
-			accessor, err := meta.Accessor(resource)
-			assert.NoError(t, err)
-
-			_, err = tt.getItemFunc(clients, accessor.GetName(), fixtures.namespace)
-			assert.NoError(t, err)
-
-			err = tt.deleteFunc(clients, fixtures.namespace, accessor.GetName())
-			assert.NoError(t, err)
-		})
-	}
-}
-
 func TestResourceItems(t *testing.T) {
 	fixtures := newTestFixtures()

@@ -185,42 +118,36 @@ func TestResourceItems(t *testing.T) {
 		name          string
 		createFunc    func(kube.Clients, string) error
 		getItemsFunc  func(kube.Clients, string) []runtime.Object
-		deleteFunc    func(kube.Clients, string) error
 		expectedCount int
 	}{
 		{
 			name:          "Deployments",
 			createFunc:    createTestDeployments,
 			getItemsFunc:  callbacks.GetDeploymentItems,
-			deleteFunc:    deleteTestDeployments,
 			expectedCount: 2,
 		},
 		{
 			name:          "CronJobs",
 			createFunc:    createTestCronJobs,
 			getItemsFunc:  callbacks.GetCronJobItems,
-			deleteFunc:    deleteTestCronJobs,
 			expectedCount: 2,
 		},
 		{
 			name:          "Jobs",
 			createFunc:    createTestJobs,
 			getItemsFunc:  callbacks.GetJobItems,
-			deleteFunc:    deleteTestJobs,
 			expectedCount: 2,
 		},
 		{
 			name:          "DaemonSets",
 			createFunc:    createTestDaemonSets,
 			getItemsFunc:  callbacks.GetDaemonSetItems,
-			deleteFunc:    deleteTestDaemonSets,
 			expectedCount: 2,
 		},
 		{
 			name:          "StatefulSets",
 			createFunc:    createTestStatefulSets,
 			getItemsFunc:  callbacks.GetStatefulSetItems,
-			deleteFunc:    deleteTestStatefulSets,
 			expectedCount: 2,
 		},
 	}
@@ -335,11 +262,10 @@ func TestUpdateResources(t *testing.T) {
 		name       string
 		createFunc func(kube.Clients, string, string) (runtime.Object, error)
 		updateFunc func(kube.Clients, string, runtime.Object) error
-		deleteFunc func(kube.Clients, string, string) error
 	}{
-		{"Deployment", createTestDeploymentWithAnnotations, callbacks.UpdateDeployment, deleteTestDeployment},
-		{"DaemonSet", createTestDaemonSetWithAnnotations, callbacks.UpdateDaemonSet, deleteTestDaemonSet},
-		{"StatefulSet", createTestStatefulSetWithAnnotations, callbacks.UpdateStatefulSet, deleteTestStatefulSet},
+		{"Deployment", createTestDeploymentWithAnnotations, callbacks.UpdateDeployment},
+		{"DaemonSet", createTestDaemonSetWithAnnotations, callbacks.UpdateDaemonSet},
+		{"StatefulSet", createTestStatefulSetWithAnnotations, callbacks.UpdateStatefulSet},
 	}

 	for _, tt := range tests {
@@ -349,65 +275,6 @@ func TestUpdateResources(t *testing.T) {

 			err = tt.updateFunc(clients, fixtures.namespace, resource)
 			assert.NoError(t, err)
-
-			accessor, err := meta.Accessor(resource)
-			assert.NoError(t, err)
-
-			err = tt.deleteFunc(clients, fixtures.namespace, accessor.GetName())
-			assert.NoError(t, err)
-		})
-	}
-}
-
-func TestPatchResources(t *testing.T) {
-	fixtures := newTestFixtures()
-
-	tests := []struct {
-		name       string
-		createFunc func(kube.Clients, string, string) (runtime.Object, error)
-		patchFunc  func(kube.Clients, string, runtime.Object, patchtypes.PatchType, []byte) error
-		deleteFunc func(kube.Clients, string, string) error
-		assertFunc func(err error)
-	}{
-		{"Deployment", createTestDeploymentWithAnnotations, callbacks.PatchDeployment, deleteTestDeployment, func(err error) {
-			assert.NoError(t, err)
-			patchedResource, err := callbacks.GetDeploymentItem(clients, "test-deployment", fixtures.namespace)
-			assert.NoError(t, err)
-			assert.Equal(t, "test", patchedResource.(*appsv1.Deployment).ObjectMeta.Annotations["test"])
-		}},
-		{"DaemonSet", createTestDaemonSetWithAnnotations, callbacks.PatchDaemonSet, deleteTestDaemonSet, func(err error) {
-			assert.NoError(t, err)
-			patchedResource, err := callbacks.GetDaemonSetItem(clients, "test-daemonset", fixtures.namespace)
-			assert.NoError(t, err)
-			assert.Equal(t, "test", patchedResource.(*appsv1.DaemonSet).ObjectMeta.Annotations["test"])
-		}},
-		{"StatefulSet", createTestStatefulSetWithAnnotations, callbacks.PatchStatefulSet, deleteTestStatefulSet, func(err error) {
-			assert.NoError(t, err)
-			patchedResource, err := callbacks.GetStatefulSetItem(clients, "test-statefulset", fixtures.namespace)
-			assert.NoError(t, err)
-			assert.Equal(t, "test", patchedResource.(*appsv1.StatefulSet).ObjectMeta.Annotations["test"])
-		}},
-		{"CronJob", createTestCronJobWithAnnotations, callbacks.PatchCronJob, deleteTestCronJob, func(err error) {
-			assert.EqualError(t, err, "not supported patching: CronJob")
-		}},
-		{"Job", createTestJobWithAnnotations, callbacks.PatchJob, deleteTestJob, func(err error) {
-			assert.EqualError(t, err, "not supported patching: Job")
-		}},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			resource, err := tt.createFunc(clients, fixtures.namespace, "1")
-			assert.NoError(t, err)
-
-			err = tt.patchFunc(clients, fixtures.namespace, resource, patchtypes.StrategicMergePatchType, []byte(`{"metadata":{"annotations":{"test":"test"}}}`))
-			tt.assertFunc(err)
-
-			accessor, err := meta.Accessor(resource)
-			assert.NoError(t, err)
-
-			err = tt.deleteFunc(clients, fixtures.namespace, accessor.GetName())
-			assert.NoError(t, err)
 		})
 	}
 }
@@ -420,9 +287,6 @@ func TestCreateJobFromCronjob(t *testing.T) {

 	err = callbacks.CreateJobFromCronjob(clients, fixtures.namespace, cronJob.(*batchv1.CronJob))
 	assert.NoError(t, err)
-
-	err = deleteTestCronJob(clients, fixtures.namespace, "test-cronjob")
-	assert.NoError(t, err)
 }

 func TestReCreateJobFromJob(t *testing.T) {
@@ -433,9 +297,6 @@ func TestReCreateJobFromJob(t *testing.T) {

 	err = callbacks.ReCreateJobFromjob(clients, fixtures.namespace, job.(*batchv1.Job))
 	assert.NoError(t, err)
-
-	err = deleteTestJob(clients, fixtures.namespace, "test-job")
-	assert.NoError(t, err)
 }

 func TestGetVolumes(t *testing.T) {
@@ -460,24 +321,6 @@ func TestGetVolumes(t *testing.T) {
 	}
 }

-func TesGetPatchTemplateAnnotation(t *testing.T) {
-	templates := callbacks.GetPatchTemplates()
-	assert.NotEmpty(t, templates.AnnotationTemplate)
-	assert.Equal(t, 2, strings.Count(templates.AnnotationTemplate, "%s"))
-}
-
-func TestGetPatchTemplateEnvVar(t *testing.T) {
-	templates := callbacks.GetPatchTemplates()
-	assert.NotEmpty(t, templates.EnvVarTemplate)
-	assert.Equal(t, 3, strings.Count(templates.EnvVarTemplate, "%s"))
-}
-
-func TestGetPatchDeleteTemplateEnvVar(t *testing.T) {
-	templates := callbacks.GetPatchTemplates()
-	assert.NotEmpty(t, templates.DeleteEnvVarTemplate)
-	assert.Equal(t, 2, strings.Count(templates.DeleteEnvVarTemplate, "%d"))
-}
-
 // Helper functions

 func isRestartStrategy(rollout *argorolloutv1alpha1.Rollout) bool {
@@ -487,7 +330,7 @@ func isRestartStrategy(rollout *argorolloutv1alpha1.Rollout) bool {
 func watchRollout(name, namespace string) chan interface{} {
 	timeOut := int64(1)
 	modifiedChan := make(chan interface{})
-	watcher, _ := clients.ArgoRolloutClient.ArgoprojV1alpha1().Rollouts(namespace).Watch(context.Background(), metav1.ListOptions{TimeoutSeconds: &timeOut})
+	watcher, _ := clients.ArgoRolloutClient.ArgoprojV1alpha1().Rollouts(namespace).Watch(context.Background(), meta_v1.ListOptions{TimeoutSeconds: &timeOut})
 	go watchModified(watcher, name, modifiedChan)
 	return modifiedChan
 }
@@ -515,16 +358,6 @@ func createTestDeployments(clients kube.Clients, namespace string) error {
 	return nil
 }

-func deleteTestDeployments(clients kube.Clients, namespace string) error {
-	for i := 1; i <= 2; i++ {
-		err := testutil.DeleteDeployment(clients.KubernetesClient, namespace, fmt.Sprintf("test-deployment-%d", i))
-		if err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
 func createTestCronJobs(clients kube.Clients, namespace string) error {
 	for i := 1; i <= 2; i++ {
 		_, err := testutil.CreateCronJob(clients.KubernetesClient, fmt.Sprintf("test-cron-%d", i), namespace, false)
@@ -535,16 +368,6 @@ func createTestCronJobs(clients kube.Clients, namespace string) error {
 	return nil
 }

-func deleteTestCronJobs(clients kube.Clients, namespace string) error {
-	for i := 1; i <= 2; i++ {
-		err := testutil.DeleteCronJob(clients.KubernetesClient, namespace, fmt.Sprintf("test-cron-%d", i))
-		if err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
 func createTestJobs(clients kube.Clients, namespace string) error {
 	for i := 1; i <= 2; i++ {
 		_, err := testutil.CreateJob(clients.KubernetesClient, fmt.Sprintf("test-job-%d", i), namespace, false)
@@ -555,16 +378,6 @@ func createTestJobs(clients kube.Clients, namespace string) error {
 	return nil
 }

-func deleteTestJobs(clients kube.Clients, namespace string) error {
-	for i := 1; i <= 2; i++ {
-		err := testutil.DeleteJob(clients.KubernetesClient, namespace, fmt.Sprintf("test-job-%d", i))
-		if err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
 func createTestDaemonSets(clients kube.Clients, namespace string) error {
 	for i := 1; i <= 2; i++ {
 		_, err := testutil.CreateDaemonSet(clients.KubernetesClient, fmt.Sprintf("test-daemonset-%d", i), namespace, false)
@@ -575,16 +388,6 @@ func createTestDaemonSets(clients kube.Clients, namespace string) error {
 	return nil
 }

-func deleteTestDaemonSets(clients kube.Clients, namespace string) error {
-	for i := 1; i <= 2; i++ {
-		err := testutil.DeleteDaemonSet(clients.KubernetesClient, namespace, fmt.Sprintf("test-daemonset-%d", i))
-		if err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
 func createTestStatefulSets(clients kube.Clients, namespace string) error {
 	for i := 1; i <= 2; i++ {
 		_, err := testutil.CreateStatefulSet(clients.KubernetesClient, fmt.Sprintf("test-statefulset-%d", i), namespace, false)
@@ -595,16 +398,6 @@ func createTestStatefulSets(clients kube.Clients, namespace string) error {
 	return nil
 }

-func deleteTestStatefulSets(clients kube.Clients, namespace string) error {
-	for i := 1; i <= 2; i++ {
-		err := testutil.DeleteStatefulSet(clients.KubernetesClient, namespace, fmt.Sprintf("test-statefulset-%d", i))
-		if err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
 func createResourceWithPodAnnotations(obj runtime.Object, annotations map[string]string) runtime.Object {
 	switch v := obj.(type) {
 	case *appsv1.Deployment:
@@ -686,10 +479,6 @@ func createTestDeploymentWithAnnotations(clients kube.Clients, namespace, versio
 	return clients.KubernetesClient.AppsV1().Deployments(namespace).Create(context.TODO(), deployment, metav1.CreateOptions{})
 }

-func deleteTestDeployment(clients kube.Clients, namespace, name string) error {
-	return clients.KubernetesClient.AppsV1().Deployments(namespace).Delete(context.TODO(), name, metav1.DeleteOptions{})
-}
-
 func createTestDaemonSetWithAnnotations(clients kube.Clients, namespace, version string) (runtime.Object, error) {
 	daemonSet := &appsv1.DaemonSet{
 		ObjectMeta: metav1.ObjectMeta{
@@ -701,10 +490,6 @@ func createTestDaemonSetWithAnnotations(clients kube.Clients, namespace, version
 	return clients.KubernetesClient.AppsV1().DaemonSets(namespace).Create(context.TODO(), daemonSet, metav1.CreateOptions{})
 }

-func deleteTestDaemonSet(clients kube.Clients, namespace, name string) error {
-	return clients.KubernetesClient.AppsV1().DaemonSets(namespace).Delete(context.TODO(), name, metav1.DeleteOptions{})
-}
-
 func createTestStatefulSetWithAnnotations(clients kube.Clients, namespace, version string) (runtime.Object, error) {
 	statefulSet := &appsv1.StatefulSet{
 		ObjectMeta: metav1.ObjectMeta{
@@ -716,10 +501,6 @@ func createTestStatefulSetWithAnnotations(clients kube.Clients, namespace, versi
 	return clients.KubernetesClient.AppsV1().StatefulSets(namespace).Create(context.TODO(), statefulSet, metav1.CreateOptions{})
 }

-func deleteTestStatefulSet(clients kube.Clients, namespace, name string) error {
-	return clients.KubernetesClient.AppsV1().StatefulSets(namespace).Delete(context.TODO(), name, metav1.DeleteOptions{})
-}
-
 func createTestCronJobWithAnnotations(clients kube.Clients, namespace, version string) (runtime.Object, error) {
 	cronJob := &batchv1.CronJob{
 		ObjectMeta: metav1.ObjectMeta{
@@ -731,10 +512,6 @@ func createTestCronJobWithAnnotations(clients kube.Clients, namespace, version s
 	return clients.KubernetesClient.BatchV1().CronJobs(namespace).Create(context.TODO(), cronJob, metav1.CreateOptions{})
 }

-func deleteTestCronJob(clients kube.Clients, namespace, name string) error {
-	return clients.KubernetesClient.BatchV1().CronJobs(namespace).Delete(context.TODO(), name, metav1.DeleteOptions{})
-}
-
 func createTestJobWithAnnotations(clients kube.Clients, namespace, version string) (runtime.Object, error) {
 	job := &batchv1.Job{
 		ObjectMeta: metav1.ObjectMeta{
@@ -745,7 +522,3 @@ func createTestJobWithAnnotations(clients kube.Clients, namespace, version strin
 	}
 	return clients.KubernetesClient.BatchV1().Jobs(namespace).Create(context.TODO(), job, metav1.CreateOptions{})
 }
-
-func deleteTestJob(clients kube.Clients, namespace, name string) error {
-	return clients.KubernetesClient.BatchV1().Jobs(namespace).Delete(context.TODO(), name, metav1.DeleteOptions{})
-}
--- a/internal/pkg/handler/delete.go
+++ b/internal/pkg/handler/delete.go
@@ -1,9 +1,6 @@
 package handler

 import (
-	"fmt"
-	"slices"
-
 	"github.com/sirupsen/logrus"
 	"github.com/stakater/Reloader/internal/pkg/callbacks"
 	"github.com/stakater/Reloader/internal/pkg/constants"
@@ -11,10 +8,8 @@ import (
 	"github.com/stakater/Reloader/internal/pkg/options"
 	"github.com/stakater/Reloader/internal/pkg/testutil"
 	"github.com/stakater/Reloader/internal/pkg/util"
-
 	v1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/runtime"
-	patchtypes "k8s.io/apimachinery/pkg/types"
 	"k8s.io/client-go/tools/record"
 )

@@ -55,7 +50,7 @@ func (r ResourceDeleteHandler) GetConfig() (util.Config, string) {
 	return config, oldSHAData
 }

-func invokeDeleteStrategy(upgradeFuncs callbacks.RollingUpgradeFuncs, item runtime.Object, config util.Config, autoReload bool) InvokeStrategyResult {
+func invokeDeleteStrategy(upgradeFuncs callbacks.RollingUpgradeFuncs, item runtime.Object, config util.Config, autoReload bool) constants.Result {
 	if options.ReloadStrategy == constants.AnnotationsReloadStrategy {
 		return removePodAnnotations(upgradeFuncs, item, config, autoReload)
 	}
@@ -63,38 +58,35 @@ func invokeDeleteStrategy(upgradeFuncs callbacks.RollingUpgradeFuncs, item runti
 	return removeContainerEnvVars(upgradeFuncs, item, config, autoReload)
 }

-func removePodAnnotations(upgradeFuncs callbacks.RollingUpgradeFuncs, item runtime.Object, config util.Config, autoReload bool) InvokeStrategyResult {
+func removePodAnnotations(upgradeFuncs callbacks.RollingUpgradeFuncs, item runtime.Object, config util.Config, autoReload bool) constants.Result {
 	config.SHAValue = testutil.GetSHAfromEmptyData()
 	return updatePodAnnotations(upgradeFuncs, item, config, autoReload)
 }

-func removeContainerEnvVars(upgradeFuncs callbacks.RollingUpgradeFuncs, item runtime.Object, config util.Config, autoReload bool) InvokeStrategyResult {
+func removeContainerEnvVars(upgradeFuncs callbacks.RollingUpgradeFuncs, item runtime.Object, config util.Config, autoReload bool) constants.Result {
 	envVar := getEnvVarName(config.ResourceName, config.Type)
 	container := getContainerUsingResource(upgradeFuncs, item, config, autoReload)

 	if container == nil {
-		return InvokeStrategyResult{constants.NoContainerFound, nil}
+		return constants.NoContainerFound
 	}

 	//remove if env var exists
-	if len(container.Env) > 0 {
-		index := slices.IndexFunc(container.Env, func(envVariable v1.EnvVar) bool {
-			return envVariable.Name == envVar
-		})
-		if index != -1 {
-			var patch []byte
-			if upgradeFuncs.SupportsPatch {
-				containers := upgradeFuncs.ContainersFunc(item)
-				containerIndex := slices.IndexFunc(containers, func(c v1.Container) bool {
-					return c.Name == container.Name
-				})
-				patch = fmt.Appendf(nil, upgradeFuncs.PatchTemplatesFunc().DeleteEnvVarTemplate, containerIndex, index)
+	containers := upgradeFuncs.ContainersFunc(item)
+	for i := range containers {
+		envs := containers[i].Env
+		index := -1
+		for j := range envs {
+			if envs[j].Name == envVar {
+				index = j
+				break
 			}
-
-			container.Env = append(container.Env[:index], container.Env[index+1:]...)
-			return InvokeStrategyResult{constants.Updated, &Patch{Type: patchtypes.JSONPatchType, Bytes: patch}}
+		}
+		if index != -1 {
+			containers[i].Env = append(containers[i].Env[:index], containers[i].Env[index+1:]...)
+			return constants.Updated
 		}
 	}

-	return InvokeStrategyResult{constants.NotUpdated, nil}
+	return constants.NotUpdated
 }
--- a/internal/pkg/handler/upgrade.go
+++ b/internal/pkg/handler/upgrade.go
@@ -24,134 +24,104 @@ import (
 	v1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/meta"
 	"k8s.io/apimachinery/pkg/runtime"
-	patchtypes "k8s.io/apimachinery/pkg/types"
 	"k8s.io/client-go/tools/record"
-	"k8s.io/client-go/util/retry"
 )

 // GetDeploymentRollingUpgradeFuncs returns all callback funcs for a deployment
 func GetDeploymentRollingUpgradeFuncs() callbacks.RollingUpgradeFuncs {
 	return callbacks.RollingUpgradeFuncs{
-		ItemFunc:           callbacks.GetDeploymentItem,
 		ItemsFunc:          callbacks.GetDeploymentItems,
 		AnnotationsFunc:    callbacks.GetDeploymentAnnotations,
 		PodAnnotationsFunc: callbacks.GetDeploymentPodAnnotations,
 		ContainersFunc:     callbacks.GetDeploymentContainers,
 		InitContainersFunc: callbacks.GetDeploymentInitContainers,
 		UpdateFunc:         callbacks.UpdateDeployment,
-		PatchFunc:          callbacks.PatchDeployment,
-		PatchTemplatesFunc: callbacks.GetPatchTemplates,
 		VolumesFunc:        callbacks.GetDeploymentVolumes,
 		ResourceType:       "Deployment",
-		SupportsPatch:      true,
 	}
 }

 // GetDeploymentRollingUpgradeFuncs returns all callback funcs for a cronjob
 func GetCronJobCreateJobFuncs() callbacks.RollingUpgradeFuncs {
 	return callbacks.RollingUpgradeFuncs{
-		ItemFunc:           callbacks.GetCronJobItem,
 		ItemsFunc:          callbacks.GetCronJobItems,
 		AnnotationsFunc:    callbacks.GetCronJobAnnotations,
 		PodAnnotationsFunc: callbacks.GetCronJobPodAnnotations,
 		ContainersFunc:     callbacks.GetCronJobContainers,
 		InitContainersFunc: callbacks.GetCronJobInitContainers,
 		UpdateFunc:         callbacks.CreateJobFromCronjob,
-		PatchFunc:          callbacks.PatchCronJob,
-		PatchTemplatesFunc: func() callbacks.PatchTemplates { return callbacks.PatchTemplates{} },
 		VolumesFunc:        callbacks.GetCronJobVolumes,
 		ResourceType:       "CronJob",
-		SupportsPatch:      false,
 	}
 }

 // GetDeploymentRollingUpgradeFuncs returns all callback funcs for a cronjob
 func GetJobCreateJobFuncs() callbacks.RollingUpgradeFuncs {
 	return callbacks.RollingUpgradeFuncs{
-		ItemFunc:           callbacks.GetJobItem,
 		ItemsFunc:          callbacks.GetJobItems,
 		AnnotationsFunc:    callbacks.GetJobAnnotations,
 		PodAnnotationsFunc: callbacks.GetJobPodAnnotations,
 		ContainersFunc:     callbacks.GetJobContainers,
 		InitContainersFunc: callbacks.GetJobInitContainers,
 		UpdateFunc:         callbacks.ReCreateJobFromjob,
-		PatchFunc:          callbacks.PatchJob,
-		PatchTemplatesFunc: func() callbacks.PatchTemplates { return callbacks.PatchTemplates{} },
 		VolumesFunc:        callbacks.GetJobVolumes,
 		ResourceType:       "Job",
-		SupportsPatch:      false,
 	}
 }

 // GetDaemonSetRollingUpgradeFuncs returns all callback funcs for a daemonset
 func GetDaemonSetRollingUpgradeFuncs() callbacks.RollingUpgradeFuncs {
 	return callbacks.RollingUpgradeFuncs{
-		ItemFunc:           callbacks.GetDaemonSetItem,
 		ItemsFunc:          callbacks.GetDaemonSetItems,
 		AnnotationsFunc:    callbacks.GetDaemonSetAnnotations,
 		PodAnnotationsFunc: callbacks.GetDaemonSetPodAnnotations,
 		ContainersFunc:     callbacks.GetDaemonSetContainers,
 		InitContainersFunc: callbacks.GetDaemonSetInitContainers,
 		UpdateFunc:         callbacks.UpdateDaemonSet,
-		PatchFunc:          callbacks.PatchDaemonSet,
-		PatchTemplatesFunc: callbacks.GetPatchTemplates,
 		VolumesFunc:        callbacks.GetDaemonSetVolumes,
 		ResourceType:       "DaemonSet",
-		SupportsPatch:      true,
 	}
 }

 // GetStatefulSetRollingUpgradeFuncs returns all callback funcs for a statefulSet
 func GetStatefulSetRollingUpgradeFuncs() callbacks.RollingUpgradeFuncs {
 	return callbacks.RollingUpgradeFuncs{
-		ItemFunc:           callbacks.GetStatefulSetItem,
 		ItemsFunc:          callbacks.GetStatefulSetItems,
 		AnnotationsFunc:    callbacks.GetStatefulSetAnnotations,
 		PodAnnotationsFunc: callbacks.GetStatefulSetPodAnnotations,
 		ContainersFunc:     callbacks.GetStatefulSetContainers,
 		InitContainersFunc: callbacks.GetStatefulSetInitContainers,
 		UpdateFunc:         callbacks.UpdateStatefulSet,
-		PatchFunc:          callbacks.PatchStatefulSet,
-		PatchTemplatesFunc: callbacks.GetPatchTemplates,
 		VolumesFunc:        callbacks.GetStatefulSetVolumes,
 		ResourceType:       "StatefulSet",
-		SupportsPatch:      true,
 	}
 }

 // GetDeploymentConfigRollingUpgradeFuncs returns all callback funcs for a deploymentConfig
 func GetDeploymentConfigRollingUpgradeFuncs() callbacks.RollingUpgradeFuncs {
 	return callbacks.RollingUpgradeFuncs{
-		ItemFunc:           callbacks.GetDeploymentConfigItem,
 		ItemsFunc:          callbacks.GetDeploymentConfigItems,
 		AnnotationsFunc:    callbacks.GetDeploymentConfigAnnotations,
 		PodAnnotationsFunc: callbacks.GetDeploymentConfigPodAnnotations,
 		ContainersFunc:     callbacks.GetDeploymentConfigContainers,
 		InitContainersFunc: callbacks.GetDeploymentConfigInitContainers,
 		UpdateFunc:         callbacks.UpdateDeploymentConfig,
-		PatchFunc:          callbacks.PatchDeploymentConfig,
-		PatchTemplatesFunc: callbacks.GetPatchTemplates,
 		VolumesFunc:        callbacks.GetDeploymentConfigVolumes,
 		ResourceType:       "DeploymentConfig",
-		SupportsPatch:      true,
 	}
 }

 // GetArgoRolloutRollingUpgradeFuncs returns all callback funcs for a rollout
 func GetArgoRolloutRollingUpgradeFuncs() callbacks.RollingUpgradeFuncs {
 	return callbacks.RollingUpgradeFuncs{
-		ItemFunc:           callbacks.GetRolloutItem,
 		ItemsFunc:          callbacks.GetRolloutItems,
 		AnnotationsFunc:    callbacks.GetRolloutAnnotations,
 		PodAnnotationsFunc: callbacks.GetRolloutPodAnnotations,
 		ContainersFunc:     callbacks.GetRolloutContainers,
 		InitContainersFunc: callbacks.GetRolloutInitContainers,
 		UpdateFunc:         callbacks.UpdateRollout,
-		PatchFunc:          callbacks.PatchRollout,
-		PatchTemplatesFunc: func() callbacks.PatchTemplates { return callbacks.PatchTemplates{} },
 		VolumesFunc:        callbacks.GetRolloutVolumes,
 		ResourceType:       "Rollout",
-		SupportsPatch:      false,
 	}
 }

@@ -240,131 +210,107 @@ func rollingUpgrade(clients kube.Clients, config util.Config, upgradeFuncs callb
 func PerformAction(clients kube.Clients, config util.Config, upgradeFuncs callbacks.RollingUpgradeFuncs, collectors metrics.Collectors, recorder record.EventRecorder, strategy invokeStrategy) error {
 	items := upgradeFuncs.ItemsFunc(clients, config.Namespace)

-	for _, item := range items {
-		err := retry.RetryOnConflict(retry.DefaultRetry, func() error {
-			return upgradeResource(clients, config, upgradeFuncs, collectors, recorder, strategy, item)
-		})
+	for _, i := range items {
+		// find correct annotation and update the resource
+		annotations := upgradeFuncs.AnnotationsFunc(i)
+		annotationValue, found := annotations[config.Annotation]
+		searchAnnotationValue, foundSearchAnn := annotations[options.AutoSearchAnnotation]
+		reloaderEnabledValue, foundAuto := annotations[options.ReloaderAutoAnnotation]
+		typedAutoAnnotationEnabledValue, foundTypedAuto := annotations[config.TypedAutoAnnotation]
+		excludeConfigmapAnnotationValue, foundExcludeConfigmap := annotations[options.ConfigmapExcludeReloaderAnnotation]
+		excludeSecretAnnotationValue, foundExcludeSecret := annotations[options.SecretExcludeReloaderAnnotation]

-		if err != nil {
-			return err
+		if !found && !foundAuto && !foundTypedAuto && !foundSearchAnn {
+			annotations = upgradeFuncs.PodAnnotationsFunc(i)
+			annotationValue = annotations[config.Annotation]
+			searchAnnotationValue = annotations[options.AutoSearchAnnotation]
+			reloaderEnabledValue = annotations[options.ReloaderAutoAnnotation]
+			typedAutoAnnotationEnabledValue = annotations[config.TypedAutoAnnotation]
 		}
-	}

-	return nil
-}
+		isResourceExcluded := false

-func upgradeResource(clients kube.Clients, config util.Config, upgradeFuncs callbacks.RollingUpgradeFuncs, collectors metrics.Collectors, recorder record.EventRecorder, strategy invokeStrategy, resource runtime.Object) error {
-	accessor, err := meta.Accessor(resource)
-	if err != nil {
-		return err
-	}
-
-	resourceName := accessor.GetName()
-	resource, err = upgradeFuncs.ItemFunc(clients, resourceName, config.Namespace)
-	if err != nil {
-		return err
-	}
-
-	// find correct annotation and update the resource
-	annotations := upgradeFuncs.AnnotationsFunc(resource)
-	annotationValue, found := annotations[config.Annotation]
-	searchAnnotationValue, foundSearchAnn := annotations[options.AutoSearchAnnotation]
-	reloaderEnabledValue, foundAuto := annotations[options.ReloaderAutoAnnotation]
-	typedAutoAnnotationEnabledValue, foundTypedAuto := annotations[config.TypedAutoAnnotation]
-	excludeConfigmapAnnotationValue, foundExcludeConfigmap := annotations[options.ConfigmapExcludeReloaderAnnotation]
-	excludeSecretAnnotationValue, foundExcludeSecret := annotations[options.SecretExcludeReloaderAnnotation]
-
-	if !found && !foundAuto && !foundTypedAuto && !foundSearchAnn {
-		annotations = upgradeFuncs.PodAnnotationsFunc(resource)
-		annotationValue = annotations[config.Annotation]
-		searchAnnotationValue = annotations[options.AutoSearchAnnotation]
-		reloaderEnabledValue = annotations[options.ReloaderAutoAnnotation]
-		typedAutoAnnotationEnabledValue = annotations[config.TypedAutoAnnotation]
-	}
-
-	isResourceExcluded := false
-
-	switch config.Type {
-	case constants.ConfigmapEnvVarPostfix:
-		if foundExcludeConfigmap {
-			isResourceExcluded = checkIfResourceIsExcluded(config.ResourceName, excludeConfigmapAnnotationValue)
+		switch config.Type {
+		case constants.ConfigmapEnvVarPostfix:
+			if foundExcludeConfigmap {
+				isResourceExcluded = checkIfResourceIsExcluded(config.ResourceName, excludeConfigmapAnnotationValue)
+			}
+		case constants.SecretEnvVarPostfix:
+			if foundExcludeSecret {
+				isResourceExcluded = checkIfResourceIsExcluded(config.ResourceName, excludeSecretAnnotationValue)
+			}
 		}
-	case constants.SecretEnvVarPostfix:
-		if foundExcludeSecret {
-			isResourceExcluded = checkIfResourceIsExcluded(config.ResourceName, excludeSecretAnnotationValue)
+
+		if isResourceExcluded {
+			continue
 		}
-	}

-	if isResourceExcluded {
-		return nil
-	}
+		result := constants.NotUpdated
+		reloaderEnabled, _ := strconv.ParseBool(reloaderEnabledValue)
+		typedAutoAnnotationEnabled, _ := strconv.ParseBool(typedAutoAnnotationEnabledValue)
+		if reloaderEnabled || typedAutoAnnotationEnabled || reloaderEnabledValue == "" && typedAutoAnnotationEnabledValue == "" && options.AutoReloadAll {
+			result = strategy(upgradeFuncs, i, config, true)
+		}

-	strategyResult := InvokeStrategyResult{constants.NotUpdated, nil}
-	reloaderEnabled, _ := strconv.ParseBool(reloaderEnabledValue)
-	typedAutoAnnotationEnabled, _ := strconv.ParseBool(typedAutoAnnotationEnabledValue)
-	if reloaderEnabled || typedAutoAnnotationEnabled || reloaderEnabledValue == "" && typedAutoAnnotationEnabledValue == "" && options.AutoReloadAll {
-		strategyResult = strategy(upgradeFuncs, resource, config, true)
-	}
+		if result != constants.Updated && annotationValue != "" {
+			values := strings.Split(annotationValue, ",")
+			for _, value := range values {
+				value = strings.TrimSpace(value)
+				re := regexp.MustCompile("^" + value + "$")
+				if re.Match([]byte(config.ResourceName)) {
+					result = strategy(upgradeFuncs, i, config, false)
+					if result == constants.Updated {
+						break
+					}
+				}
+			}
+		}

-	if strategyResult.Result != constants.Updated && annotationValue != "" {
-		values := strings.Split(annotationValue, ",")
-		for _, value := range values {
-			value = strings.TrimSpace(value)
-			re := regexp.MustCompile("^" + value + "$")
-			if re.Match([]byte(config.ResourceName)) {
-				strategyResult = strategy(upgradeFuncs, resource, config, false)
-				if strategyResult.Result == constants.Updated {
-					break
+		if result != constants.Updated && searchAnnotationValue == "true" {
+			matchAnnotationValue := config.ResourceAnnotations[options.SearchMatchAnnotation]
+			if matchAnnotationValue == "true" {
+				result = strategy(upgradeFuncs, i, config, true)
+			}
+		}
+
+		if result == constants.Updated {
+			accessor, err := meta.Accessor(i)
+			if err != nil {
+				return err
+			}
+			resourceName := accessor.GetName()
+			err = upgradeFuncs.UpdateFunc(clients, config.Namespace, i)
+			if err != nil {
+				message := fmt.Sprintf("Update for '%s' of type '%s' in namespace '%s' failed with error %v", resourceName, upgradeFuncs.ResourceType, config.Namespace, err)
+				logrus.Errorf("Update for '%s' of type '%s' in namespace '%s' failed with error %v", resourceName, upgradeFuncs.ResourceType, config.Namespace, err)
+
+				collectors.Reloaded.With(prometheus.Labels{"success": "false"}).Inc()
+				collectors.ReloadedByNamespace.With(prometheus.Labels{"success": "false", "namespace": config.Namespace}).Inc()
+				if recorder != nil {
+					recorder.Event(i, v1.EventTypeWarning, "ReloadFail", message)
+				}
+				return err
+			} else {
+				message := fmt.Sprintf("Changes detected in '%s' of type '%s' in namespace '%s'", config.ResourceName, config.Type, config.Namespace)
+				message += fmt.Sprintf(", Updated '%s' of type '%s' in namespace '%s'", resourceName, upgradeFuncs.ResourceType, config.Namespace)
+
+				logrus.Infof("Changes detected in '%s' of type '%s' in namespace '%s'; updated '%s' of type '%s' in namespace '%s'", config.ResourceName, config.Type, config.Namespace, resourceName, upgradeFuncs.ResourceType, config.Namespace)
+
+				collectors.Reloaded.With(prometheus.Labels{"success": "true"}).Inc()
+				collectors.ReloadedByNamespace.With(prometheus.Labels{"success": "true", "namespace": config.Namespace}).Inc()
+				alert_on_reload, ok := os.LookupEnv("ALERT_ON_RELOAD")
+				if recorder != nil {
+					recorder.Event(i, v1.EventTypeNormal, "Reloaded", message)
+				}
+				if ok && alert_on_reload == "true" {
+					msg := fmt.Sprintf(
+						"Reloader detected changes in *%s* of type *%s* in namespace *%s*. Hence reloaded *%s* of type *%s* in namespace *%s*",
+						config.ResourceName, config.Type, config.Namespace, resourceName, upgradeFuncs.ResourceType, config.Namespace)
+					alert.SendWebhookAlert(msg)
 				}
 			}
 		}
 	}
-
-	if strategyResult.Result != constants.Updated && searchAnnotationValue == "true" {
-		matchAnnotationValue := config.ResourceAnnotations[options.SearchMatchAnnotation]
-		if matchAnnotationValue == "true" {
-			strategyResult = strategy(upgradeFuncs, resource, config, true)
-		}
-	}
-	if strategyResult.Result == constants.Updated {
-		var err error
-		if upgradeFuncs.SupportsPatch && strategyResult.Patch != nil {
-			err = upgradeFuncs.PatchFunc(clients, config.Namespace, resource, strategyResult.Patch.Type, strategyResult.Patch.Bytes)
-		} else {
-			err = upgradeFuncs.UpdateFunc(clients, config.Namespace, resource)
-		}
-
-		if err != nil {
-			message := fmt.Sprintf("Update for '%s' of type '%s' in namespace '%s' failed with error %v", resourceName, upgradeFuncs.ResourceType, config.Namespace, err)
-			logrus.Errorf("Update for '%s' of type '%s' in namespace '%s' failed with error %v", resourceName, upgradeFuncs.ResourceType, config.Namespace, err)
-
-			collectors.Reloaded.With(prometheus.Labels{"success": "false"}).Inc()
-			collectors.ReloadedByNamespace.With(prometheus.Labels{"success": "false", "namespace": config.Namespace}).Inc()
-			if recorder != nil {
-				recorder.Event(resource, v1.EventTypeWarning, "ReloadFail", message)
-			}
-			return err
-		} else {
-			message := fmt.Sprintf("Changes detected in '%s' of type '%s' in namespace '%s'", config.ResourceName, config.Type, config.Namespace)
-			message += fmt.Sprintf(", Updated '%s' of type '%s' in namespace '%s'", resourceName, upgradeFuncs.ResourceType, config.Namespace)
-
-			logrus.Infof("Changes detected in '%s' of type '%s' in namespace '%s'; updated '%s' of type '%s' in namespace '%s'", config.ResourceName, config.Type, config.Namespace, resourceName, upgradeFuncs.ResourceType, config.Namespace)
-
-			collectors.Reloaded.With(prometheus.Labels{"success": "true"}).Inc()
-			collectors.ReloadedByNamespace.With(prometheus.Labels{"success": "true", "namespace": config.Namespace}).Inc()
-			alert_on_reload, ok := os.LookupEnv("ALERT_ON_RELOAD")
-			if recorder != nil {
-				recorder.Event(resource, v1.EventTypeNormal, "Reloaded", message)
-			}
-			if ok && alert_on_reload == "true" {
-				msg := fmt.Sprintf(
-					"Reloader detected changes in *%s* of type *%s* in namespace *%s*. Hence reloaded *%s* of type *%s* in namespace *%s*",
-					config.ResourceName, config.Type, config.Namespace, resourceName, upgradeFuncs.ResourceType, config.Namespace)
-				alert.SendWebhookAlert(msg)
-			}
-		}
-	}
-
 	return nil
 }

@@ -493,51 +439,42 @@ func getContainerUsingResource(upgradeFuncs callbacks.RollingUpgradeFuncs, item
 	return container
 }

-type Patch struct {
-	Type  patchtypes.PatchType
-	Bytes []byte
-}
+type invokeStrategy func(upgradeFuncs callbacks.RollingUpgradeFuncs, item runtime.Object, config util.Config, autoReload bool) constants.Result

-type InvokeStrategyResult struct {
-	Result constants.Result
-	Patch  *Patch
-}
-
-type invokeStrategy func(upgradeFuncs callbacks.RollingUpgradeFuncs, item runtime.Object, config util.Config, autoReload bool) InvokeStrategyResult
-
-func invokeReloadStrategy(upgradeFuncs callbacks.RollingUpgradeFuncs, item runtime.Object, config util.Config, autoReload bool) InvokeStrategyResult {
+func invokeReloadStrategy(upgradeFuncs callbacks.RollingUpgradeFuncs, item runtime.Object, config util.Config, autoReload bool) constants.Result {
 	if options.ReloadStrategy == constants.AnnotationsReloadStrategy {
 		return updatePodAnnotations(upgradeFuncs, item, config, autoReload)
 	}
+
 	return updateContainerEnvVars(upgradeFuncs, item, config, autoReload)
 }

-func updatePodAnnotations(upgradeFuncs callbacks.RollingUpgradeFuncs, item runtime.Object, config util.Config, autoReload bool) InvokeStrategyResult {
+func updatePodAnnotations(upgradeFuncs callbacks.RollingUpgradeFuncs, item runtime.Object, config util.Config, autoReload bool) constants.Result {
 	container := getContainerUsingResource(upgradeFuncs, item, config, autoReload)
 	if container == nil {
-		return InvokeStrategyResult{constants.NoContainerFound, nil}
+		return constants.NoContainerFound
 	}

 	// Generate reloaded annotations. Attaching this to the item's annotation will trigger a rollout
 	// Note: the data on this struct is purely informational and is not used for future updates
 	reloadSource := util.NewReloadSourceFromConfig(config, []string{container.Name})
-	annotations, patch, err := createReloadedAnnotations(&reloadSource, upgradeFuncs)
+	annotations, err := createReloadedAnnotations(&reloadSource)
 	if err != nil {
 		logrus.Errorf("Failed to create reloaded annotations for %s! error = %v", config.ResourceName, err)
-		return InvokeStrategyResult{constants.NotUpdated, nil}
+		return constants.NotUpdated
 	}

 	// Copy the all annotations to the item's annotations
 	pa := upgradeFuncs.PodAnnotationsFunc(item)
 	if pa == nil {
-		return InvokeStrategyResult{constants.NotUpdated, nil}
+		return constants.NotUpdated
 	}

 	for k, v := range annotations {
 		pa[k] = v
 	}

-	return InvokeStrategyResult{constants.Updated, &Patch{Type: patchtypes.StrategicMergePatchType, Bytes: patch}}
+	return constants.Updated
 }

 func getReloaderAnnotationKey() string {
@@ -547,9 +484,9 @@ func getReloaderAnnotationKey() string {
 	)
 }

-func createReloadedAnnotations(target *util.ReloadSource, upgradeFuncs callbacks.RollingUpgradeFuncs) (map[string]string, []byte, error) {
+func createReloadedAnnotations(target *util.ReloadSource) (map[string]string, error) {
 	if target == nil {
-		return nil, nil, errors.New("target is required")
+		return nil, errors.New("target is required")
 	}

 	// Create a single "last-invokeReloadStrategy-from" annotation that stores metadata about the
@@ -561,76 +498,53 @@ func createReloadedAnnotations(target *util.ReloadSource, upgradeFuncs callbacks

 	lastReloadedResource, err := json.Marshal(target)
 	if err != nil {
-		return nil, nil, err
+		return nil, err
 	}

 	annotations[lastReloadedResourceName] = string(lastReloadedResource)
-
-	var patch []byte
-	if upgradeFuncs.SupportsPatch {
-		escapedValue, err := jsonEscape(annotations[lastReloadedResourceName])
-		if err != nil {
-			return nil, nil, err
-		}
-		patch = fmt.Appendf(nil, upgradeFuncs.PatchTemplatesFunc().AnnotationTemplate, lastReloadedResourceName, escapedValue)
-	}
-
-	return annotations, patch, nil
+	return annotations, nil
 }

 func getEnvVarName(resourceName string, typeName string) string {
 	return constants.EnvVarPrefix + util.ConvertToEnvVarName(resourceName) + "_" + typeName
 }

-func updateContainerEnvVars(upgradeFuncs callbacks.RollingUpgradeFuncs, item runtime.Object, config util.Config, autoReload bool) InvokeStrategyResult {
+func updateContainerEnvVars(upgradeFuncs callbacks.RollingUpgradeFuncs, item runtime.Object, config util.Config, autoReload bool) constants.Result {
+	var result constants.Result
 	envVar := getEnvVarName(config.ResourceName, config.Type)
 	container := getContainerUsingResource(upgradeFuncs, item, config, autoReload)

 	if container == nil {
-		return InvokeStrategyResult{constants.NoContainerFound, nil}
+		return constants.NoContainerFound
 	}

 	//update if env var exists
-	updateResult := updateEnvVar(container, envVar, config.SHAValue)
+	result = updateEnvVar(upgradeFuncs.ContainersFunc(item), envVar, config.SHAValue)

 	// if no existing env var exists lets create one
-	if updateResult == constants.NoEnvVarFound {
+	if result == constants.NoEnvVarFound {
 		e := v1.EnvVar{
 			Name:  envVar,
 			Value: config.SHAValue,
 		}
 		container.Env = append(container.Env, e)
-		updateResult = constants.Updated
+		result = constants.Updated
 	}
-
-	var patch []byte
-	if upgradeFuncs.SupportsPatch {
-		patch = fmt.Appendf(nil, upgradeFuncs.PatchTemplatesFunc().EnvVarTemplate, container.Name, envVar, config.SHAValue)
-	}
-
-	return InvokeStrategyResult{updateResult, &Patch{Type: patchtypes.StrategicMergePatchType, Bytes: patch}}
+	return result
 }

-func updateEnvVar(container *v1.Container, envVar string, shaData string) constants.Result {
-	envs := container.Env
-	for j := range envs {
-		if envs[j].Name == envVar {
-			if envs[j].Value != shaData {
-				envs[j].Value = shaData
-				return constants.Updated
+func updateEnvVar(containers []v1.Container, envVar string, shaData string) constants.Result {
+	for i := range containers {
+		envs := containers[i].Env
+		for j := range envs {
+			if envs[j].Name == envVar {
+				if envs[j].Value != shaData {
+					envs[j].Value = shaData
+					return constants.Updated
+				}
+				return constants.NotUpdated
 			}
-			return constants.NotUpdated
 		}
 	}
-
 	return constants.NoEnvVarFound
 }
-
-func jsonEscape(toEscape string) (string, error) {
-	bytes, err := json.Marshal(toEscape)
-	if err != nil {
-		return "", err
-	}
-	escaped := string(bytes)
-	return escaped[1 : len(escaped)-1], nil
-}
--- a/internal/pkg/handler/upgrade_test.go
+++ b/internal/pkg/handler/upgrade_test.go
@@ -17,12 +17,9 @@ import (
 	"github.com/stakater/Reloader/internal/pkg/testutil"
 	"github.com/stakater/Reloader/internal/pkg/util"
 	"github.com/stakater/Reloader/pkg/kube"
-	"github.com/stretchr/testify/assert"
-	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/api/meta"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
-	patchtypes "k8s.io/apimachinery/pkg/types"
 	testclient "k8s.io/client-go/kubernetes/fake"
 )

@@ -1416,22 +1413,6 @@ func testRollingUpgradeInvokeDeleteStrategyArs(t *testing.T, clients kube.Client
 	}
 }

-func testRollingUpgradeWithPatchAndInvokeDeleteStrategyArs(t *testing.T, clients kube.Clients, config util.Config, upgradeFuncs callbacks.RollingUpgradeFuncs, collectors metrics.Collectors, envVarPostfix string) {
-	err := PerformAction(clients, config, upgradeFuncs, collectors, nil, invokeDeleteStrategy)
-	upgradeFuncs.PatchFunc = func(client kube.Clients, namespace string, resource runtime.Object, patchType patchtypes.PatchType, bytes []byte) error {
-		assert.Equal(t, patchtypes.StrategicMergePatchType, patchType)
-		assert.NotEmpty(t, bytes)
-		return nil
-	}
-	upgradeFuncs.UpdateFunc = func(kube.Clients, string, runtime.Object) error {
-		t.Errorf("Update should not be called")
-		return nil
-	}
-	if err != nil {
-		t.Errorf("Rolling upgrade failed for %s with %s", upgradeFuncs.ResourceType, envVarPostfix)
-	}
-}
-
 func TestRollingUpgradeForDeploymentWithConfigmapUsingArs(t *testing.T) {
 	options.ReloadStrategy = constants.AnnotationsReloadStrategy
 	envVarPostfix := constants.ConfigmapEnvVarPostfix
@@ -1463,47 +1444,6 @@ func TestRollingUpgradeForDeploymentWithConfigmapUsingArs(t *testing.T) {
 	testRollingUpgradeInvokeDeleteStrategyArs(t, clients, config, deploymentFuncs, collectors, envVarPostfix)
 }

-func TestRollingUpgradeForDeploymentWithPatchAndRetryUsingArs(t *testing.T) {
-	options.ReloadStrategy = constants.AnnotationsReloadStrategy
-	envVarPostfix := constants.ConfigmapEnvVarPostfix
-
-	shaData := testutil.ConvertResourceToSHA(testutil.ConfigmapResourceType, arsNamespace, arsConfigmapName, "www.stakater.com")
-	config := getConfigWithAnnotations(envVarPostfix, arsConfigmapName, shaData, options.ConfigmapUpdateOnChangeAnnotation, options.ConfigmapReloaderAutoAnnotation)
-	deploymentFuncs := GetDeploymentRollingUpgradeFuncs()
-
-	assert.True(t, deploymentFuncs.SupportsPatch)
-	assert.NotEmpty(t, deploymentFuncs.PatchTemplatesFunc().AnnotationTemplate)
-
-	patchCalled := 0
-	deploymentFuncs.PatchFunc = func(client kube.Clients, namespace string, resource runtime.Object, patchType patchtypes.PatchType, bytes []byte) error {
-		patchCalled++
-		if patchCalled < 2 {
-			return &errors.StatusError{ErrStatus: metav1.Status{Reason: metav1.StatusReasonConflict}} // simulate conflict
-		}
-		assert.Equal(t, patchtypes.StrategicMergePatchType, patchType)
-		assert.NotEmpty(t, bytes)
-		assert.Contains(t, string(bytes), `{"spec":{"template":{"metadata":{"annotations":{"reloader.stakater.com/last-reloaded-from":`)
-		assert.Contains(t, string(bytes), `\"hash\":\"3c9a892aeaedc759abc3df9884a37b8be5680382\"`)
-		return nil
-	}
-
-	deploymentFuncs.UpdateFunc = func(kube.Clients, string, runtime.Object) error {
-		t.Errorf("Update should not be called")
-		return nil
-	}
-
-	collectors := getCollectors()
-	err := PerformAction(clients, config, deploymentFuncs, collectors, nil, invokeReloadStrategy)
-	if err != nil {
-		t.Errorf("Rolling upgrade failed for Deployment with Configmap")
-	}
-
-	assert.Equal(t, 2, patchCalled)
-
-	deploymentFuncs = GetDeploymentRollingUpgradeFuncs()
-	testRollingUpgradeWithPatchAndInvokeDeleteStrategyArs(t, clients, config, deploymentFuncs, collectors, envVarPostfix)
-}
-
 func TestRollingUpgradeForDeploymentWithConfigmapWithoutReloadAnnotationAndWithoutAutoReloadAllNoTriggersUsingArs(t *testing.T) {
 	options.ReloadStrategy = constants.AnnotationsReloadStrategy
 	envVarPostfix := constants.ConfigmapEnvVarPostfix
@@ -1676,7 +1616,7 @@ func TestRollingUpgradeForDeploymentWithConfigmapViaSearchAnnotationNotMappedUsi
 		t.Errorf("Failed to create deployment with search annotation.")
 	}
 	defer func() {
-		_ = clients.KubernetesClient.AppsV1().Deployments(arsNamespace).Delete(context.TODO(), deployment.Name, metav1.DeleteOptions{})
+		_ = clients.KubernetesClient.AppsV1().Deployments(arsNamespace).Delete(context.TODO(), deployment.Name, v1.DeleteOptions{})
 	}()
 	// defer clients.KubernetesClient.AppsV1().Deployments(namespace).Delete(deployment.Name, &v1.DeleteOptions{})

@@ -2162,7 +2102,6 @@ func TestRollingUpgradeForDeploymentWithExcludeConfigMapAnnotationUsingArs(t *te
 		t.Errorf("Deployment which had to be excluded was updated")
 	}
 }
-
 func TestRollingUpgradeForDeploymentWithConfigMapAutoAnnotationUsingArs(t *testing.T) {
 	options.ReloadStrategy = constants.AnnotationsReloadStrategy
 	envVarPostfix := constants.ConfigmapEnvVarPostfix
@@ -2227,48 +2166,6 @@ func TestRollingUpgradeForDaemonSetWithConfigmapUsingArs(t *testing.T) {
 	testRollingUpgradeInvokeDeleteStrategyArs(t, clients, config, daemonSetFuncs, collectors, envVarPostfix)
 }

-func TestRollingUpgradeForDaemonSetWithPatchAndRetryUsingArs(t *testing.T) {
-	options.ReloadStrategy = constants.AnnotationsReloadStrategy
-	envVarPostfix := constants.ConfigmapEnvVarPostfix
-
-	shaData := testutil.ConvertResourceToSHA(testutil.ConfigmapResourceType, arsNamespace, arsConfigmapName, "www.facebook.com")
-	config := getConfigWithAnnotations(envVarPostfix, arsConfigmapName, shaData, options.ConfigmapUpdateOnChangeAnnotation, options.ConfigmapReloaderAutoAnnotation)
-	daemonSetFuncs := GetDaemonSetRollingUpgradeFuncs()
-
-	assert.True(t, daemonSetFuncs.SupportsPatch)
-	assert.NotEmpty(t, daemonSetFuncs.PatchTemplatesFunc().AnnotationTemplate)
-
-	patchCalled := 0
-	daemonSetFuncs.PatchFunc = func(client kube.Clients, namespace string, resource runtime.Object, patchType patchtypes.PatchType, bytes []byte) error {
-		patchCalled++
-		if patchCalled < 2 {
-			return &errors.StatusError{ErrStatus: metav1.Status{Reason: metav1.StatusReasonConflict}} // simulate conflict
-		}
-		assert.Equal(t, patchtypes.StrategicMergePatchType, patchType)
-		assert.NotEmpty(t, bytes)
-		assert.Contains(t, string(bytes), `{"spec":{"template":{"metadata":{"annotations":{"reloader.stakater.com/last-reloaded-from":`)
-		assert.Contains(t, string(bytes), `\"hash\":\"314a2269170750a974d79f02b5b9ee517de7f280\"`)
-		return nil
-	}
-
-	daemonSetFuncs.UpdateFunc = func(kube.Clients, string, runtime.Object) error {
-		t.Errorf("Update should not be called")
-		return nil
-	}
-
-	collectors := getCollectors()
-
-	err := PerformAction(clients, config, daemonSetFuncs, collectors, nil, invokeReloadStrategy)
-	if err != nil {
-		t.Errorf("Rolling upgrade failed for DaemonSet with configmap")
-	}
-
-	assert.Equal(t, 2, patchCalled)
-
-	daemonSetFuncs = GetDeploymentRollingUpgradeFuncs()
-	testRollingUpgradeWithPatchAndInvokeDeleteStrategyArs(t, clients, config, daemonSetFuncs, collectors, envVarPostfix)
-}
-
 func TestRollingUpgradeForDaemonSetWithConfigmapInProjectedVolumeUsingArs(t *testing.T) {
 	options.ReloadStrategy = constants.AnnotationsReloadStrategy
 	envVarPostfix := constants.ConfigmapEnvVarPostfix
@@ -2429,48 +2326,6 @@ func TestRollingUpgradeForStatefulSetWithConfigmapUsingArs(t *testing.T) {
 	testRollingUpgradeInvokeDeleteStrategyArs(t, clients, config, statefulSetFuncs, collectors, envVarPostfix)
 }

-func TestRollingUpgradeForStatefulSetWithPatchAndRetryUsingArs(t *testing.T) {
-	options.ReloadStrategy = constants.AnnotationsReloadStrategy
-	envVarPostfix := constants.ConfigmapEnvVarPostfix
-
-	shaData := testutil.ConvertResourceToSHA(testutil.ConfigmapResourceType, arsNamespace, arsConfigmapName, "www.twitter.com")
-	config := getConfigWithAnnotations(envVarPostfix, arsConfigmapName, shaData, options.ConfigmapUpdateOnChangeAnnotation, options.ConfigmapReloaderAutoAnnotation)
-	statefulSetFuncs := GetStatefulSetRollingUpgradeFuncs()
-
-	assert.True(t, statefulSetFuncs.SupportsPatch)
-	assert.NotEmpty(t, statefulSetFuncs.PatchTemplatesFunc().AnnotationTemplate)
-
-	patchCalled := 0
-	statefulSetFuncs.PatchFunc = func(client kube.Clients, namespace string, resource runtime.Object, patchType patchtypes.PatchType, bytes []byte) error {
-		patchCalled++
-		if patchCalled < 2 {
-			return &errors.StatusError{ErrStatus: metav1.Status{Reason: metav1.StatusReasonConflict}} // simulate conflict
-		}
-		assert.Equal(t, patchtypes.StrategicMergePatchType, patchType)
-		assert.NotEmpty(t, bytes)
-		assert.Contains(t, string(bytes), `{"spec":{"template":{"metadata":{"annotations":{"reloader.stakater.com/last-reloaded-from":`)
-		assert.Contains(t, string(bytes), `\"hash\":\"f821414d40d8815fb330763f74a4ff7ab651d4fa\"`)
-		return nil
-	}
-
-	statefulSetFuncs.UpdateFunc = func(kube.Clients, string, runtime.Object) error {
-		t.Errorf("Update should not be called")
-		return nil
-	}
-
-	collectors := getCollectors()
-
-	err := PerformAction(clients, config, statefulSetFuncs, collectors, nil, invokeReloadStrategy)
-	if err != nil {
-		t.Errorf("Rolling upgrade failed for StatefulSet with configmap")
-	}
-
-	assert.Equal(t, 2, patchCalled)
-
-	statefulSetFuncs = GetDeploymentRollingUpgradeFuncs()
-	testRollingUpgradeWithPatchAndInvokeDeleteStrategyArs(t, clients, config, statefulSetFuncs, collectors, envVarPostfix)
-}
-
 func TestRollingUpgradeForStatefulSetWithConfigmapInProjectedVolumeUsingArs(t *testing.T) {
 	options.ReloadStrategy = constants.AnnotationsReloadStrategy
 	envVarPostfix := constants.ConfigmapEnvVarPostfix
@@ -2633,9 +2488,6 @@ func TestFailedRollingUpgradeUsingArs(t *testing.T) {
 	deploymentFuncs.UpdateFunc = func(_ kube.Clients, _ string, _ runtime.Object) error {
 		return fmt.Errorf("error")
 	}
-	deploymentFuncs.PatchFunc = func(kube.Clients, string, runtime.Object, patchtypes.PatchType, []byte) error {
-		return fmt.Errorf("error")
-	}
 	collectors := getCollectors()

 	_ = PerformAction(clients, config, deploymentFuncs, collectors, nil, invokeReloadStrategy)
@@ -2666,24 +2518,6 @@ func testRollingUpgradeInvokeDeleteStrategyErs(t *testing.T, clients kube.Client
 	}
 }

-func testRollingUpgradeWithPatchAndInvokeDeleteStrategyErs(t *testing.T, clients kube.Clients, config util.Config, upgradeFuncs callbacks.RollingUpgradeFuncs, collectors metrics.Collectors, envVarPostfix string) {
-	assert.NotEmpty(t, upgradeFuncs.PatchTemplatesFunc().DeleteEnvVarTemplate)
-
-	err := PerformAction(clients, config, upgradeFuncs, collectors, nil, invokeDeleteStrategy)
-	upgradeFuncs.PatchFunc = func(client kube.Clients, namespace string, resource runtime.Object, patchType patchtypes.PatchType, bytes []byte) error {
-		assert.Equal(t, patchtypes.JSONPatchType, patchType)
-		assert.NotEmpty(t, bytes)
-		return nil
-	}
-	upgradeFuncs.UpdateFunc = func(kube.Clients, string, runtime.Object) error {
-		t.Errorf("Update should not be called")
-		return nil
-	}
-	if err != nil {
-		t.Errorf("Rolling upgrade failed for %s with %s", upgradeFuncs.ResourceType, envVarPostfix)
-	}
-}
-
 func TestRollingUpgradeForDeploymentWithConfigmapUsingErs(t *testing.T) {
 	options.ReloadStrategy = constants.EnvVarsReloadStrategy
 	envVarPostfix := constants.ConfigmapEnvVarPostfix
@@ -2716,48 +2550,6 @@ func TestRollingUpgradeForDeploymentWithConfigmapUsingErs(t *testing.T) {
 	testRollingUpgradeInvokeDeleteStrategyErs(t, clients, config, deploymentFuncs, collectors, envVarPostfix)
 }

-func TestRollingUpgradeForDeploymentWithPatchAndRetryUsingErs(t *testing.T) {
-	options.ReloadStrategy = constants.EnvVarsReloadStrategy
-	envVarPostfix := constants.ConfigmapEnvVarPostfix
-
-	shaData := testutil.ConvertResourceToSHA(testutil.ConfigmapResourceType, ersNamespace, ersConfigmapName, "www.stakater.com")
-	config := getConfigWithAnnotations(envVarPostfix, ersConfigmapName, shaData, options.ConfigmapUpdateOnChangeAnnotation, options.ConfigmapReloaderAutoAnnotation)
-	deploymentFuncs := GetDeploymentRollingUpgradeFuncs()
-
-	assert.True(t, deploymentFuncs.SupportsPatch)
-	assert.NotEmpty(t, deploymentFuncs.PatchTemplatesFunc().EnvVarTemplate)
-
-	patchCalled := 0
-	deploymentFuncs.PatchFunc = func(client kube.Clients, namespace string, resource runtime.Object, patchType patchtypes.PatchType, bytes []byte) error {
-		patchCalled++
-		if patchCalled < 2 {
-			return &errors.StatusError{ErrStatus: metav1.Status{Reason: metav1.StatusReasonConflict}} // simulate conflict
-		}
-		assert.Equal(t, patchtypes.StrategicMergePatchType, patchType)
-		assert.NotEmpty(t, bytes)
-		assert.Contains(t, string(bytes), `{"spec":{"template":{"spec":{"containers":[{"name":`)
-		assert.Contains(t, string(bytes), `"value":"3c9a892aeaedc759abc3df9884a37b8be5680382"`)
-		return nil
-	}
-
-	deploymentFuncs.UpdateFunc = func(kube.Clients, string, runtime.Object) error {
-		t.Errorf("Update should not be called")
-		return nil
-	}
-
-	collectors := getCollectors()
-
-	err := PerformAction(clients, config, deploymentFuncs, collectors, nil, invokeReloadStrategy)
-	if err != nil {
-		t.Errorf("Rolling upgrade failed for %s with %s", deploymentFuncs.ResourceType, envVarPostfix)
-	}
-
-	assert.Equal(t, 2, patchCalled)
-
-	deploymentFuncs = GetDeploymentRollingUpgradeFuncs()
-	testRollingUpgradeWithPatchAndInvokeDeleteStrategyErs(t, clients, config, deploymentFuncs, collectors, envVarPostfix)
-}
-
 func TestRollingUpgradeForDeploymentWithConfigmapInProjectedVolumeUsingErs(t *testing.T) {
 	options.ReloadStrategy = constants.EnvVarsReloadStrategy
 	envVarPostfix := constants.ConfigmapEnvVarPostfix
@@ -2866,7 +2658,7 @@ func TestRollingUpgradeForDeploymentWithConfigmapViaSearchAnnotationNotMappedUsi
 		t.Errorf("Failed to create deployment with search annotation.")
 	}
 	defer func() {
-		_ = clients.KubernetesClient.AppsV1().Deployments(ersNamespace).Delete(context.TODO(), deployment.Name, metav1.DeleteOptions{})
+		_ = clients.KubernetesClient.AppsV1().Deployments(ersNamespace).Delete(context.TODO(), deployment.Name, v1.DeleteOptions{})
 	}()
 	// defer clients.KubernetesClient.AppsV1().Deployments(namespace).Delete(deployment.Name, &v1.DeleteOptions{})

@@ -3420,49 +3212,6 @@ func TestRollingUpgradeForDaemonSetWithConfigmapUsingErs(t *testing.T) {
 	testRollingUpgradeInvokeDeleteStrategyErs(t, clients, config, daemonSetFuncs, collectors, envVarPostfix)
 }

-func TestRollingUpgradeForDaemonSetWithPatchAndRetryUsingErs(t *testing.T) {
-	options.ReloadStrategy = constants.EnvVarsReloadStrategy
-	envVarPostfix := constants.ConfigmapEnvVarPostfix
-
-	shaData := testutil.ConvertResourceToSHA(testutil.ConfigmapResourceType, ersNamespace, ersConfigmapName, "www.facebook.com")
-	config := getConfigWithAnnotations(envVarPostfix, ersConfigmapName, shaData, options.ConfigmapUpdateOnChangeAnnotation, options.ConfigmapReloaderAutoAnnotation)
-	daemonSetFuncs := GetDaemonSetRollingUpgradeFuncs()
-
-	assert.True(t, daemonSetFuncs.SupportsPatch)
-	assert.NotEmpty(t, daemonSetFuncs.PatchTemplatesFunc().EnvVarTemplate)
-
-	patchCalled := 0
-	daemonSetFuncs.PatchFunc = func(client kube.Clients, namespace string, resource runtime.Object, patchType patchtypes.PatchType, bytes []byte) error {
-		patchCalled++
-		if patchCalled < 2 {
-			return &errors.StatusError{ErrStatus: metav1.Status{Reason: metav1.StatusReasonConflict}} // simulate conflict
-		}
-		assert.Equal(t, patchtypes.StrategicMergePatchType, patchType)
-		assert.NotEmpty(t, bytes)
-		assert.Contains(t, string(bytes), `{"spec":{"template":{"spec":{"containers":[{"name":`)
-		assert.Contains(t, string(bytes), `"value":"314a2269170750a974d79f02b5b9ee517de7f280"`)
-		return nil
-	}
-
-	daemonSetFuncs.UpdateFunc = func(kube.Clients, string, runtime.Object) error {
-		t.Errorf("Update should not be called")
-		return nil
-	}
-
-	collectors := getCollectors()
-
-	err := PerformAction(clients, config, daemonSetFuncs, collectors, nil, invokeReloadStrategy)
-	time.Sleep(5 * time.Second)
-	if err != nil {
-		t.Errorf("Rolling upgrade failed for DaemonSet with configmap")
-	}
-
-	assert.Equal(t, 2, patchCalled)
-
-	daemonSetFuncs = GetDeploymentRollingUpgradeFuncs()
-	testRollingUpgradeWithPatchAndInvokeDeleteStrategyErs(t, clients, config, daemonSetFuncs, collectors, envVarPostfix)
-}
-
 func TestRollingUpgradeForDaemonSetWithConfigmapInProjectedVolumeUsingErs(t *testing.T) {
 	options.ReloadStrategy = constants.EnvVarsReloadStrategy
 	envVarPostfix := constants.ConfigmapEnvVarPostfix
@@ -3623,49 +3372,6 @@ func TestRollingUpgradeForStatefulSetWithConfigmapUsingErs(t *testing.T) {
 	testRollingUpgradeInvokeDeleteStrategyErs(t, clients, config, statefulSetFuncs, collectors, envVarPostfix)
 }

-func TestRollingUpgradeForStatefulSetWithPatchAndRetryUsingErs(t *testing.T) {
-	options.ReloadStrategy = constants.EnvVarsReloadStrategy
-	envVarPostfix := constants.ConfigmapEnvVarPostfix
-
-	shaData := testutil.ConvertResourceToSHA(testutil.ConfigmapResourceType, ersNamespace, ersConfigmapName, "www.twitter.com")
-	config := getConfigWithAnnotations(envVarPostfix, ersConfigmapName, shaData, options.ConfigmapUpdateOnChangeAnnotation, options.ConfigmapReloaderAutoAnnotation)
-	statefulSetFuncs := GetStatefulSetRollingUpgradeFuncs()
-
-	assert.True(t, statefulSetFuncs.SupportsPatch)
-	assert.NotEmpty(t, statefulSetFuncs.PatchTemplatesFunc().EnvVarTemplate)
-
-	patchCalled := 0
-	statefulSetFuncs.PatchFunc = func(client kube.Clients, namespace string, resource runtime.Object, patchType patchtypes.PatchType, bytes []byte) error {
-		patchCalled++
-		if patchCalled < 2 {
-			return &errors.StatusError{ErrStatus: metav1.Status{Reason: metav1.StatusReasonConflict}} // simulate conflict
-		}
-		assert.Equal(t, patchtypes.StrategicMergePatchType, patchType)
-		assert.NotEmpty(t, bytes)
-		assert.Contains(t, string(bytes), `{"spec":{"template":{"spec":{"containers":[{"name":`)
-		assert.Contains(t, string(bytes), `"value":"f821414d40d8815fb330763f74a4ff7ab651d4fa"`)
-		return nil
-	}
-
-	statefulSetFuncs.UpdateFunc = func(kube.Clients, string, runtime.Object) error {
-		t.Errorf("Update should not be called")
-		return nil
-	}
-
-	collectors := getCollectors()
-
-	err := PerformAction(clients, config, statefulSetFuncs, collectors, nil, invokeReloadStrategy)
-	time.Sleep(5 * time.Second)
-	if err != nil {
-		t.Errorf("Rolling upgrade failed for StatefulSet with configmap")
-	}
-
-	assert.Equal(t, 2, patchCalled)
-
-	statefulSetFuncs = GetDeploymentRollingUpgradeFuncs()
-	testRollingUpgradeWithPatchAndInvokeDeleteStrategyErs(t, clients, config, statefulSetFuncs, collectors, envVarPostfix)
-}
-
 func TestRollingUpgradeForStatefulSetWithConfigmapInProjectedVolumeUsingErs(t *testing.T) {
 	options.ReloadStrategy = constants.EnvVarsReloadStrategy
 	envVarPostfix := constants.ConfigmapEnvVarPostfix
@@ -3830,9 +3536,6 @@ func TestFailedRollingUpgradeUsingErs(t *testing.T) {
 	deploymentFuncs.UpdateFunc = func(_ kube.Clients, _ string, _ runtime.Object) error {
 		return fmt.Errorf("error")
 	}
-	deploymentFuncs.PatchFunc = func(kube.Clients, string, runtime.Object, patchtypes.PatchType, []byte) error {
-		return fmt.Errorf("error")
-	}
 	collectors := getCollectors()

 	_ = PerformAction(clients, config, deploymentFuncs, collectors, nil, invokeReloadStrategy)
--- a/internal/pkg/testutil/kube.go
+++ b/internal/pkg/testutil/kube.go
@@ -968,22 +968,6 @@ func DeleteStatefulSet(client kubernetes.Interface, namespace string, statefulse
 	return statefulsetError
 }

-// DeleteCronJob deletes a cronJob in given namespace and returns the error if any
-func DeleteCronJob(client kubernetes.Interface, namespace string, cronJobName string) error {
-	logrus.Infof("Deleting CronJob %s", cronJobName)
-	cronJobError := client.BatchV1().CronJobs(namespace).Delete(context.TODO(), cronJobName, metav1.DeleteOptions{})
-	time.Sleep(3 * time.Second)
-	return cronJobError
-}
-
-// Deleteob deletes a job in given namespace and returns the error if any
-func DeleteJob(client kubernetes.Interface, namespace string, jobName string) error {
-	logrus.Infof("Deleting Job %s", jobName)
-	jobError := client.BatchV1().Jobs(namespace).Delete(context.TODO(), jobName, metav1.DeleteOptions{})
-	time.Sleep(3 * time.Second)
-	return jobError
-}
-
 // UpdateConfigMap updates a configmap in given namespace and returns the error if any
 func UpdateConfigMap(configmapClient core_v1.ConfigMapInterface, namespace string, configmapName string, label string, data string) error {
 	logrus.Infof("Updating configmap %q.\n", configmapName)
@@ -1 +1 @@
 .1.0
 .4.2