apply feedback

Signed-off-by: Jorge Turrado <jorge.turrado@scrm.lidl>

config/interceptor/interceptor.yaml

@@ -16,10 +16,12 @@ spec:
   selector:
     matchLabels:
       control-plane: interceptor
+      app: keda-http-add-on
   template:
     metadata:
       labels:
         control-plane: interceptor
+        app: keda-http-add-on
       name: keda-http-add-on-interceptor
     spec:
       securityContext:

config/interceptor/service-admin.yaml

@@ -14,4 +14,5 @@ spec:
     port: 9090
     targetPort: inter-admin
   selector:
-    control-plane: interceptor
+    control-plane: interceptor
+    app: keda-http-add-on

config/interceptor/service-proxy.yaml

@@ -15,3 +15,4 @@ spec:
     targetPort: inter-proxy
   selector:
     control-plane: interceptor
+    app: keda-http-add-on

config/operator/operator.yaml

@@ -16,10 +16,12 @@ spec:
   selector:
     matchLabels:
       control-plane: controller-manager
+      app: keda-http-add-on
   template:
     metadata:
       labels:
         control-plane: controller-manager
+        app: keda-http-add-on
       name: keda-http-add-on-operator
     spec:      
       serviceAccountName: keda-http-add-on

config/operator/service-admin.yaml

@@ -14,4 +14,5 @@ spec:
     port: 9090
     targetPort: admin-http
   selector:
-    control-plane: controller-manager
+    control-plane: controller-manager
+    app: keda-http-add-on

config/operator/service-metrics.yaml

@@ -15,3 +15,4 @@ spec:
     targetPort: https
   selector:
     control-plane: controller-manager
+    app: keda-http-add-on

config/scaler/scaler.yaml

@@ -16,10 +16,12 @@ spec:
   selector:
     matchLabels:
       control-plane: external-scaler
+      app: keda-http-add-on
   template:
     metadata:
       labels:
         control-plane: external-scaler
+        app: keda-http-add-on
       name: keda-http-add-on-scaler
     spec:
       securityContext:

config/scaler/service.yaml

@@ -17,4 +17,5 @@ spec:
     port: 9091
     targetPort: scaler-health
   selector:
-    control-plane: external-scaler
+    control-plane: external-scaler
+    app: keda-http-add-on

docs/developing.md

@@ -40,12 +40,13 @@ The Makefile located in the root directory has targets useful for the whole proj
 
 > All commands are case sensitive.
 
-- `make build`: Builds all the binaries for local testing.
-- `make test`: Tests the entire codebase
+- `make build`: Builds all the binaries for local testing
+- `make test`: Run all unit tests
+- `make e2e-test`: Run all e2e tests
 - `make docker-build`: Builds all docker images
-- `make docker-publish`: Pushes all docker images, building them first
-- `make publish-multiarch`: Pushes all docker images, building them first for `linux/arm64` and `linux/amd64`
-- `make manifests`: Builds all the manifest files for Kubernetes, it's important to build after every change
+- `make docker-publish`: Build and push all Docker images
+- `make publish-multiarch`: Build and push all Docker images for `linux/arm64` and `linux/amd64`
+- `make manifests`: Generate all the manifest files for Kubernetes, it's important to build after every change
 - `make deploy`: Deploys the HTTP Add-on to the cluster selected in `~/.kube/config` using `config` folder manifests
 
 ### Required Environment Variables

interceptor/main.go

@@ -7,7 +7,6 @@ import (
 	"math/rand"
 	nethttp "net/http"
 	"os"
-	"runtime"
 	"time"
 
 	"github.com/go-logr/logr"
@@ -178,10 +177,7 @@ func main() {
 		lggr.Error(err, "proxy server failed")
 		return err
 	})
-	lggr.Info(fmt.Sprintf("Interceptor Version: %s", build.Version()))
-	lggr.Info(fmt.Sprintf("Interceptor Commit: %s", build.GitCommit()))
-	lggr.Info(fmt.Sprintf("Go Version: %s", runtime.Version()))
-	lggr.Info(fmt.Sprintf("Go OS/Arch: %s/%s", runtime.GOOS, runtime.GOARCH))
+	build.PrintComponentInfo(lggr, "Interceptor")
 
 	// errGrp.Wait() should hang forever for healthy admin and proxy servers.
 	// if it returns an error, log and exit immediately.

operator/main.go

@@ -22,7 +22,6 @@ import (
 	"fmt"
 	"net/http"
 	"os"
-	goruntime "runtime"
 
 	"golang.org/x/sync/errgroup"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -164,10 +163,7 @@ func main() {
 			externalScalerCfg,
 		)
 	})
-	setupLog.Info(fmt.Sprintf("Operator Version: %s", build.Version()))
-	setupLog.Info(fmt.Sprintf("Operator Commit: %s", build.GitCommit()))
-	setupLog.Info(fmt.Sprintf("Go Version: %s", goruntime.Version()))
-	setupLog.Info(fmt.Sprintf("Go OS/Arch: %s/%s", goruntime.GOOS, goruntime.GOARCH))
+	build.PrintComponentInfo(setupLog, "Operator")
 	setupLog.Error(errGrp.Wait(), "running the operator")
 }
 

pkg/build/version.go

@@ -1,5 +1,12 @@
 package build
 
+import (
+	"fmt"
+	"runtime"
+
+	"github.com/go-logr/logr"
+)
+
 var (
 	version   = "main"
 	gitCommit string
@@ -14,3 +21,10 @@ func Version() string {
 func GitCommit() string {
 	return gitCommit
 }
+
+func PrintComponentInfo(logger logr.Logger, component string) {
+	logger.Info(fmt.Sprintf("%s Version: %s", component, Version()))
+	logger.Info(fmt.Sprintf("%s Commit: %s", component, GitCommit()))
+	logger.Info(fmt.Sprintf("Go Version: %s", runtime.Version()))
+	logger.Info(fmt.Sprintf("Go OS/Arch: %s/%s", runtime.GOOS, runtime.GOARCH))
+}

scaler/main.go

@@ -12,7 +12,6 @@ import (
 	"net"
 	"net/http"
 	"os"
-	"runtime"
 	"time"
 
 	"github.com/go-logr/logr"
@@ -145,10 +144,7 @@ func main() {
 			table,
 		)
 	})
-	lggr.Info(fmt.Sprintf("Scaler Version: %s", build.Version()))
-	lggr.Info(fmt.Sprintf("Scaler Commit: %s", build.GitCommit()))
-	lggr.Info(fmt.Sprintf("Go Version: %s", runtime.Version()))
-	lggr.Info(fmt.Sprintf("Go OS/Arch: %s/%s", runtime.GOOS, runtime.GOARCH))
+	build.PrintComponentInfo(lggr, "Scaler")
 	lggr.Error(grp.Wait(), "one or more of the servers failed")
 }