chore: removed release name

main
Sven Ketelsen 4 years ago
parent 23dd09b3d0
commit b6931e6d19

@ -1,16 +1,16 @@
apiVersion: apps/v1 apiVersion: apps/v1
kind: Deployment kind: Deployment
metadata: metadata:
name: "{{ .Release.Name }}-connect" name: "connect"
spec: spec:
replicas: 1 replicas: 1
selector: selector:
matchLabels: matchLabels:
app: "{{ .Release.Name }}-connect" app: "connect"
template: template:
metadata: metadata:
labels: labels:
app: "{{ .Release.Name }}-connect" app: "connect"
spec: spec:
hostAliases: hostAliases:
- ip: "{{ .Values.sharedService.keycloak.host.ip }}" - ip: "{{ .Values.sharedService.keycloak.host.ip }}"
@ -21,7 +21,7 @@ spec:
secret: secret:
secretName: elastic-client-cert secretName: elastic-client-cert
containers: containers:
- name: "{{ .Release.Name }}-connect" - name: "connect"
image: "{{ .Values.harbor.host.name }}/{{ .Values.connect.image.name }}:{{ .Values.connect.image.version }}" image: "{{ .Values.harbor.host.name }}/{{ .Values.connect.image.name }}:{{ .Values.connect.image.version }}"
imagePullPolicy: Always imagePullPolicy: Always
volumeMounts: volumeMounts:
@ -40,7 +40,7 @@ spec:
- name: SMA_JWT_SECRET - name: SMA_JWT_SECRET
valueFrom: valueFrom:
secretKeyRef: secretKeyRef:
name: "{{ .Release.Name }}-connect-secrets" name: "connect-secrets"
key: JWT_SECRET key: JWT_SECRET
- name: SPRING_PROFILES_INCLUDE - name: SPRING_PROFILES_INCLUDE
@ -80,7 +80,7 @@ spec:
- name: IAM_CLIENT_ENABLED - name: IAM_CLIENT_ENABLED
value: "true" value: "true"
- name: EXTERNAL_IAM_SERVER_URL - name: EXTERNAL_IAM_SERVER_URL
value: "http://{{ .Release.Name }}-iam:8080" value: "http://iam:8080"
- name: MAIL_PROTOCOL - name: MAIL_PROTOCOL
value: "smtp" value: "smtp"
@ -123,7 +123,7 @@ spec:
initContainers: initContainers:
- name: init-iam - name: init-iam
image: busybox:1.28 image: busybox:1.28
command: ['sh', '-c', "until nslookup {{ .Release.Name }}-iam; do echo waiting for iam; sleep 2; done"] command: ['sh', '-c', "until nslookup iam; do echo waiting for iam; sleep 2; done"]
- name: init-postgres - name: init-postgres
image: busybox:1.28 image: busybox:1.28
command: ['sh', '-c', "until nslookup {{ .Values.connect.datasource.host }}; do echo waiting for postgres; sleep 2; done"] command: ['sh', '-c', "until nslookup {{ .Values.connect.datasource.host }}; do echo waiting for postgres; sleep 2; done"]

@ -15,7 +15,7 @@ spec:
paths: paths:
- backend: - backend:
service: service:
name: "{{ .Release.Name }}-connect" name: "connect"
port: port:
number: 8080 number: 8080
path: / path: /

@ -1,7 +1,7 @@
apiVersion: v1 apiVersion: v1
kind: Secret kind: Secret
metadata: metadata:
name: {{ .Release.Name }}-connect-secrets name: connect-secrets
data: data:
JWT_SECRET: ZDI3NTJjNjU3NTU4NDg5Yzg3MjEyZTJhMjkyYTcyNjk= JWT_SECRET: ZDI3NTJjNjU3NTU4NDg5Yzg3MjEyZTJhMjkyYTcyNjk=
AUTH_TOKEN: ZXlKbGJtTWlPaUpCTVRJNFEwSkRMVWhUTWpVMklpd2lZV3huSWpvaVpHbHlJbjAuLm5PV2xhZXRhM0swaHpwZ2dXaWNBeXcuaVc5ZF9tUmhKVm1FRzZGT3plT1BQY2VvNTRIMTBzdkZJWDlya1ZqcnZhUS5kSDNfQVlOOUZ1MV9hamk0MkpMY0h3 AUTH_TOKEN: ZXlKbGJtTWlPaUpCTVRJNFEwSkRMVWhUTWpVMklpd2lZV3huSWpvaVpHbHlJbjAuLm5PV2xhZXRhM0swaHpwZ2dXaWNBeXcuaVc5ZF9tUmhKVm1FRzZGT3plT1BQY2VvNTRIMTBzdkZJWDlya1ZqcnZhUS5kSDNfQVlOOUZ1MV9hamk0MkpMY0h3

@ -1,10 +1,10 @@
apiVersion: v1 apiVersion: v1
kind: Service kind: Service
metadata: metadata:
name: "{{ .Release.Name }}-connect" name: "connect"
spec: spec:
selector: selector:
app: "{{ .Release.Name }}-connect" app: "connect"
type: NodePort type: NodePort
ports: ports:
- port: 8080 - port: 8080

@ -1,23 +1,23 @@
apiVersion: apps/v1 apiVersion: apps/v1
kind: Deployment kind: Deployment
metadata: metadata:
name: "{{ .Release.Name }}-iam" name: "iam"
spec: spec:
replicas: 1 replicas: 1
selector: selector:
matchLabels: matchLabels:
app: "{{ .Release.Name }}-iam" app: "iam"
template: template:
metadata: metadata:
labels: labels:
app: "{{ .Release.Name }}-iam" app: "iam"
spec: spec:
hostAliases: hostAliases:
- ip: "{{ .Values.sharedService.keycloak.host.ip }}" - ip: "{{ .Values.sharedService.keycloak.host.ip }}"
hostnames: hostnames:
- "{{ .Values.sharedService.keycloak.host.name }}" - "{{ .Values.sharedService.keycloak.host.name }}"
containers: containers:
- name: "{{ .Release.Name }}-iam" - name: "iam"
image: "{{ .Values.harbor.host.name }}/{{ .Values.iam.image.name }}:{{ .Values.iam.image.version }}" image: "{{ .Values.harbor.host.name }}/{{ .Values.iam.image.name }}:{{ .Values.iam.image.version }}"
imagePullPolicy: Always imagePullPolicy: Always
env: env:

@ -1,10 +1,10 @@
apiVersion: v1 apiVersion: v1
kind: Service kind: Service
metadata: metadata:
name: "{{ .Release.Name }}-iam" name: "iam"
spec: spec:
selector: selector:
app: "{{ .Release.Name }}-iam" app: "iam"
type: NodePort type: NodePort
ports: ports:
- port: 8080 - port: 8080

@ -61,8 +61,8 @@ connect:
password: password:
properties: properties:
simulation: true simulation: true
base_url: "https://dev-teanant-cluster-connect.smardigo.digital" base_url: "https://dev-mobene-nsodev-connect.smardigo.digital"
base_url_extern: "https://dev-teanant-cluster.smardigo.digital" base_url_extern: "https://dev-mobene-nsodev-connect.smardigo.digital"
sender: "noreply-connect@netgo.de" sender: "noreply-connect@netgo.de"
sender_alias: "noreply-connect" sender_alias: "noreply-connect"

Loading…
Cancel
Save