Skip to content

Improve operator status management #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 7 commits into from
May 17, 2021
Merged

Improve operator status management #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5e6388f
Implement operator status handling methods
May 14, 2021
f0661b5
Revendor with test required packages
May 14, 2021
dea7c69
Fix missing return in watches
May 14, 2021
7610537
Move config related handling into separate package
May 14, 2021
8c93ec6
Integrate changes with controller sync package
May 14, 2021
720aa56
Add event recorder to the reconcile loop
May 11, 2021
95ee82a
Evaluate if apply changed resource and report Progressing
May 14, 2021
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
18 changes: 16 additions & 2 deletions cmd/cluster-cloud-controller-manager-operator/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import (

// Import all Kubernetes client auth plugins (e.g. Azure, GCP, OIDC, etc.)
// to ensure that exec-entrypoint and run can make use of them.

_ "k8s.io/client-go/plugin/pkg/client/auth"
"k8s.io/klog/klogr"
"k8s.io/klog/v2"
Expand All @@ -49,8 +50,10 @@ var (
)

const (
defaultManagedNamespace = "openshift-cloud-controller-manager"
defaultImagesLocation = "/etc/cloud-controller-manager-config/images.json"
defaultManagedNamespace = "openshift-cloud-controller-manager"
defaultImagesLocation = "/etc/cloud-controller-manager-config/images.json"
releaseVersionEnvVariableName = "RELEASE_VERSION"
unknownVersionValue = "unknown"
)

func init() {
Expand Down Expand Up @@ -133,6 +136,8 @@ func main() {
if err = (&controllers.CloudOperatorReconciler{
Client: mgr.GetClient(),
Scheme: mgr.GetScheme(),
Recorder: mgr.GetEventRecorderFor("cloud-controller-manager-operator"),
ReleaseVersion: getReleaseVersion(),
ManagedNamespace: *managedNamespace,
ImagesFile: *imagesFile,
}).SetupWithManager(mgr); err != nil {
Expand All @@ -156,3 +161,12 @@ func main() {
os.Exit(1)
}
}

func getReleaseVersion() string {
releaseVersion := os.Getenv(releaseVersionEnvVariableName)
if len(releaseVersion) == 0 {
releaseVersion = unknownVersionValue
klog.Infof("%s environment variable is missing, defaulting to %q", releaseVersionEnvVariableName, unknownVersionValue)
}
return releaseVersion
}
3 changes: 2 additions & 1 deletion controllers/cache.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ type ObjectWatcher interface {

func NewObjectWatcher(opts WatcherOptions) (ObjectWatcher, error) {
if opts.Cache == nil {
return nil, errors.New("Cache is required")
return nil, errors.New("cache is required")
}

// Use the default Kubernetes Scheme if unset
Expand Down Expand Up @@ -128,6 +128,7 @@ func (e *eventToChannelHandler) queueEventForObject(oldObj, newObj interface{})
}
if new.GetName() != e.name {
// Not the right object, skip
return
}

if oldObj != nil {
Expand Down
Loading