Merge pull request #1034 from stakater/update-version-g213t1o

Bump version to 1.4.9 on release-v1.4.9 branch

.github/workflows/pull_request_docs.yaml

@@ -16,17 +16,16 @@ on:
 
 jobs:
   qa:
-    uses: stakater/.github/.github/workflows/pull_request_doc_qa.yaml@v0.0.134
+    uses: stakater/.github/.github/workflows/pull_request_doc_qa.yaml@v0.0.131
     with:
       MD_CONFIG: .github/md_config.json
       DOC_SRC: docs
       MD_LINT_CONFIG: .markdownlint.yaml
   build:
-    uses: stakater/.github/.github/workflows/pull_request_container_build.yaml@v0.0.134
+    uses: stakater/.github/.github/workflows/pull_request_container_build.yaml@v0.0.131
     with:
       DOCKER_FILE_PATH: Dockerfile-docs
       CONTAINER_REGISTRY_URL: ghcr.io/stakater
-      PUSH_IMAGE: false
     secrets:
       CONTAINER_REGISTRY_USERNAME: ${{ github.actor }}
       CONTAINER_REGISTRY_PASSWORD: ${{ secrets.GHCR_TOKEN }}

.vale.ini

@@ -1,7 +1,7 @@
 StylesPath = styles
 MinAlertLevel = warning
 
-Packages = https://github.com/stakater/vale-package/releases/download/v0.0.77/Stakater.zip
+Packages = https://github.com/stakater/vale-package/releases/download/v0.0.62/Stakater.zip
 Vocab = Stakater
 
 # Only check MarkDown files

README.md

@@ -189,7 +189,7 @@ metadata:
 
 Reloader can optionally **send alerts** whenever it triggers a rolling upgrade for a workload (e.g., `Deployment`, `StatefulSet`, etc.).
 
-These alerts are sent to a configured **webhook endpoint**, which can be a generic receiver or services like Slack, Microsoft Teams or Google Chat.
+These alerts are sent to a configured **webhook endpoint**, which can be a generic receiver or services like Slack or Microsoft Teams.
 
 To enable this feature, update the `reloader.env.secret` section in your `values.yaml` (when installing via Helm):
 
@@ -198,7 +198,7 @@ reloader:
   env:
     secret:
       ALERT_ON_RELOAD: "true"                    # Enable alerting (default: false)
-      ALERT_SINK: "slack"                        # Options: slack, teams, gchat or webhook (default: webhook)
+      ALERT_SINK: "slack"                        # Options: slack, teams, webhook (default: webhook)
       ALERT_WEBHOOK_URL: "<your-webhook-url>"    # Required if ALERT_ON_RELOAD is true
       ALERT_ADDITIONAL_INFO: "Triggered by Reloader in staging environment"
 ```

VERSION

@@ -1 +1 @@
-1.4.5
+1.4.9

deployments/kubernetes/chart/reloader/templates/clusterrole.yaml

@@ -11,10 +11,10 @@ metadata:
   labels:
 {{ include "reloader-labels.chart" . | indent 4 }}
 {{- if .Values.reloader.rbac.labels }}
-{{ tpl (toYaml .Values.reloader.rbac.labels) . | indent 4 }}
+{{ toYaml .Values.reloader.rbac.labels | indent 4 }}
 {{- end }}
 {{- if .Values.reloader.matchLabels }}
-{{ tpl (toYaml .Values.reloader.matchLabels) . | indent 4 }}
+{{ toYaml .Values.reloader.matchLabels | indent 4 }}
 {{- end }}
   name: {{ template "reloader-fullname" . }}-role
 rules:

deployments/kubernetes/chart/reloader/templates/clusterrolebinding.yaml

@@ -11,10 +11,10 @@ metadata:
   labels:
 {{ include "reloader-labels.chart" . | indent 4 }}
 {{- if .Values.reloader.rbac.labels }}
-{{ tpl (toYaml .Values.reloader.rbac.labels) . | indent 4 }}
+{{ toYaml .Values.reloader.rbac.labels | indent 4 }}
 {{- end }}
 {{- if .Values.reloader.matchLabels }}
-{{ tpl (toYaml .Values.reloader.matchLabels) . | indent 4 }}
+{{ toYaml .Values.reloader.matchLabels | indent 4 }}
 {{- end }}
   name: {{ template "reloader-fullname" . }}-role-binding
 roleRef:

deployments/kubernetes/chart/reloader/templates/deployment.yaml

@@ -4,15 +4,15 @@ metadata:
   annotations:
 {{ include "reloader-helm3.annotations" . | indent 4 }}
 {{- if .Values.reloader.deployment.annotations }}
-{{ tpl (toYaml .Values.reloader.deployment.annotations) . | indent 4 }}
+{{ toYaml .Values.reloader.deployment.annotations | indent 4 }}
 {{- end }}
   labels:
 {{ include "reloader-labels.chart" . | indent 4 }}
 {{- if .Values.reloader.deployment.labels }}
-{{ tpl (toYaml .Values.reloader.deployment.labels) . | indent 4 }}
+{{ toYaml .Values.reloader.deployment.labels | indent 4 }}
 {{- end }}
 {{- if .Values.reloader.matchLabels }}
-{{ tpl (toYaml .Values.reloader.matchLabels) . | indent 4 }}
+{{ toYaml .Values.reloader.matchLabels | indent 4 }}
 {{- end }}
   name: {{ template "reloader-fullname" . }}
   namespace: {{ .Values.namespace | default .Release.Namespace }}
@@ -28,21 +28,21 @@ spec:
       app: {{ template "reloader-fullname" . }}
       release: {{ .Release.Name | quote }}
 {{- if .Values.reloader.matchLabels }}
-{{ tpl (toYaml .Values.reloader.matchLabels) . | indent 6 }}
+{{ toYaml .Values.reloader.matchLabels | indent 6 }}
 {{- end }}
   template:
     metadata:
 {{- if .Values.reloader.deployment.pod.annotations }}
       annotations:
-{{ tpl (toYaml .Values.reloader.deployment.pod.annotations) . | indent 8 }}
+{{ toYaml .Values.reloader.deployment.pod.annotations | indent 8 }}
 {{- end }}
       labels:
 {{ include "reloader-labels.chart" . | indent 8 }}
 {{- if .Values.reloader.deployment.labels }}
-{{ tpl (toYaml .Values.reloader.deployment.labels) . | indent 8 }}
+{{ toYaml .Values.reloader.deployment.labels | indent 8 }}
 {{- end }}
 {{- if .Values.reloader.matchLabels }}
-{{ tpl (toYaml .Values.reloader.matchLabels) . | indent 8 }}
+{{ toYaml .Values.reloader.matchLabels | indent 8 }}
 {{- end }}
     spec:
       {{- with .Values.global.imagePullSecrets }}

deployments/kubernetes/chart/reloader/templates/networkpolicy.yaml

@@ -7,7 +7,7 @@ metadata:
   labels:
 {{ include "reloader-labels.chart" . | indent 4 }}
 {{- if .Values.reloader.matchLabels }}
-{{ tpl (toYaml .Values.reloader.matchLabels) . | indent 4 }}
+{{ toYaml .Values.reloader.matchLabels | indent 4 }}
 {{- end }}
   name: {{ template "reloader-fullname" . }}
   namespace: {{ .Values.namespace | default .Release.Namespace }}
@@ -17,7 +17,7 @@ spec:
       app: {{ template "reloader-fullname" . }}
       release: {{ .Release.Name | quote }}
 {{- if .Values.reloader.matchLabels }}
-{{ tpl (toYaml .Values.reloader.matchLabels) . | indent 6 }}
+{{ toYaml .Values.reloader.matchLabels | indent 6 }}
 {{- end }}
   policyTypes:
   - Ingress

deployments/kubernetes/chart/reloader/templates/role.yaml

@@ -11,10 +11,10 @@ metadata:
   labels:
 {{ include "reloader-labels.chart" . | indent 4 }}
 {{- if .Values.reloader.rbac.labels }}
-{{ tpl (toYaml .Values.reloader.rbac.labels) . | indent 4 }}
+{{ toYaml .Values.reloader.rbac.labels | indent 4 }}
 {{- end }}
 {{- if .Values.reloader.matchLabels }}
-{{ tpl (toYaml .Values.reloader.matchLabels) . | indent 4 }}
+{{ toYaml .Values.reloader.matchLabels | indent 4 }}
 {{- end }}
   name: {{ template "reloader-fullname" . }}-role
   namespace: {{ .Values.namespace | default .Release.Namespace }}

deployments/kubernetes/chart/reloader/templates/rolebinding.yaml

@@ -11,10 +11,10 @@ metadata:
   labels:
 {{ include "reloader-labels.chart" . | indent 4 }}
 {{- if .Values.reloader.rbac.labels }}
-{{ tpl (toYaml .Values.reloader.rbac.labels) . | indent 4 }}
+{{ toYaml .Values.reloader.rbac.labels | indent 4 }}
 {{- end }}
 {{- if .Values.reloader.matchLabels }}
-{{ tpl (toYaml .Values.reloader.matchLabels) . | indent 4 }}
+{{ toYaml .Values.reloader.matchLabels | indent 4 }}
 {{- end }}
   name: {{ template "reloader-fullname" . }}-role-binding
   namespace: {{ .Values.namespace | default .Release.Namespace }}

deployments/kubernetes/chart/reloader/templates/service.yaml

@@ -5,22 +5,22 @@ metadata:
   annotations:
 {{ include "reloader-helm3.annotations" . | indent 4 }}
 {{- if .Values.reloader.service.annotations }}
-{{ tpl (toYaml .Values.reloader.service.annotations) . | indent 4 }}
+{{ toYaml .Values.reloader.service.annotations | indent 4 }}
 {{- end }}
   labels:
 {{ include "reloader-labels.chart" . | indent 4 }}
 {{- if .Values.reloader.service.labels }}
-{{ tpl (toYaml .Values.reloader.service.labels) . | indent 4 }}
+{{ toYaml .Values.reloader.service.labels | indent 4 }}
 {{- end }}
   name: {{ template "reloader-fullname" . }}
   namespace: {{ .Values.namespace | default .Release.Namespace }}
 spec:
   selector:
 {{- if .Values.reloader.deployment.labels }}
-{{ tpl (toYaml .Values.reloader.deployment.labels) . | indent 4 }}
+{{ toYaml .Values.reloader.deployment.labels | indent 4 }}
 {{- end }}
 {{- if .Values.reloader.matchLabels }}
-{{ tpl (toYaml .Values.reloader.matchLabels) . | indent 4 }}
+{{ toYaml .Values.reloader.matchLabels | indent 4 }}
 {{- end }}
   ports:
   - port: {{ .Values.reloader.service.port }}

deployments/kubernetes/chart/reloader/templates/serviceaccount.yaml

@@ -11,15 +11,15 @@ metadata:
   annotations:
 {{ include "reloader-helm3.annotations" . | indent 4 }}
 {{- if .Values.reloader.serviceAccount.annotations }}
-{{ tpl (toYaml .Values.reloader.serviceAccount.annotations) . | indent 4 }}
+{{ toYaml .Values.reloader.serviceAccount.annotations | indent 4 }}
 {{- end }}
   labels:
 {{ include "reloader-labels.chart" . | indent 4 }}
 {{- if .Values.reloader.serviceAccount.labels }}
-{{ tpl (toYaml .Values.reloader.serviceAccount.labels) . | indent 4 }}
+{{ toYaml .Values.reloader.serviceAccount.labels | indent 4 }}
 {{- end }}
 {{- if .Values.reloader.matchLabels }}
-{{ tpl (toYaml .Values.reloader.matchLabels) . | indent 4 }}
+{{ toYaml .Values.reloader.matchLabels | indent 4 }}
 {{- end }}
   name: {{ template "reloader-serviceAccountName" . }}
   namespace: {{ .Values.namespace | default .Release.Namespace }}

deployments/kubernetes/manifests/deployment.yaml

@@ -17,7 +17,7 @@ spec:
         app: reloader-reloader
     spec:
       containers:
-        - image: "ghcr.io/stakater/reloader:v1.4.5"
+        - image: "ghcr.io/stakater/reloader:v1.4.9"
           imagePullPolicy: IfNotPresent
           name: reloader-reloader
           env:

deployments/kubernetes/reloader.yaml

@@ -104,7 +104,7 @@ spec:
             resourceFieldRef:
               divisor: "1"
               resource: limits.memory
-        image: ghcr.io/stakater/reloader:v1.4.5
+        image: ghcr.io/stakater/reloader:v1.4.9
         imagePullPolicy: IfNotPresent
         livenessProbe:
           failureThreshold: 5

docs/Alerting.md

@@ -8,7 +8,7 @@ In-order to enable this feature, you need to update the `reloader.env.secret` se
 
 ```yaml
       ALERT_ON_RELOAD: [ true/false ] Default: false
-      ALERT_SINK: [ slack/teams/gchat/webhook ] Default: webhook
+      ALERT_SINK: [ slack/teams/webhook ] Default: webhook
       ALERT_WEBHOOK_URL: Required if ALERT_ON_RELOAD is true
       ALERT_ADDITIONAL_INFO: Any additional information to be added to alert
 ```

internal/pkg/alerts/alert.go

@@ -35,8 +35,6 @@ func SendWebhookAlert(msg string) {
 		sendSlackAlert(webhook_url, webhook_proxy, msg)
 	} else if alert_sink == "teams" {
 		sendTeamsAlert(webhook_url, webhook_proxy, msg)
-	} else if alert_sink == "gchat" {
-		sendGoogleChatAlert(webhook_url, webhook_proxy, msg)
 	} else {
 		msg = strings.Replace(msg, "*", "", -1)
 		sendRawWebhookAlert(webhook_url, webhook_proxy, msg)
@@ -100,29 +98,6 @@ func sendTeamsAlert(webhookUrl string, proxy string, msg string) []error {
 	return nil
 }
 
-// function to send alert to Google Chat webhook
-func sendGoogleChatAlert(webhookUrl string, proxy string, msg string) []error {
-	payload := map[string]interface{}{
-		"text": msg,
-	}
-
-	request := gorequest.New().Proxy(proxy)
-	resp, _, err := request.
-		Post(webhookUrl).
-		RedirectPolicy(redirectPolicy).
-		Send(payload).
-		End()
-
-	if err != nil {
-		return err
-	}
-	if resp.StatusCode != 200 {
-		return []error{fmt.Errorf("error sending msg. status: %v", resp.Status)}
-	}
-
-	return nil
-}
-
 // function to send alert to webhook service as text
 func sendRawWebhookAlert(webhookUrl string, proxy string, msg string) []error {
 	request := gorequest.New().Proxy(proxy)

internal/pkg/handler/upgrade.go

@@ -22,11 +22,9 @@ import (
 	"github.com/stakater/Reloader/internal/pkg/util"
 	"github.com/stakater/Reloader/pkg/kube"
 	v1 "k8s.io/api/core/v1"
-	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/api/meta"
 	"k8s.io/apimachinery/pkg/runtime"
 	patchtypes "k8s.io/apimachinery/pkg/types"
-	"k8s.io/apimachinery/pkg/util/wait"
 	"k8s.io/client-go/tools/record"
 	"k8s.io/client-go/util/retry"
 )
@@ -205,6 +203,7 @@ func doRollingUpgrade(config util.Config, collectors metrics.Collectors, recorde
 }
 
 func rollingUpgrade(clients kube.Clients, config util.Config, upgradeFuncs callbacks.RollingUpgradeFuncs, collectors metrics.Collectors, recorder record.EventRecorder, strategy invokeStrategy) error {
+
 	err := PerformAction(clients, config, upgradeFuncs, collectors, recorder, strategy)
 	if err != nil {
 		logrus.Errorf("Rolling upgrade for '%s' failed with error = %v", config.ResourceName, err)
@@ -217,9 +216,10 @@ func PerformAction(clients kube.Clients, config util.Config, upgradeFuncs callba
 	items := upgradeFuncs.ItemsFunc(clients, config.Namespace)
 
 	for _, item := range items {
-		err := retryOnConflict(retry.DefaultRetry, func(fetchResource bool) error {
-			return upgradeResource(clients, config, upgradeFuncs, collectors, recorder, strategy, item, fetchResource)
+		err := retry.RetryOnConflict(retry.DefaultRetry, func() error {
+			return upgradeResource(clients, config, upgradeFuncs, collectors, recorder, strategy, item)
 		})
+
 		if err != nil {
 			return err
 		}
@@ -228,40 +228,16 @@ func PerformAction(clients kube.Clients, config util.Config, upgradeFuncs callba
 	return nil
 }
 
-func retryOnConflict(backoff wait.Backoff, fn func(_ bool) error) error {
-	var lastError error
-	fetchResource := false // do not fetch resource on first attempt, already done by ItemsFunc
-	err := wait.ExponentialBackoff(backoff, func() (bool, error) {
-		err := fn(fetchResource)
-		fetchResource = true
-		switch {
-		case err == nil:
-			return true, nil
-		case apierrors.IsConflict(err):
-			lastError = err
-			return false, nil
-		default:
-			return false, err
-		}
-	})
-	if wait.Interrupted(err) {
-		err = lastError
-	}
-	return err
-}
-
-func upgradeResource(clients kube.Clients, config util.Config, upgradeFuncs callbacks.RollingUpgradeFuncs, collectors metrics.Collectors, recorder record.EventRecorder, strategy invokeStrategy, resource runtime.Object, fetchResource bool) error {
+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()
-	if fetchResource {
-		resource, err = upgradeFuncs.ItemFunc(clients, resourceName, config.Namespace)
-		if err != nil {
-			return err
-		}
+	resource, err = upgradeFuncs.ItemFunc(clients, resourceName, config.Namespace)
+	if err != nil {
+		return err
 	}
 
 	// find correct annotation and update the resource

internal/pkg/handler/upgrade_test.go

@@ -1441,18 +1441,6 @@ func TestRollingUpgradeForDeploymentWithConfigmapUsingArs(t *testing.T) {
 	deploymentFuncs := GetDeploymentRollingUpgradeFuncs()
 	collectors := getCollectors()
 
-	itemCalled := 0
-	itemsCalled := 0
-
-	deploymentFuncs.ItemFunc = func(client kube.Clients, namespace string, name string) (runtime.Object, error) {
-		itemCalled++
-		return callbacks.GetDeploymentItem(client, namespace, name)
-	}
-	deploymentFuncs.ItemsFunc = func(client kube.Clients, namespace string) []runtime.Object {
-		itemsCalled++
-		return callbacks.GetDeploymentItems(client, namespace)
-	}
-
 	err := PerformAction(clients, config, deploymentFuncs, collectors, nil, invokeReloadStrategy)
 	time.Sleep(5 * time.Second)
 	if err != nil {
@@ -1472,10 +1460,6 @@ func TestRollingUpgradeForDeploymentWithConfigmapUsingArs(t *testing.T) {
 	if promtestutil.ToFloat64(collectors.ReloadedByNamespace.With(prometheus.Labels{"success": "true", "namespace": arsNamespace})) != 1 {
 		t.Errorf("Counter by namespace was not increased")
 	}
-
-	assert.Equal(t, 0, itemCalled, "ItemFunc should not be called")
-	assert.Equal(t, 2, itemsCalled, "ItemsFunc should be called twice")
-
 	testRollingUpgradeInvokeDeleteStrategyArs(t, clients, config, deploymentFuncs, collectors, envVarPostfix)
 }
 
@@ -1490,18 +1474,6 @@ func TestRollingUpgradeForDeploymentWithPatchAndRetryUsingArs(t *testing.T) {
 	assert.True(t, deploymentFuncs.SupportsPatch)
 	assert.NotEmpty(t, deploymentFuncs.PatchTemplatesFunc().AnnotationTemplate)
 
-	itemCalled := 0
-	itemsCalled := 0
-
-	deploymentFuncs.ItemFunc = func(client kube.Clients, namespace string, name string) (runtime.Object, error) {
-		itemCalled++
-		return callbacks.GetDeploymentItem(client, namespace, name)
-	}
-	deploymentFuncs.ItemsFunc = func(client kube.Clients, namespace string) []runtime.Object {
-		itemsCalled++
-		return callbacks.GetDeploymentItems(client, namespace)
-	}
-
 	patchCalled := 0
 	deploymentFuncs.PatchFunc = func(client kube.Clients, namespace string, resource runtime.Object, patchType patchtypes.PatchType, bytes []byte) error {
 		patchCalled++
@@ -1526,9 +1498,7 @@ func TestRollingUpgradeForDeploymentWithPatchAndRetryUsingArs(t *testing.T) {
 		t.Errorf("Rolling upgrade failed for Deployment with Configmap")
 	}
 
-	assert.Equal(t, 1, itemCalled, "ItemFunc should be called once")
-	assert.Equal(t, 1, itemsCalled, "ItemsFunc should be called once")
-	assert.Equal(t, 2, patchCalled, "PatchFunc should be called twice")
+	assert.Equal(t, 2, patchCalled)
 
 	deploymentFuncs = GetDeploymentRollingUpgradeFuncs()
 	testRollingUpgradeWithPatchAndInvokeDeleteStrategyArs(t, clients, config, deploymentFuncs, collectors, envVarPostfix)
@@ -2234,18 +2204,6 @@ func TestRollingUpgradeForDaemonSetWithConfigmapUsingArs(t *testing.T) {
 	daemonSetFuncs := GetDaemonSetRollingUpgradeFuncs()
 	collectors := getCollectors()
 
-	itemCalled := 0
-	itemsCalled := 0
-
-	daemonSetFuncs.ItemFunc = func(client kube.Clients, namespace string, name string) (runtime.Object, error) {
-		itemCalled++
-		return callbacks.GetDaemonSetItem(client, namespace, name)
-	}
-	daemonSetFuncs.ItemsFunc = func(client kube.Clients, namespace string) []runtime.Object {
-		itemsCalled++
-		return callbacks.GetDaemonSetItems(client, namespace)
-	}
-
 	err := PerformAction(clients, config, daemonSetFuncs, collectors, nil, invokeReloadStrategy)
 	time.Sleep(5 * time.Second)
 	if err != nil {
@@ -2266,9 +2224,6 @@ func TestRollingUpgradeForDaemonSetWithConfigmapUsingArs(t *testing.T) {
 		t.Errorf("Counter by namespace was not increased")
 	}
 
-	assert.Equal(t, 0, itemCalled, "ItemFunc should not be called")
-	assert.Equal(t, 2, itemsCalled, "ItemsFunc should be called twice")
-
 	testRollingUpgradeInvokeDeleteStrategyArs(t, clients, config, daemonSetFuncs, collectors, envVarPostfix)
 }
 
@@ -2280,18 +2235,6 @@ func TestRollingUpgradeForDaemonSetWithPatchAndRetryUsingArs(t *testing.T) {
 	config := getConfigWithAnnotations(envVarPostfix, arsConfigmapName, shaData, options.ConfigmapUpdateOnChangeAnnotation, options.ConfigmapReloaderAutoAnnotation)
 	daemonSetFuncs := GetDaemonSetRollingUpgradeFuncs()
 
-	itemCalled := 0
-	itemsCalled := 0
-
-	daemonSetFuncs.ItemFunc = func(client kube.Clients, namespace string, name string) (runtime.Object, error) {
-		itemCalled++
-		return callbacks.GetDaemonSetItem(client, namespace, name)
-	}
-	daemonSetFuncs.ItemsFunc = func(client kube.Clients, namespace string) []runtime.Object {
-		itemsCalled++
-		return callbacks.GetDaemonSetItems(client, namespace)
-	}
-
 	assert.True(t, daemonSetFuncs.SupportsPatch)
 	assert.NotEmpty(t, daemonSetFuncs.PatchTemplatesFunc().AnnotationTemplate)
 
@@ -2320,9 +2263,7 @@ func TestRollingUpgradeForDaemonSetWithPatchAndRetryUsingArs(t *testing.T) {
 		t.Errorf("Rolling upgrade failed for DaemonSet with configmap")
 	}
 
-	assert.Equal(t, 1, itemCalled, "ItemFunc should be called once")
-	assert.Equal(t, 1, itemsCalled, "ItemsFunc should be called once")
-	assert.Equal(t, 2, patchCalled, "PatchFunc should be called twice")
+	assert.Equal(t, 2, patchCalled)
 
 	daemonSetFuncs = GetDeploymentRollingUpgradeFuncs()
 	testRollingUpgradeWithPatchAndInvokeDeleteStrategyArs(t, clients, config, daemonSetFuncs, collectors, envVarPostfix)
@@ -2465,18 +2406,6 @@ func TestRollingUpgradeForStatefulSetWithConfigmapUsingArs(t *testing.T) {
 	statefulSetFuncs := GetStatefulSetRollingUpgradeFuncs()
 	collectors := getCollectors()
 
-	itemCalled := 0
-	itemsCalled := 0
-
-	statefulSetFuncs.ItemFunc = func(client kube.Clients, namespace string, name string) (runtime.Object, error) {
-		itemCalled++
-		return callbacks.GetStatefulSetItem(client, namespace, name)
-	}
-	statefulSetFuncs.ItemsFunc = func(client kube.Clients, namespace string) []runtime.Object {
-		itemsCalled++
-		return callbacks.GetStatefulSetItems(client, namespace)
-	}
-
 	err := PerformAction(clients, config, statefulSetFuncs, collectors, nil, invokeReloadStrategy)
 	time.Sleep(5 * time.Second)
 	if err != nil {
@@ -2497,9 +2426,6 @@ func TestRollingUpgradeForStatefulSetWithConfigmapUsingArs(t *testing.T) {
 		t.Errorf("Counter by namespace was not increased")
 	}
 
-	assert.Equal(t, 0, itemCalled, "ItemFunc should not be called")
-	assert.Equal(t, 2, itemsCalled, "ItemsFunc should be called twice")
-
 	testRollingUpgradeInvokeDeleteStrategyArs(t, clients, config, statefulSetFuncs, collectors, envVarPostfix)
 }
 
@@ -2511,18 +2437,6 @@ func TestRollingUpgradeForStatefulSetWithPatchAndRetryUsingArs(t *testing.T) {
 	config := getConfigWithAnnotations(envVarPostfix, arsConfigmapName, shaData, options.ConfigmapUpdateOnChangeAnnotation, options.ConfigmapReloaderAutoAnnotation)
 	statefulSetFuncs := GetStatefulSetRollingUpgradeFuncs()
 
-	itemCalled := 0
-	itemsCalled := 0
-
-	statefulSetFuncs.ItemFunc = func(client kube.Clients, namespace string, name string) (runtime.Object, error) {
-		itemCalled++
-		return callbacks.GetStatefulSetItem(client, namespace, name)
-	}
-	statefulSetFuncs.ItemsFunc = func(client kube.Clients, namespace string) []runtime.Object {
-		itemsCalled++
-		return callbacks.GetStatefulSetItems(client, namespace)
-	}
-
 	assert.True(t, statefulSetFuncs.SupportsPatch)
 	assert.NotEmpty(t, statefulSetFuncs.PatchTemplatesFunc().AnnotationTemplate)
 
@@ -2551,9 +2465,7 @@ func TestRollingUpgradeForStatefulSetWithPatchAndRetryUsingArs(t *testing.T) {
 		t.Errorf("Rolling upgrade failed for StatefulSet with configmap")
 	}
 
-	assert.Equal(t, 1, itemCalled, "ItemFunc should be called once")
-	assert.Equal(t, 1, itemsCalled, "ItemsFunc should be called once")
-	assert.Equal(t, 2, patchCalled, "PatchFunc should be called twice")
+	assert.Equal(t, 2, patchCalled)
 
 	statefulSetFuncs = GetDeploymentRollingUpgradeFuncs()
 	testRollingUpgradeWithPatchAndInvokeDeleteStrategyArs(t, clients, config, statefulSetFuncs, collectors, envVarPostfix)