-
Notifications
You must be signed in to change notification settings - Fork 1.1k
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.
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
Emit kubernetes events from KEDA #1523
Merged
Merged
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains 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 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 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 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 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 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 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 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 controllers | ||
|
||
import ( | ||
"context" | ||
|
||
"github.com/go-logr/logr" | ||
kedav1alpha1 "github.com/kedacore/keda/v2/api/v1alpha1" | ||
"github.com/kedacore/keda/v2/pkg/eventreason" | ||
corev1 "k8s.io/api/core/v1" | ||
"k8s.io/apimachinery/pkg/api/errors" | ||
"k8s.io/client-go/tools/record" | ||
ctrl "sigs.k8s.io/controller-runtime" | ||
"sigs.k8s.io/controller-runtime/pkg/builder" | ||
"sigs.k8s.io/controller-runtime/pkg/client" | ||
"sigs.k8s.io/controller-runtime/pkg/predicate" | ||
) | ||
|
||
// +kubebuilder:rbac:groups=keda.sh,resources=triggerauthentications;triggerauthentications/status,verbs="*" | ||
|
||
// TriggerAuthenticationReconciler reconciles a TriggerAuthentication object | ||
type TriggerAuthenticationReconciler struct { | ||
Client client.Client | ||
Log logr.Logger | ||
Recorder record.EventRecorder | ||
} | ||
|
||
// Reconcile performs reconciliation on the identified TriggerAuthentication resource based on the request information passed, returns the result and an error (if any). | ||
func (r *TriggerAuthenticationReconciler) Reconcile(req ctrl.Request) (ctrl.Result, error) { | ||
reqLogger := r.Log.WithValues("TriggerAuthentication.Namespace", req.Namespace, "TriggerAuthentication.Name", req.Name) | ||
|
||
triggerAuthentication := &kedav1alpha1.TriggerAuthentication{} | ||
err := r.Client.Get(context.TODO(), req.NamespacedName, triggerAuthentication) | ||
if err != nil { | ||
if errors.IsNotFound(err) { | ||
return ctrl.Result{}, nil | ||
} | ||
reqLogger.Error(err, "Failed ot get TriggerAuthentication") | ||
return ctrl.Result{}, err | ||
} | ||
|
||
if triggerAuthentication.GetDeletionTimestamp() != nil { | ||
r.Recorder.Event(triggerAuthentication, corev1.EventTypeNormal, eventreason.TriggerAuthenticationDeleted, "TriggerAuthentication was deleted") | ||
return ctrl.Result{}, nil | ||
} | ||
|
||
if triggerAuthentication.ObjectMeta.Generation == 1 { | ||
r.Recorder.Event(triggerAuthentication, corev1.EventTypeNormal, eventreason.TriggerAuthenticationAdded, "New TriggerAuthentication configured") | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This seems like a slightly weird one, but I don't think it will do any harm :) There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Yeah, we can go with this for now :) |
||
} | ||
|
||
return ctrl.Result{}, nil | ||
} | ||
|
||
// SetupWithManager initializes the TriggerAuthenticationReconciler instance and starts a new controller managed by the passed Manager instance. | ||
func (r *TriggerAuthenticationReconciler) SetupWithManager(mgr ctrl.Manager) error { | ||
return ctrl.NewControllerManagedBy(mgr). | ||
For(&kedav1alpha1.TriggerAuthentication{}, builder.WithPredicates(predicate.GenerationChangedPredicate{})). | ||
Complete(r) | ||
} |
This file contains 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 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 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,67 @@ | ||
/* | ||
Copyright 2020 The KEDA Authors | ||
|
||
Licensed under the Apache License, Version 2.0 (the "License"); | ||
you may not use this file except in compliance with the License. | ||
You may obtain a copy of the License at | ||
|
||
http://www.apache.org/licenses/LICENSE-2.0 | ||
|
||
Unless required by applicable law or agreed to in writing, software | ||
distributed under the License is distributed on an "AS IS" BASIS, | ||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
See the License for the specific language governing permissions and | ||
limitations under the License. | ||
*/ | ||
|
||
package eventreason | ||
|
||
const ( | ||
tomkerkhove marked this conversation as resolved.
Show resolved
Hide resolved
|
||
// ScaledObjectReady is for event when a new ScaledObject is ready | ||
ScaledObjectReady = "ScaledObjectReady" | ||
|
||
// ScaledJobReady is for event when a new ScaledJob is ready | ||
ScaledJobReady = "ScaledJobReady" | ||
|
||
// ScaledObjectCheckFailed is for event when ScaledObject validation check fails | ||
ScaledObjectCheckFailed = "ScaledObjectCheckFailed" | ||
|
||
// ScaledJobCheckFailed is for event when ScaledJob validation check fails | ||
ScaledJobCheckFailed = "ScaledJobCheckFailed" | ||
|
||
// ScaledObjectDeleted is for event when ScaledObject is deleted | ||
ScaledObjectDeleted = "ScaledObjectDeleted" | ||
|
||
// ScaledJobDeleted is for event when ScaledJob is deleted | ||
ScaledJobDeleted = "ScaledJobDeleted" | ||
|
||
// KEDAScalersStarted is for event when scalers watch started for ScaledObject or ScaledJob | ||
KEDAScalersStarted = "KEDAScalersStarted" | ||
|
||
// KEDAScalersStopped is for event when scalers watch was stopped for ScaledObject or ScaledJob | ||
KEDAScalersStopped = "KEDAScalersStopped" | ||
|
||
// KEDAScalerFailed is for event when a scaler fails for a ScaledJob or a ScaledObject | ||
KEDAScalerFailed = "KEDAScalerFailed" | ||
|
||
// KEDAScaleTargetActivated is for event when the scale target of ScaledObject was activated | ||
KEDAScaleTargetActivated = "KEDAScaleTargetActivated" | ||
|
||
// KEDAScaleTargetDeactivated is for event when the scale target for ScaledObject was deactivated | ||
KEDAScaleTargetDeactivated = "KEDAScaleTargetDeactivated" | ||
|
||
// KEDAScaleTargetActivationFailed is for event when the activation the scale target for ScaledObject fails | ||
KEDAScaleTargetActivationFailed = "KEDAScaleTargetActivationFailed" | ||
|
||
// KEDAScaleTargetDeactivationFailed is for event when the deactivation of the scale target for ScaledObject fails | ||
KEDAScaleTargetDeactivationFailed = "KEDAScaleTargetDeactivationFailed" | ||
|
||
// KEDAJobsCreated is for event when jobs for ScaledJob are created | ||
KEDAJobsCreated = "KEDAJobsCreated" | ||
|
||
// TriggerAuthenticationDeleted is for event when a TriggerAuthentication is deleted | ||
TriggerAuthenticationDeleted = "TriggerAuthenticationDeleted" | ||
|
||
// TriggerAuthenticationAdded is for event when a TriggerAuthentication is added | ||
TriggerAuthenticationAdded = "TriggerAuthenticationAdded" | ||
) |
This file contains 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 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
Oops, something went wrong.
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.
Event recorder for Metrics Adapter is named
keda-metrics-adapter
and this one is namedscale-handler
. For consistency, this one could be maybe namedkeda-operator
/keda-controller
and sync them with those set in main.go WDYT?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.
Yeah, I think that makes sense. I'll change it to one recorder with the name
keda-operator