From deb80f2b37d6b6e003aaec5aebec68de97926719 Mon Sep 17 00:00:00 2001 From: Anton Kuznetcov Date: Tue, 28 Oct 2025 14:42:17 +0600 Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=B2=20=D0=B2=D0=B5=D1=82=D0=BA?= =?UTF-8?q?=D0=B5=20main?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- VERSION.txt | 2 +- deploy/3.deployment.tmpl.yaml | 3 +-- deploy/VERSION.txt | 2 +- deploy/ingress-route.tmpl.yaml | 3 +-- deploy/kustomization.tmpl.yaml | 16 ++++++++-------- deploy/service.tmpl.yaml | 6 ++---- kustomize/configmap.yaml | 2 +- kustomize/deployment.yaml | 7 +++---- kustomize/ingress-route.yaml | 3 +-- kustomize/kustomization.yaml | 16 ++++++++-------- kustomize/service.yaml | 6 ++---- 11 files changed, 29 insertions(+), 37 deletions(-) diff --git a/VERSION.txt b/VERSION.txt index cea0e15..c2f6de9 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1 +1 @@ -v2.0.6 +v2.0.5 diff --git a/deploy/3.deployment.tmpl.yaml b/deploy/3.deployment.tmpl.yaml index c47e1e5..f97aa2d 100644 --- a/deploy/3.deployment.tmpl.yaml +++ b/deploy/3.deployment.tmpl.yaml @@ -14,8 +14,7 @@ spec: template: metadata: labels: - app: lcg - version: ${VERSION} + app: lcg spec: containers: - name: lcg diff --git a/deploy/VERSION.txt b/deploy/VERSION.txt index cea0e15..c2f6de9 100644 --- a/deploy/VERSION.txt +++ b/deploy/VERSION.txt @@ -1 +1 @@ -v2.0.6 +v2.0.5 diff --git a/deploy/ingress-route.tmpl.yaml b/deploy/ingress-route.tmpl.yaml index b9c8189..9148b7a 100644 --- a/deploy/ingress-route.tmpl.yaml +++ b/deploy/ingress-route.tmpl.yaml @@ -4,8 +4,7 @@ metadata: name: lcg-route namespace: lcg labels: - app: lcg - version: ${VERSION} + app: lcg spec: entryPoints: - websecure diff --git a/deploy/kustomization.tmpl.yaml b/deploy/kustomization.tmpl.yaml index 3d43c1d..7bcacad 100644 --- a/deploy/kustomization.tmpl.yaml +++ b/deploy/kustomization.tmpl.yaml @@ -13,13 +13,13 @@ resources: - ingress-route.yaml # Common labels -commonLabels: - app: lcg - version: ${VERSION} - managed-by: kustomize +# commonLabels: +# app: lcg +# version: ${VERSION} +# managed-by: kustomize # Images -images: - - name: lcg - newName: ${REPOSITORY} - newTag: ${VERSION} +# images: +# - name: lcg +# newName: ${REPOSITORY} +# newTag: ${VERSION} diff --git a/deploy/service.tmpl.yaml b/deploy/service.tmpl.yaml index 72bcad4..091bf8b 100644 --- a/deploy/service.tmpl.yaml +++ b/deploy/service.tmpl.yaml @@ -4,8 +4,7 @@ metadata: name: lcg namespace: lcg labels: - app: lcg - version: ${VERSION} + app: lcg spec: type: ClusterIP ports: @@ -14,5 +13,4 @@ spec: protocol: TCP name: http selector: - app: lcg - version: ${VERSION} + app: lcg diff --git a/kustomize/configmap.yaml b/kustomize/configmap.yaml index 34ff390..0b6da9f 100644 --- a/kustomize/configmap.yaml +++ b/kustomize/configmap.yaml @@ -5,7 +5,7 @@ metadata: namespace: lcg data: # Основные настройки - LCG_VERSION: "v2.0.6" + LCG_VERSION: "v2.0.5" LCG_BASE_PATH: "/lcg" LCG_SERVER_HOST: "0.0.0.0" LCG_SERVER_PORT: "8080" diff --git a/kustomize/deployment.yaml b/kustomize/deployment.yaml index c13d947..fa01ef5 100644 --- a/kustomize/deployment.yaml +++ b/kustomize/deployment.yaml @@ -5,7 +5,7 @@ metadata: namespace: lcg labels: app: lcg - version: v2.0.6 + version: v2.0.5 spec: replicas: 1 selector: @@ -14,12 +14,11 @@ spec: template: metadata: labels: - app: lcg - version: v2.0.6 + app: lcg spec: containers: - name: lcg - image: kuznetcovay/lcg:v2.0.6 + image: kuznetcovay/lcg:v2.0.5 imagePullPolicy: Always ports: - containerPort: 8080 diff --git a/kustomize/ingress-route.yaml b/kustomize/ingress-route.yaml index 633a0b0..9148b7a 100644 --- a/kustomize/ingress-route.yaml +++ b/kustomize/ingress-route.yaml @@ -4,8 +4,7 @@ metadata: name: lcg-route namespace: lcg labels: - app: lcg - version: v2.0.6 + app: lcg spec: entryPoints: - websecure diff --git a/kustomize/kustomization.yaml b/kustomize/kustomization.yaml index 7cf8102..f45c11f 100644 --- a/kustomize/kustomization.yaml +++ b/kustomize/kustomization.yaml @@ -13,13 +13,13 @@ resources: - ingress-route.yaml # Common labels -commonLabels: - app: lcg - version: v2.0.6 - managed-by: kustomize +# commonLabels: +# app: lcg +# version: v2.0.5 +# managed-by: kustomize # Images -images: - - name: lcg - newName: kuznetcovay/lcg - newTag: v2.0.6 +# images: +# - name: lcg +# newName: kuznetcovay/lcg +# newTag: v2.0.5 diff --git a/kustomize/service.yaml b/kustomize/service.yaml index 0c7ddbe..091bf8b 100644 --- a/kustomize/service.yaml +++ b/kustomize/service.yaml @@ -4,8 +4,7 @@ metadata: name: lcg namespace: lcg labels: - app: lcg - version: v2.0.6 + app: lcg spec: type: ClusterIP ports: @@ -14,5 +13,4 @@ spec: protocol: TCP name: http selector: - app: lcg - version: v2.0.6 + app: lcg