Fix reverting ingress security to oauth-proxy on openshift if set to …

…none (#301) * Fix reverting ingress security to oauth-proxy on openshift if set to none Signed-off-by: Pavol Loffay <ploffay@redhat.com> * remove junk Signed-off-by: Pavol Loffay <ploffay@redhat.com> * Fix tests Signed-off-by: Pavol Loffay <ploffay@redhat.com>
jaegertracing · Mar 12, 2019 · c55de17 · c55de17
1 parent f128fa3
commit c55de17
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/pkg/strategy/controller.go b/pkg/strategy/controller.go
@@ -75,7 +75,7 @@ func normalize(jaeger *v1.Jaeger) {
 		// cases:
 		// - omitted on Kubernetes
 		// - 'none' on any platform
-		jaeger.Spec.Ingress.Security = v1.IngressSecurityNone
+		jaeger.Spec.Ingress.Security = v1.IngressSecurityNoneExplicit
 	}
 
 	normalizeSparkDependencies(&jaeger.Spec.Storage.SparkDependencies, jaeger.Spec.Storage.Type)

diff --git a/pkg/strategy/controller_test.go b/pkg/strategy/controller_test.go
@@ -122,14 +122,14 @@ func TestStorageMemoryOnlyUsedWithAllInOneStrategy(t *testing.T) {
 func TestSetSecurityToNoneByDefault(t *testing.T) {
 	jaeger := v1.NewJaeger("TestSetSecurityToNoneByDefault")
 	normalize(jaeger)
-	assert.Equal(t, v1.IngressSecurityNone, jaeger.Spec.Ingress.Security)
+	assert.Equal(t, v1.IngressSecurityNoneExplicit, jaeger.Spec.Ingress.Security)
 }
 
 func TestSetSecurityToNoneWhenExplicitSettingToNone(t *testing.T) {
 	jaeger := v1.NewJaeger("TestSetSecurityToNoneWhenExplicitSettingToNone")
 	jaeger.Spec.Ingress.Security = v1.IngressSecurityNoneExplicit
 	normalize(jaeger)
-	assert.Equal(t, v1.IngressSecurityNone, jaeger.Spec.Ingress.Security)
+	assert.Equal(t, v1.IngressSecurityNoneExplicit, jaeger.Spec.Ingress.Security)
 }
 
 func TestSetSecurityToOAuthProxyByDefaultOnOpenShift(t *testing.T) {
@@ -148,7 +148,7 @@ func TestSetSecurityToNoneOnNonOpenShift(t *testing.T) {
 
 	normalize(jaeger)
 
-	assert.Equal(t, v1.IngressSecurityNone, jaeger.Spec.Ingress.Security)
+	assert.Equal(t, v1.IngressSecurityNoneExplicit, jaeger.Spec.Ingress.Security)
 }
 
 func TestAcceptExplicitValueFromSecurityWhenOnOpenShift(t *testing.T) {
@@ -160,7 +160,7 @@ func TestAcceptExplicitValueFromSecurityWhenOnOpenShift(t *testing.T) {
 
 	normalize(jaeger)
 
-	assert.Equal(t, v1.IngressSecurityNone, jaeger.Spec.Ingress.Security)
+	assert.Equal(t, v1.IngressSecurityNoneExplicit, jaeger.Spec.Ingress.Security)
 }
 
 func TestNormalizeIndexCleaner(t *testing.T) {