Merge pull request #942 from stakater/update-version-3vogv5u

Bump version to 1.4.4 on release-v1.4.4 branch

.github/workflows/pull_request_docs.yaml

@@ -22,11 +22,10 @@ jobs:
       DOC_SRC: docs
       MD_LINT_CONFIG: .markdownlint.yaml
   build:
-    uses: stakater/.github/.github/workflows/pull_request_container_build.yaml@v0.0.132
+    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

VERSION

@@ -1 +1 @@
-1.1.0
+1.4.4

deployments/kubernetes/chart/reloader/Chart.yaml

@@ -1,8 +1,8 @@
 apiVersion: v1
 name: reloader
 description: Reloader chart that runs on kubernetes
-version: 2.1.4
-appVersion: v1.4.4
+version: 2.1.3
+appVersion: v1.4.2
 keywords:
   - Reloader
   - kubernetes

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/chart/reloader/values.yaml

@@ -17,7 +17,7 @@ fullnameOverride: ""
 image:
   name: stakater/reloader
   repository: ghcr.io/stakater/reloader
-  tag: v1.4.4
+  tag: v1.4.2
   # digest: sha256:1234567
   pullPolicy: IfNotPresent
 
@@ -106,7 +106,7 @@ reloader:
     labels:
       provider: stakater
       group: com.stakater.platform
-      version: v1.4.4
+      version: v1.4.2
     # Support for extra environment variables.
     env:
       # Open supports Key value pair as environment variables.

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.4"
           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:latest"
+        image: ghcr.io/stakater/reloader:v1.4.4
         imagePullPolicy: IfNotPresent
         livenessProbe:
           failureThreshold: 5

internal/pkg/callbacks/rolling_upgrade.go

@@ -17,6 +17,7 @@ import (
 	patchtypes "k8s.io/apimachinery/pkg/types"
 
 	argorolloutv1alpha1 "github.com/argoproj/argo-rollouts/pkg/apis/rollouts/v1alpha1"
+	openshiftv1 "github.com/openshift/api/apps/v1"
 )
 
 // ItemFunc is a generic function to return a specific resource in given namespace
@@ -231,6 +232,36 @@ 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{})
+	if err != nil {
+		logrus.Errorf("Failed to list deploymentConfigs %v", err)
+	}
+
+	items := make([]runtime.Object, len(deploymentConfigs.Items))
+	// Ensure we always have pod annotations to add to
+	for i, v := range deploymentConfigs.Items {
+		if v.Spec.Template.ObjectMeta.Annotations == nil {
+			deploymentConfigs.Items[i].Spec.Template.ObjectMeta.Annotations = make(map[string]string)
+		}
+		items[i] = &deploymentConfigs.Items[i]
+	}
+
+	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{})
@@ -301,6 +332,14 @@ func GetStatefulSetAnnotations(item runtime.Object) 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 {
@@ -349,6 +388,14 @@ func GetStatefulSetPodAnnotations(item runtime.Object) 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 {
@@ -382,6 +429,11 @@ func GetStatefulSetContainers(item runtime.Object) []v1.Container {
 	return item.(*appsv1.StatefulSet).Spec.Template.Spec.Containers
 }
 
+// GetDeploymentConfigContainers returns the containers of given deploymentConfig
+func GetDeploymentConfigContainers(item runtime.Object) []v1.Container {
+	return item.(*openshiftv1.DeploymentConfig).Spec.Template.Spec.Containers
+}
+
 // GetRolloutContainers returns the containers of given rollout
 func GetRolloutContainers(item runtime.Object) []v1.Container {
 	return item.(*argorolloutv1alpha1.Rollout).Spec.Template.Spec.Containers
@@ -412,6 +464,11 @@ func GetStatefulSetInitContainers(item runtime.Object) []v1.Container {
 	return item.(*appsv1.StatefulSet).Spec.Template.Spec.InitContainers
 }
 
+// GetDeploymentConfigInitContainers returns the containers of given deploymentConfig
+func GetDeploymentConfigInitContainers(item runtime.Object) []v1.Container {
+	return item.(*openshiftv1.DeploymentConfig).Spec.Template.Spec.InitContainers
+}
+
 // GetRolloutInitContainers returns the containers of given rollout
 func GetRolloutInitContainers(item runtime.Object) []v1.Container {
 	return item.(*argorolloutv1alpha1.Rollout).Spec.Template.Spec.InitContainers
@@ -518,6 +575,19 @@ func PatchStatefulSet(clients kube.Clients, namespace string, resource runtime.O
 	return err
 }
 
+// UpdateDeploymentConfig performs rolling upgrade on deploymentConfig
+func UpdateDeploymentConfig(clients kube.Clients, namespace string, resource runtime.Object) error {
+	deploymentConfig := resource.(*openshiftv1.DeploymentConfig)
+	_, err := clients.OpenshiftAppsClient.AppsV1().DeploymentConfigs(namespace).Update(context.TODO(), deploymentConfig, meta_v1.UpdateOptions{FieldManager: "Reloader"})
+	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 {
 	rollout := resource.(*argorolloutv1alpha1.Rollout)
@@ -561,6 +631,11 @@ func GetStatefulSetVolumes(item runtime.Object) []v1.Volume {
 	return item.(*appsv1.StatefulSet).Spec.Template.Spec.Volumes
 }
 
+// GetDeploymentConfigVolumes returns the Volumes of given deploymentConfig
+func GetDeploymentConfigVolumes(item runtime.Object) []v1.Volume {
+	return item.(*openshiftv1.DeploymentConfig).Spec.Template.Spec.Volumes
+}
+
 // GetRolloutVolumes returns the Volumes of given rollout
 func GetRolloutVolumes(item runtime.Object) []v1.Volume {
 	return item.(*argorolloutv1alpha1.Rollout).Spec.Template.Spec.Volumes

internal/pkg/controller/controller_test.go

@@ -68,6 +68,64 @@ func TestMain(m *testing.M) {
 	os.Exit(retCode)
 }
 
+// Perform rolling upgrade on deploymentConfig and create pod annotation var upon updating the configmap
+func TestControllerUpdatingConfigmapShouldCreatePodAnnotationInDeploymentConfig(t *testing.T) {
+	options.ReloadStrategy = constants.AnnotationsReloadStrategy
+
+	// Don't run test on non-openshift environment
+	if !kube.IsOpenshift {
+		return
+	}
+
+	// Creating configmap
+	configmapName := configmapNamePrefix + "-update-" + testutil.RandSeq(5)
+	configmapClient, err := testutil.CreateConfigMap(clients.KubernetesClient, namespace, configmapName, "www.google.com")
+	if err != nil {
+		t.Errorf("Error while creating the configmap %v", err)
+	}
+
+	// Creating deployment
+	_, err = testutil.CreateDeploymentConfig(clients.OpenshiftAppsClient, configmapName, namespace, true)
+	if err != nil {
+		t.Errorf("Error in deploymentConfig creation: %v", err)
+	}
+
+	// Updating configmap for first time
+	updateErr := testutil.UpdateConfigMap(configmapClient, namespace, configmapName, "", "www.stakater.com")
+	if updateErr != nil {
+		t.Errorf("Configmap was not updated")
+	}
+
+	// Verifying deployment update
+	logrus.Infof("Verifying pod annotation has been created")
+	shaData := testutil.ConvertResourceToSHA(testutil.ConfigmapResourceType, namespace, configmapName, "www.stakater.com")
+	config := util.Config{
+		Namespace:    namespace,
+		ResourceName: configmapName,
+		SHAValue:     shaData,
+		Annotation:   options.ConfigmapUpdateOnChangeAnnotation,
+	}
+	deploymentConfigFuncs := handler.GetDeploymentConfigRollingUpgradeFuncs()
+	updated := testutil.VerifyResourceAnnotationUpdate(clients, config, deploymentConfigFuncs)
+	if !updated {
+		t.Errorf("DeploymentConfig was not updated")
+	}
+	time.Sleep(sleepDuration)
+
+	// Deleting deployment
+	err = testutil.DeleteDeploymentConfig(clients.OpenshiftAppsClient, namespace, configmapName)
+	if err != nil {
+		logrus.Errorf("Error while deleting the deploymentConfig %v", err)
+	}
+
+	// Deleting configmap
+	err = testutil.DeleteConfigMap(clients.KubernetesClient, namespace, configmapName)
+	if err != nil {
+		logrus.Errorf("Error while deleting the configmap %v", err)
+	}
+	time.Sleep(sleepDuration)
+}
+
 // Perform rolling upgrade on deployment and create pod annotation var upon updating the configmap
 func TestControllerUpdatingConfigmapShouldCreatePodAnnotationInDeployment(t *testing.T) {
 	options.ReloadStrategy = constants.AnnotationsReloadStrategy
@@ -1020,6 +1078,64 @@ func TestControllerUpdatingSecretShouldCreatePodAnnotationInStatefulSet(t *testi
 	time.Sleep(sleepDuration)
 }
 
+// Perform rolling upgrade on deploymentConfig and create env var upon updating the configmap
+func TestControllerUpdatingConfigmapShouldCreateEnvInDeploymentConfig(t *testing.T) {
+	options.ReloadStrategy = constants.EnvVarsReloadStrategy
+
+	// Don't run test on non-openshift environment
+	if !kube.IsOpenshift {
+		return
+	}
+
+	// Creating configmap
+	configmapName := configmapNamePrefix + "-update-" + testutil.RandSeq(5)
+	configmapClient, err := testutil.CreateConfigMap(clients.KubernetesClient, namespace, configmapName, "www.google.com")
+	if err != nil {
+		t.Errorf("Error while creating the configmap %v", err)
+	}
+
+	// Creating deployment
+	_, err = testutil.CreateDeploymentConfig(clients.OpenshiftAppsClient, configmapName, namespace, true)
+	if err != nil {
+		t.Errorf("Error in deploymentConfig creation: %v", err)
+	}
+
+	// Updating configmap for first time
+	updateErr := testutil.UpdateConfigMap(configmapClient, namespace, configmapName, "", "www.stakater.com")
+	if updateErr != nil {
+		t.Errorf("Configmap was not updated")
+	}
+
+	// Verifying deployment update
+	logrus.Infof("Verifying env var has been created")
+	shaData := testutil.ConvertResourceToSHA(testutil.ConfigmapResourceType, namespace, configmapName, "www.stakater.com")
+	config := util.Config{
+		Namespace:    namespace,
+		ResourceName: configmapName,
+		SHAValue:     shaData,
+		Annotation:   options.ConfigmapUpdateOnChangeAnnotation,
+	}
+	deploymentConfigFuncs := handler.GetDeploymentConfigRollingUpgradeFuncs()
+	updated := testutil.VerifyResourceEnvVarUpdate(clients, config, constants.ConfigmapEnvVarPostfix, deploymentConfigFuncs)
+	if !updated {
+		t.Errorf("DeploymentConfig was not updated")
+	}
+	time.Sleep(sleepDuration)
+
+	// Deleting deployment
+	err = testutil.DeleteDeploymentConfig(clients.OpenshiftAppsClient, namespace, configmapName)
+	if err != nil {
+		logrus.Errorf("Error while deleting the deploymentConfig %v", err)
+	}
+
+	// Deleting configmap
+	err = testutil.DeleteConfigMap(clients.KubernetesClient, namespace, configmapName)
+	if err != nil {
+		logrus.Errorf("Error while deleting the configmap %v", err)
+	}
+	time.Sleep(sleepDuration)
+}
+
 // Perform rolling upgrade on deployment and create env var upon updating the configmap
 func TestControllerUpdatingConfigmapShouldCreateEnvInDeployment(t *testing.T) {
 	options.ReloadStrategy = constants.EnvVarsReloadStrategy

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"
 )
@@ -121,6 +119,24 @@ func GetStatefulSetRollingUpgradeFuncs() callbacks.RollingUpgradeFuncs {
 	}
 }
 
+// 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{
@@ -194,6 +210,13 @@ func doRollingUpgrade(config util.Config, collectors metrics.Collectors, recorde
 		return err
 	}
 
+	if kube.IsOpenshift {
+		err = rollingUpgrade(clients, config, GetDeploymentConfigRollingUpgradeFuncs(), collectors, recorder, invoke)
+		if err != nil {
+			return err
+		}
+	}
+
 	if options.IsArgoRollouts == "true" {
 		err = rollingUpgrade(clients, config, GetArgoRolloutRollingUpgradeFuncs(), collectors, recorder, invoke)
 		if err != nil {
@@ -205,6 +228,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 +241,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 +253,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)