Skip to content

cvo/internal: catch up the operator status handler to PR #31 #40

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

Merged
openshift-merge-robot merged 1 commit into from
Oct 19, 2018
Merged

cvo/internal: catch up the operator status handler to PR #31 #40

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
22 changes: 11 additions & 11 deletions pkg/cvo/internal/operatorstatus.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,39 +30,39 @@ func init() {
panic(err)
}

osMapper.RegisterGVK(osv1.SchemeGroupVersion.WithKind("OperatorStatus"), newOperatorStatusBuilder)
osMapper.RegisterGVK(osv1.SchemeGroupVersion.WithKind("ClusterOperator"), newClusterOperatorBuilder)
osMapper.AddToMap(resourcebuilder.Mapper)
}

// readOperatorStatusV1OrDie reads operatorstatus object from bytes. Panics on error.
func readOperatorStatusV1OrDie(objBytes []byte) *osv1.ClusterOperator {
// readClusterOperatorV1OrDie reads clusteroperator object from bytes. Panics on error.
func readClusterOperatorV1OrDie(objBytes []byte) *osv1.ClusterOperator {
requiredObj, err := runtime.Decode(osCodecs.UniversalDecoder(osv1.SchemeGroupVersion), objBytes)
if err != nil {
panic(err)
}
return requiredObj.(*osv1.ClusterOperator)
}

type operatorStatusBuilder struct {
type clusterOperatorBuilder struct {
client *osclientv1.OperatorstatusV1Client
raw []byte
modifier resourcebuilder.MetaV1ObjectModifierFunc
}

func newOperatorStatusBuilder(config *rest.Config, m lib.Manifest) resourcebuilder.Interface {
return &operatorStatusBuilder{
func newClusterOperatorBuilder(config *rest.Config, m lib.Manifest) resourcebuilder.Interface {
return &clusterOperatorBuilder{
client: osclientv1.NewForConfigOrDie(config),
raw: m.Raw,
}
}

func (b *operatorStatusBuilder) WithModifier(f resourcebuilder.MetaV1ObjectModifierFunc) resourcebuilder.Interface {
func (b *clusterOperatorBuilder) WithModifier(f resourcebuilder.MetaV1ObjectModifierFunc) resourcebuilder.Interface {
b.modifier = f
return b
}

func (b *operatorStatusBuilder) Do() error {
os := readOperatorStatusV1OrDie(b.raw)
func (b *clusterOperatorBuilder) Do() error {
os := readClusterOperatorV1OrDie(b.raw)
if b.modifier != nil {
b.modifier(os)
}
Expand All @@ -81,7 +81,7 @@ func waitForOperatorStatusToBeDone(client osclientv1.ClusterOperatorsGetter, os
if err != nil {
return false, err
}
glog.V(4).Infof("OperatorStatus %s/%s is reporting %v",
glog.V(4).Infof("ClusterOperator %s/%s is reporting %v",
eos.Namespace, eos.Name, spew.Sdump(eos.Status))

if eos.Status.Version != os.Status.Version {
Expand All @@ -106,7 +106,7 @@ func waitForOperatorStatusToBeDone(client osclientv1.ClusterOperatorsGetter, os
if available && !progressing && !failing {
return true, nil
}
glog.V(3).Infof("OperatorStatus %s/%s is not done for version %s; it is version=%v, available=%v, progressing=%v, failing=%v",
glog.V(3).Infof("ClusterOperator %s/%s is not done for version %s; it is version=%v, available=%v, progressing=%v, failing=%v",
eos.Namespace, eos.Name, os.Status.Version,
eos.Status.Version, available, progressing, failing)

Expand Down