Skip to content

Commit 265fd4d

Browse files
AnthonyAmanseAnthonyAmanse
committed
Updated README and scripts
1 parent 4544876 commit 265fd4d

File tree

10 files changed

+99
-27
lines changed

10 files changed

+99
-27
lines changed

‎.DS_Store‎

0 Bytes
Binary file not shown.

‎core/auth.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,4 +113,4 @@ spec:
113113
volumes:
114114
- name: keystore
115115
persistentVolumeClaim:
116-
claimName: keystore-claim
116+
claimName: keystore-claim

‎core/map.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,4 +113,4 @@ spec:
113113
volumes:
114114
- name: keystore
115115
persistentVolumeClaim:
116-
claimName: keystore-claim
116+
claimName: keystore-claim

‎core/mediator.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ spec:
7979
- name: LICENSE
8080
value : accept
8181
- name: PROXY_DOCKER_HOST
82-
value : '169.47.241.213'
82+
value : ''
8383
- name: ADMIN_PASSWORD
8484
value : admin
8585
- name: WLP_SKIP_MAXPERMSIZE
@@ -113,4 +113,4 @@ spec:
113113
volumes:
114114
- name: keystore
115115
persistentVolumeClaim:
116-
claimName: keystore-claim
116+
claimName: keystore-claim

‎core/player.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,4 +120,4 @@ spec:
120120
volumes:
121121
- name: keystore
122122
persistentVolumeClaim:
123-
claimName: keystore-claim
123+
claimName: keystore-claim

‎core/room.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,4 +113,4 @@ spec:
113113
volumes:
114114
- name: keystore
115115
persistentVolumeClaim:
116-
claimName: keystore-claim
116+
claimName: keystore-claim

‎core/webapp.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,4 +103,4 @@ spec:
103103
- containerPort: 80
104104
name: webapp-2
105105
- containerPort: 443
106-
name: webapp-3
106+
name: webapp-3

‎scripts/replace_ip_OSX.sh‎

Lines changed: 45 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,51 @@
22
kubectl get nodes
33
IP_ADDR=$(kubectl get nodes | grep Ready | awk '{print $1}' | head -1)
44

5-
if [ -z "$IP_ADDR" ]
5+
if [ -z $1 ]
66
then
7-
echo "IP Address not found"
8-
exit 1
9-
fi
7+
defaultIP=$(cat core/* | grep 169.47.241.213)
8+
if [[ -z $defaultIP ]]
9+
then
10+
echo "169.47.241.213 not found in yaml files. Please use ./scripts/replace_ip_<your-os>.sh <IP-in-the-yaml-files-you-want-to-replace>"
11+
else
12+
echo "Replacing 169.47.241.213 to $IP_ADDR in core/*.yaml and setup.yaml"
13+
for filename in core/*.yaml
14+
do
15+
sed -i '' s#169\.47\.241\.213#$IP_ADDR# $filename
16+
done
1017

11-
for filename in core/*.yaml
12-
do
13-
sed -i '' s#169\.47\.241\.213#$IP_ADDR# $filename
14-
done
18+
sed -i '' s#169\.47\.241\.213#$IP_ADDR# setup.yaml
19+
fi
20+
else
21+
ip=$1
22+
if [[ $ip =~ ^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$ ]]
23+
then
24+
OIFS=$IFS
25+
IFS='.'
26+
ip=($ip)
27+
IFS=$OIFS
28+
[[ ${ip[0]} -le 255 && ${ip[1]} -le 255 \
29+
&& ${ip[2]} -le 255 && ${ip[3]} -le 255 ]]
30+
stat=$?
31+
if [ $stat -eq 0 ]
32+
then
33+
prevIP=$(cat core/* | grep $1)
34+
if [[ -z $prevIP ]]
35+
then
36+
echo "$1 not found in yaml files. Please check your yaml files."
37+
else
1538

16-
sed -i '' s#169\.47\.241\.213#$IP_ADDR# setup.yaml
39+
echo "Replacing $1 to $IP_ADDR in core/*.yaml and setup.yaml"
40+
for filename in core/*.yaml
41+
do
42+
sed -i '' s#$1#$IP_ADDR# $filename
43+
done
44+
sed -i '' s#$1#$IP_ADDR# setup.yaml
45+
fi
46+
else
47+
echo "Invalid IP"
48+
fi
49+
else
50+
echo "Invalid IP format"
51+
fi
52+
fi

‎scripts/replace_ip_linux.sh‎

Lines changed: 45 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,51 @@
22
kubectl get nodes
33
IP_ADDR=$(kubectl get nodes | grep Ready | awk '{print $1}' | head -1)
44

5-
if [ -z "$IP_ADDR" ]
5+
if [ -z $1 ]
66
then
7-
echo "IP Address not found"
8-
exit 1
9-
fi
7+
defaultIP=$(cat core/* | grep 169.47.241.213)
8+
if [[ -z $defaultIP ]]
9+
then
10+
echo "169.47.241.213 not found in yaml files. Please use ./scripts/replace_ip_<your-os>.sh <IP-in-the-yaml-files-you-want-to-replace>"
11+
else
12+
echo "Replacing 169.47.241.213 to $IP_ADDR in core/*.yaml and setup.yaml"
13+
for filename in core/*.yaml
14+
do
15+
sed -i s#169\.47\.241\.213#$IP_ADDR# $filename
16+
done
1017

11-
for filename in core/*.yaml
12-
do
13-
sed -i s#169\.47\.241\.213#$IP_ADDR# $filename
14-
done
18+
sed -i s#169\.47\.241\.213#$IP_ADDR# setup.yaml
19+
fi
20+
else
21+
ip=$1
22+
if [[ $ip =~ ^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$ ]]
23+
then
24+
OIFS=$IFS
25+
IFS='.'
26+
ip=($ip)
27+
IFS=$OIFS
28+
[[ ${ip[0]} -le 255 && ${ip[1]} -le 255 \
29+
&& ${ip[2]} -le 255 && ${ip[3]} -le 255 ]]
30+
stat=$?
31+
if [ $stat -eq 0 ]
32+
then
33+
prevIP=$(cat core/* | grep $1)
34+
if [[ -z $prevIP ]]
35+
then
36+
echo "$1 not found in yaml files. Please check your yaml files."
37+
else
1538

16-
sed -i s#169\.47\.241\.213#$IP_ADDR# setup.yaml
39+
echo "Replacing $1 to $IP_ADDR in core/*.yaml and setup.yaml"
40+
for filename in core/*.yaml
41+
do
42+
sed -i s#$1#$IP_ADDR# $filename
43+
done
44+
sed -i s#$1#$IP_ADDR# setup.yaml
45+
fi
46+
else
47+
echo "Invalid IP"
48+
fi
49+
else
50+
echo "Invalid IP format"
51+
fi
52+
fi

‎setup.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ spec:
1212
image: anthonyamanse/keystore
1313
env:
1414
- name: IP
15-
value: 169.47.241.213
15+
value: '169.47.241.213'
1616
volumeMounts:
1717
- name: keystore
1818
mountPath: /tmp/keystore/
1919
volumes:
2020
- name: keystore
2121
persistentVolumeClaim:
22-
claimName: keystore-claim
22+
claimName: keystore-claim

0 commit comments

Comments
 (0)