rubypitaya 1.6.0 → 1.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d3c2d65cb66c8a89ffc58b797ccef1f404d81056f912d98f7e656ea63271e5c7
-  data.tar.gz: b8d089767fa6fff1c092fa570fcf730fdf77e83a656669ad71204a67585345e5
+  metadata.gz: f956732e23359892f97cd275d3d258b6937374f7f8e7ddb40f5d97d0abcce272
+  data.tar.gz: '09c66465d85c6814a83833afecec31dafdc229111d63a9534ba5a7fc2258921a'
 SHA512:
-  metadata.gz: aa66e24ec0a0027136ebcd4d329f2b4fa3c7ee1347343d002b5e9d875040e7cfaf894bdd595060dfbacc43e0f102a760bcbf9177871cb4814e1c98bc5be1865c
-  data.tar.gz: 37d7f64a4417a6544a8f9f3faca2f700dfdf7489de03c4f3321de1e359edc903281402b1ada1f8c31fc349756a900f0a796760b339193d46aac34da48a148f85
+  metadata.gz: e1c97191adfaac2e829355814ee88fcc3cc999b09219296ef3abe509eb2fbee6422044095bb220a0cb5fd23cb1b80ceb7d2b17773710c4d23470c10993226f23
+  data.tar.gz: 5c49869cb24b420f4a7bc4d7c255c1b29fae2adf550ccd0ebc3dfb74a2ccafc72f7c09ed41217dedff0fc33c68c893bcca21f5239f37df282d12ead48d59a0d4

data/lib/rubypitaya/app-template/Gemfile

@@ -1,6 +1,6 @@
 source "https://rubygems.org"
 
-gem 'rubypitaya', '1.6.0'
+gem 'rubypitaya', '1.7.2'
 
 group :development do
   gem 'pry', '0.12.2'

data/lib/rubypitaya/app-template/Gemfile.lock

@@ -62,7 +62,7 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.8.0)
     rspec-support (3.8.3)
-    rubypitaya (1.6.0)
+    rubypitaya (1.7.2)
       activerecord (= 6.0.2)
       etcdv3 (= 0.10.2)
       eventmachine (= 1.2.7)
@@ -85,7 +85,7 @@ DEPENDENCIES
   pry (= 0.12.2)
   rake (= 10.0)
   rspec (= 3.8.0)
-  rubypitaya (= 1.6.0)
+  rubypitaya (= 1.7.2)
 
 BUNDLED WITH
    1.17.2

data/lib/rubypitaya/app-template/Makefile

@@ -44,7 +44,15 @@ generate-gemfilelock:
 
 ## Build image to production environment
 prod-build-image:
-	@docker build . -f docker/prod/Dockerfile -t rubypitaya-prod:latest
+	@docker build . -f docker/prod/Dockerfile -t [registry-address]:$(IMAGE_TAG)
+
+## Push prod image to gitlab
+prod-push-image:
+	@docker push [registry-address]:$(IMAGE_TAG)
+
+## Deploy prod image to kubernetes cluster
+prod-deploy-image:
+	kubectl -n $(PROD_NAMESPACE) set image deployment rubypitaya rubypitaya=[registry-address]:$(IMAGE_TAG)
 
 .DEFAULT_GOAL := show-help
 

data/lib/rubypitaya/app-template/docker-compose.yml

@@ -12,7 +12,7 @@ services:
       - '2380:2380'
 
   redis:
-    image: 'redis:3.2.5-alpine'
+    image: 'redis:6.0.5-alpine'
     ports:
       - '9001:6379'
 
@@ -22,7 +22,7 @@ services:
       - 'postgres:/var/lib/postgresql/data'
     environment:
       POSTGRES_USER: 'postgres'
-      POSTGRES_HOST_AUTH_METHOD: 'trust'
+      POSTGRES_PASSWORD: 'postgres'
     ports:
       - '9100:5432'
 
@@ -67,7 +67,7 @@ services:
       REDIS_URL: 'redis://redis:6379'
       DATABASE_HOST: 'db'
       DATABASE_USER: 'postgres'
-      DATABASE_PASSWORD: ''
+      DATABASE_PASSWORD: 'postgres'
       DATABASE_NAME: 'ruby_pitaya'
 
 volumes:

data/lib/rubypitaya/app-template/docker/dev/Dockerfile

@@ -16,4 +16,4 @@ ENV LC_ALL=C.UTF-8
 
 ENTRYPOINT ["./docker/entrypoint.sh"]
 
-CMD ["bundle", "exec", "rubypitaya"]
+CMD ["bundle", "exec", "rubypitaya", "run"]

data/lib/rubypitaya/app-template/docker/prod/Dockerfile

@@ -29,4 +29,4 @@ ENV LC_ALL=C.UTF-8
 
 ENTRYPOINT ["./docker/entrypoint.sh"]
 
-CMD ["bundle", "exec", "rubypitaya"]
+CMD ["bundle", "exec", "rubypitaya", "run"]

data/lib/rubypitaya/app-template/kubernetes/README.md

@@ -0,0 +1,60 @@
+Kubernetes Configuration
+========================
+
+Set namespace
+-------------
+
+Open files "deployment-*.yaml" and set the correct namespace on links
+
+
+Apply sequence
+--------------
+
+Run the following command on the listed files.
+But remember to put your namespace and your KUBECONFIG env var if you need.
+
+```sh
+$ kubectl apply -f [file-path]
+```
+
+persistent-volume.yaml
+
+statefulset-etcd.yaml
+statefulset-nats.yaml
+statefulset-postgres.yaml
+statefulset-redis.yaml
+
+service-etcd.yaml
+service-nats.yaml
+service-postgres.yaml
+service-redis.yaml
+
+deployment-connector.yaml
+service-connector.yaml
+
+
+Create gitlab-registry secret
+-----------------------------
+
+Run the following command.
+But remember to put your namespace and your KUBECONFIG env var if you need.
+
+```sh
+$ kubectl create secret docker-registry gitlab-registry --docker-server=[registry-server] --docker-username=[username] --docker-password=[password]
+```
+
+If you use a different registry name instead of "gitlab-registry" change the deployment-rubypitaya.yaml imagePullSecrets.name
+
+
+Apply sequence
+--------------
+
+Run the following command on the listed files.
+But remember to put your namespace and your KUBECONFIG env var if you need.
+
+```sh
+$ kubectl apply -f [file-path]
+```
+
+deployment-rubypitaya.yaml
+service-rubypitaya.yaml

data/lib/rubypitaya/app-template/kubernetes/deployment-connector.yaml

@@ -0,0 +1,35 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: connector
+  labels:
+    app: connector
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: connector
+  template:
+    metadata:
+      labels:
+        app: connector
+    spec:
+      containers:
+      - name: connector
+        image: registry.gitlab.com/lucianopc/pitaya-connector:0.2.0
+        ports:
+        - containerPort: 3250
+          name: connector
+        env:
+          - name: PITAYA_CLUSTER_RPC_SERVER_NATS_CONNECT
+            value: "nats://nats.default.svc.cluster.local:4222"
+          - name: PITAYA_CLUSTER_RPC_CLIENT_NATS_CONNECT
+            value: "nats://nats.default.svc.cluster.local:4222"
+          - name: PITAYA_CLUSTER_RPC_CLIENT_NATS_REQUESTTIMEOUT
+            value: "10s"
+          - name: PITAYA_CLUSTER_SD_ETCD_ENDPOINTS
+            value: "etcd.default.svc.cluster.local:2379"
+          - name: PITAYA_CLUSTER_SD_ETCD_PREFIX
+            value: "rubypitaya/"
+          - name: SERVER_ROUTES
+            value: "rubypitaya"

data/lib/rubypitaya/app-template/kubernetes/deployment-rubypitaya.yaml

@@ -0,0 +1,48 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: rubypitaya
+  labels:
+    app: rubypitaya
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: rubypitaya
+  template:
+    metadata:
+      labels:
+        app: rubypitaya
+    spec:
+      containers:
+      - name: rubypitaya
+        image: git.topfreegames.com:4567/prestes/tech-prototype/rubypitaya:latest
+        command: ["bundle", "exec", "rubypitaya", "run"]
+        ports:
+        - containerPort: 4567
+          name: rubypitaya
+        env:
+          - name: SERVER_NAME
+            value: "rubypitaya"
+          - name: RUBYPITAYA_ENV
+            value: "production"
+          - name: NATS_URL
+            value: "nats://nats.default.svc.cluster.local:4222"
+          - name: ETCD_URL
+            value: "http://etcd.default.svc.cluster.local:2379"
+          - name: ETCD_PREFIX
+            value: "rubypitaya/"
+          - name: ETCD_LEASE_SECONDS
+            value: "60"
+          - name: REDIS_URL
+            value: "redis://redis.default.svc.cluster.local:6379"
+          - name: DATABASE_HOST
+            value: "postgres.default.svc.cluster.local"
+          - name: DATABASE_USER
+            value: "postgres"
+          - name: DATABASE_PASSWORD
+            value: "postgres"
+          - name: DATABASE_NAME
+            value: "ruby_pitaya"
+      imagePullSecrets:
+      - name: gitlab-registry

data/lib/rubypitaya/app-template/kubernetes/persistent-volume.yaml

@@ -0,0 +1,11 @@
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: postgres-pvc
+spec:
+  accessModes:
+    - ReadWriteOnce
+  resources:
+    requests:
+      storage: 5Gi
+  storageClassName: standard

data/lib/rubypitaya/app-template/kubernetes/service-connector.yaml

@@ -0,0 +1,12 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: connector
+spec:
+  selector:
+    app: connector
+  ports:
+    - protocol: TCP
+      port: 3250
+      targetPort: 3250
+  type: LoadBalancer

data/lib/rubypitaya/app-template/kubernetes/service-etcd.yaml

@@ -0,0 +1,17 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: etcd
+spec:
+  selector:
+    app: etcd
+  ports:
+    - protocol: TCP
+      port: 2379
+      targetPort: 2379
+      name: etcd-2379
+    - protocol: TCP
+      port: 2380
+      targetPort: 2380
+      name: etcd-2380
+  type: LoadBalancer

data/lib/rubypitaya/app-template/kubernetes/service-nats.yaml

@@ -0,0 +1,12 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: nats
+spec:
+  selector:
+    app: nats
+  ports:
+    - protocol: TCP
+      port: 4222
+      targetPort: 4222
+  type: LoadBalancer

data/lib/rubypitaya/app-template/kubernetes/service-postgres.yaml

@@ -0,0 +1,12 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: postgres
+spec:
+  selector:
+    app: postgres
+  ports:
+    - protocol: TCP
+      port: 5432
+      targetPort: 5432
+  type: LoadBalancer

data/lib/rubypitaya/app-template/kubernetes/service-redis.yaml

@@ -0,0 +1,13 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: redis
+spec:
+  selector:
+    app: redis
+  ports:
+    - protocol: TCP
+      port: 6379
+      targetPort: 6379
+      name: redis
+  type: LoadBalancer

data/lib/rubypitaya/app-template/kubernetes/service-rubypitaya.yaml

@@ -0,0 +1,12 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: rubypitaya
+spec:
+  selector:
+    app: rubypitaya
+  ports:
+    - protocol: TCP
+      port: 80
+      targetPort: 4567
+  type: LoadBalancer

data/lib/rubypitaya/app-template/kubernetes/statefulset-etcd.yaml

@@ -0,0 +1,25 @@
+apiVersion: apps/v1
+kind: StatefulSet
+metadata:
+  name: etcd
+  labels:
+    app: etcd
+spec:
+  serviceName: "etcd"
+  replicas: 1
+  selector:
+    matchLabels:
+      app: etcd
+  template:
+    metadata:
+      labels:
+        app: etcd
+    spec:
+      containers:
+      - name: etcd
+        image: appcelerator/etcd:3.0.15
+        ports:
+        - containerPort: 2379
+          name: etcd-2379
+        - containerPort: 2380
+          name: etcd-2380

data/lib/rubypitaya/app-template/kubernetes/statefulset-nats.yaml

@@ -0,0 +1,23 @@
+apiVersion: apps/v1
+kind: StatefulSet
+metadata:
+  name: nats
+  labels:
+    app: nats
+spec:
+  serviceName: "nats"
+  replicas: 1
+  selector:
+    matchLabels:
+      app: nats
+  template:
+    metadata:
+      labels:
+        app: nats
+    spec:
+      containers:
+      - name: nats
+        image: nats:2.1.4
+        ports:
+        - containerPort: 4222
+          name: nats

data/lib/rubypitaya/app-template/kubernetes/statefulset-postgres.yaml

@@ -0,0 +1,37 @@
+apiVersion: apps/v1
+kind: StatefulSet
+metadata:
+  name: postgres
+  labels:
+    app: postgres
+spec:
+  serviceName: "postgres"
+  replicas: 1
+  selector:
+    matchLabels:
+      app: postgres
+  template:
+    metadata:
+      labels:
+        app: postgres
+    spec:
+      containers:
+      - name: postgres
+        image: postgres:9.6.17
+        env:
+          - name: POSTGRES_USER
+            value: "postgres"
+          - name: POSTGRES_PASSWORD
+            value: "postgres"
+          - name: PGDATA
+            value: "/var/lib/postgresql/data/pgdata"
+        ports:
+        - containerPort: 5432
+          name: postgres
+        volumeMounts:
+        - name: postgres
+          mountPath: /var/lib/postgresql/data
+      volumes:
+      - name: postgres
+        persistentVolumeClaim:
+          claimName: postgres-pvc

data/lib/rubypitaya/app-template/kubernetes/statefulset-redis.yaml

@@ -0,0 +1,23 @@
+apiVersion: apps/v1
+kind: StatefulSet
+metadata:
+  name: redis
+  labels:
+    app: redis
+spec:
+  serviceName: "redis"
+  replicas: 1
+  selector:
+    matchLabels:
+      app: redis
+  template:
+    metadata:
+      labels:
+        app: redis
+    spec:
+      containers:
+      - name: redis
+        image: redis:6.0.5-alpine
+        ports:
+        - containerPort: 6379
+          name: redis

data/lib/rubypitaya/core/database_config.rb

@@ -25,6 +25,7 @@ module RubyPitaya
         'pool': config['pool'],
         'host': config['host'],
         'user': config['user'],
+        'password': config['password'],
         'database': config['database'],
       }
     end
@@ -36,6 +37,7 @@ module RubyPitaya
         'pool': config['pool'],
         'host': config['host'],
         'user': config['user'],
+        'password': config['password'],
       }
     end
 

data/lib/rubypitaya/core/redis_connector.rb

@@ -12,15 +12,14 @@ module RubyPitaya
     end
 
     def connect
-      @redis = Redis.new(url: @redis_address)
+      @redis = Redis.new(
+        url: @redis_address,
+        :reconnect_attempts => 10,
+        :reconnect_delay => 1.5,
+        :reconnect_delay_max => 2.0,
+      )
 
-      test_connection
-    end
-
-    def test_connection
-      @redis.set('tmp', 'value')
-      @redis.get('tmp')
-      @redis.del('tmp')
+      @redis.ping
     end
   end
 end

data/lib/rubypitaya/version.rb

@@ -1,3 +1,3 @@
 module RubyPitaya
-  VERSION = "1.6.0"
+  VERSION = "1.7.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubypitaya
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.7.2
 platform: ruby
 authors:
 - Luciano Prestes Cavalcanti
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-20 00:00:00.000000000 Z
+date: 2020-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -201,7 +201,6 @@ files:
 - "./lib/rubypitaya/app-template/app/handlers/player_handler.rb"
 - "./lib/rubypitaya/app-template/app/models/player.rb"
 - "./lib/rubypitaya/app-template/app/models/user.rb"
-- "./lib/rubypitaya/app-template/apptemplate-0.1.0.gem"
 - "./lib/rubypitaya/app-template/bin/console"
 - "./lib/rubypitaya/app-template/config/database.yml"
 - "./lib/rubypitaya/app-template/config/routes.rb"
@@ -212,6 +211,20 @@ files:
 - "./lib/rubypitaya/app-template/docker/entrypoint.sh"
 - "./lib/rubypitaya/app-template/docker/prod/Dockerfile"
 - "./lib/rubypitaya/app-template/docker/prod/Makefile"
+- "./lib/rubypitaya/app-template/kubernetes/README.md"
+- "./lib/rubypitaya/app-template/kubernetes/deployment-connector.yaml"
+- "./lib/rubypitaya/app-template/kubernetes/deployment-rubypitaya.yaml"
+- "./lib/rubypitaya/app-template/kubernetes/persistent-volume.yaml"
+- "./lib/rubypitaya/app-template/kubernetes/service-connector.yaml"
+- "./lib/rubypitaya/app-template/kubernetes/service-etcd.yaml"
+- "./lib/rubypitaya/app-template/kubernetes/service-nats.yaml"
+- "./lib/rubypitaya/app-template/kubernetes/service-postgres.yaml"
+- "./lib/rubypitaya/app-template/kubernetes/service-redis.yaml"
+- "./lib/rubypitaya/app-template/kubernetes/service-rubypitaya.yaml"
+- "./lib/rubypitaya/app-template/kubernetes/statefulset-etcd.yaml"
+- "./lib/rubypitaya/app-template/kubernetes/statefulset-nats.yaml"
+- "./lib/rubypitaya/app-template/kubernetes/statefulset-postgres.yaml"
+- "./lib/rubypitaya/app-template/kubernetes/statefulset-redis.yaml"
 - "./lib/rubypitaya/core/application_files_importer.rb"
 - "./lib/rubypitaya/core/config.rb"
 - "./lib/rubypitaya/core/database_config.rb"