DEVX-200: [BE] Унифицировать понятие версии сервиса
This commit is contained in:
@@ -1,7 +1,7 @@
|
|||||||
apiVersion: apps/v1
|
apiVersion: apps/v1
|
||||||
kind: Deployment
|
kind: Deployment
|
||||||
metadata:
|
metadata:
|
||||||
name: "{{$.Release.Name}}-{{$.Values.name}}"
|
name: "{{$.Release.Name}}-{{$.Chart.Name}}"
|
||||||
annotations:
|
annotations:
|
||||||
devspace.isb/name: {{ $.Values.repository.name | quote }}
|
devspace.isb/name: {{ $.Values.repository.name | quote }}
|
||||||
devspace.isb/branch: {{ $.Values.repository.branch | quote }}
|
devspace.isb/branch: {{ $.Values.repository.branch | quote }}
|
||||||
@@ -10,7 +10,7 @@ metadata:
|
|||||||
{{- if $.Values.labels}}
|
{{- if $.Values.labels}}
|
||||||
{{- toYaml $.Values.labels | nindent 4 }}
|
{{- toYaml $.Values.labels | nindent 4 }}
|
||||||
{{- end}}
|
{{- end}}
|
||||||
app.kubernetes.io/name: {{$.Values.name}}
|
app.kubernetes.io/name: {{$.Chart.Name}}
|
||||||
app.kubernetes.io/instance: {{ $.Release.Name }}
|
app.kubernetes.io/instance: {{ $.Release.Name }}
|
||||||
app.kubernetes.io/version: {{ $.Chart.AppVersion | quote }}
|
app.kubernetes.io/version: {{ $.Chart.AppVersion | quote }}
|
||||||
spec:
|
spec:
|
||||||
@@ -23,7 +23,7 @@ spec:
|
|||||||
{{- end }}
|
{{- end }}
|
||||||
selector:
|
selector:
|
||||||
matchLabels:
|
matchLabels:
|
||||||
app.kubernetes.io/name: {{$.Values.name}}
|
app.kubernetes.io/name: {{$.Chart.Name}}
|
||||||
app.kubernetes.io/instance: {{ $.Release.Name }}
|
app.kubernetes.io/instance: {{ $.Release.Name }}
|
||||||
template:
|
template:
|
||||||
metadata:
|
metadata:
|
||||||
@@ -37,7 +37,7 @@ spec:
|
|||||||
{{- toYaml . | nindent 8 }}
|
{{- toYaml . | nindent 8 }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
labels:
|
labels:
|
||||||
app.kubernetes.io/name: {{$.Values.name}}
|
app.kubernetes.io/name: {{$.Chart.Name}}
|
||||||
app.kubernetes.io/instance: {{ $.Release.Name }}
|
app.kubernetes.io/instance: {{ $.Release.Name }}
|
||||||
{{/* app.kubernetes.io/version: {{ $.Chart.AppVersion | quote }}*/}}
|
{{/* app.kubernetes.io/version: {{ $.Chart.AppVersion | quote }}*/}}
|
||||||
spec:
|
spec:
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
apiVersion: networking.k8s.io/v1
|
apiVersion: networking.k8s.io/v1
|
||||||
kind: Ingress
|
kind: Ingress
|
||||||
metadata:
|
metadata:
|
||||||
name: {{$.Release.Name}}-{{$.Values.name}}
|
name: {{$.Release.Name}}-{{$.Chart.Name}}
|
||||||
namespace: {{$.Release.Namespace}}
|
namespace: {{$.Release.Namespace}}
|
||||||
annotations:
|
annotations:
|
||||||
traefik.ingress.kubernetes.io/router.middlewares: {{$.Release.Namespace}}-{{$.Release.Name}}-url-prefix@kubernetescrd
|
traefik.ingress.kubernetes.io/router.middlewares: {{$.Release.Namespace}}-{{$.Release.Name}}-url-prefix@kubernetescrd
|
||||||
@@ -14,6 +14,6 @@ spec:
|
|||||||
pathType: Prefix
|
pathType: Prefix
|
||||||
backend:
|
backend:
|
||||||
service:
|
service:
|
||||||
name: "{{ $.Release.Name }}-{{ $.Values.name }}"
|
name: "{{ $.Release.Name }}-{{ $.Chart.Name }}"
|
||||||
port:
|
port:
|
||||||
number: {{ $.Values.port }}
|
number: {{ $.Values.port }}
|
||||||
@@ -1,10 +1,10 @@
|
|||||||
apiVersion: v1
|
apiVersion: v1
|
||||||
kind: Service
|
kind: Service
|
||||||
metadata:
|
metadata:
|
||||||
name: "{{$.Release.Name}}-{{$.Values.name}}"
|
name: "{{$.Release.Name}}-{{$.Chart.Name}}"
|
||||||
spec:
|
spec:
|
||||||
selector:
|
selector:
|
||||||
app.kubernetes.io/name: {{$.Values.name}}
|
app.kubernetes.io/name: {{$.Chart.Name}}
|
||||||
app.kubernetes.io/instance: {{ $.Release.Name }}
|
app.kubernetes.io/instance: {{ $.Release.Name }}
|
||||||
ports:
|
ports:
|
||||||
- protocol: TCP
|
- protocol: TCP
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ services:
|
|||||||
generator: 'devspace-apiregistry-generator-service-agent'
|
generator: 'devspace-apiregistry-generator-service-agent'
|
||||||
keycloak:
|
keycloak:
|
||||||
jwk: 'http://192.168.76.150/realms/devspace-dev/protocol/openid-connect/certs'
|
jwk: 'http://192.168.76.150/realms/devspace-dev/protocol/openid-connect/certs'
|
||||||
claimName: 'development-space'
|
claimName: 'dev-space'
|
||||||
ingress:
|
ingress:
|
||||||
host: 'ui.devx.kube.xx'
|
host: 'ui.devx.kube.xx'
|
||||||
prefix: '/devspace-gateway'
|
prefix: '/devspace-gateway'
|
||||||
Reference in New Issue
Block a user