version bump

integr8ly · Jul 29, 2019 · 693fe38 · 693fe38
1 parent 1efd7c6
commit 693fe38
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 5 deletions.
diff --git a/Makefile b/Makefile
@@ -3,7 +3,7 @@ NAMESPACE ?= application-monitoring
 PROJECT ?= application-monitoring-operator
 REG=quay.io
 SHELL=/bin/bash
-TAG ?= 0.0.20
+TAG ?= 0.0.21
 PKG=github.com/integr8ly/application-monitoring-operator
 TEST_DIRS?=$(shell sh -c "find $(TOP_SRC_DIRS) -name \\*_test.go -exec dirname {} \\; | sort | uniq")
 TEST_POD_NAME=application-monitoring-operator-test

diff --git a/deploy/operator.yaml b/deploy/operator.yaml
@@ -15,7 +15,7 @@ spec:
       serviceAccountName: application-monitoring-operator
       containers:
         - name: application-monitoring-operator
-          image: quay.io/integreatly/application-monitoring-operator:0.0.20
+          image: quay.io/integreatly/application-monitoring-operator:0.0.21
           ports:
             - containerPort: 60000
               name: metrics

diff --git a/pkg/controller/applicationmonitoring/applicationmonitoring_controller.go b/pkg/controller/applicationmonitoring/applicationmonitoring_controller.go
@@ -220,7 +220,8 @@ func (r *ReconcileApplicationMonitoring) watchAdditionalScrapeConfigs(cr *applic
 
 	go func() {
 		for update := range events.ResultChan() {
-			if update.Type != watch.Error {
+			secret := update.Object.(*corev1.Secret)
+			if update.Type != watch.Error && secret.Name == cr.Spec.AdditionalScrapeConfigSecretName {
 				log.Info(fmt.Sprintf("watch event of type '%v' received for additional scrape config", update.Type))
 				err = r.createOrUpdateAdditionalScrapeConfig(cr)
 				if err != nil {

diff --git a/pkg/controller/applicationmonitoring/kubeHelper.go b/pkg/controller/applicationmonitoring/kubeHelper.go
@@ -29,4 +29,4 @@ func (h *KubeHelperImpl) startSecretWatch(cr *v1alpha1.ApplicationMonitoring) (w
 		LabelSelector: fmt.Sprintf("monitoring-key=%s", cr.Spec.LabelSelector),
 	}
 	return h.k8client.CoreV1().Secrets(cr.Namespace).Watch(opts)
-}
+}
diff --git a/version/version.go b/version/version.go
@@ -1,5 +1,5 @@
 package version
 
 var (
-	Version = "0.0.20"
+	Version = "0.0.21"
 )
-Original file line number
+Diff line change
@@ Expand Up @@
     		LabelSelector: fmt.Sprintf("monitoring-key=%s", cr.Spec.LabelSelector),
     	}
     	return h.k8client.CoreV1().Secrets(cr.Namespace).Watch(opts)
-    }
+    }