Skip to content

WIP operator: rework ApplyOperatorStatus #376

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 1 commit into from
Closed

WIP operator: rework ApplyOperatorStatus #376

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 11 additions & 1 deletion pkg/operator/generic_client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,17 @@ import (
"context"
"encoding/json"
"fmt"

"github.com/google/go-cmp/cmp"
"github.com/openshift/library-go/pkg/apiserver/jsonpatch"

"github.com/davecgh/go-spew/spew"
"k8s.io/apimachinery/pkg/api/equality"
apierrors "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/types"
"k8s.io/client-go/tools/cache"
"k8s.io/klog/v2"
"k8s.io/utils/clock"

operatorapiv1 "github.com/openshift/api/operator/v1"
Expand Down Expand Up @@ -158,6 +162,7 @@ func (p *genericClient) ApplyOperatorStatus(ctx context.Context, fieldManager st
if err != nil {
return fmt.Errorf("unable to extract operator configuration: %w", err)
}
klog.Infof("ApplyOperatorStatus+, previous: %s", spew.Sdump(previous))

operatorStatus := &v1.OperatorStatusApplyConfiguration{}
if previous.Status != nil {
Expand All @@ -169,6 +174,7 @@ func (p *genericClient) ApplyOperatorStatus(ctx context.Context, fieldManager st
return fmt.Errorf("unable to deserialize operator configuration: %w", err)
}
}
klog.Infof("ApplyOperatorStatus+, unmarshalled operatorStatus: %s", spew.Sdump(operatorStatus))

switch {
case desiredConfiguration.Conditions != nil && operatorStatus != nil:
Expand All @@ -180,6 +186,8 @@ func (p *genericClient) ApplyOperatorStatus(ctx context.Context, fieldManager st
v1helpers.CanonicalizeOperatorStatus(desiredConfiguration)
v1helpers.CanonicalizeOperatorStatus(operatorStatus)

klog.Infof("ApplyOperatorStatus+, final operatorStatus: %s", spew.Sdump(operatorStatus))

original := v1.OpenShiftControllerManager("cluster")
if operatorStatus != nil {
originalStatus := &v1.OpenShiftControllerManagerStatusApplyConfiguration{
Expand All @@ -196,12 +204,14 @@ func (p *genericClient) ApplyOperatorStatus(ctx context.Context, fieldManager st
if equality.Semantic.DeepEqual(original, desired) {
return nil
}
klog.Infof("ApplyOperatorStatus+, diff: %s", cmp.Diff(original, desired))
}

_, err = p.client.OpenShiftControllerManagers().ApplyStatus(ctx, desired, metav1.ApplyOptions{
res, err := p.client.OpenShiftControllerManagers().ApplyStatus(ctx, desired, metav1.ApplyOptions{
Force: true,
FieldManager: fieldManager,
})
klog.Infof("ApplyOperatorStatus-, res: %s", spew.Sdump(res))
if err != nil {
return fmt.Errorf("unable to Apply for operator using fieldManager %q: %w", fieldManager, err)
}
Expand Down