diff --git a/manifest.yaml b/manifest.yaml index 7dd904db06381cedadda1788fe032e0f5b8c9b83..a0ca9324965d1dc8f3cf6c92357f0fad3f5afaf1 100644 --- a/manifest.yaml +++ b/manifest.yaml @@ -37,39 +37,39 @@ spec: app: postgresql tier: postgreSQL spec: - containers: - - image: postgres:9.6.2-alpine - name: postgresql - env: - - name: POSTGRES_USER - valueFrom: - secretKeyRef: - name: postgresql-credentials - key: username - - name: POSTGRES_DB - valueFrom: - secretKeyRef: - name: postgresql-credentials - key: database - - name: POSTGRES_PASSWORD - valueFrom: - secretKeyRef: - name: postgresql-credentials - key: password - ports: - - containerPort: 5432 - name: postgresql - volumeMounts: - - name: postgresql - mountPath: /var/lib/postgresql/data - subPath: data - volumes: - - name: postgresql - persistentVolumeClaim: - claimName: postgres-claim - - name: postgresql-credentials - secret: - secretName: postgresql + containers: + - image: postgres:9.6.2-alpine + name: postgresql + env: + - name: POSTGRES_USER + valueFrom: + secretKeyRef: + name: postgresql-credentials + key: username + - name: POSTGRES_DB + valueFrom: + secretKeyRef: + name: postgresql-credentials + key: database + - name: POSTGRES_PASSWORD + valueFrom: + secretKeyRef: + name: postgresql-credentials + key: password + ports: + - containerPort: 5432 + name: postgresql + volumeMounts: + - name: postgresql + mountPath: /var/lib/postgresql/data + subPath: data + volumes: + - name: postgresql + persistentVolumeClaim: + claimName: postgres-claim + - name: postgresql-credentials + secret: + secretName: postgresql --- apiVersion: v1 kind: Service @@ -97,32 +97,32 @@ spec: labels: app: polls spec: - containers: - name: polls-app - image: $CI_REGISTRY_IMAGE/$CI_COMMIT_REF_NAME/polls:${CI_COMMIT_SHORT_SHA} - imagePullPolicy: Always - env: - - name: DATABASE_NAME - valueFrom: - secretKeyRef: - name: postgresql-credentials - key: database - - name: DATABASE_USER - valueFrom: - secretKeyRef: - name: postgresql-credentials - key: username - - name: DATABASE_PASSWORD - valueFrom: - secretKeyRef: - name: postgresql-credentials - key: password - ports: - - containerPort: 8080 - volumes: - - name: postgresql-credentials - secret: - secretName: postgresql + containers: + - name: polls-app + image: $CI_REGISTRY_IMAGE/$CI_COMMIT_REF_NAME/polls:${CI_COMMIT_SHORT_SHA} + imagePullPolicy: Always + env: + - name: DATABASE_NAME + valueFrom: + secretKeyRef: + name: postgresql-credentials + key: database + - name: DATABASE_USER + valueFrom: + secretKeyRef: + name: postgresql-credentials + key: username + - name: DATABASE_PASSWORD + valueFrom: + secretKeyRef: + name: postgresql-credentials + key: password + ports: + - containerPort: 8080 + volumes: + - name: postgresql-credentials + secret: + secretName: postgresql --- apiVersion: v1 kind: Service