rebase fixes

netobserv · Oct 11, 2022 · adc8afe · adc8afe
1 parent 0e2da74
commit adc8afe
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/controllers/consoleplugin/consoleplugin_objects.go b/controllers/consoleplugin/consoleplugin_objects.go
@@ -121,7 +121,7 @@ func buildArgs(desired *flowsv1alpha1.FlowCollectorSpec, ns string) []string {
 		"-frontend-config", filepath.Join(configPath, configFile),
 	}
 
-	if desiredLoki.ForwardUserToken() {
+	if desired.Loki.ForwardUserToken() {
 		args = append(args, "-loki-forward-user-token")
 	}
 

diff --git a/controllers/consoleplugin/consoleplugin_test.go b/controllers/consoleplugin/consoleplugin_test.go
@@ -145,16 +145,19 @@ func TestContainerUpdateCheck(t *testing.T) {
 		corev1.ResourceCPU:    resource.MustParse("500m"),
 		corev1.ResourceMemory: resource.MustParse("500Gi"),
 	}
+	spec.ConsolePlugin = containerConfig
 	assert.True(containerNeedsUpdate(&podSpec, spec, "netobserv"))
 
 	//new image
 	podSpec, containerConfig = getContainerSpecs()
 	containerConfig.Image = "quay.io/netobserv/network-observability-console-plugin:latest"
+	spec.ConsolePlugin = containerConfig
 	assert.Equal(containerNeedsUpdate(&podSpec, spec, "netobserv"), true)
 
 	//new pull policy
 	podSpec, containerConfig = getContainerSpecs()
 	containerConfig.ImagePullPolicy = string(corev1.PullAlways)
+	spec.ConsolePlugin = containerConfig
 	assert.Equal(containerNeedsUpdate(&podSpec, spec, "netobserv"), true)
 
 }