add deployment name change based on flag, fix minor makefile issues

Author: FilipRudy

components/buildless-serverless/Makefile

@@ -139,18 +139,18 @@ docker-buildx: ## Build and push docker image for the manager for cross-platform
 	rm Dockerfile.cross
 
 build-image: ## Build buildless serverless backend image
-	docker build -t $(APP_NAME) -f Dockerfile .
+	docker build -t $(APP_NAME) -f Dockerfile ../..
 
 ######## disable operator to prevent undo of local image update to k3d
 disable-operator:
-	$(KUBECTL) scale deployment serverless-operator -n kyma-system --replicas=0
+	$(KUBECTL) scale deployment serverless-operator -n kyma-system --replicas=0 || true
 
 .PHONY: install-buildless
-install-buildless: build-image disable-operator## Build buildless serverless image and install it on local k3d cluster
+install-buildless: build-image disable-operator ## Build buildless serverless image and install it on local k3d cluster
 	$(eval HASH_TAG=$(shell docker images $(APP_NAME):latest --quiet))
 	docker tag $(APP_NAME) $(APP_NAME):$(HASH_TAG)
 
-	k3d image import $(APP_NAME):$(HASH_TAG) -c kyma
+	k3d image import $(APP_NAME):$(HASH_TAG)
 	$(KUBECTL) set image deployment -n kyma-system serverless-ctrl-mngr manager=$(APP_NAME):$(HASH_TAG)
 ##@ Deployment
 

components/buildless-serverless/internal/endpoint/function.go

@@ -12,7 +12,7 @@ import (
 func (s *Server) handleFunctionRequest(w http.ResponseWriter, r *http.Request) {
 	ns := r.URL.Query().Get("namespace")
 	name := r.URL.Query().Get("name")
-	appName := r.URL.Query().Get("appName")
+	appName := r.URL.Query().Get("targetAppName")
 
 	s.log.Infof("handling function request for function '%s/%s'", ns, name)
 

components/buildless-serverless/internal/endpoint/runtime/resources.go

@@ -19,7 +19,7 @@ func BuildResources(functionConfig *config.FunctionConfig, f *v1alpha2.Function,
 		return nil, errors.Wrapf(err, "failed to build service")
 	}
 
-	deployment, err := buildDeploymentFileData(functionConfig, f)
+	deployment, err := buildDeploymentFileData(functionConfig, f, appName)
 	if err != nil {
 		return nil, errors.Wrapf(err, "failed to build deployment")
 	}
@@ -53,13 +53,17 @@ func buildServiceFileData(function *v1alpha2.Function, appName string) ([]byte,
 	return data, nil
 }
 
-func buildDeploymentFileData(functionConfig *config.FunctionConfig, function *v1alpha2.Function) ([]byte, error) {
+func buildDeploymentFileData(functionConfig *config.FunctionConfig, function *v1alpha2.Function, appName string) ([]byte, error) {
 	if function.HasGitSources() {
 		// TODO: support git source
 		return nil, errors.New("ejecting functions with git source is not supported")
 	}
 
-	deployName := fmt.Sprintf("%s-ejected", function.Name)
+	deployName := appName
+	if deployName == "" {
+		deployName = fmt.Sprintf("%s-ejected", function.Name)
+	}
+
 	deploy := resources.NewDeployment(
 		function,
 		functionConfig,

components/buildless-serverless/internal/endpoint/runtime/resources_test.go

@@ -26,7 +26,7 @@ func TestBuildResources(t *testing.T) {
 				Name:      "test-function",
 				Namespace: "test-namespace",
 			},
-		})
+		}, "")
 
 		require.NoError(t, err)
 		require.Len(t, files, 2)
@@ -48,7 +48,7 @@ func TestBuildResources(t *testing.T) {
 				Name:      "test-function",
 				Namespace: "test-namespace",
 			},
-		})
+		}, "")
 
 		require.ErrorContains(t, err, "ejecting functions with git source is not supported")
 		require.Nil(t, files)

config/buildless-serverless/files/kyma-commands.yaml

@@ -74,7 +74,7 @@ subCommands:
       parameters:
         name: ${{ .args.value }}
         namespace: ${{ .flags.namespace.value }}
-        app-name: ${{ .flags.targetappname.value}}
+        targetAppName: ${{ .flags.targetappname.value}}
     targetPod:
       path: "/internal/function/eject/"
       port: "12137"