Skip to content

OCPBUGS-29159: no need to rollout operand when we just update operatorCr.operatorloglevel #330

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

OCPBUGS-29159: no need to rollout operand when we just update operatorCr.operatorloglevel #330

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d74b064
Ignore the operatorConfig.ObjectMeta.Generation
lance5890 Feb 7, 2024
fe6db74
update context
lance5890 Feb 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions pkg/operator/generic_client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ func (p *genericClient) UpdateOperatorSpec(ctx context.Context, resourceVersion
resourceCopy.ResourceVersion = resourceVersion
resourceCopy.Spec.OperatorSpec = *spec

ret, err := p.client.OpenShiftControllerManagers().Update(context.TODO(), resourceCopy, metav1.UpdateOptions{})
ret, err := p.client.OpenShiftControllerManagers().Update(ctx, resourceCopy, metav1.UpdateOptions{})
if err != nil {
return nil, "", err
}
Expand All @@ -80,7 +80,7 @@ func (p *genericClient) UpdateOperatorStatus(ctx context.Context, resourceVersio
resourceCopy.ResourceVersion = resourceVersion
resourceCopy.Status.OperatorStatus = *status

ret, err := p.client.OpenShiftControllerManagers().UpdateStatus(context.TODO(), resourceCopy, metav1.UpdateOptions{})
ret, err := p.client.OpenShiftControllerManagers().UpdateStatus(ctx, resourceCopy, metav1.UpdateOptions{})
if err != nil {
return nil, err
}
Expand Down
9 changes: 2 additions & 7 deletions pkg/operator/sync_openshiftcontrollermanager_v311_00.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import (
"fmt"
"os"
"sort"
"strconv"
"strings"

"github.com/openshift/cluster-openshift-controller-manager-operator/bindata"
Expand Down Expand Up @@ -60,13 +59,9 @@ func syncOpenShiftControllerManager_v311_00_to_latest(
operandName := "openshift-controller-manager"
rcOperandName := "route-controller-manager"

specAnnotations := map[string]string{
"openshiftcontrollermanagers.operator.openshift.io/cluster": strconv.FormatInt(operatorConfig.ObjectMeta.Generation, 10),
}
specAnnotations := map[string]string{}

rcSpecAnnotations := map[string]string{
"openshiftcontrollermanagers.operator.openshift.io/cluster": strconv.FormatInt(operatorConfig.ObjectMeta.Generation, 10),
}
rcSpecAnnotations := map[string]string{}

// OpenShift Controller Manager
configMap, _, err := manageOpenShiftControllerManagerConfigMap_v311_00_to_latest(c.clusterVersionLister, c.kubeClient, c.configMapsGetter, c.recorder, operatorConfig)
Expand Down