Merged main into release while building v2.0.4

VERSION.txt

@@ -1 +1 @@
-v2.0.3
+v2.0.4

deploy/3.deployment.tmpl.yaml

@@ -59,20 +59,20 @@ spec:
         # Health checks
         startupProbe:
           httpGet:
-            path: /login
+            path: /lcg
             port: 8080
           initialDelaySeconds: 10
           periodSeconds: 5
           failureThreshold: 30
         readinessProbe:
           httpGet:
-            path: /login
+            path: /lcg
             port: 8080
           initialDelaySeconds: 5
           periodSeconds: 10
         livenessProbe:
           httpGet:
-            path: /login
+            path: /lcg
             port: 8080
           initialDelaySeconds: 10
           periodSeconds: 60

deploy/6.full-build.sh

@@ -127,15 +127,24 @@ fi
 if [ "$current_branch" != "main" ]; then
     git checkout main
     git merge --no-ff -m "Merged branch '$current_branch' into main while building $VERSION" "$current_branch"
+    git push origin main
 elif [ "$current_branch" = "main" ]; then
     log "🔄 Вы находитесь на ветке main. Слияние с release..."
     git add .
     git commit -m "Исправления в ветке $current_branch"
+    git push origin main
 fi
 
 # переключиться на ветку release и слить с веткой main
-git checkout release
+if git show-ref --quiet refs/heads/release; then
-git merge --no-ff -m "Merged main into release while building $VERSION" main
+    log "ℹ️ Branch 'release' exists. Proceeding with merge."
+    git checkout release
+    git merge --no-ff -m "Merged main into release while building $VERSION" main
+else
+    log "❌ Branch 'release' does not exist. Please create the branch before proceeding."
+    git checkout -b release
+    git merge --no-ff -m "Merged main into release while building $VERSION" main        
+fi
 
 # если тег $VERSION существует, удалить его и принудительно запушить
 tag_exists=$(git tag -l "$VERSION")

deploy/VERSION.txt

@@ -1 +1 @@
-v2.0.3
+v2.0.4

kustomize/configmap.yaml

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

kustomize/deployment.yaml

@@ -5,7 +5,7 @@ metadata:
   namespace: lcg
   labels:
     app: lcg
-    version: v2.0.3
+    version: v2.0.4
 spec:
   replicas: 1
   selector:
@@ -15,11 +15,11 @@ spec:
     metadata:
       labels:
         app: lcg
-        version: v2.0.3
+        version: v2.0.4
     spec:
       containers:
       - name: lcg
-        image: kuznetcovay/lcg:v2.0.3
+        image: kuznetcovay/lcg:v2.0.4
         imagePullPolicy: Always
         ports:
         - containerPort: 8080
@@ -59,20 +59,20 @@ spec:
         # Health checks
         startupProbe:
           httpGet:
-            path: /login
+            path: /lcg
             port: 8080
           initialDelaySeconds: 10
           periodSeconds: 5
           failureThreshold: 30
         readinessProbe:
           httpGet:
-            path: /login
+            path: /lcg
             port: 8080
           initialDelaySeconds: 5
           periodSeconds: 10
         livenessProbe:
           httpGet:
-            path: /login
+            path: /lcg
             port: 8080
           initialDelaySeconds: 10
           periodSeconds: 60

kustomize/ingress-route.yaml

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

kustomize/kustomization.yaml

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

kustomize/service.yaml

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

ssl/ssl.go

@@ -1,6 +1,7 @@
 package ssl
 
 import (
+	"slices"
 	"crypto/rand"
 	"crypto/rsa"
 	"crypto/tls"
@@ -139,26 +140,23 @@ func LoadOrGenerateCert(host string) (*tls.Certificate, error) {
 // IsSecureHost проверяет, является ли хост безопасным для HTTP
 func IsSecureHost(host string) bool {
 	secureHosts := []string{"localhost", "127.0.0.1", "::1"}
-	for _, secureHost := range secureHosts {
+	return slices.Contains(secureHosts, host)
-		if host == secureHost {
-			return true
-		}
-	}
-	return false
 }
 
 // ShouldUseHTTPS определяет, нужно ли использовать HTTPS
 func ShouldUseHTTPS(host string) bool {
-	// Если хост не localhost/127.0.0.1, принуждаем к HTTPS
-	if !IsSecureHost(host) {
-		return true
-	}
 	
 	// Если явно разрешен HTTP, используем HTTP
 	if config.AppConfig.Server.AllowHTTP {
 		return false
 	}
 	
+	// Если хост не localhost/127.0.0.1, принуждаем к HTTPS
+	if !IsSecureHost(host) {
+		return true
+	}
+
+
 	// По умолчанию для localhost используем HTTP
 	return false
 }