Merge pull request #103 from pawelpaszki/secretOutputCondFix

added empty string check for specClient.OutputSecret
integr8ly · Oct 16, 2019 · 317ffa2 · 317ffa2
2 parents cf1e611 + d97ee5d
commit 317ffa2
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 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.3
+TAG=v1.9.4
 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.3
+          image: quay.io/integreatly/keycloak-operator:v1.9.4
           ports:
           - containerPort: 60000
             name: metrics

diff --git a/pkg/keycloak/realm/phaseHandler.go b/pkg/keycloak/realm/phaseHandler.go
@@ -507,7 +507,7 @@ func (ph *phaseHandler) reconcileClient(kcClient, specClient *v1alpha1.KeycloakC
 			}
 		}
 	}
-	if kcClient != nil && specClient != nil && specClient.OutputSecret != nil {
+	if kcClient != nil && specClient != nil && specClient.OutputSecret != nil && *specClient.OutputSecret != "" {
 		cs, err := authenticatedClient.GetClientSecret(kcClient.ID, realmName)
 		if err != nil {
 			return err

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