Compare commits

..

6 Commits

13 changed files with 40 additions and 45 deletions

View File

@@ -1 +1 @@
v2.0.6 v2.0.7

View File

@@ -17,6 +17,7 @@ data:
LCG_NO_HISTORY: "false" LCG_NO_HISTORY: "false"
LCG_ALLOW_EXECUTION: "false" LCG_ALLOW_EXECUTION: "false"
LCG_DEBUG: "true" LCG_DEBUG: "true"
LCG_PROVIDER: "proxy"
# Настройки аутентификации # Настройки аутентификации
LCG_SERVER_REQUIRE_AUTH: "true" LCG_SERVER_REQUIRE_AUTH: "true"

View File

@@ -15,7 +15,6 @@ spec:
metadata: metadata:
labels: labels:
app: lcg app: lcg
version: ${VERSION}
spec: spec:
containers: containers:
- name: lcg - name: lcg

View File

@@ -1 +1 @@
v2.0.6 v2.0.7

View File

@@ -5,7 +5,6 @@ metadata:
namespace: lcg namespace: lcg
labels: labels:
app: lcg app: lcg
version: ${VERSION}
spec: spec:
entryPoints: entryPoints:
- websecure - websecure

View File

@@ -13,13 +13,13 @@ resources:
- ingress-route.yaml - ingress-route.yaml
# Common labels # Common labels
commonLabels: # commonLabels:
app: lcg # app: lcg
version: ${VERSION} # version: ${VERSION}
managed-by: kustomize # managed-by: kustomize
# Images # Images
images: # images:
- name: lcg # - name: lcg
newName: ${REPOSITORY} # newName: ${REPOSITORY}
newTag: ${VERSION} # newTag: ${VERSION}

View File

@@ -5,7 +5,6 @@ metadata:
namespace: lcg namespace: lcg
labels: labels:
app: lcg app: lcg
version: ${VERSION}
spec: spec:
type: ClusterIP type: ClusterIP
ports: ports:
@@ -15,4 +14,3 @@ spec:
name: http name: http
selector: selector:
app: lcg app: lcg
version: ${VERSION}

View File

@@ -5,7 +5,7 @@ metadata:
namespace: lcg namespace: lcg
data: data:
# Основные настройки # Основные настройки
LCG_VERSION: "v2.0.6" LCG_VERSION: "v2.0.7"
LCG_BASE_PATH: "/lcg" LCG_BASE_PATH: "/lcg"
LCG_SERVER_HOST: "0.0.0.0" LCG_SERVER_HOST: "0.0.0.0"
LCG_SERVER_PORT: "8080" LCG_SERVER_PORT: "8080"
@@ -17,6 +17,7 @@ data:
LCG_NO_HISTORY: "false" LCG_NO_HISTORY: "false"
LCG_ALLOW_EXECUTION: "false" LCG_ALLOW_EXECUTION: "false"
LCG_DEBUG: "true" LCG_DEBUG: "true"
LCG_PROVIDER: "proxy"
# Настройки аутентификации # Настройки аутентификации
LCG_SERVER_REQUIRE_AUTH: "true" LCG_SERVER_REQUIRE_AUTH: "true"

View File

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

View File

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

View File

@@ -13,13 +13,13 @@ resources:
- ingress-route.yaml - ingress-route.yaml
# Common labels # Common labels
commonLabels: # commonLabels:
app: lcg # app: lcg
version: v2.0.6 # version: v2.0.7
managed-by: kustomize # managed-by: kustomize
# Images # Images
images: # images:
- name: lcg # - name: lcg
newName: kuznetcovay/lcg # newName: kuznetcovay/lcg
newTag: v2.0.6 # newTag: v2.0.7

View File

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

11
main.go
View File

@@ -159,6 +159,9 @@ lcg [опции] <описание команды>
config.AppConfig.MainFlags.Debug = config.AppConfig.MainFlags.Debug || config.GetEnvBool("LCG_DEBUG", false) config.AppConfig.MainFlags.Debug = config.AppConfig.MainFlags.Debug || config.GetEnvBool("LCG_DEBUG", false)
fmt.Println("Debug:", config.AppConfig.MainFlags.Debug)
fmt.Println("LCG_DEBUG:", config.GetEnvBool("LCG_DEBUG", false))
args := c.Args().Slice() args := c.Args().Slice()
if len(args) == 0 { if len(args) == 0 {
@@ -569,11 +572,9 @@ func getCommands() []*cli.Command {
host := c.String("host") host := c.String("host")
openBrowser := c.Bool("browser") openBrowser := c.Bool("browser")
// Пробрасываем глобальный флаг debug для web-сервера // Пробрасываем debug: флаг или переменная окружения LCG_DEBUG
// Позволяет запускать: lcg -d serve -p ... // Позволяет запускать: LCG_DEBUG=1 lcg serve ... или lcg -d serve ...
if c.Bool("debug") { config.AppConfig.MainFlags.Debug = c.Bool("debug") || config.GetEnvBool("LCG_DEBUG", false)
config.AppConfig.MainFlags.Debug = true
}
// Обновляем конфигурацию сервера с новыми параметрами // Обновляем конфигурацию сервера с новыми параметрами
config.AppConfig.Server.Host = host config.AppConfig.Server.Host = host