From f8612437e430d24f0f741ced125652d9b3b26b36 Mon Sep 17 00:00:00 2001
From: Bryce-Huang <44901318+Bryce-huang@users.noreply.github.com>
Date: Mon, 15 Jul 2024 20:30:45 +0800
Subject: [PATCH] update config

Signed-off-by: Bryce-Huang <44901318+Bryce-huang@users.noreply.github.com>
---
 Dockerfile                              | 2 +-
 Makefile                                | 5 +++--
 config/bundle.yaml                      | 4 ++--
 controllers/core/function_controller.go | 2 +-
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 6a6a98e1..cf997d24 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -16,7 +16,7 @@
 ARG GOPROXY="https://goproxy.cn"
 
 # Build the openfunction binary
-FROM golang:1.19 as builder
+FROM golang:1.20 as builder
 ARG GOPROXY
 
 WORKDIR /workspace
diff --git a/Makefile b/Makefile
index 44b90b0f..577cb451 100644
--- a/Makefile
+++ b/Makefile
@@ -14,9 +14,10 @@
 # limitations under the License.
 #
 
-VERSION?=$(shell cat VERSION | tr -d " \t\n\r")
+#VERSION?=$(shell cat VERSION | tr -d " \t\n\r")
+VERSION="v1.5.0"
 # Image URL to use all building/pushing image targets
-IMG ?= openfunction/openfunction:$(VERSION)
+IMG ?= brycehuang/openfunction:$(VERSION)
 IMG_DEV ?= openfunctiondev/openfunction:$(VERSION)
 # Produce CRDs that work back to Kubernetes 1.11 (no version conversion)
 #CRD_OPTIONS ?= "crd:trivialVersions=true,preserveUnknownFields=false"
diff --git a/config/bundle.yaml b/config/bundle.yaml
index bb394cf5..0b32dd01 100644
--- a/config/bundle.yaml
+++ b/config/bundle.yaml
@@ -40712,7 +40712,7 @@ kind: Deployment
 metadata:
   labels:
     app.kubernetes.io/name: openfunction-controller-manager
-    app.kubernetes.io/version: latest
+    app.kubernetes.io/version: "v1.5.0"
     control-plane: controller-manager
   name: openfunction-controller-manager
   namespace: openfunction
@@ -40733,7 +40733,7 @@ spec:
         - --leader-elect
         command:
         - /openfunction
-        image: openfunction/openfunction:latest
+        image: openfunction/openfunction:"v1.5.0"
         livenessProbe:
           httpGet:
             path: /healthz
diff --git a/controllers/core/function_controller.go b/controllers/core/function_controller.go
index aba70645..588f4a32 100644
--- a/controllers/core/function_controller.go
+++ b/controllers/core/function_controller.go
@@ -619,7 +619,7 @@ func (r *FunctionReconciler) createServing(fn *openfunction.Function) error {
 
 	serving := &openfunction.Serving{
 		ObjectMeta: metav1.ObjectMeta{
-			GenerateName: fn.Name + "-",
+			GenerateName: "serving-",
 			Namespace:    fn.Namespace,
 			Labels: map[string]string{
 				constants.FunctionLabel: fn.Name,