Skip to content

Commit a134f82

Browse files
authored
Merge pull request #13 from testdrivenio/updates
bump dependencies
2 parents 375d33f + 0e6425c commit a134f82

12 files changed

+13048
-111
lines changed

deploy.sh

+1
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ kubectl create -f ./kubernetes/flask-service.yml
2828
echo "Adding the ingress..."
2929

3030
minikube addons enable ingress
31+
kubectl delete -A ValidatingWebhookConfiguration ingress-nginx-admission
3132
kubectl apply -f ./kubernetes/minikube-ingress.yml
3233

3334

docker-compose.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version: '3.7'
1+
version: '3.8'
22

33
services:
44

kubernetes/minikube-ingress.yml

+11-5
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
apiVersion: extensions/v1beta1
1+
apiVersion: networking.k8s.io/v1
22
kind: Ingress
33
metadata:
44
name: minikube-ingress
@@ -9,10 +9,16 @@ spec:
99
http:
1010
paths:
1111
- path: /
12+
pathType: Prefix
1213
backend:
13-
serviceName: vue
14-
servicePort: 8080
14+
service:
15+
name: vue
16+
port:
17+
number: 8080
1518
- path: /books
19+
pathType: Prefix
1620
backend:
17-
serviceName: flask
18-
servicePort: 5000
21+
service:
22+
name: flask
23+
port:
24+
number: 5000

kubernetes/postgres-deployment.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ spec:
1919
spec:
2020
containers:
2121
- name: postgres
22-
image: postgres:12.1-alpine
22+
image: postgres:13-alpine
2323
env:
2424
- name: POSTGRES_USER
2525
valueFrom:

services/client/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM node:13.7.0-alpine
1+
FROM node:15-alpine
22

33
RUN npm install -g http-server
44

services/client/Dockerfile-minikube

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM node:13.7.0-alpine
1+
FROM node:15-alpine
22

33
RUN npm install -g http-server
44

0 commit comments

Comments
 (0)