Merged main into release while building v2.0.5

This commit is contained in:
11 changed files with 29 additions and 37 deletions

View File

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

View File

@@ -14,8 +14,7 @@ spec:
template: template:
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.5

View File

@@ -4,8 +4,7 @@ metadata:
name: lcg-route name: lcg-route
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

@@ -4,8 +4,7 @@ metadata:
name: lcg name: lcg
namespace: lcg namespace: lcg
labels: labels:
app: lcg app: lcg
version: ${VERSION}
spec: spec:
type: ClusterIP type: ClusterIP
ports: ports:
@@ -14,5 +13,4 @@ spec:
protocol: TCP protocol: TCP
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.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.6 version: v2.0.5
spec: spec:
replicas: 1 replicas: 1
selector: selector:
@@ -14,12 +14,11 @@ spec:
template: template:
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.5
imagePullPolicy: Always imagePullPolicy: Always
ports: ports:
- containerPort: 8080 - containerPort: 8080

View File

@@ -4,8 +4,7 @@ metadata:
name: lcg-route name: lcg-route
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.5
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.5

View File

@@ -4,8 +4,7 @@ metadata:
name: lcg name: lcg
namespace: lcg namespace: lcg
labels: labels:
app: lcg app: lcg
version: v2.0.6
spec: spec:
type: ClusterIP type: ClusterIP
ports: ports:
@@ -14,5 +13,4 @@ spec:
protocol: TCP protocol: TCP
name: http name: http
selector: selector:
app: lcg app: lcg
version: v2.0.6