reverting init containers

main
Sven Ketelsen 4 years ago
parent 8029148d41
commit 506868b392

@ -132,5 +132,15 @@ spec:
value: "true" value: "true"
ports: ports:
- containerPort: 8080 - containerPort: 8080
initContainers:
- name: init-iam
image: busybox:1.28
command: ['sh', '-c', "until nslookup iam; do echo waiting for iam; sleep 2; done"]
- name: init-postgres
image: busybox:1.28
command: ['sh', '-c', "until nslookup {{ .Values.connect.datasource.host }}; do echo waiting for postgres; sleep 2; done"]
- name: init-elasticsearch
image: busybox:1.28
command: ['sh', '-c', "until nslookup {{ .Values.connect.elastic.host }}; do echo waiting for elastic; sleep 2; done"]
imagePullSecrets: imagePullSecrets:
- name: "{{ .Values.harbor.pull_secret }}" - name: "{{ .Values.harbor.pull_secret }}"

@ -0,0 +1,60 @@
---
apiVersion: v1
kind: Service
metadata:
name: "{{ .Values.sharedService.elastic.host01.name }}"
spec:
ports:
- protocol: TCP
port: 9200
targetPort: 9200
---
apiVersion: v1
kind: Endpoints
metadata:
name: "{{ .Values.sharedService.elastic.host01.name }}"
subsets:
- addresses:
- ip: {{ .Values.sharedService.elastic.host01.ip }}
ports:
- port: 9200
---
apiVersion: v1
kind: Service
metadata:
name: "{{ .Values.sharedService.elastic.host02.name }}"
spec:
ports:
- protocol: TCP
port: 9200
targetPort: 9200
---
apiVersion: v1
kind: Endpoints
metadata:
name: "{{ .Values.sharedService.elastic.host02.name }}"
subsets:
- addresses:
- ip: {{ .Values.sharedService.elastic.host02.ip }}
ports:
- port: 9200
---
apiVersion: v1
kind: Service
metadata:
name: "{{ .Values.sharedService.elastic.host03.name }}"
spec:
ports:
- protocol: TCP
port: 9200
targetPort: 9200
---
apiVersion: v1
kind: Endpoints
metadata:
name: "{{ .Values.sharedService.elastic.host03.name }}"
subsets:
- addresses:
- ip: {{ .Values.sharedService.elastic.host03.ip }}
ports:
- port: 9200

@ -0,0 +1,20 @@
---
apiVersion: v1
kind: Service
metadata:
name: "{{ .Values.sharedService.maria.host.name }}"
spec:
ports:
- protocol: TCP
port: 3306
targetPort: 3306
---
apiVersion: v1
kind: Endpoints
metadata:
name: "{{ .Values.sharedService.maria.host.name }}"
subsets:
- addresses:
- ip: {{ .Values.sharedService.maria.host.ip }}
ports:
- port: 3306

@ -0,0 +1,20 @@
---
apiVersion: v1
kind: Service
metadata:
name: "{{ .Values.sharedService.postgres.host.name }}"
spec:
ports:
- protocol: TCP
port: 5432
targetPort: 5432
---
apiVersion: v1
kind: Endpoints
metadata:
name: "{{ .Values.sharedService.postgres.host.name }}"
subsets:
- addresses:
- ip: {{ .Values.sharedService.postgres.host.ip }}
ports:
- port: 5432

@ -16,10 +16,10 @@ spec:
# runAsUser: 33 # runAsUser: 33
# runAsGroup: 33 # runAsGroup: 33
# fsGroup: 33 # fsGroup: 33
# volumes: volumes:
# - name: wordpress-content - name: wordpress-content
# persistentVolumeClaim: persistentVolumeClaim:
# claimName: wordpress-content-pvc claimName: wordpress-content-pvc
hostAliases: hostAliases:
- ip: "{{ .Values.sharedService.keycloak.host.ip }}" - ip: "{{ .Values.sharedService.keycloak.host.ip }}"
hostnames: hostnames:
@ -88,8 +88,12 @@ spec:
key: AUTH_TOKEN key: AUTH_TOKEN
ports: ports:
- containerPort: 80 - containerPort: 80
# volumeMounts: initContainers:
# - name: wordpress-content - name: init-maria
# mountPath: /var/www/html/wp-content image: busybox:1.28
command: ['sh', '-c', "until nslookup {{ .Values.wordpress.database.host }}; do echo waiting for maria; sleep 2; done"]
volumeMounts:
- name: wordpress-content
mountPath: /var/www/html/wp-content
imagePullSecrets: imagePullSecrets:
- name: "{{ .Values.harbor.pull_secret }}" - name: "{{ .Values.harbor.pull_secret }}"

@ -14,7 +14,7 @@ connect:
username: "connect-admin" username: "connect-admin"
password: "connect-admin" password: "connect-admin"
database: database:
host: "10.0.0.19" host: "dev-postgres-01"
port: "5432" port: "5432"
name: "dev_mobene_nsodev_connect" name: "dev_mobene_nsodev_connect"
username: "dev_mobene_nsodev_connect" username: "dev_mobene_nsodev_connect"
@ -56,7 +56,7 @@ wordpress:
version: "latest" version: "latest"
name: "smardigo/wordpress" name: "smardigo/wordpress"
database: database:
host: "10.0.0.16" host: "dev-maria-01"
port: "3306" port: "3306"
username: "dev_mobene_nsodev_connect_wordpress" username: "dev_mobene_nsodev_connect_wordpress"
password: "connect-wordpress-maria-admin" password: "connect-wordpress-maria-admin"

Loading…
Cancel
Save