This repository was archived by the owner on Jun 7, 2021. It is now read-only.
Knative Event wiring #12
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
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
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 |
|---|---|---|
|
|
@@ -4,8 +4,9 @@ import ( | |
| "context" | ||
| "fmt" | ||
|
|
||
| kneventing "knative.dev/eventing/pkg/apis/eventing/v1alpha1" | ||
| knv1alpha1 "knative.dev/serving/pkg/apis/serving/v1alpha1" | ||
| knv1beta1 "knative.dev/serving/pkg/apis/serving/v1beta1" | ||
|
|
||
| faasv1alpha1 "github.com/openshift-cloud-functions/js-function-operator/pkg/apis/faas/v1alpha1" | ||
|
|
||
|
|
@@ -60,6 +61,22 @@ func add(mgr manager.Manager, r reconcile.Reconciler) error { | |
| return err | ||
| } | ||
|
|
||
| // Watch for changes to secondary resources KnChanel and KnSubscription and requeue the owner JSFunction | ||
| err = c.Watch(&source.Kind{Type: &kneventing.Channel{}}, &handler.EnqueueRequestForOwner{ | ||
| IsController: true, | ||
| OwnerType: &faasv1alpha1.JSFunction{}, | ||
| }) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| err = c.Watch(&source.Kind{Type: &kneventing.Subscription{}}, &handler.EnqueueRequestForOwner{ | ||
| IsController: true, | ||
| OwnerType: &faasv1alpha1.JSFunction{}, | ||
| }) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| return nil | ||
| } | ||
|
|
||
|
|
@@ -100,8 +117,8 @@ func (r *ReconcileJSFunction) Reconcile(request reconcile.Request) (reconcile.Re | |
| } | ||
|
|
||
| // Check if a Service for this JSFunction already exists, if not create a new one | ||
| knService := &knv1alpha1.Service{} | ||
| err = r.client.Get(context.TODO(), types.NamespacedName{Name: function.Name, Namespace: function.Namespace}, knService) | ||
| if err != nil && errors.IsNotFound(err) { | ||
| // No service for this function exists. Create a new one | ||
|
|
||
|
|
@@ -113,7 +130,7 @@ func (r *ReconcileJSFunction) Reconcile(request reconcile.Request) (reconcile.Re | |
| } | ||
| err = r.client.Create(context.TODO(), configMap) | ||
| if err != nil { | ||
| reqLogger.Error(err, "Failed to create new ConfigMap holding function.", "ConfigMap.Namespace", configMap.Namespace, "ConfigMap.Name", configMap.Name) | ||
| return reconcile.Result{}, err | ||
| } | ||
|
|
||
|
|
@@ -137,18 +154,83 @@ func (r *ReconcileJSFunction) Reconcile(request reconcile.Request) (reconcile.Re | |
| return reconcile.Result{}, err | ||
| } | ||
|
|
||
| /////// Knative Eventing section | ||
| // Create or delete Channel | ||
| knChannel := &kneventing.Channel{} | ||
| err = r.client.Get(context.TODO(), types.NamespacedName{Name: function.Name, Namespace: function.Namespace}, knChannel) | ||
| if err != nil && errors.IsNotFound(err) { | ||
| if function.Spec.Events { | ||
| // Create channel | ||
| channel, err := r.channelForFunction(function) | ||
| if err != nil { | ||
| return reconcile.Result{}, err | ||
| } | ||
| err = r.client.Create(context.TODO(), channel) | ||
| if err != nil { | ||
| reqLogger.Error(err, "Failed to create new Channel.", "Channel.Namespace", channel.Namespace, "Channel.Name", channel.Name) | ||
| return reconcile.Result{}, err | ||
| } | ||
| } | ||
| } else { | ||
| if !function.Spec.Events && knChannel.ObjectMeta.DeletionTimestamp == nil { | ||
| err = r.client.Delete(context.TODO(), knChannel) | ||
| if err != nil && !errors.IsNotFound(err) { | ||
| reqLogger.Error(err, "failed to delete Channel") | ||
| return reconcile.Result{}, err | ||
| } | ||
| } | ||
| } | ||
|
|
||
| // Create or delete Subscription | ||
| knSubscription := &kneventing.Subscription{} | ||
| err = r.client.Get(context.TODO(), types.NamespacedName{Name: function.Name, Namespace: function.Namespace}, knSubscription) | ||
| if err != nil && errors.IsNotFound(err) { | ||
| if function.Spec.Events { | ||
| // Create subscription | ||
| subscription, err := r.subscriptionForFunction(function) | ||
| if err != nil { | ||
| return reconcile.Result{}, err | ||
| } | ||
| err = r.client.Create(context.TODO(), subscription) | ||
| if err != nil { | ||
| reqLogger.Error(err, "Failed to create new Subscription.", "Subscription.Namespace", subscription.Namespace, "Subscription.Name", subscription.Name) | ||
| return reconcile.Result{}, err | ||
| } | ||
| } | ||
| } else { | ||
| if !function.Spec.Events && knSubscription.ObjectMeta.DeletionTimestamp == nil { | ||
| err = r.client.Delete(context.TODO(), knSubscription) | ||
| if err != nil && !errors.IsNotFound(err) { | ||
| reqLogger.Error(err, "failed to delete Subscription") | ||
| return reconcile.Result{}, err | ||
| } | ||
| } | ||
|
|
||
| } | ||
| /////// | ||
|
|
||
| // TODO update the JSFunction status with the pod names | ||
| // TODO update status nodes if necessary | ||
|
|
||
| reqLogger.Info("JSFunction Service exists.", "Service.Namespace", knService.Namespace, "Service.Name", knService.Name) | ||
| return reconcile.Result{}, nil | ||
| } | ||
|
|
||
| func (r *ReconcileJSFunction) configMapWithFunction(f *faasv1alpha1.JSFunction) (*corev1.ConfigMap, error) { | ||
|
|
||
| data := map[string]string{"index.js": f.Spec.Func} | ||
|
|
||
| if f.Spec.Package != "" { | ||
| data["package.json"] = f.Spec.Package | ||
| } | ||
|
|
||
| // Create a config map containing the user code | ||
| configMap := &corev1.ConfigMap{ | ||
| ObjectMeta: metav1.ObjectMeta{ | ||
| Name: f.Name, | ||
| Namespace: f.Namespace, | ||
| }, | ||
| Data: data, | ||
| } | ||
| if err := controllerutil.SetControllerReference(f, configMap, r.scheme); err != nil { | ||
| return nil, err | ||
|
|
@@ -191,10 +273,10 @@ func createPodSpec(functionName, configMapName string) corev1.PodSpec { | |
| volumeName := fmt.Sprintf("%s-source", functionName) | ||
| return corev1.PodSpec{ | ||
| Containers: []corev1.Container{{ | ||
| Image: "docker.io/zroubalik/js-runtime", | ||
| Name: fmt.Sprintf("nodejs-%s", functionName), | ||
| Ports: []corev1.ContainerPort{{ | ||
| ContainerPort: 8080, | ||
|
There was a problem hiding this comment. @rhuss originally changed this from 8080 to 8181. I subsequently ran into problems using 8080, but can't recall which it was of the many problems I have run into lately. :) Not sure what it should really be. There was a problem hiding this comment. 8181 didn't worked for me, it was listening on 8080 |
||
| }}, | ||
| VolumeMounts: []corev1.VolumeMount{ | ||
| { | ||
|
|
@@ -221,3 +303,57 @@ func createConfigMapVolume(volumeName, configMapName string) corev1.Volume { | |
| }, | ||
| } | ||
| } | ||
|
|
||
| func (r *ReconcileJSFunction) channelForFunction(f *faasv1alpha1.JSFunction) (*kneventing.Channel, error) { | ||
|
|
||
| channel := &kneventing.Channel{ | ||
| ObjectMeta: metav1.ObjectMeta{ | ||
| Name: f.Name, | ||
| Namespace: f.Namespace, | ||
| }, | ||
| Spec: kneventing.ChannelSpec{ | ||
| Provisioner: &corev1.ObjectReference{ | ||
| Name: "in-memory", | ||
| Kind: "InMemoryChannel", | ||
| APIVersion: kneventing.SchemeGroupVersion.String(), | ||
| }, | ||
| }, | ||
| } | ||
|
|
||
| // Set JSFunction instance as the owner and controller | ||
| if err := controllerutil.SetControllerReference(f, channel, r.scheme); err != nil { | ||
| return nil, err | ||
| } | ||
| return channel, nil | ||
| } | ||
|
|
||
| func (r *ReconcileJSFunction) subscriptionForFunction(f *faasv1alpha1.JSFunction) (*kneventing.Subscription, error) { | ||
| subscription := &kneventing.Subscription{ | ||
| ObjectMeta: metav1.ObjectMeta{ | ||
| Name: f.Name, | ||
| Namespace: f.Namespace, | ||
| }, | ||
|
|
||
| Spec: kneventing.SubscriptionSpec{ | ||
| Channel: corev1.ObjectReference{ | ||
| Name: f.Name, | ||
| Kind: "Channel", | ||
| APIVersion: kneventing.SchemeGroupVersion.String(), | ||
| }, | ||
| Subscriber: &kneventing.SubscriberSpec{ | ||
| Ref: &corev1.ObjectReference{ | ||
| Name: f.Name, | ||
| Kind: "Service", | ||
| APIVersion: knv1alpha1.SchemeGroupVersion.String(), | ||
| }, | ||
| }, | ||
| }, | ||
| } | ||
|
|
||
| // Set JSFunction instance as the owner and controller | ||
| if err := controllerutil.SetControllerReference(f, subscription, r.scheme); err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| return subscription, nil | ||
| } | ||
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.
Thanks for fixing this as part of the PR :)