Add status updates #36
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,62 @@ | ||
| package operator2 | ||
|
|
||
| import ( | ||
| "k8s.io/client-go/tools/cache" | ||
|
|
||
| operatorv1 "github.com/openshift/api/operator/v1" | ||
|
|
||
| operatorconfigclient "github.com/openshift/client-go/operator/clientset/versioned/typed/operator/v1" | ||
| operatorclientinformers "github.com/openshift/client-go/operator/informers/externalversions" | ||
| ) | ||
|
|
||
| type OperatorClient struct { | ||
| Informers operatorclientinformers.SharedInformerFactory | ||
| Client operatorconfigclient.AuthenticationsGetter | ||
| } | ||
|
|
||
| func (c OperatorClient) Informer() cache.SharedIndexInformer { | ||
| return c.Informers.Operator().V1().Authentications().Informer() | ||
| } | ||
|
|
||
| func (c OperatorClient) GetOperatorState() (*operatorv1.OperatorSpec, *operatorv1.OperatorStatus, string, error) { | ||
| instance, err := c.Informers.Operator().V1().Authentications().Lister().Get(globalConfigName) | ||
| if err != nil { | ||
| return nil, nil, "", err | ||
| } | ||
|
|
||
| return &instance.Spec.OperatorSpec, &instance.Status.OperatorStatus, instance.ResourceVersion, nil | ||
| } | ||
|
|
||
| func (c OperatorClient) UpdateOperatorSpec(resourceVersion string, spec *operatorv1.OperatorSpec) (*operatorv1.OperatorSpec, string, error) { | ||
| original, err := c.Informers.Operator().V1().Authentications().Lister().Get(globalConfigName) | ||
| if err != nil { | ||
| return nil, "", err | ||
| } | ||
| copy := original.DeepCopy() | ||
| copy.ResourceVersion = resourceVersion | ||
| copy.Spec.OperatorSpec = *spec | ||
|
|
||
| ret, err := c.Client.Authentications().Update(copy) | ||
| if err != nil { | ||
| return nil, "", err | ||
| } | ||
|
|
||
| return &ret.Spec.OperatorSpec, ret.ResourceVersion, nil | ||
| } | ||
|
|
||
| func (c OperatorClient) UpdateOperatorStatus(resourceVersion string, status *operatorv1.OperatorStatus) (*operatorv1.OperatorStatus, error) { | ||
| original, err := c.Informers.Operator().V1().Authentications().Lister().Get(globalConfigName) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| copy := original.DeepCopy() | ||
| copy.ResourceVersion = resourceVersion | ||
| copy.Status.OperatorStatus = *status | ||
|
|
||
| ret, err := c.Client.Authentications().Update(copy) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| return &ret.Status.OperatorStatus, nil | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -10,7 +10,6 @@ import ( | |
| "k8s.io/client-go/dynamic" | ||
| "k8s.io/client-go/informers" | ||
| "k8s.io/client-go/kubernetes" | ||
|
|
||
| configv1 "github.com/openshift/api/config/v1" | ||
| operatorv1 "github.com/openshift/api/operator/v1" | ||
|
|
@@ -22,6 +21,7 @@ import ( | |
| routeinformer "github.com/openshift/client-go/route/informers/externalversions" | ||
| "github.com/openshift/library-go/pkg/controller/controllercmd" | ||
| "github.com/openshift/library-go/pkg/operator/resourcesynccontroller" | ||
| "github.com/openshift/library-go/pkg/operator/status" | ||
| "github.com/openshift/library-go/pkg/operator/v1helpers" | ||
| ) | ||
|
|
||
|
|
@@ -114,17 +114,21 @@ func RunOperator(ctx *controllercmd.ControllerContext) error { | |
|
|
||
| resourceSyncerInformers := v1helpers.NewKubeInformersForNamespaces(kubeClient, targetName, userConfigNamespace) | ||
|
|
||
| operatorClient := &OperatorClient{ | ||
| authOperatorConfigInformers, | ||
| authConfigClient.OperatorV1(), | ||
| } | ||
|
|
||
| resourceSyncer := resourcesynccontroller.NewResourceSyncController( | ||
| operatorClient, | ||
| resourceSyncerInformers, | ||
| v1helpers.CachedSecretGetter(kubeClient.CoreV1(), resourceSyncerInformers), | ||
| v1helpers.CachedConfigMapGetter(kubeClient.CoreV1(), resourceSyncerInformers), | ||
| ctx.EventRecorder, | ||
| ) | ||
|
|
||
| operator := NewAuthenticationOperator( | ||
| *operatorClient, | ||
| kubeInformersNamespaced, | ||
| kubeClient, | ||
| routeInformersNamespaced.Route().V1().Routes(), | ||
|
|
@@ -135,6 +139,23 @@ func RunOperator(ctx *controllercmd.ControllerContext) error { | |
| resourceSyncer, | ||
| ) | ||
|
|
||
| clusterOperatorStatus := status.NewClusterOperatorStatusController( | ||
| targetName, | ||
| []configv1.ObjectReference{ | ||
stlaz marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| {Group: operatorv1.GroupName, Resource: "authentications", Name: globalConfigName}, | ||
|
Contributor
There was a problem hiding this comment. Also add the infrastructure top level config per #79 |
||
| {Group: configv1.GroupName, Resource: "authentications", Name: globalConfigName}, | ||
| {Group: configv1.GroupName, Resource: "oauths", Name: globalConfigName}, | ||
| {Resource: "namespaces", Name: userConfigNamespace}, | ||
| {Resource: "namespaces", Name: machineConfigNamespace}, | ||
| {Resource: "namespaces", Name: targetName}, | ||
| {Resource: "namespaces", Name: targetNameOperator}, | ||
| }, | ||
| configClient.ConfigV1(), | ||
| operatorClient, | ||
| status.NewVersionGetter(), | ||
| ctx.EventRecorder, | ||
| ) | ||
|
|
||
| for _, informer := range []interface { | ||
| Start(stopCh <-chan struct{}) | ||
| }{ | ||
|
|
@@ -149,6 +170,7 @@ func RunOperator(ctx *controllercmd.ControllerContext) error { | |
|
|
||
| go operator.Run(ctx.Done()) | ||
| go resourceSyncer.Run(1, ctx.Done()) | ||
| go clusterOperatorStatus.Run(1, ctx.Done()) | ||
|
|
||
| <-ctx.Done() | ||
|
|
||
|
|
@@ -160,28 +182,3 @@ func singleNameListOptions(name string) func(opts *v1.ListOptions) { | |
| opts.FieldSelector = fields.OneTermEqualSelector("metadata.name", name).String() | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,58 @@ | ||
| package operator2 | ||
|
|
||
| import ( | ||
| operatorv1 "github.com/openshift/api/operator/v1" | ||
| "github.com/openshift/library-go/pkg/operator/v1helpers" | ||
| ) | ||
|
|
||
| func (c *authOperator) setFailingStatus(operatorConfig *operatorv1.Authentication, reason, message string) error { | ||
stlaz marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| failStatusFunc := func(status *operatorv1.OperatorStatus) error { | ||
| v1helpers.SetOperatorCondition(&status.Conditions, | ||
| operatorv1.OperatorCondition{ | ||
| Type: operatorv1.OperatorStatusTypeFailing, | ||
| Status: operatorv1.ConditionTrue, | ||
| Reason: reason, | ||
| Message: message, | ||
| }) | ||
|
|
||
| v1helpers.SetOperatorCondition(&status.Conditions, operatorv1.OperatorCondition{ | ||
| Type: operatorv1.OperatorStatusTypeProgressing, | ||
| Status: operatorv1.ConditionFalse, | ||
| }) | ||
|
|
||
| v1helpers.SetOperatorCondition(&status.Conditions, | ||
| operatorv1.OperatorCondition{ | ||
| Type: operatorv1.OperatorStatusTypeAvailable, | ||
| Status: operatorv1.ConditionFalse, | ||
| }) | ||
|
|
||
| return nil | ||
| } | ||
|
|
||
| _, _, err := v1helpers.UpdateStatus(c.authOperatorConfigClient, failStatusFunc) | ||
| return err | ||
| } | ||
|
|
||
| func (c *authOperator) setAvailableStatus(operatorConfig *operatorv1.Authentication) error { | ||
| availStatusFunc := func(status *operatorv1.OperatorStatus) error { | ||
| v1helpers.SetOperatorCondition(&status.Conditions, operatorv1.OperatorCondition{ | ||
| Type: operatorv1.OperatorStatusTypeAvailable, | ||
| Status: operatorv1.ConditionTrue, | ||
| }) | ||
|
|
||
| v1helpers.SetOperatorCondition(&status.Conditions, operatorv1.OperatorCondition{ | ||
| Type: operatorv1.OperatorStatusTypeProgressing, | ||
| Status: operatorv1.ConditionFalse, | ||
| }) | ||
|
|
||
| v1helpers.SetOperatorCondition(&status.Conditions, operatorv1.OperatorCondition{ | ||
| Type: operatorv1.OperatorStatusTypeFailing, | ||
| Status: operatorv1.ConditionFalse, | ||
| }) | ||
|
|
||
| return nil | ||
| } | ||
|
|
||
| _, _, err := v1helpers.UpdateStatus(c.authOperatorConfigClient, availStatusFunc) | ||
| return err | ||
| } | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is wholly insufficient - ex: if the deployment fails to rollout we would be stating everything is fine.