fix: cherry-pick error

- remove new logger - dummy: request from devops to verify auto-sync Signed-off-by: Wen Zhou <wenzhou@redhat.com>
opendatahub-io · Nov 8, 2024 · 975469f · 975469f
1 parent a5771c8
commit 975469f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/config/manager/kustomization.yaml.in b/config/manager/kustomization.yaml.in
@@ -9,3 +9,4 @@ resources:
 
 generatorOptions:
   disableNameSuffixHash: true
+
diff --git a/pkg/upgrade/upgrade.go b/pkg/upgrade/upgrade.go
@@ -492,7 +492,6 @@ func updateODCModelRegistry(ctx context.Context, cli client.Client, instanceName
 // workaround for RHOAIENG-15328
 // TODO: this can be removed from ODH 2.22.
 func removeRBACProxyModelRegistry(ctx context.Context, cli client.Client, componentName string, containerName string, applicationNS string) error {
-	log := logf.FromContext(ctx)
 	deploymentList := &appsv1.DeploymentList{}
 	if err := cli.List(ctx, deploymentList, client.InNamespace(applicationNS), client.HasLabels{labels.ODH.Component(componentName)}); err != nil {
 		return fmt.Errorf("error fetching list of deployments: %w", err)
@@ -508,7 +507,7 @@ func removeRBACProxyModelRegistry(ctx context.Context, cli client.Client, compon
 		return nil
 	}
 
-	log.Info("Upgrade force ModelRegistry to remove container from deployment")
+	ctrl.Log.Info("Upgrade force ModelRegistry to remove container from deployment")
 	for i, container := range mrContainerList {
 		if container.Name == containerName {
 			removeUnusedKubeRbacProxy := []byte(fmt.Sprintf("[{\"op\": \"remove\", \"path\": \"/spec/template/spec/containers/%d\"}]", i))
Original file line number	Diff line number	Diff line change
Expand Up		@@ -9,3 +9,4 @@ resources:

		generatorOptions:
		disableNameSuffixHash: true