Update tests

cryostatio · Dec 1, 2021 · 61e73c7 · 61e73c7
1 parent 3613bbc
commit 61e73c7
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 8 deletions.
diff --git a/internal/controllers/cryostat_controller_test.go b/internal/controllers/cryostat_controller_test.go
@@ -1032,6 +1032,8 @@ func (t *cryostatTestInput) expectRBAC() {
 	err := t.Client.Get(context.Background(), types.NamespacedName{Name: "cryostat", Namespace: "default"}, sa)
 	Expect(err).ToNot(HaveOccurred())
 	expectedSA := test.NewServiceAccount()
+	Expect(sa.Labels).To(Equal(expectedSA.Labels))
+	Expect(sa.Annotations).To(Equal(expectedSA.Annotations))
 	Expect(sa.Secrets).To(Equal(expectedSA.Secrets))
 	Expect(sa.ImagePullSecrets).To(Equal(expectedSA.ImagePullSecrets))
 	Expect(sa.AutomountServiceAccountToken).To(Equal(expectedSA.AutomountServiceAccountToken))

diff --git a/internal/test/resources.go b/internal/test/resources.go
@@ -763,14 +763,6 @@ func NewCoreEnvironmentVariables(minimal bool, tls bool, externalTLS bool, opens
 			Name:  "CRYOSTAT_CLIENTLIB_PATH",
 			Value: "/opt/cryostat.d/clientlib.d",
 		},
-		{
-			Name:  "CRYOSTAT_OAUTH_CLIENT_ID",
-			Value: "cryostat-serviceaccount-name",
-		},
-		{
-			Name:  "CRYOSTAT_OAUTH_ROLE",
-			Value: "cryostat-cluster-role",
-		},
 	}
 
 	if externalTLS {
@@ -843,6 +835,14 @@ func NewCoreEnvironmentVariables(minimal bool, tls bool, externalTLS bool, opens
 			corev1.EnvVar{
 				Name:  "CRYOSTAT_AUTH_MANAGER",
 				Value: "io.cryostat.net.OpenShiftAuthManager",
+			},
+			corev1.EnvVar{
+				Name:  "CRYOSTAT_OAUTH_CLIENT_ID",
+				Value: "cryostat",
+			},
+			corev1.EnvVar{
+				Name:  "CRYOSTAT_OAUTH_ROLE",
+				Value: "cryostat-operator-cryostat",
 			})
 	}
 	return envs
@@ -1267,10 +1267,20 @@ func NewNetworkConfiguration(svcName string, svcPort int32, tls bool) operatorv1
 }
 
 func NewServiceAccount() *corev1.ServiceAccount {
+
+	ref := []byte(`{"metadata":{"creationTimestamp":null},"reference":{"group":"","kind":"Route","name":"cryostat"}}`)
+
 	return &corev1.ServiceAccount{
 		ObjectMeta: metav1.ObjectMeta{
 			Name:      "cryostat",
 			Namespace: "default",
+			Labels: map[string]string{
+				"app": "cryostat",
+			},
+			Annotations: map[string]string{
+				"serviceaccounts.openshift.io/oauth-redirecturi.route":       "https://",
+				"serviceaccounts.openshift.io/oauth-redirectreference.route": string(ref),
+			},
 		},
 	}
 }