Merged main into release while building v2.0.6

This commit is contained in:
9 changed files with 23 additions and 11 deletions

View File

@@ -1 +1 @@
v2.0.5
v2.0.6

View File

@@ -68,6 +68,15 @@ type ValidationConfig struct {
MaxExplanationLength int
}
func GetEnvBool(key string, defaultValue bool) bool {
if value, exists := os.LookupEnv(key); exists {
if boolValue, err := strconv.ParseBool(value); err == nil {
return boolValue
}
}
return defaultValue
}
func getEnv(key, defaultValue string) string {
if value, exists := os.LookupEnv(key); exists {
return value

View File

@@ -1 +1 @@
v2.0.5
v2.0.6

View File

@@ -5,7 +5,7 @@ metadata:
namespace: lcg
data:
# Основные настройки
LCG_VERSION: "v2.0.5"
LCG_VERSION: "v2.0.6"
LCG_BASE_PATH: "/lcg"
LCG_SERVER_HOST: "0.0.0.0"
LCG_SERVER_PORT: "8080"

View File

@@ -5,7 +5,7 @@ metadata:
namespace: lcg
labels:
app: lcg
version: v2.0.5
version: v2.0.6
spec:
replicas: 1
selector:
@@ -15,11 +15,11 @@ spec:
metadata:
labels:
app: lcg
version: v2.0.5
version: v2.0.6
spec:
containers:
- name: lcg
image: kuznetcovay/lcg:v2.0.5
image: kuznetcovay/lcg:v2.0.6
imagePullPolicy: Always
ports:
- containerPort: 8080

View File

@@ -5,7 +5,7 @@ metadata:
namespace: lcg
labels:
app: lcg
version: v2.0.5
version: v2.0.6
spec:
entryPoints:
- websecure

View File

@@ -15,11 +15,11 @@ resources:
# Common labels
commonLabels:
app: lcg
version: v2.0.5
version: v2.0.6
managed-by: kustomize
# Images
images:
- name: lcg
newName: kuznetcovay/lcg
newTag: v2.0.5
newTag: v2.0.6

View File

@@ -5,7 +5,7 @@ metadata:
namespace: lcg
labels:
app: lcg
version: v2.0.5
version: v2.0.6
spec:
type: ClusterIP
ports:
@@ -15,4 +15,4 @@ spec:
name: http
selector:
app: lcg
version: v2.0.5
version: v2.0.6

View File

@@ -156,6 +156,9 @@ lcg [опции] <описание команды>
Debug: c.Bool("debug"),
}
disableHistory = config.AppConfig.MainFlags.NoHistory || config.AppConfig.IsNoHistoryEnabled()
config.AppConfig.MainFlags.Debug = config.AppConfig.MainFlags.Debug || config.GetEnvBool("LCG_DEBUG", false)
args := c.Args().Slice()
if len(args) == 0 {