From c8149fc51b5e3f66dd505065dd9feb11c9c4bc42 Mon Sep 17 00:00:00 2001 From: subochev Date: Wed, 8 Apr 2026 13:55:13 +0300 Subject: [PATCH] =?UTF-8?q?DEVX-200:=20[BE]=20=D0=A3=D0=BD=D0=B8=D1=84?= =?UTF-8?q?=D0=B8=D1=86=D0=B8=D1=80=D0=BE=D0=B2=D0=B0=D1=82=D1=8C=20=D0=BF?= =?UTF-8?q?=D0=BE=D0=BD=D1=8F=D1=82=D0=B8=D0=B5=20=D0=B2=D0=B5=D1=80=D1=81?= =?UTF-8?q?=D0=B8=D0=B8=20=D1=81=D0=B5=D1=80=D0=B2=D0=B8=D1=81=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../templates/deployment.yaml | 8 ++++---- .../templates/ingress.yaml | 2 +- .../templates/service.yaml | 4 ++-- .../templates/deployment.yaml | 10 +++++----- .../templates/ingress.yaml | 2 +- .../templates/pvc.yaml | 2 +- .../templates/service.yaml | 4 ++-- 7 files changed, 16 insertions(+), 16 deletions(-) diff --git a/devspc/devspace-apiregistry-core-service/templates/deployment.yaml b/devspc/devspace-apiregistry-core-service/templates/deployment.yaml index 7d2b20c..ba1012b 100644 --- a/devspc/devspace-apiregistry-core-service/templates/deployment.yaml +++ b/devspc/devspace-apiregistry-core-service/templates/deployment.yaml @@ -1,7 +1,7 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: "{{$.Release.Name}}-{{$.Values.name}}" + name: "{{$.Release.Name}}-{{$.Chart.Name}}" annotations: devspace.isb/name: {{ $.Values.repository.name | quote }} devspace.isb/branch: {{ $.Values.repository.branch | quote }} @@ -10,7 +10,7 @@ metadata: {{- if $.Values.labels}} {{- toYaml $.Values.labels | nindent 4 }} {{- end}} - app.kubernetes.io/name: {{$.Values.name}} + app.kubernetes.io/name: {{$.Chart.Name}} app.kubernetes.io/instance: {{ $.Release.Name }} app.kubernetes.io/version: {{ $.Chart.AppVersion | quote }} spec: @@ -23,7 +23,7 @@ spec: {{- end }} selector: matchLabels: - app.kubernetes.io/name: {{$.Values.name}} + app.kubernetes.io/name: {{$.Chart.Name}} app.kubernetes.io/instance: {{ $.Release.Name }} template: metadata: @@ -37,7 +37,7 @@ spec: {{- toYaml . | nindent 8 }} {{- end }} labels: - app.kubernetes.io/name: {{$.Values.name}} + app.kubernetes.io/name: {{$.Chart.Name}} app.kubernetes.io/instance: {{ $.Release.Name }} {{/* app.kubernetes.io/version: {{ $.Chart.AppVersion | quote }}*/}} spec: diff --git a/devspc/devspace-apiregistry-core-service/templates/ingress.yaml b/devspc/devspace-apiregistry-core-service/templates/ingress.yaml index 1295ee8..e46cf31 100644 --- a/devspc/devspace-apiregistry-core-service/templates/ingress.yaml +++ b/devspc/devspace-apiregistry-core-service/templates/ingress.yaml @@ -1,7 +1,7 @@ apiVersion: networking.k8s.io/v1 kind: Ingress metadata: - name: {{$.Release.Name}}-{{$.Values.name}} + name: {{$.Release.Name}}-{{$.Chart.Name}} namespace: {{$.Release.Namespace}} annotations: traefik.ingress.kubernetes.io/router.middlewares: {{$.Release.Namespace}}-{{$.Release.Name}}-cors@kubernetescrd diff --git a/devspc/devspace-apiregistry-core-service/templates/service.yaml b/devspc/devspace-apiregistry-core-service/templates/service.yaml index bc2cb7d..a8c06f9 100644 --- a/devspc/devspace-apiregistry-core-service/templates/service.yaml +++ b/devspc/devspace-apiregistry-core-service/templates/service.yaml @@ -1,10 +1,10 @@ apiVersion: v1 kind: Service metadata: - name: "{{$.Release.Name}}-{{$.Values.name}}" + name: "{{$.Release.Name}}-{{$.Chart.Name}}" spec: selector: - app.kubernetes.io/name: {{$.Values.name}} + app.kubernetes.io/name: {{$.Chart.Name}} app.kubernetes.io/instance: {{ $.Release.Name }} ports: - protocol: TCP diff --git a/devspc/devspace-apiregistry-generator-service/templates/deployment.yaml b/devspc/devspace-apiregistry-generator-service/templates/deployment.yaml index 67d58be..8414f86 100644 --- a/devspc/devspace-apiregistry-generator-service/templates/deployment.yaml +++ b/devspc/devspace-apiregistry-generator-service/templates/deployment.yaml @@ -1,7 +1,7 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: "{{$.Release.Name}}-{{$.Values.name}}" + name: "{{$.Release.Name}}-{{$.Chart.Name}}" annotations: devspace.isb/name: {{ $.Values.repository.name | quote }} devspace.isb/branch: {{ $.Values.repository.branch | quote }} @@ -10,7 +10,7 @@ metadata: {{- if $.Values.labels}} {{- toYaml $.Values.labels | nindent 4 }} {{- end}} - app.kubernetes.io/name: {{$.Values.name}} + app.kubernetes.io/name: {{$.Chart.Name}} app.kubernetes.io/instance: {{ $.Release.Name }} app.kubernetes.io/version: {{ $.Chart.AppVersion | quote }} spec: @@ -23,7 +23,7 @@ spec: {{- end }} selector: matchLabels: - app.kubernetes.io/name: {{$.Values.name}} + app.kubernetes.io/name: {{$.Chart.Name}} app.kubernetes.io/instance: {{ $.Release.Name }} template: metadata: @@ -37,7 +37,7 @@ spec: {{- toYaml . | nindent 8 }} {{- end }} labels: - app.kubernetes.io/name: {{$.Values.name}} + app.kubernetes.io/name: {{$.Chart.Name}} app.kubernetes.io/instance: {{ $.Release.Name }} {{/* app.kubernetes.io/version: {{ $.Chart.AppVersion | quote }}*/}} spec: @@ -57,7 +57,7 @@ spec: path: application.yaml - name: dependencies-data persistentVolumeClaim: - claimName: "{{$.Release.Name}}-{{$.Values.name}}-dependencies" + claimName: "{{$.Release.Name}}-{{$.Chart.Name}}-dependencies" securityContext: {{- toYaml $.Values.podSecurityContext | nindent 8 }} containers: diff --git a/devspc/devspace-apiregistry-generator-service/templates/ingress.yaml b/devspc/devspace-apiregistry-generator-service/templates/ingress.yaml index 44f15c7..ae7c503 100644 --- a/devspc/devspace-apiregistry-generator-service/templates/ingress.yaml +++ b/devspc/devspace-apiregistry-generator-service/templates/ingress.yaml @@ -1,7 +1,7 @@ apiVersion: networking.k8s.io/v1 kind: Ingress metadata: - name: {{$.Release.Name}}-{{$.Values.name}} + name: {{$.Release.Name}}-{{$.Chart.Name}} namespace: {{$.Release.Namespace}} spec: rules: diff --git a/devspc/devspace-apiregistry-generator-service/templates/pvc.yaml b/devspc/devspace-apiregistry-generator-service/templates/pvc.yaml index 511a1a6..a1c7699 100644 --- a/devspc/devspace-apiregistry-generator-service/templates/pvc.yaml +++ b/devspc/devspace-apiregistry-generator-service/templates/pvc.yaml @@ -1,7 +1,7 @@ apiVersion: v1 kind: PersistentVolumeClaim metadata: - name: "{{$.Release.Name}}-{{$.Values.name}}-dependencies" + name: "{{$.Release.Name}}-{{$.Chart.Name}}-dependencies" spec: accessModes: - ReadWriteOnce diff --git a/devspc/devspace-apiregistry-generator-service/templates/service.yaml b/devspc/devspace-apiregistry-generator-service/templates/service.yaml index bc2cb7d..a8c06f9 100644 --- a/devspc/devspace-apiregistry-generator-service/templates/service.yaml +++ b/devspc/devspace-apiregistry-generator-service/templates/service.yaml @@ -1,10 +1,10 @@ apiVersion: v1 kind: Service metadata: - name: "{{$.Release.Name}}-{{$.Values.name}}" + name: "{{$.Release.Name}}-{{$.Chart.Name}}" spec: selector: - app.kubernetes.io/name: {{$.Values.name}} + app.kubernetes.io/name: {{$.Chart.Name}} app.kubernetes.io/instance: {{ $.Release.Name }} ports: - protocol: TCP