feat: support custom config path via "config"

Remove isCreateDatabaseDefined
feat: helm hpa yaml must reference correct apiVersion (#2581 )
2025-07-23 22:53:31 +08:00 · 2024-01-06 14:09:48 +08:00 · 2024-01-06 14:08:34 +08:00 · 2024-01-06 08:55:59 +08:00
2 changed files with 18 additions and 11 deletions
--- a/manifests/casdoor/templates/hpa.yaml
+++ b/manifests/casdoor/templates/hpa.yaml
@ -1,5 +1,5 @@
 {{- if .Values.autoscaling.enabled }}
-apiVersion: autoscaling/v2beta1
+apiVersion: autoscaling/v2
 kind: HorizontalPodAutoscaler
 metadata:
  name: {{ include "casdoor.fullname" . }}
@ -17,12 +17,15 @@ spec:
    - type: Resource
      resource:
        name: cpu
-        targetAverageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }}
+        target:
+          type: Utilization
+          averageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }}
    {{- end }}
    {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }}
    - type: Resource
      resource:
        name: memory
-        targetAverageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }}
+        target:
+          averageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }}
    {{- end }}
 {{- end }}
--- a/object/ormer.go
+++ b/object/ormer.go
@ -36,16 +36,14 @@ import (
 )

 var (
-	ormer                   *Ormer = nil
-	isCreateDatabaseDefined        = false
-	createDatabase                 = true
+	ormer          *Ormer = nil
+	createDatabase        = true
+	configPath            = "conf/app.conf"
 )

 func InitFlag() {
-	if !isCreateDatabaseDefined {
-		isCreateDatabaseDefined = true
-		createDatabase = getCreateDatabaseFlag()
-	}
+	createDatabase = getCreateDatabaseFlag()
+	configPath = getConfigFlag()
 }

 func getCreateDatabaseFlag() bool {
@ -54,6 +52,12 @@ func getCreateDatabaseFlag() bool {
 	return *res
 }

+func getConfigFlag() string {
+	res := flag.String("config", "conf/app.conf", "set it to \"/your/path/app.conf\" if your config file is not in: \"/conf/app.conf\"")
+	flag.Parse()
+	return *res
+}
+
 func InitConfig() {
 	err := beego.LoadAppConfig("ini", "../conf/app.conf")
 	if err != nil {
@ -68,7 +72,7 @@ func InitConfig() {

 func InitAdapter() {
 	if conf.GetConfigString("driverName") == "" {
-		if !util.FileExist("conf/app.conf") {
+		if !util.FileExist(configPath) {
 			dir, err := os.Getwd()
 			if err != nil {
 				panic(err)
Author	SHA1	Message	Date
Yang Luo	2d6fae32be	feat: support custom config path via "config"	2024-01-06 14:09:48 +08:00
Yang Luo	741cff99df	Remove isCreateDatabaseDefined	2024-01-06 14:08:34 +08:00
Satinder Singh	cad9c28e92	feat: helm hpa yaml must reference correct apiVersion (#2581 )	2024-01-06 08:55:59 +08:00