Skip to content

Commit

Permalink
default setting update
Browse files Browse the repository at this point in the history
  • Loading branch information
DannyYang committed Oct 15, 2023
1 parent 072a03f commit d6df23d
Show file tree
Hide file tree
Showing 18 changed files with 22 additions and 118 deletions.
5 changes: 1 addition & 4 deletions backend/src/main/resources/application.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,10 @@ server:
port: 8081
servlet:
context-path: /VoteService


spring:
redis:
redisson:
file: classpath:redisson.yml

vote:
question: "這季NBA冠軍賽,你支持哪一隊呢?"
options:
Expand All @@ -24,4 +21,4 @@ vote:
- optionId: "04"
label: "勇士"
bgColor: "#006BB6"


1 change: 0 additions & 1 deletion cluster1-IP.txt

This file was deleted.

1 change: 0 additions & 1 deletion cluster2-IP.txt

This file was deleted.

6 changes: 3 additions & 3 deletions deploy/dev/api-configMap.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: v1
data:
application.yml: "server:\n port: 8081\n servlet:\n context-path: /VoteService\n\nspring:\n
\ redis:\n redisson:\n file: file:///app/config/redisson.yml\n \nvote:\n
application.yml: "server:\n port: 8081\n servlet:\n context-path: /VoteService\nspring:\n
\ redis:\n redisson:\n file: file:///app/config/redisson.yml\nvote:\n
\ question: \"這季NBA冠軍賽,你支持哪一隊呢?\"\n options:\n - optionId: \"01\"\n label:
\"金塊\"\n bgColor: \"#000000\"\n - optionId: \"02\"\n label: \"熱火\"\n
\ bgColor: \"#FF4500\"\n - optionId: \"03\"\n label: \"湖人\"\n bgColor:
Expand Down Expand Up @@ -36,4 +36,4 @@ kind: ConfigMap
metadata:
creationTimestamp: null
name: vote-api-dev-configmap
namespace: default
namespace: dev
4 changes: 2 additions & 2 deletions deploy/dev/api-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
labels:
app: vote-app-dev
name: vote-api-dev
namespace: default
namespace: dev
spec:
replicas: 1
selector:
Expand All @@ -18,7 +18,7 @@ spec:
vote-config-version: v1
spec:
containers:
- image: yjring/vote-api:2.0.0
- image: yjring/vote-api:0.1.0
name: vote-api
imagePullPolicy: Always
resources:
Expand Down
6 changes: 3 additions & 3 deletions deploy/dev/api-ingress.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ apiVersion: networking.k8s.io/v1
kind: Ingress
metadata:
name: api-ingress
namespace: default
namespace: dev
spec:
rules:
- host: 20.204.78.115.sslip.io #這邊改成你的Cluster1叢集的{IP}.sslip.io
- host: localhost
http:
paths:
- pathType: Prefix
Expand All @@ -14,4 +14,4 @@ spec:
service:
name: vote-api-dev-svc
port:
number: 8081
number: 8081
2 changes: 1 addition & 1 deletion deploy/dev/api-service.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
labels:
app: vote-app-dev-svc
name: vote-api-dev-svc
namespace: default
namespace: dev
spec:
ports:
- name: http
Expand Down
4 changes: 2 additions & 2 deletions deploy/dev/redis-configMap.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
labels:
app: vote-app-dev
name: vote-api-dev-redis-configmap
namespace: default
namespace: dev
data:
redis.conf: |-
protected-mode yes
Expand Down Expand Up @@ -77,4 +77,4 @@ data:
hz 10
dynamic-hz yes
aof-rewrite-incremental-fsync yes
rdb-save-incremental-fsync yes
rdb-save-incremental-fsync yes
2 changes: 1 addition & 1 deletion deploy/dev/redis-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
name: redis-deployment
labels:
app: vote-api-dev-redis
namespace: default
namespace: dev
spec:
replicas: 1
selector:
Expand Down
2 changes: 1 addition & 1 deletion deploy/dev/redis-service.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
labels:
app: vote-app-uat
name: vote-api-dev-redis
namespace: default
namespace: dev
spec:
ports:
- name: tcp
Expand Down
2 changes: 1 addition & 1 deletion deploy/dev/ui-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: apps/v1
kind: Deployment
metadata:
name: vote-ui
namespace: default
namespace: dev
spec:
replicas: 1
selector:
Expand Down
6 changes: 3 additions & 3 deletions deploy/dev/ui-ingress.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@ apiVersion: networking.k8s.io/v1
kind: Ingress
metadata:
name: ui-ingress
namespace: default
namespace: dev
annotations:
nginx.ingress.kubernetes.io/rewrite-target: /
spec:
rules:
- host: 20.204.78.115.sslip.io #這邊改成你的Cluster1叢集的{IP}.sslip.io
- host: localhost
http:
paths:
- pathType: Prefix
Expand All @@ -16,4 +16,4 @@ spec:
service:
name: vote-ui-dev-svc
port:
number: 80
number: 80
4 changes: 2 additions & 2 deletions deploy/dev/ui-service.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@ apiVersion: v1
kind: Service
metadata:
name: vote-ui-dev-svc
namespace: default
namespace: dev
spec:
selector:
app: vote-ui
type: ClusterIP
ports:
- protocol: TCP
port: 80
targetPort: 80
targetPort: 80
2 changes: 1 addition & 1 deletion deploy/uat/api-configMap.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,4 @@ kind: ConfigMap
metadata:
creationTimestamp: null
name: vote-api-dev-configmap
namespace: default
namespace: uat
2 changes: 1 addition & 1 deletion deploy/uat/api-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
labels:
app: vote-app-dev
name: vote-api-dev
namespace: default
namespace: uat
spec:
replicas: 1
selector:
Expand Down
1 change: 0 additions & 1 deletion dockerAccount.txt

This file was deleted.

44 changes: 0 additions & 44 deletions setup.ps1

This file was deleted.

46 changes: 0 additions & 46 deletions setup.sh

This file was deleted.

0 comments on commit d6df23d

Please sign in to comment.