rubypitaya 2.24.0 → 2.25.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (13) hide show
  1. checksums.yaml +4 -4
  2. data/lib/rubypitaya/app-template/Gemfile +1 -1
  3. data/lib/rubypitaya/app-template/Gemfile.lock +2 -2
  4. data/lib/rubypitaya/app-template/helm/templates/config-maps/nginx-config.yaml +2 -2
  5. data/lib/rubypitaya/app-template/helm/templates/deployments/gameserver-nginx.yaml +2 -2
  6. data/lib/rubypitaya/app-template/helm/templates/deployments/rubypitaya.yaml +6 -6
  7. data/lib/rubypitaya/app-template/helm/templates/pods/gameserver.yaml +21 -0
  8. data/lib/rubypitaya/app-template/helm/templates/services/gameserver-nginx.yaml +2 -2
  9. data/lib/rubypitaya/app-template/helm/templates/services/gameserver.yaml +6 -13
  10. data/lib/rubypitaya/app-template/helm/values.yaml +2 -1
  11. data/lib/rubypitaya/core/spec-helpers/handler_spec_helper.rb +5 -5
  12. data/lib/rubypitaya/version.rb +1 -1
  13. metadata +3 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 42695632f5f5199cbce5586b5600ef0297b4dad059397c523a5bf975cb192896
4
- data.tar.gz: 37a55fabac4729035ef2d5129734e178745dcc3cb3056ab1b6c290cc68c2db93
3
+ metadata.gz: 2f1c2aee3aba15fcf5485c3aca454f8c18808a3cfe156d80f59d4cdbfa58d441
4
+ data.tar.gz: b3c35e6aab203309e4d7992a61ed3a7484b61b044dfe4e4aa6467dabe1374bf6
5
5
  SHA512:
6
- metadata.gz: 296d521e0de245fbaa1895de1fa1298bbac7653e4419d36fec27166737e595a434b96e64020d203e0a6375ff445753cfd989d8242f11b11cb75644aea5952c0a
7
- data.tar.gz: 11d0cbe5dbc539fa914fc6faae7ced4f13a908c7ecd6decef96168b9dbe7109a78b02ff34eb644514fb1015a84aca77f2e27361b00897ab5253e4fc467ec08fe
6
+ metadata.gz: 7fe1dc4a9b2101050157b6f204b9d69e113035746b4ec258e14cf21c4f42d6af8b05d1dd2eef7ef29f4df563672894d3aa504dfac953ddc1ebc27ba095398e09
7
+ data.tar.gz: 1c8b3aa7dad2432544585fb04e917392c74c9a5dff671db3845e70796ac7062e0bc8daefa3325dd24849252c70907c1806910f384923642f3381744e0cfbc870
data/lib/rubypitaya/app-template/Gemfile CHANGED
@@ -1,6 +1,6 @@
1
1
  source "https://rubygems.org"
2
2
 
3
- gem 'rubypitaya', '2.24.0'
3
+ gem 'rubypitaya', '2.25.0'
4
4
 
5
5
  group :development do
6
6
  gem 'pry', '0.14.0'
data/lib/rubypitaya/app-template/Gemfile.lock CHANGED
@@ -111,7 +111,7 @@ GEM
111
111
  rspec-support (~> 3.10.0)
112
112
  rspec-support (3.10.2)
113
113
  ruby2_keywords (0.0.5)
114
- rubypitaya (2.24.0)
114
+ rubypitaya (2.25.0)
115
115
  activerecord (= 6.1.3)
116
116
  etcdv3 (= 0.10.2)
117
117
  mongo (= 2.15.0)
@@ -152,7 +152,7 @@ DEPENDENCIES
152
152
  listen (= 3.4.1)
153
153
  pry (= 0.14.0)
154
154
  rspec (= 3.10.0)
155
- rubypitaya (= 2.24.0)
155
+ rubypitaya (= 2.25.0)
156
156
 
157
157
  BUNDLED WITH
158
158
  2.1.4
data/lib/rubypitaya/app-template/helm/templates/config-maps/nginx-config.yaml CHANGED
@@ -4,6 +4,6 @@ metadata:
4
4
  name: nginx-config
5
5
  data:
6
6
  nginx.conf: "events {\n worker_connections 1024;\n}\n\nstream {\n server
7
- {\n listen {{ .Values.gameserver.port.first }}-{{ .Values.gameserver.port.last }};\n \n resolver kube-dns.kube-system.svc.cluster.local
8
- valid=5s;\n\n proxy_pass gameserver-$server_port.{{ .Values.namespace }}.svc.cluster.local:$server_port;\n
7
+ {\n listen {{ .Values.gameserver.externalport.first }}-{{ .Values.gameserver.externalport.last }};\n \n resolver kube-dns.kube-system.svc.cluster.local
8
+ valid=5s;\n\n proxy_pass gameserver-$server_port.gameserver.{{ .Values.namespace }}.svc.cluster.local:{{ .Values.gameserver.gameport }};\n
9
9
  \ }\n}\n"
data/lib/rubypitaya/app-template/helm/templates/deployments/gameserver-nginx.yaml CHANGED
@@ -21,8 +21,8 @@ spec:
21
21
  - name: gameserver-nginx
22
22
  image: nginx:1.18.0
23
23
  ports:
24
- {{- $initialValue := int .Values.gameserver.port.first }}
25
- {{- $finalValue := add .Values.gameserver.port.last 1 }}
24
+ {{- $initialValue := int .Values.gameserver.externalport.first }}
25
+ {{- $finalValue := add .Values.gameserver.externalport.last 1 }}
26
26
  {{- $finalValue = int $finalValue }}
27
27
  {{- range untilStep $initialValue $finalValue 1 }}
28
28
  {{- $port := . }}
data/lib/rubypitaya/app-template/helm/templates/deployments/rubypitaya.yaml CHANGED
@@ -19,7 +19,7 @@ spec:
19
19
  spec:
20
20
  containers:
21
21
  - name: rubypitaya
22
- image: {{ .Values.rubypitaya.image.repository }}:{{ .Values.rubypitaya.image.tag }}
22
+ image: "{{ .Values.rubypitaya.image.repository }}:{{ .Values.rubypitaya.image.tag }}"
23
23
  command: ["bundle", "exec", "rubypitaya", "run"]
24
24
  ports:
25
25
  - containerPort: 4567
@@ -48,19 +48,19 @@ spec:
48
48
  - name: RUBYPITAYA_HTTP_AUTH_USER
49
49
  value: {{ .Values.http.auth.user | quote }}
50
50
  - name: RUBYPITAYA_HTTP_AUTH_PASS
51
- value: {{ .Values.http.auth.password | quote }}
51
+ value: {{ .Values.http.auth.pass | quote }}
52
52
  - name: MATCHMAKING_CURRENTROOMBLL
53
53
  value: kubernetes
54
54
  - name: MATCHMAKING_ROOMBLL_KUBERNETES_NAMESPACE
55
55
  value: {{ .Values.namespace }}
56
56
  - name: MATCHMAKING_ROOMBLL_KUBERNETES_CONTAINERIMAGE
57
- value: {{ .Values.gameserver.image.repository }}:{{ .Values.gameserver.image.tag }}
57
+ value: "{{ .Values.gameserver.image.repository }}:{{ .Values.gameserver.image.tag }}"
58
58
  - name: MATCHMAKING_ROOMBLL_KUBERNETES_INITIALPORT
59
- value: {{ .Values.gameserver.port.first | quote }}
59
+ value: {{ .Values.gameserver.externalport.first | quote }}
60
60
  - name: MATCHMAKING_ROOMBLL_KUBERNETES_FINALPORT
61
- value: {{ .Values.gameserver.port.last | quote }}
61
+ value: {{ .Values.gameserver.externalport.last | quote }}
62
62
  - name: MATCHMAKING_ROOMBLL_KUBERNETES_SERVICEHOST
63
- value: {{ .Values.gameserver.servicehost }}
63
+ value: {{ .Values.gameserver.servicehost | quote }}
64
64
  imagePullSecrets:
65
65
  - name: gitlab-registry
66
66
  serviceAccount: rubypitaya
data/lib/rubypitaya/app-template/helm/templates/pods/gameserver.yaml ADDED
@@ -0,0 +1,21 @@
1
+ apiVersion: v1
2
+ kind: Pod
3
+ metadata:
4
+ name: gameserver-{{ .Values.gameserver.port }}
5
+ labels:
6
+ app: rubypitaya
7
+ component: gameserver
8
+ spec:
9
+ hostname: gameserver-{{ .Values.gameserver.port }}
10
+ subdomain: gameserver
11
+ containers:
12
+ - name: gameserver-{{ .Values.gameserver.port }}
13
+ image: {{ .Values.gameserver.image.repository }}:{{ .Values.connector.image.tag }}
14
+ ports:
15
+ - containerPort: {{ .Values.gameserver.gameport }}
16
+ name: gameserver
17
+ env:
18
+ - name: ROOM_ID
19
+ value: {{ .Values.gameserver.roomid }}
20
+ - name: PORT
21
+ value: {{ .Values.gameserver.gameport }}
data/lib/rubypitaya/app-template/helm/templates/services/gameserver-nginx.yaml CHANGED
@@ -7,8 +7,8 @@ spec:
7
7
  app: gameserver
8
8
  component: gameserver-nginx
9
9
  ports:
10
- {{- $initialValue := int .Values.gameserver.port.first }}
11
- {{- $finalValue := add .Values.gameserver.port.last 1 }}
10
+ {{- $initialValue := int .Values.gameserver.externalport.first }}
11
+ {{- $finalValue := add .Values.gameserver.externalport.last 1 }}
12
12
  {{- $finalValue = int $finalValue }}
13
13
  {{- range untilStep $initialValue $finalValue 1 }}
14
14
  {{- $port := . }}
data/lib/rubypitaya/app-template/helm/templates/services/gameserver.yaml CHANGED
@@ -1,20 +1,13 @@
1
- {{- $initialValue := int .Values.gameserver.port.first }}
2
- {{- $finalValue := add .Values.gameserver.port.last 1 }}
3
- {{- $finalValue = int $finalValue }}
4
- {{- range untilStep $initialValue $finalValue 1 }}
5
- {{- $port := . }}
6
1
  apiVersion: v1
7
2
  kind: Service
8
3
  metadata:
9
- name: gameserver-{{ $port }}
4
+ name: gameserver
10
5
  spec:
11
6
  selector:
12
- app: gameserver
13
- component: gameserver-{{ $port }}
7
+ app: rubypitaya
8
+ component: gameserver
14
9
  ports:
15
10
  - protocol: TCP
16
- port: {{ $port }}
17
- targetPort: {{ $port }}
18
- type: ClusterIP
19
- ---
20
- {{- end }}
11
+ port: {{ .Values.gameserver.gameport }}
12
+ targetPort: {{ .Values.gameserver.gameport }}
13
+ type: ClusterIP
data/lib/rubypitaya/app-template/helm/values.yaml CHANGED
@@ -30,7 +30,8 @@ gameserver:
30
30
  image:
31
31
  repository: [gameserver-repository-link]
32
32
  tag: latest
33
- port:
33
+ externalport:
34
34
  first: 5000
35
35
  last: 5099
36
+ gameport: 3250
36
37
  servicehost: [gameserver-service-url]
data/lib/rubypitaya/core/spec-helpers/handler_spec_helper.rb CHANGED
@@ -74,23 +74,23 @@ module RubyPitaya
74
74
  @@setup.add(*keys, value)
75
75
  end
76
76
 
77
- def get_bll
77
+ def bll
78
78
  @@bll
79
79
  end
80
80
 
81
- def get_log
81
+ def log
82
82
  @@log
83
83
  end
84
84
 
85
- def get_session
85
+ def session
86
86
  @@session
87
87
  end
88
88
 
89
- def get_postman
89
+ def postman
90
90
  @@postman
91
91
  end
92
92
 
93
- def get_redis
93
+ def redis
94
94
  @@redis_connector.redis
95
95
  end
96
96
 
data/lib/rubypitaya/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module RubyPitaya
2
- VERSION = '2.24.0'
2
+ VERSION = '2.25.0'
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: rubypitaya
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.24.0
4
+ version: 2.25.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Luciano Prestes Cavalcanti
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2021-07-25 00:00:00.000000000 Z
11
+ date: 2021-08-22 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: pg
@@ -279,6 +279,7 @@ files:
279
279
  - "./lib/rubypitaya/app-template/helm/templates/deployments/connector.yaml"
280
280
  - "./lib/rubypitaya/app-template/helm/templates/deployments/gameserver-nginx.yaml"
281
281
  - "./lib/rubypitaya/app-template/helm/templates/deployments/rubypitaya.yaml"
282
+ - "./lib/rubypitaya/app-template/helm/templates/pods/gameserver.yaml"
282
283
  - "./lib/rubypitaya/app-template/helm/templates/role-bindings/rubypitaya.yaml"
283
284
  - "./lib/rubypitaya/app-template/helm/templates/roles/rubypitaya.yaml"
284
285
  - "./lib/rubypitaya/app-template/helm/templates/service-accounts/rubypitaya.yaml"