Skip to content

Commit f5030b2

Browse files
committed
update deployment yaml for apps/v1, bump dependency versions
1 parent fbaf8f3 commit f5030b2

File tree

11 files changed

+178
-51
lines changed

11 files changed

+178
-51
lines changed

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ Test it out at:
3333

3434
Install and run [Minikube](https://kubernetes.io/docs/setup/minikube/):
3535

36-
1. Install a [Hypervisor](https://kubernetes.io/docs/tasks/tools/install-minikube/#install-a-hypervisor) (like [VirtualBox](https://www.virtualbox.org/wiki/Downloads) or [HyperKit](https://github.com/moby/hyperkit)) to manage virtual machines
36+
1. Install a [Hypervisor](https://kubernetes.io/docs/tasks/tools/install-minikube/#install-a-hypervisor) (like [VirtualBox](https://www.virtualbox.org/wiki/Downloads) or [HyperKit](https://github.com/moby/hyperkit)) to manage virtual machines
3737
1. Install and Set Up [kubectl](https://kubernetes.io/docs/tasks/tools/install-kubectl/) to deploy and manage apps on Kubernetes
3838
1. Install [Minikube](https://github.com/kubernetes/minikube/releases)
3939

@@ -146,6 +146,7 @@ Build and push the image to Docker Hub:
146146
```sh
147147
$ docker build -t mjhea0/vue-kubernetes ./services/client \
148148
-f ./services/client/Dockerfile-minikube
149+
149150
$ docker push mjhea0/vue-kubernetes
150151
```
151152

kubernetes/flask-deployment.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,9 @@ metadata:
88
spec:
99
progressDeadlineSeconds: 2147483647
1010
replicas: 1
11-
revisionHistoryLimit: 2147483647
1211
selector:
1312
matchLabels:
1413
app: flask
15-
strategy:
16-
rollingUpdate:
17-
maxSurge: 1
18-
maxUnavailable: 1
19-
type: RollingUpdate
2014
template:
2115
metadata:
2216
creationTimestamp: null

kubernetes/postgres-deployment.yml

Lines changed: 13 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -8,39 +8,29 @@ metadata:
88
spec:
99
progressDeadlineSeconds: 2147483647
1010
replicas: 1
11-
revisionHistoryLimit: 2147483647
1211
selector:
1312
matchLabels:
1413
service: postgres
15-
strategy:
16-
rollingUpdate:
17-
maxSurge: 1
18-
maxUnavailable: 1
19-
type: RollingUpdate
2014
template:
2115
metadata:
2216
creationTimestamp: null
2317
labels:
2418
service: postgres
2519
spec:
2620
containers:
27-
- env:
28-
- name: POSTGRES_USER
29-
valueFrom:
30-
secretKeyRef:
31-
key: user
32-
name: postgres-credentials
33-
- name: POSTGRES_PASSWORD
34-
valueFrom:
35-
secretKeyRef:
36-
key: password
37-
name: postgres-credentials
38-
image: postgres:10.4-alpine
39-
imagePullPolicy: IfNotPresent
40-
name: postgres
41-
resources: {}
42-
terminationMessagePath: /dev/termination-log
43-
terminationMessagePolicy: File
21+
- name: postgres
22+
image: postgres:12.1-alpine
23+
env:
24+
- name: POSTGRES_USER
25+
valueFrom:
26+
secretKeyRef:
27+
name: postgres-credentials
28+
key: user
29+
- name: POSTGRES_PASSWORD
30+
valueFrom:
31+
secretKeyRef:
32+
name: postgres-credentials
33+
key: password
4434
volumeMounts:
4535
- mountPath: /var/lib/postgresql/data
4636
name: postgres-volume-mount

kubernetes/vue-deployment.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,9 @@ metadata:
88
spec:
99
progressDeadlineSeconds: 2147483647
1010
replicas: 1
11-
revisionHistoryLimit: 2147483647
1211
selector:
1312
matchLabels:
1413
app: vue
15-
strategy:
16-
rollingUpdate:
17-
maxSurge: 1
18-
maxUnavailable: 1
19-
type: RollingUpdate
2014
template:
2115
metadata:
2216
creationTimestamp: null

services/client/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM node:11.7.0-alpine
1+
FROM node:13.7.0-alpine
22

33
RUN npm install -g http-server
44

services/client/Dockerfile-minikube

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM node:11.7.0-alpine
1+
FROM node:13.7.0-alpine
22

33
RUN npm install -g http-server
44

services/client/package-lock.json

Lines changed: 148 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

services/client/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@
1111
"build": "node build/build.js"
1212
},
1313
"dependencies": {
14-
"axios": "^0.18.0",
15-
"bootstrap": "^4.1.1",
16-
"bootstrap-vue": "^2.0.0-rc.11",
17-
"vue": "^2.5.2",
18-
"vue-router": "^3.0.1"
14+
"axios": "^0.19.2",
15+
"bootstrap": "^4.4.1",
16+
"bootstrap-vue": "^2.2.2",
17+
"vue": "^2.6.11",
18+
"vue-router": "^3.1.5"
1919
},
2020
"devDependencies": {
2121
"autoprefixer": "^7.1.2",

services/db/dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# base image
2-
FROM postgres:10.4-alpine
2+
FROM postgres:12.1-alpine
33

44
# run create.sql on init
55
ADD create.sql /docker-entrypoint-initdb.d

services/server/dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# base image
2-
FROM python:3.7.2-slim
2+
FROM python:3.8.1-slim
33

44
# install netcat
55
RUN apt-get update && \

0 commit comments

Comments
 (0)