chore: Fix usage with ConfigMap

Author: rhuss

Diff for: cmd/manager/main.go

@@ -14,8 +14,8 @@ import (
 	// Import all Kubernetes client auth plugins (e.g. Azure, GCP, OIDC, etc.)
 	_ "k8s.io/client-go/plugin/pkg/client/auth"
 
-	"github.com/lance/js-function-operator/pkg/apis"
-	"github.com/lance/js-function-operator/pkg/controller"
+	"github.com/openshift-cloud-functions/js-function-operator/pkg/apis"
+	"github.com/openshift-cloud-functions/js-function-operator/pkg/controller"
 
 	"github.com/operator-framework/operator-sdk/pkg/k8sutil"
 	"github.com/operator-framework/operator-sdk/pkg/leader"

Diff for: deploy/crds/faas_v1alpha1_jsfunction_cr.yaml

@@ -6,7 +6,7 @@ spec:
   # Add fields here
   func: | 
     const http = require('http');
-    const port = 8080;
+    const port = 8181;
 
     const handler = (request, response) => {
       console.log(request.url);

Diff for: deploy/operator.yaml

@@ -16,7 +16,7 @@ spec:
       containers:
         - name: js-function-operator
           # Replace this with the built image name
-          image: quay.io/lanceball/js-function-operator:v0.0.1
+          image: docker.io/rhuss/js-function-operator:v0.0.1
           command:
           - js-function-operator
           imagePullPolicy: Always

Diff for: pkg/apis/addtoscheme_faas_v1alpha1.go

@@ -1,7 +1,7 @@
 package apis
 
 import (
-	"github.com/lance/js-function-operator/pkg/apis/faas/v1alpha1"
+	"github.com/openshift-cloud-functions/js-function-operator/pkg/apis/faas/v1alpha1"
 )
 
 func init() {

Diff for: pkg/controller/add_jsfunction.go

@@ -1,7 +1,7 @@
 package controller
 
 import (
-	"github.com/lance/js-function-operator/pkg/controller/jsfunction"
+	"github.com/openshift-cloud-functions/js-function-operator/pkg/controller/jsfunction"
 )
 
 func init() {

Diff for: pkg/controller/jsfunction/jsfunction_controller.go

@@ -2,12 +2,12 @@ package jsfunction
 
 import (
 	"context"
-	"strings"
+	"fmt"
 
 	knv1alpha1 "github.com/knative/serving/pkg/apis/serving/v1alpha1"
 	knv1beta1 "github.com/knative/serving/pkg/apis/serving/v1beta1"
 
-	faasv1alpha1 "github.com/lance/js-function-operator/pkg/apis/faas/v1alpha1"
+	faasv1alpha1 "github.com/openshift-cloud-functions/js-function-operator/pkg/apis/faas/v1alpha1"
 
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/errors"
@@ -104,7 +104,24 @@ func (r *ReconcileJSFunction) Reconcile(request reconcile.Request) (reconcile.Re
 	err = r.client.Get(context.TODO(), types.NamespacedName{Name: function.Name, Namespace: function.Namespace}, found)
 	if err != nil && errors.IsNotFound(err) {
 		// No service for this function exists. Create a new one
-		service := r.serviceForFunction(function)
+
+		// Create configmap first
+		configMap, err := r.configMapWithFunction(function)
+		if err != nil {
+			return reconcile.Result{}, err
+		}
+		err = r.client.Create(context.TODO(), configMap)
+		if err != nil {
+			reqLogger.Error(err, "Failed to create new ConfigMap holding function.", "Service.Namespace", configMap.Namespace, "ConfigMap.Name",  configMap.Name)
+			return reconcile.Result{}, err
+		}
+
+		// Create service, mounting the config map
+		service, err := r.serviceForFunction(function, configMap.Name)
+		if err != nil {
+			return reconcile.Result{}, err
+		}
+
 		reqLogger.Info("Creating a new knative Service", "Service.Namespace", service.Namespace, "Service.Name", service.Name)
 		err = r.client.Create(context.TODO(), service)
 		if err != nil {
@@ -126,35 +143,23 @@ func (r *ReconcileJSFunction) Reconcile(request reconcile.Request) (reconcile.Re
 	return reconcile.Result{}, nil
 }
 
-func (r *ReconcileJSFunction) serviceForFunction(f *faasv1alpha1.JSFunction) *knv1alpha1.Service {
+func (r *ReconcileJSFunction) configMapWithFunction(f *faasv1alpha1.JSFunction) (*corev1.ConfigMap, error) {
 	// Create a config map containing the user code
 	configMap := &corev1.ConfigMap{
 		ObjectMeta: metav1.ObjectMeta{
 			Name: f.Name,
+			Namespace: f.Namespace,
 		},
 		Data: map[string]string{"index.js": f.Spec.Func},
 	}
 	if err := controllerutil.SetControllerReference(f, configMap, r.scheme); err != nil {
-		log.Error(err, "Failed to set controller reference for function ConfigMap")
-	}
-
-	volumeName := strings.Join([]string{f.Name, "source"}, "-")
-	var _ = &corev1.Volume{
-		Name: volumeName,
-		VolumeSource: corev1.VolumeSource{
-			ConfigMap: &corev1.ConfigMapVolumeSource{
-				LocalObjectReference: corev1.LocalObjectReference{
-					Name: configMap.Name,
-				},
-			},
-		},
+		return nil, err
 	}
+	return configMap, nil
+}
 
+func (r *ReconcileJSFunction) serviceForFunction(f *faasv1alpha1.JSFunction, configMapName string) (*knv1alpha1.Service, error) {
 	service := &knv1alpha1.Service{
-		TypeMeta: metav1.TypeMeta{
-			APIVersion: "serving.knative.dev/v1beta1",
-			Kind:       "Service",
-		},
 		ObjectMeta: metav1.ObjectMeta{
 			Name:      f.Name,
 			Namespace: f.Namespace,
@@ -167,21 +172,7 @@ func (r *ReconcileJSFunction) serviceForFunction(f *faasv1alpha1.JSFunction) *kn
 					},
 					Spec: knv1alpha1.RevisionSpec{
 						RevisionSpec: knv1beta1.RevisionSpec{
-							PodSpec: corev1.PodSpec{
-								Containers: []corev1.Container{{
-									Image: "quay.io/lanceball/js-runtime",
-									Name:  strings.Join([]string{"nodejs", f.Name}, "-"),
-									Ports: []corev1.ContainerPort{{
-										ContainerPort: 8080,
-									}},
-									VolumeMounts: []corev1.VolumeMount{
-										corev1.VolumeMount{
-											Name:      volumeName,
-											MountPath: "/home/node/usr",
-										},
-									},
-								}},
-							},
+							PodSpec: createPodSpec(f.Name, configMapName),
 						},
 					},
 				},
@@ -192,8 +183,43 @@ func (r *ReconcileJSFunction) serviceForFunction(f *faasv1alpha1.JSFunction) *kn
 
 	// Set JSFunction instance as the owner and controller
 	if err := controllerutil.SetControllerReference(f, service, r.scheme); err != nil {
-		log.Error(err, "Failed to set controller reference for function Service")
+		return nil, err
 	}
 
-	return service
+	return service, nil
+}
+
+func createPodSpec(functionName, configMapName string) corev1.PodSpec {
+	volumeName := fmt.Sprintf("%s-source", functionName)
+	return corev1.PodSpec{
+		Containers: []corev1.Container{{
+			Image: "docker.io/rhuss/js-runtime",
+			Name:  fmt.Sprintf("nodejs-%s", functionName),
+			Ports: []corev1.ContainerPort{{
+				ContainerPort: 8181,
+			}},
+			VolumeMounts: []corev1.VolumeMount{
+				{
+					Name:      volumeName,
+					MountPath: "/home/node/usr",
+				},
+			},
+		}},
+		Volumes: []corev1.Volume{
+			createConfigMapVolume(volumeName, configMapName),
+		},
+	}
+}
+
+func createConfigMapVolume(volumeName, configMapName string) corev1.Volume {
+	return corev1.Volume {
+		Name: volumeName,
+		VolumeSource: corev1.VolumeSource {
+			ConfigMap: &corev1.ConfigMapVolumeSource{
+				LocalObjectReference: corev1.LocalObjectReference{
+					Name: configMapName,
+				},
+			},
+		},
+	}
 }