fix passes

This commit is contained in:
Vassiliy Yegorov
2021-05-20 14:52:35 +07:00
parent 1b42b9592f
commit 50716a55f2
3 changed files with 51 additions and 34 deletions

View File

@@ -25,6 +25,24 @@ spec:
imagePullPolicy: Always
ports:
- containerPort: 80
env:
- name: MARIADB_HOST
value: app-mariadb-service
- name: MARIADB_USER
valueFrom:
secretKeyRef:
name: myapp-mariadb-secret
key: mariadb-user
- name: MARIADB_PASSWORD
valueFrom:
secretKeyRef:
name: myapp-mariadb-secret
key: mariadb-password
- name: MARIADB_DATABASE
valueFrom:
secretKeyRef:
name: myapp-mariadb-secret
key: mariadb-dbname
---
apiVersion: apps/v1
@@ -32,55 +50,53 @@ kind: Deployment
metadata:
namespace: myapp
labels:
app: myapp-psql
name: myapp-psql
app: myapp-mariadb
name: myapp-mariadb
spec:
replicas: 1
selector:
matchLabels:
app: myapp-psql
app: myapp-mariadb
strategy:
type: Recreate
template:
metadata:
labels:
app: myapp-psql
app: myapp-mariadb
spec:
hostname: myapp-psql-pod
hostname: myapp-mariadb-pod
restartPolicy: Always
containers:
- name: myapp-db
image: postgres:12-alpine
imagePullPolicy: IfNotPresent
image: vasyakrg/php-db
imagePullPolicy: Always
env:
- name: POSTGRES_USER
- name: MARIADB_ROOT_PASSWORD
valueFrom:
secretKeyRef:
name: myapp-psql-secret
key: postgress-user
- name: POSTGRES_PASSWORD
name: myapp-mariadb-secret
key: mariadb-password
- name: MARIADB_USER
valueFrom:
secretKeyRef:
name: myapp-psql-secret
key: postgress-password
- name: POSTGRES_DB
name: myapp-mariadb-secret
key: mariadb-user
- name: MARIADB_PASSWORD
valueFrom:
secretKeyRef:
name: myapp-psql-secret
key: postgress-dbname
name: myapp-mariadb-secret
key: mariadb-password
- name: MARIADB_DATABASE
valueFrom:
secretKeyRef:
name: myapp-mariadb-secret
key: mariadb-dbname
volumeMounts:
- name: vol-myapp-postgres
mountPath: /var/lib/postgresql/data
- name: vol-myapp-mariadb
mountPath: /var/lib/mysql
subPath: data
- name: pgsql-tmpfs
mountPath: /run
- name: pgsql-tmpfs
mountPath: /tmp
volumes:
- name: vol-myapp-postgres
- name: vol-myapp-mariadb
persistentVolumeClaim:
claimName: myapp-db-pvc
- name: pgsql-tmpfs
emptyDir:
medium: Memory

View File

@@ -1,10 +1,10 @@
apiVersion: v1
kind: Secret
metadata:
name: myapp-psql-secret
name: myapp-mariadb-secret
namespace: myapp
data:
postgress-user: cmVzdHVzZXI=
postgress-password: dkVIQ1ZuN0NndXdGd0ViZXQySEMxQQ==
postgress-dbname: cmVzdGRi
mariadb-user: cmVzdHVzZXI=
mariadb-password: dkVIQ1ZuN0NndXdGd0ViZXQySEMxQQ==
mariadb-dbname: cmVzdGRi
---

View File

@@ -15,12 +15,13 @@ spec:
apiVersion: v1
kind: Service
metadata:
name: app-postgress-service
namespace: myapp
name: app-mariadb-service
spec:
type: NodePort
ports:
- name: myapp-postgress-port
port: 5432
- name: myapp-mariadb-port
port: 3306
selector:
app: myapp-psql
app: myapp-mariadb
---