Merge pull request #118 from 3scale-ops/fix/backend-hpa

fix/backend-hpa
3scale-ops · Jul 9, 2021 · 420433d · 420433d
2 parents f20946e + ddf5c26
commit 420433d
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 16 deletions.
diff --git a/Makefile b/Makefile
@@ -1,6 +1,6 @@
 SHELL:=/bin/bash
 # Current Operator version
-VERSION ?= 0.10.3
+VERSION ?= 0.10.4
 # Default catalog image
 CATALOG_IMG ?= quay.io/3scaleops/saas-operator-bundle:catalog
 # Default bundle image tag

diff --git a/bundle/manifests/saas-operator.clusterserviceversion.yaml b/bundle/manifests/saas-operator.clusterserviceversion.yaml
@@ -585,7 +585,7 @@ metadata:
     operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
     repository: https://github.com/3scale/saas-operator
     support: Red Hat
-  name: saas-operator.v0.10.3
+  name: saas-operator.v0.10.4
   namespace: placeholder
 spec:
   apiservicedefinitions: {}
@@ -3053,7 +3053,7 @@ spec:
                   valueFrom:
                     fieldRef:
                       fieldPath: metadata.annotations['olm.targetNamespaces']
-                image: quay.io/3scale/saas-operator:0.10.3
+                image: quay.io/3scale/saas-operator:0.10.4
                 livenessProbe:
                   httpGet:
                     path: /healthz
@@ -3440,4 +3440,4 @@ spec:
   provider:
     name: Red Hat
     url: https://www.3scale.net/
-  version: 0.10.3
+  version: 0.10.4
diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml
@@ -13,4 +13,4 @@ kind: Kustomization
 images:
 - name: controller
   newName: quay.io/3scale/saas-operator
-  newTag: 0.10.3
+  newTag: 0.10.4
diff --git a/controllers/backend_controller.go b/controllers/backend_controller.go
@@ -96,13 +96,13 @@ func (r *BackendReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ct
 			},
 			{
 				Template: gen.Worker.Deployment(),
-				HasHPA:   !instance.Spec.Listener.HPA.IsDeactivated(),
+				HasHPA:   !instance.Spec.Worker.HPA.IsDeactivated(),
 				//Worker only depends on SystemEventsHookSecretDefinition and ErrorMonitoringSecretDefinition
 				RolloutTriggers: []basereconciler.RolloutTrigger{triggers[0], triggers[2]},
 			},
 			{
 				Template: gen.Cron.Deployment(),
-				HasHPA:   !instance.Spec.Listener.HPA.IsDeactivated(),
+				HasHPA:   false,
 				// Cron only depends on ErrorMonitoringSecretDefinition
 				RolloutTriggers: []basereconciler.RolloutTrigger{triggers[2]},
 			},

diff --git a/pkg/assets/bindata.go b/pkg/assets/bindata.go
diff --git a/pkg/version/version.go b/pkg/version/version.go
@@ -1,7 +1,7 @@
 package version
 
 const (
-	version string = "v0.10.3"
+	version string = "v0.10.4"
 )
 
 // Current returns the current marin3r operator version