Merged main into release while building v2.0.5

This commit is contained in:
8 changed files with 12 additions and 12 deletions

View File

@@ -1 +1 @@
v2.0.4 v2.0.5

View File

@@ -1 +1 @@
v2.0.4 v2.0.5

View File

@@ -5,7 +5,7 @@ metadata:
namespace: lcg namespace: lcg
data: data:
# Основные настройки # Основные настройки
LCG_VERSION: "v2.0.4" LCG_VERSION: "v2.0.5"
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"

View File

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

View File

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

View File

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

View File

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

View File

@@ -94,7 +94,7 @@ func validateJWTToken(tokenString string) (*JWTClaims, error) {
} }
// Парсим токен // Парсим токен
token, err := jwt.ParseWithClaims(tokenString, &JWTClaims{}, func(token *jwt.Token) (interface{}, error) { token, err := jwt.ParseWithClaims(tokenString, &JWTClaims{}, func(token *jwt.Token) (any, error) {
// Проверяем метод подписи // Проверяем метод подписи
if _, ok := token.Method.(*jwt.SigningMethodHMAC); !ok { if _, ok := token.Method.(*jwt.SigningMethodHMAC); !ok {
return nil, fmt.Errorf("unexpected signing method: %v", token.Header["alg"]) return nil, fmt.Errorf("unexpected signing method: %v", token.Header["alg"])