Merge pull request #98 from davidffrench/update_prom_rule

Update prom rule
integr8ly · Sep 3, 2019 · a2b5941 · a2b5941
2 parents 030083a + bbe02de
commit a2b5941
Show file tree

Hide file tree

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

diff --git a/deploy/operator.yaml b/deploy/operator.yaml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
         - name: keycloak-operator
-          image: quay.io/integreatly/keycloak-operator:v1.9.0
+          image: quay.io/integreatly/keycloak-operator:v1.9.1
           ports:
           - containerPort: 60000
             name: metrics

diff --git a/deploy/template/prometheus-rule.yaml b/deploy/template/prometheus-rule.yaml
@@ -86,7 +86,7 @@ spec:
               Keycloak instance in namespace {{ $labels.namespace }} has not
               been available for the last 5 minutes.
           expr: >
-            (1 - absent(kube_pod_status_ready{namespace="sso", condition="true"}
+            (1 - absent(kube_pod_status_ready{namespace="[[ .Namespace ]]", condition="true"}
             * on (pod) group_left (label_deploymentConfig)
             kube_pod_labels{label_deploymentConfig="sso"})) == 0 or
             probe_success{service="rhsso-ui"} == 0 
@@ -121,7 +121,7 @@ spec:
               RH SSO database in namespace {{ $labels.namespace }} is not
               available for the last 5 minutes.
           expr: >
-            (1 - absent(kube_pod_status_ready{namespace="sso", condition="true"}
+            (1 - absent(kube_pod_status_ready{namespace="[[ .Namespace ]]", condition="true"}
             * on (pod) group_left (label_deploymentConfig)
             kube_pod_labels{label_deploymentConfig="sso-postgresql"})) == 0 
           for: 5m

diff --git a/deploy/test-pod.yaml b/deploy/test-pod.yaml
@@ -6,7 +6,7 @@ spec:
   restartPolicy: Never
   containers:
   - name: keycloak-operator-test
-    image: quay.io/integreatly/keycloak-operator:v1.9.0
+    image: quay.io/integreatly/keycloak-operator:v1.9.1
     imagePullPolicy: Always
     command: ["/go-test.sh"]
     env:

diff --git a/version/version.go b/version/version.go
@@ -1,5 +1,5 @@
 package version
 
 var (
-	Version = "1.9.0"
+	Version = "1.9.1"
 )