Skip to content
This repository was archived by the owner on Jul 18, 2024. It is now read-only.

Commit 9b0de9a

Browse files
committed
Fix images used for core deployment
Images from gameontext dockerhub repo removed images that were using amalgam8 sidecars. This fix replaces the image in the deployment to use built images from old source that are still using a8 sidecars. The gameon-proxy configuration is also modified to use kubernetes service names and port for core services. Local volume is configured for PersistentVolumeClaim to use user-created PersistentVolume.
1 parent 02ac8ca commit 9b0de9a

10 files changed

Lines changed: 31 additions & 21 deletions

File tree

containers/gameon-proxy/haproxy-dev.cfg

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ frontend logstash-lumberjack
3434
default_backend logstash-lumberjack
3535

3636
frontend frontend-ssl
37-
bind *:443 ssl crt /keystore/proxy.pem
37+
bind *:443 ssl crt /etc/ssl/proxy.pem
3838
mode http
3939
option httplog
4040

@@ -94,7 +94,7 @@ backend room
9494
option httplog
9595
option httpchk HEAD / HTTP/1.1\r\nHost:localhost
9696
balance roundrobin
97-
server room1 PLACEHOLDER_DOCKERHOST:30980 check
97+
server room1 room:9080 check
9898

9999
backend roomjs
100100
mode http
@@ -107,33 +107,33 @@ backend map
107107
option httplog
108108
option httpchk GET /map/v1/health HTTP/1.1\r\nHost:localhost
109109
balance roundrobin
110-
server map1 PLACEHOLDER_DOCKERHOST:30947 ssl check check-ssl verify none
110+
server map1 map:9443 ssl check check-ssl verify none
111111

112112
backend mediator
113113
mode http
114114
option httplog
115115
balance roundrobin
116-
server mediator1 PLACEHOLDER_DOCKERHOST:30946 ssl check check-ssl verify none
116+
server mediator1 mediator:9443 ssl check check-ssl verify none
117117

118118
backend auth
119119
mode http
120120
option httplog
121121
option httpchk GET /auth/health HTTP/1.1\r\nHost:localhost
122122
balance roundrobin
123-
server auth1 PLACEHOLDER_DOCKERHOST:30949 ssl check check-ssl verify none
123+
server auth1 auth:9443 ssl check check-ssl verify none
124124

125125
backend player
126126
mode http
127127
option httplog
128128
balance roundrobin
129-
server player1 PLACEHOLDER_DOCKERHOST:30943 ssl check check-ssl verify none
129+
server player1 player:9443 ssl check check-ssl verify none
130130

131131
backend static-content
132132
mode http
133133
option httpchk HEAD / HTTP/1.1\r\nHost:localhost
134134
option httplog
135135
balance roundrobin
136-
server webapp1 PLACEHOLDER_DOCKERHOST:30880 check inter 1m
136+
server webapp1 webapp:8080 check inter 1m
137137

138138
backend logstash-lumberjack
139139
mode tcp

containers/gameon-proxy/startup.sh

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,24 +46,23 @@ if [ "$ETCDCTL_ENDPOINT" != "" ]; then
4646
export A8_CONTROLLER_POLL=$(etcdctl get /amalgam8/controllerPoll)
4747
JWT=$(etcdctl get /amalgam8/jwt)
4848

49-
sudo service rsyslog start
49+
sudo service rsyslog start
5050

5151
echo Starting haproxy...
52-
if [ -z "$A8_REGISTRY_URL" ]; then
52+
if [ -z "$A8_REGISTRY_URL" ]; then
5353
#no a8, just run haproxy.
5454
haproxy -f $PROXY_CONFIG
5555
else
5656
#a8, configure security, and run via sidecar.
57-
if [ ! -z "$JWT" ]; then
57+
if [ ! -z "$JWT" ]; then
5858
export A8_REGISTRY_TOKEN=$JWT
5959
export A8_CONTROLLER_TOKEN=$JWT
60-
fi
60+
fi
6161
exec a8sidecar --proxy haproxy -f $PROXY_CONFIG
62-
fi
62+
fi
6363
echo HAProxy shut down
6464
else
6565
echo HAProxy will log to STDOUT--this is dev environment.
6666
sed -i s/PLACEHOLDER_PASSWORD/$ADMIN_PASSWORD/g /etc/haproxy/haproxy-dev.cfg
67-
sed -i s/PLACEHOLDER_DOCKERHOST/$PROXY_DOCKER_HOST/g /etc/haproxy/haproxy-dev.cfg
6867
exec a8sidecar --proxy haproxy -f /etc/haproxy/haproxy-dev.cfg
6968
fi

core/auth.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,8 @@ spec:
3737
tier: auth
3838
spec:
3939
containers:
40-
- image: gameontext/gameon-auth
40+
- image: anthonyamanse/gameon-auth:latest
41+
imagePullPolicy: Always
4142
name: auth
4243
env:
4344
- name: service_map

core/map.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,8 @@ spec:
3737
tier: map
3838
spec:
3939
containers:
40-
- image: gameontext/gameon-map
40+
- image: anthonyamanse/gameon-map:latest
41+
imagePullPolicy: Always
4142
name: map
4243
env:
4344
- name: service_map

core/mediator.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,8 @@ spec:
3737
tier: mediator
3838
spec:
3939
containers:
40-
- image: gameontext/gameon-mediator
40+
- image: anthonyamanse/gameon-mediator:latest
41+
imagePullPolicy: Always
4142
name: mediator
4243
env:
4344
- name: service_map

core/player.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,8 @@ spec:
4242
tier: player
4343
spec:
4444
containers:
45-
- image: gameontext/gameon-player
45+
- image: anthonyamanse/gameon-player:latest
46+
imagePullPolicy: Always
4647
name: player
4748
env:
4849
- name: service_map

core/proxy.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,8 @@ spec:
4242
tier: proxy
4343
spec:
4444
containers:
45-
- image: anthonyamanse/gameon-proxy
45+
- image: anthonyamanse/gameon-proxy:0.1
46+
imagePullPolicy: Always
4647
name: proxy
4748
env:
4849
- name: service_map

core/room.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,8 @@ spec:
3737
tier: room
3838
spec:
3939
containers:
40-
- image: gameontext/gameon-room
40+
- image: anthonyamanse/gameon-room:latest
41+
imagePullPolicy: Always
4142
name: room
4243
env:
4344
- name: service_map

core/webapp.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@ spec:
3232
tier: webapp
3333
spec:
3434
containers:
35-
- image: gameontext/gameon-webapp
35+
- image: anthonyamanse/gameon-webapp:latest
36+
imagePullPolicy: Always
3637
name: webapp
3738
env:
3839
- name: service_map

local-volume.yaml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,15 @@ apiVersion: v1
1717
kind: PersistentVolumeClaim
1818
metadata:
1919
name: keystore-claim
20+
annotations: # comment line if you want to use a StorageClass
21+
# or specify which StorageClass
22+
volume.beta.kubernetes.io/storage-class: "" # comment line if you
23+
# want to use a StorageClass or specify which StorageClass
2024
labels:
2125
app: gameon
2226
spec:
2327
accessModes:
2428
- ReadWriteOnce
2529
resources:
2630
requests:
27-
storage: 20Gi
31+
storage: 20Gi

0 commit comments

Comments
 (0)