Fixes

Signed-off-by: Anatolii Bazko <abazko@redhat.com>
eclipse-che · Feb 15, 2021 · 46d7957 · 46d7957
1 parent 7165804
commit 46d7957
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 10 deletions.
diff --git a/pkg/controller/che/che_controller.go b/pkg/controller/che/che_controller.go
@@ -406,7 +406,7 @@ func (r *ReconcileChe) Reconcile(request reconcile.Request) (reconcile.Result, e
 	}
 
 	if instance.Spec.Auth.InitialOpenShiftOAuthUser == nil && instance.Status.OpenShiftOAuthUserCredentialsSecret != "" {
-		secret, err := deploy.GetSecret(deployContext, instance.Status.OpenShiftOAuthUserCredentialsSecret, instance.Namespace)
+		secret, err := deploy.GetSecret(deployContext, openShiftOAuthUserCredentialsSecret, instance.Namespace)
 		if secret == nil {
 			if err == nil {
 				instance.Status.OpenShiftOAuthUserCredentialsSecret = ""

diff --git a/pkg/deploy/ingres_test.go b/pkg/deploy/ingres_test.go
@@ -18,6 +18,7 @@ import (
 	"github.com/google/go-cmp/cmp"
 
 	orgv1 "github.com/eclipse/che-operator/pkg/apis/org/v1"
+	"github.com/eclipse/che-operator/pkg/util"
 	"k8s.io/api/extensions/v1beta1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
@@ -31,8 +32,6 @@ import (
 )
 
 func TestIngressSpec(t *testing.T) {
-	_true := true
-
 	type testCase struct {
 		name                  string
 		ingressName           string
@@ -72,8 +71,8 @@ func TestIngressSpec(t *testing.T) {
 						{
 							APIVersion:         "org.eclipse.che/v1",
 							Kind:               "CheCluster",
-							Controller:         &_true,
-							BlockOwnerDeletion: &_true,
+							Controller:         util.NewBoolPointer(true),
+							BlockOwnerDeletion: util.NewBoolPointer(true),
 						},
 					},
 					Annotations: map[string]string{

diff --git a/pkg/deploy/route_test.go b/pkg/deploy/route_test.go
@@ -19,6 +19,7 @@ import (
 	routev1 "github.com/openshift/api/route/v1"
 
 	orgv1 "github.com/eclipse/che-operator/pkg/apis/org/v1"
+	"github.com/eclipse/che-operator/pkg/util"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/util/intstr"
@@ -32,7 +33,6 @@ import (
 
 func TestRouteSpec(t *testing.T) {
 	weight := int32(100)
-	_true := true
 
 	type testCase struct {
 		name                string
@@ -73,8 +73,8 @@ func TestRouteSpec(t *testing.T) {
 						{
 							APIVersion:         "org.eclipse.che/v1",
 							Kind:               "CheCluster",
-							Controller:         &_true,
-							BlockOwnerDeletion: &_true,
+							Controller:         util.NewBoolPointer(true),
+							BlockOwnerDeletion: util.NewBoolPointer(true),
 						},
 					},
 				},
@@ -124,8 +124,8 @@ func TestRouteSpec(t *testing.T) {
 						{
 							APIVersion:         "org.eclipse.che/v1",
 							Kind:               "CheCluster",
-							Controller:         &_true,
-							BlockOwnerDeletion: &_true,
+							Controller:         util.NewBoolPointer(true),
+							BlockOwnerDeletion: util.NewBoolPointer(true),
 						},
 					},
 				},