Merge pull request #139 from Rajagopalan-Ranganathan/INTLY-8046

Fix for a second pod during upgrade.

Makefile

@@ -13,7 +13,7 @@ COMPILE_TARGET=./tmp/_output/bin/$(PROJECT)
 # You can delete this comment afterwards.
 PROMETHEUS_OPERATOR_VERSION=v0.34.0
 LOCAL=local
-GRAFANA_OPERATOR_VERSION=v3.2.0
+GRAFANA_OPERATOR_VERSION=v3.4.0
 AMO_VERSION=1.2.0
 PREV_AMO_VERSION=1.1.6
 

cmd/manager/main.go

@@ -17,7 +17,6 @@ import (
 	"github.com/operator-framework/operator-sdk/pkg/leader"
 	"github.com/operator-framework/operator-sdk/pkg/log/zap"
 	"github.com/operator-framework/operator-sdk/pkg/metrics"
-	"github.com/operator-framework/operator-sdk/pkg/ready"
 	sdkVersion "github.com/operator-framework/operator-sdk/version"
 	"github.com/spf13/pflag"
 	v1 "k8s.io/api/core/v1"
@@ -85,14 +84,6 @@ func main() {
 	ctx := context.TODO()
 	leader.Become(ctx, "application-monitoring-operator-lock")
 
-	r := ready.NewFileReady()
-	err = r.Set()
-	if err != nil {
-		log.Error(err, "")
-		os.Exit(1)
-	}
-	defer r.Unset()
-
 	// Create a new Cmd to provide shared dependencies and start components
 	mgr, err := manager.New(cfg, manager.Options{
 		Namespace:          namespace,

deploy/operator.yaml

@@ -22,14 +22,6 @@ spec:
           command:
             - application-monitoring-operator
           imagePullPolicy: Always
-          readinessProbe:
-            exec:
-              command:
-                - stat
-                - /tmp/operator-sdk-ready
-            initialDelaySeconds: 4
-            periodSeconds: 10
-            failureThreshold: 1
           env:
             - name: TEMPLATE_PATH
               value: /usr/local/bin/templates

pkg/controller/applicationmonitoring/templateHelper.go

@@ -143,7 +143,7 @@ func newTemplateHelper(cr *applicationmonitoring.ApplicationMonitoring, extraPar
 		ImageGrafana:                     "quay.io/openshift/origin-grafana",
 		ImageTagGrafana:                  "4.2",
 		ImageGrafanaOperator:             "quay.io/integreatly/grafana-operator",
-		ImageTagGrafanaOperator:          "v3.3.0",
+		ImageTagGrafanaOperator:          "v3.4.0",
 		ImageConfigMapReloader:           "quay.io/openshift/origin-configmap-reloader",
 		ImageTagConfigMapReloader:        "4.2",
 		ImagePrometheusConfigReloader:    "quay.io/openshift/origin-prometheus-config-reloader",