modulorails 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 38bfc28b69038bd12e6db5b86c5a81fc29aab339896ee1b2b47429ed6d12c4fe
-  data.tar.gz: 0b0a203652556def30c6e3471acd7e35fecf834310d94d21f58766acafaf9f5b
+  metadata.gz: 6a06133e9c157d574ab3cc83ffd931e7e61873d7c8deff63c22b8a0657def075
+  data.tar.gz: d345aa7aa32575496041762e43f198001260a003dc811c69ae704f889dde0411
 SHA512:
-  metadata.gz: d68c37e214e7e996b586775a4f74c805d78c6d6a9f1745e1abfe38ca323b7ce82265f94c89219f2bfa811c92b02b4c160daa8751097019cc1be919844b184009
-  data.tar.gz: 346739b57ded95ac5c96684c4e9d91af1867b4713741d7e71d6484b3ddc68ec651feef1c863c318ab6684f2fa9a93df8ddfb20956880a37e9a87962f21f9414e
+  metadata.gz: 1594ae1f801bf28f08ec2a86ecc6040f48c513d2c47a2dfb9f0a8a3b69bf2dd7f04d6465aff1041faf80759fb70610ff57a8b02b83bddf4cbdc3ab9c553bdb9b
+  data.tar.gz: 4e4652c68c1ba65d1ce429c5acffbb5e11c8f82effdcdd55735d91cb8c12e442f6a00b5b5099a316b26f8620ef20873c96b5349df4ea58ec24566aaebe75abb1

data/CHANGELOG.md

@@ -2,6 +2,16 @@
 
 This file is used to list changes made in each version of the gem.
 
+# 1.3.1
+
+- Update templates according to new devops standards:
+  - Add exec commands in entrypoints.
+  - Upgrade PG and Redis version in docker-compose files.
+  - Upgrade PG and Redis version in test stage in CI.
+  - Add default SECRET_KEY_BASE and optional `yarn install` in `Dockerfile.prod` templates.
+  - Add templates for Kubernetes values files.
+  - Append sidekiq in Kubernetes values files in Sidekiq generator.
+
 # 1.3.0
 
 - Update redis configuration in generators.

data/README.md

@@ -28,6 +28,9 @@ Modulorails.configure do |config|
   config.project_manager 'The email of the project manager of the application'
   config.endpoint 'The url to the intranet'
   config.api_key 'The API key'
+  config.review_base_url 'The base url for the review environments' # optional
+  config.staging_url 'The url for the staging environment'          # optional
+  config.production_url 'The url for the production environment'    # optional
 end
 ``` 
 

data/lib/generators/modulorails/docker/docker_generator.rb

@@ -8,6 +8,12 @@ class Modulorails::DockerGenerator < Rails::Generators::Base
   desc 'This generator creates Dockerfiles for an app'
 
   def create_config_file
+    @data = Modulorails.data
+    @adapter = data.adapter
+    @webpack_container_needed = data.webpacker_version.present?
+    @image_name = @data.name.parameterize
+    @environment_name = @data.environment_name
+
     template 'Dockerfile'
     template 'Dockerfile.prod'
     template 'docker-compose.yml'
@@ -18,7 +24,7 @@ class Modulorails::DockerGenerator < Rails::Generators::Base
     template 'config/cable.yml'
 
     # Useless unless project is using Webpacker
-    if Modulorails.data.webpacker_version.present?
+    if @webpack_container_needed
       template 'entrypoints/webpack-entrypoint.sh'
       chmod 'entrypoints/webpack-entrypoint.sh', 0755
     end

data/lib/generators/modulorails/docker/templates/Dockerfile.prod.tt

@@ -1,7 +1,8 @@
 # BUILD IMAGE
-FROM ruby:<%= Modulorails.data.ruby_version %>-alpine as builder
+FROM ruby:<%= @data.ruby_version %>-alpine as builder
 
-ENV RAILS_ENV=production
+ENV RAILS_ENV=production \
+    SECRET_KEY_BASE=1
 WORKDIR /app
 
 RUN apk add --update --no-cache \
@@ -11,27 +12,28 @@ RUN apk add --update --no-cache \
     yarn \
     shared-mime-info \
     gcompat \
-    <%- adapter = Modulorails.data.adapter -%>
-    <%- if adapter =~ /mysql/ -%>
+    <%- if @adapter =~ /mysql/ -%>
     mysql-dev
     <%- else -%>
     postgresql-dev
     <%- end -%>
-RUN gem install bundler -v <%= Modulorails.data.bundler_version %>
+RUN gem install bundler -v <%= @data.bundler_version %>
 
 COPY Gemfile Gemfile.lock ./
 RUN bundle config set --local deployment 'true'
 RUN bundle check || bundle install --jobs=2 \
     && rm -rf vendor/bundle/ruby/*/cache/*
 
+<%- if @webpack_container_needed -%>
 COPY package.json yarn.lock ./
 RUN yarn install
+<%- end-%>
 
 COPY . .
 RUN bundle exec rake assets:precompile
 
 # FINAL IMAGE
-FROM ruby:<%= Modulorails.data.ruby_version %>-alpine
+FROM ruby:<%= @data.ruby_version %>-alpine
 
 ENV RAILS_ENV=development
 ENV EDITOR=vim
@@ -44,8 +46,7 @@ RUN apk add --update --no-cache \
     tzdata \
     shared-mime-info \
     vim \
-    <%- adapter = Modulorails.data.adapter -%>
-    <%- if adapter =~ /mysql/ -%>
+    <%- if @adapter =~ /mysql/ -%>
     mysql-dev \
     <%- else -%>
     postgresql-dev \

data/lib/generators/modulorails/docker/templates/Dockerfile.tt

@@ -1,4 +1,4 @@
-FROM ruby:<%= Modulorails.data.ruby_version %>-alpine
+FROM ruby:<%= @data.ruby_version %>-alpine
 
 ENV RAILS_ENV=development
 ENV EDITOR=vim
@@ -11,13 +11,12 @@ RUN apk add --update --no-cache \
     tzdata \
     gcompat \
     vim \
-    <%- adapter = Modulorails.data.adapter -%>
-    <%- if adapter =~ /mysql/ -%>
+    <%- if @adapter =~ /mysql/ -%>
     mysql-dev
     <%- else -%>
     postgresql-dev
     <%- end -%>
-RUN gem install bundler -v <%= Modulorails.data.bundler_version %>
+RUN gem install bundler -v <%= @data.bundler_version %>
 
 COPY Gemfile Gemfile.lock ./
 RUN bundle install --jobs=2

data/lib/generators/modulorails/docker/templates/config/database.yml.tt

@@ -1,29 +1,26 @@
-<%- image_name = Modulorails.data.name.parameterize -%>
-<%- environment_name = Modulorails.data.environment_name -%>
-<%- adapter = Modulorails.data.adapter -%>
-<%- if adapter =~ /mysql/ -%>
+<%- if @adapter =~ /mysql/ -%>
 development: &default
   adapter: mysql2
   encoding: utf8mb4
   collation: utf8mb4_unicode_ci
-  database: <%%= ENV.fetch('<%= environment_name %>_DATABASE_NAME', '<%= image_name %>') %>
-  username: <%%= ENV.fetch('<%= environment_name %>_DATABASE_USERNAME', 'root') %>
-  password: <%%= ENV.fetch('<%= environment_name %>_DATABASE_PASSWORD', '') %>
-  host: <%%= ENV.fetch('<%= environment_name %>_DATABASE_HOST', 'database') %>
-  port: <%%= ENV.fetch('<%= environment_name %>_DATABASE_PORT', 3306) %>
+  database: <%%= ENV.fetch('<%= @environment_name %>_DATABASE_NAME', '<%= @image_name %>') %>
+  username: <%%= ENV.fetch('<%= @environment_name %>_DATABASE_USERNAME', 'root') %>
+  password: <%%= ENV.fetch('<%= @environment_name %>_DATABASE_PASSWORD', '') %>
+  host: <%%= ENV.fetch('<%= @environment_name %>_DATABASE_HOST', 'database') %>
+  port: <%%= ENV.fetch('<%= @environment_name %>_DATABASE_PORT', 3306) %>
 <%- else -%>
 development: &default
   adapter: postgresql
-  database: <%%= ENV.fetch('<%= environment_name %>_DATABASE_NAME', '<%= image_name %>') %>
-  username: <%%= ENV.fetch('<%= environment_name %>_DATABASE_USERNAME', 'postgres') %>
-  password: <%%= ENV.fetch('<%= environment_name %>_DATABASE_PASSWORD', 'postgres') %>
-  host: <%%= ENV.fetch('<%= environment_name %>_DATABASE_HOST', 'database') %>
-  port: <%%= ENV.fetch('<%= environment_name %>_DATABASE_PORT', 5432) %>
+  database: <%%= ENV.fetch('<%= @environment_name %>_DATABASE_NAME', '<%= @image_name %>') %>
+  username: <%%= ENV.fetch('<%= @environment_name %>_DATABASE_USERNAME', 'postgres') %>
+  password: <%%= ENV.fetch('<%= @environment_name %>_DATABASE_PASSWORD', 'postgres') %>
+  host: <%%= ENV.fetch('<%= @environment_name %>_DATABASE_HOST', 'database') %>
+  port: <%%= ENV.fetch('<%= @environment_name %>_DATABASE_PORT', 5432) %>
 <%- end -%>
 
 test:
   <<: *default
-  database: <%%= ENV.fetch('<%= environment_name %>_TEST_DATABASE_NAME', '<%= image_name %>_test') %>
+  database: <%%= ENV.fetch('<%= @environment_name %>_TEST_DATABASE_NAME', '<%= @image_name %>_test') %>
 
 staging:
   <<: *default

data/lib/generators/modulorails/docker/templates/docker-compose.prod.yml.tt

@@ -1,10 +1,8 @@
 version: '3.7'
 
-<%- image_name = Modulorails.data.name.parameterize -%>
-<%- environment_name = Modulorails.data.environment_name -%>
 services:
   app:
-    image: modulotechgroup/<%= image_name %>
+    image: modulotechgroup/<%= @image_name %>
     build:
       context: .
       dockerfile: Dockerfile.prod
@@ -16,36 +14,35 @@ services:
     environment:
       RAILS_ENV: production
       URL: http://localhost:3000
-      <%= environment_name %>_DATABASE_HOST: database
-      <%= environment_name %>_DATABASE_NAME: <%= image_name %>
+      <%= @environment_name %>_DATABASE_HOST: database
+      <%= @environment_name %>_DATABASE_NAME: <%= @image_name %>
       RAILS_SERVE_STATIC_FILES: 'true'
       REDIS_URL: redis://redis:6379/1
 
-  <%- adapter = Modulorails.data.adapter -%>
-  <%- if adapter =~ /mysql/ -%>
+  <%- if @adapter =~ /mysql/ -%>
   database:
     image: mysql/mysql-server:8.0
     volumes:
       - db_data:/var/lib/mysql
     environment:
       MYSQL_ALLOW_EMPTY_PASSWORD: 'true'
-      MYSQL_DATABASE: <%= image_name %>
+      MYSQL_DATABASE: <%= @image_name %>
       MYSQL_ROOT_HOST: '%'
   <%- else -%>
   database:
-    image: postgres:13.5
+    image: postgres:15-alpine
     volumes:
       - db_data:/var/lib/postgresql/data
     environment:
       POSTGRES_USER: postgres
       POSTGRES_PASSWORD: postgres
-      POSTGRES_DB: <%= image_name %>
+      POSTGRES_DB: <%= @image_name %>
       LC_COLLATE: 'en_US.UTF-8'
       LC_CTYPE: 'en_US.UTF-8'
   <%- end -%>
 
   redis:
-    image: redis:6.2-alpine
+    image: redis:7-alpine
 
 # Define the volumes references in the services
 volumes:

data/lib/generators/modulorails/docker/templates/docker-compose.yml.tt

@@ -1,10 +1,8 @@
 version: '3.7'
 
-<%- image_name = Modulorails.data.name.parameterize -%>
-<%- environment_name = Modulorails.data.environment_name -%>
 services:
   app:
-    image: modulotechgroup/<%= image_name %>:dev
+    image: modulotechgroup/<%= @image_name %>:dev
     build:
       context: .
       dockerfile: Dockerfile
@@ -18,48 +16,46 @@ services:
     environment:
       RAILS_ENV: development
       URL: http://localhost:3000
-      <%= environment_name %>_DATABASE_HOST: database
-      <%= environment_name %>_DATABASE_NAME: <%= image_name %>
+      <%= @environment_name %>_DATABASE_HOST: database
+      <%= @environment_name %>_DATABASE_NAME: <%= @image_name %>
       REDIS_URL: redis://redis:6379/1
     entrypoint: ./entrypoints/docker-entrypoint.sh
     stdin_open: true
     tty: true
 
-  <%- adapter = Modulorails.data.adapter -%>
-  <%- if adapter =~ /mysql/ -%>
+  <%- if @adapter =~ /mysql/ -%>
   database:
     image: mysql/mysql-server:8.0
     volumes:
       - db_data:/var/lib/mysql
     environment:
       MYSQL_ALLOW_EMPTY_PASSWORD: 'true'
-      MYSQL_DATABASE: <%= image_name %>
+      MYSQL_DATABASE: <%= @image_name %>
       MYSQL_ROOT_HOST: '%'
-  <%- else-%>
+  <%- else -%>
   database:
-    image: postgres:13.5
+    image: postgres:15-alpine
     volumes:
       - db_data:/var/lib/postgresql/data
     environment:
       POSTGRES_USER: postgres
       POSTGRES_PASSWORD: postgres
-      POSTGRES_DB: <%= image_name %>
+      POSTGRES_DB: <%= @image_name %>
       LC_COLLATE: 'en_US.UTF-8'
       LC_CTYPE: 'en_US.UTF-8'
-  <%- end-%>
+  <%- end -%>
 
   redis:
-    image: redis:6.2-alpine
+    image: redis:7-alpine
 
   mailcatcher:
     image: dockage/mailcatcher
     ports:
       - 1080:1080
 
-  <%- webpack_container_needed = Modulorails.data.webpacker_version.present? -%>
-  <%- if webpack_container_needed -%>
+  <%- if @webpack_container_needed -%>
   webpack:
-   image: modulotechgroup/<%= image_name %>:dev
+   image: modulotechgroup/<%= @image_name %>:dev
    build:
      context: .
      dockerfile: Dockerfile
@@ -72,7 +68,7 @@ services:
      NODE_ENV: development
      RAILS_ENV: development
      WEBPACKER_DEV_SERVER_HOST: 0.0.0.0
-  <%- end-%>
+  <%- end -%>
 
 volumes:
   db_data:

data/lib/generators/modulorails/docker/templates/entrypoints/docker-entrypoint.sh.tt

@@ -17,4 +17,4 @@ then
 fi
 
 # Launch the application listening from all origins on port 3000
-./bin/bundle exec rails s -b 0.0.0.0 -p 3000
+exec ./bin/bundle exec rails s -b 0.0.0.0 -p 3000

data/lib/generators/modulorails/docker/templates/entrypoints/webpack-entrypoint.sh.tt

@@ -4,4 +4,4 @@
 set -e
 
 # Launch webpack
-./bin/webpack-dev-server
+exec ./bin/webpack-dev-server

data/lib/generators/modulorails/gitlabci/gitlabci_generator.rb

@@ -8,8 +8,19 @@ class Modulorails::GitlabciGenerator < Rails::Generators::Base
   desc 'This generator creates a template for a .gitlab-ci.yml file at root'
 
   def create_config_file
+    @data = Modulorails.data
+    @image_name = @data.name.parameterize
+    @environment_name = @data.environment_name
+    @adapter = data.adapter
+    @review_base_url = @data.review_base_url
+    @staging_url = @data.staging_url
+    @production_url = @data.production_url
+
     # Update the gitlab-ci template
     template '.gitlab-ci.yml'
+    template 'config/deploy/production.yaml' if @production_url.present?
+    template 'config/deploy/staging.yaml' if @staging_url.present?
+    template 'config/deploy/review.yaml' if @review_base_url.present?
 
     # Remove the database-ci template if it exists.
     # It used to be referenced by the gitlab-ci template.

data/lib/generators/modulorails/gitlabci/templates/.gitlab-ci.yml.tt

@@ -1,5 +1,3 @@
-<%- image_name = Modulorails.data.name.parameterize -%>
-<%- environment_name = Modulorails.data.environment_name -%>
 include:
   - project: 'modulosource/modulotech/devops/gitlab-ci-templates'
     file:
@@ -7,26 +5,17 @@ include:
       - '/templates/integration.gitlab-ci.yml'
       - '/templates/docker-buildx.gitlab-ci.yml'
 
-services:
-  <%- adapter = Modulorails.data.adapter -%>
-  <%- if adapter =~ /mysql/ -%>
-  - mysql:8.0
-  <%- else -%>
-  - postgres:13.5
-  <%- end -%>
-  - redis:6.2
-
 variables:
-  IMAGE_NAME: <%= image_name %>
-  <%- if adapter =~ /mysql/ -%>
-  MYSQL_DATABASE: <%= image_name %>_test
+  IMAGE_NAME: <%= @image_name %>
+  <%- if @adapter =~ /mysql/ -%>
+  MYSQL_DATABASE: <%= @image_name %>_test
   MYSQL_ALLOW_EMPTY_PASSWORD: 'true'
-  <%= environment_name %>_DATABASE_HOST: mysql
+  <%= @environment_name %>_DATABASE_HOST: mysql
   <%- else -%>
-  POSTGRES_DB: <%= image_name %>_test
+  POSTGRES_DB: <%= @image_name %>_test
   POSTGRES_USER: postgres
   POSTGRES_PASSWORD: postgres
-  <%= environment_name %>_DATABASE_HOST: postgres
+  <%= @environment_name %>_DATABASE_HOST: postgres
   <%- end -%>
 
 stages:
@@ -34,35 +23,44 @@ stages:
   - build
   - deploy
 
+build_integration_image:
+  extends: .build_integration_image
+
 test:
   extends: .test
+  services:
+    <%- if @adapter =~ /mysql/ -%>
+    - mysql:8-alpine
+    <%- else -%>
+    - postgres:15-alpine
+    <%- end -%>
+    - redis:7-alpine
+  variables:
+    RAILS_ENV: test
   script:
-    - "bundle exec rake db:create RAILS_ENV=test"
-    - "RAILS_ENV=test bundle exec rake db:migrate:reset"
-    - RAILS_ENV=test bundle exec rspec --format progress --format RspecJunitFormatter --out rspec.xml
-
-build_integration_image:
-  extends: .build_integration_image
+    - bundle exec rake db:create
+    - bundle exec rake db:migrate:reset
+    - bundle exec rspec --format progress --format RspecJunitFormatter --out rspec.xml
 
 docker_build:
   extends: .docker_buildx_push
   only:
     - merge_requests
     - staging
+    - master
 
-<%- review_base_url = Modulorails.data.review_base_url -%>
-<%- if review_base_url.present? -%>
+<%- if @review_base_url.present? -%>
 deploy_review:
   extends: .deploy_helm
   variables:
-    NAMESPACE: <%= image_name %>-$CI_ENVIRONMENT_SLUG
-    NAME: <%= image_name %>
-    CHART_NAME: <%= image_name %>
-    CONFIG_FILE: config/deploy/kubernetes/review.yaml
-    EXTRA_VARS: --set image.tag=$CI_COMMIT_SHORT_SHA --set ingress.hosts[0].host=${CI_ENVIRONMENT_SLUG}.<%= review_base_url %> --set ingress.tls[0].hosts[0]=${CI_ENVIRONMENT_SLUG}.<%= review_base_url %> --set env.url=${CI_ENVIRONMENT_SLUG}.<%= review_base_url %> --set database.password=$DB_PASSWORD --set encryption.key=$ENCRYPTION_KEY
+    NAMESPACE: <%= @image_name %>-$CI_ENVIRONMENT_SLUG
+    NAME: <%= @image_name %>
+    CHART_NAME: <%= @image_name %>
+    CONFIG_FILE: config/deploy/review.yaml
+    EXTRA_VARS: --set image.tag=$CI_COMMIT_SHORT_SHA --set ingress.hosts[0].host=${CI_ENVIRONMENT_SLUG}.<%= @review_base_url %> --set ingress.tls[0].hosts[0]=${CI_ENVIRONMENT_SLUG}.<%= @review_base_url %> --set env.url=${CI_ENVIRONMENT_SLUG}.<%= @review_base_url %> --set database.url=$DATABASE_URL --set master_key.key=$MASTER_KEY
   environment:
     name: review/$CI_COMMIT_REF_SLUG
-    url: https://${CI_ENVIRONMENT_SLUG}.<%= review_base_url %>
+    url: https://${CI_ENVIRONMENT_SLUG}.<%= @review_base_url %>
     on_stop: stop_review
     auto_stop_in: 3 days
   only:
@@ -71,56 +69,40 @@ deploy_review:
 stop_review:
   extends: .stop_review
   variables:
-    NAMESPACE: <%= image_name %>-$CI_ENVIRONMENT_SLUG
-    NAME: <%= image_name %>
+    NAMESPACE: <%= @image_name %>-$CI_ENVIRONMENT_SLUG
+    NAME: <%= @image_name %>
   only:
     - merge_requests
 <%- end -%>
 
-<%- staging_url = Modulorails.data.staging_url -%>
-<%- if staging_url.present? -%>
+<%- if @staging_url.present? -%>
 deploy_staging:
   extends: .deploy_helm
   variables:
-    NAMESPACE: <%= image_name %>
-    NAME: <%= image_name %>
-    CHART_NAME: <%= image_name %>
-    CONFIG_FILE: config/deploy/kubernetes/staging.yaml
-    EXTRA_VARS: --set image.tag=$CI_COMMIT_SHORT_SHA --set database.password=$DB_PASSWORD
+    NAMESPACE: <%= @image_name %>
+    NAME: <%= @image_name %>
+    CHART_NAME: <%= @image_name %>
+    CONFIG_FILE: config/deploy/staging.yaml
+    EXTRA_VARS: --set image.tag=$CI_COMMIT_SHORT_SHA --set database.url=$DATABASE_URL --set master_key.key=$MASTER_KEY
   environment:
     name: staging
-    url: https://<%= staging_url %>
-  only:
-    - staging
-<%- else -%>
-deploy_staging:
-  extends: .deploy_capistrano
-  variables:
-    STAGE: staging
+    url: https://<%= @staging_url %>
   only:
     - staging
 <%- end -%>
 
-<%- production_url = Modulorails.data.production_url -%>
-<%- if production_url.present? -%>
+<%- if @production_url.present? -%>
 deploy_production:
   extends: .deploy_helm
   variables:
-    NAMESPACE: <%= image_name %>
-    NAME: <%= image_name %>
-    CHART_NAME: <%= image_name %>
-    CONFIG_FILE: config/deploy/kubernetes/production.yaml
-    EXTRA_VARS: --set image.tag=$CI_COMMIT_SHORT_SHA --set database.password=$DB_PASSWORD
+    NAMESPACE: <%= @image_name %>
+    NAME: <%= @image_name %>
+    CHART_NAME: <%= @image_name %>
+    CONFIG_FILE: config/deploy/production.yaml
+    EXTRA_VARS: --set image.tag=$CI_COMMIT_SHORT_SHA
   environment:
     name: production
-    url: https://<%= production_url %>
-  only:
-    - master
-<%- else -%>
-deploy_production:
-  extends: .deploy_capistrano
-  variables:
-    STAGE: production
+    url: https://<%= @production_url %>
   only:
     - master
 <%- end -%>

data/lib/generators/modulorails/gitlabci/templates/config/deploy/production.yaml.tt

@@ -0,0 +1,43 @@
+imagePullSecrets:
+  - name: regcred
+
+ingress:
+  enabled: true
+  annotations:
+    kubernetes.io/ingress.class: nginx
+    kubernetes.io/tls-acme: 'true'
+  hosts:
+    - host: <%= @production_url %>
+      paths:
+        - path: /
+  tls:
+    - secretName: <%= @image_name %>
+      hosts:
+        - <%= @production_url %>
+
+resources:
+  requests:
+    cpu: 100m
+    memory: 512Mi
+  limits:
+    memory: 512Mi
+
+autoscaling:
+  enabled: true
+  minReplicas: 2
+  maxReplicas: 10
+  targetCPUUtilizationPercentage: 80
+
+database:
+  existingSecret: 'database-credential'
+
+master_key:
+  existingSecret: 'masterkey-credential'
+
+env:
+  RAILS_ENV: production
+  URL: https://<%= @production_url %>/
+
+redis:
+  enabled: false
+  existingSecret: 'redis-credential'

data/lib/generators/modulorails/gitlabci/templates/config/deploy/review.yaml.tt

@@ -0,0 +1,42 @@
+imagePullSecrets:
+  - name: regcred
+
+ingress:
+  enabled: true
+  annotations:
+    kubernetes.io/ingress.class: nginx
+    kubernetes.io/tls-acme: 'true'
+  hosts:
+    - host: $REVIEW_URL
+      paths:
+        - path: /
+  tls:
+    - secretName: <%= @image_name %>
+      hosts:
+        - $REVIEW_URL
+
+resources:
+  requests:
+    cpu: 100m
+    memory: 512Mi
+  limits:
+    memory: 512Mi
+
+autoscaling:
+  enabled: true
+  minReplicas: 1
+  maxReplicas: 10
+  targetCPUUtilizationPercentage: 80
+
+database:
+  url: $DATABASE_URL
+
+master_key:
+  key: $MASTER_KEY
+
+env:
+  RAILS_ENV: staging
+  URL: https://$REVIEW_URL/
+
+redis:
+  enabled: true

data/lib/generators/modulorails/gitlabci/templates/config/deploy/staging.yaml.tt

@@ -0,0 +1,42 @@
+imagePullSecrets:
+  - name: regcred
+
+ingress:
+  enabled: true
+  annotations:
+    kubernetes.io/ingress.class: nginx
+    kubernetes.io/tls-acme: 'true'
+  hosts:
+    - host: <%= @staging_url %>
+      paths:
+        - path: /
+  tls:
+    - secretName: <%= @image_name %>
+      hosts:
+        - <%= @staging_url %>
+
+resources:
+  requests:
+    cpu: 100m
+    memory: 512Mi
+  limits:
+    memory: 512Mi
+
+autoscaling:
+  enabled: true
+  minReplicas: 1
+  maxReplicas: 10
+  targetCPUUtilizationPercentage: 80
+
+database:
+  url: $DATABASE_URL
+
+master_key:
+  key: $MASTER_KEY
+
+env:
+  RAILS_ENV: staging
+  URL: https://<%= @staging_url %>/
+
+redis:
+  enabled: true

data/lib/generators/modulorails/sidekiq/sidekiq_generator.rb

@@ -16,6 +16,12 @@ class Modulorails::SidekiqGenerator < Rails::Generators::Base
     add_to_docker_compose_yml_file(Rails.root.join('docker-compose.prod.yml'))
   end
 
+  def add_to_deploy_files
+    add_to_deploy_file(Rails.root.join('config/deploy/production.yaml'))
+    add_to_deploy_file(Rails.root.join('config/deploy/staging.yaml'))
+    add_to_deploy_file(Rails.root.join('config/deploy/review.yaml'))
+  end
+
   def add_to_gemfile
     gemfile_path = Rails.root.join('Gemfile')
 
@@ -143,4 +149,30 @@ class Modulorails::SidekiqGenerator < Rails::Generators::Base
       end
     end
   end
+
+  def add_to_deploy_file(file_path)
+    # Do nothing if file does not exists or Sidekiq is already enabled
+    return if !File.exist?(file_path) || File.read(file_path).match?(/^ {2}sidekiq:$/)
+
+    # Add sidekiq to deploy file
+    insert_into_file file_path do
+      <<-YAML
+
+sidekiq:
+  enabled: true
+  resources:
+    requests:
+      cpu: 100m
+      memory: 512Mi
+    limits:
+      cpu: 100m
+      memory: 512Mi
+  autoscaling:
+    enabled: true
+    minReplicas: 1
+    maxReplicas: 10
+    targetCPUUtilizationPercentage: 80
+      YAML
+    end
+  end
 end

data/lib/modulorails/version.rb

@@ -1,6 +1,6 @@
 module Modulorails
 
-  VERSION = '1.3.0'.freeze
+  VERSION = '1.3.1'.freeze
 
   # Useful to compare the current Ruby version
   COMPARABLE_RUBY_VERSION = Gem::Version.new(RUBY_VERSION)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: modulorails
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Matthieu Ciappara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-03-09 00:00:00.000000000 Z
+date: 2023-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: git
@@ -211,6 +211,9 @@ files:
 - lib/generators/modulorails/gitlabci/gitlabci_generator.rb
 - lib/generators/modulorails/gitlabci/templates/.gitlab-ci.yml.tt
 - lib/generators/modulorails/gitlabci/templates/.modulorails-gitlab-ci
+- lib/generators/modulorails/gitlabci/templates/config/deploy/production.yaml.tt
+- lib/generators/modulorails/gitlabci/templates/config/deploy/review.yaml.tt
+- lib/generators/modulorails/gitlabci/templates/config/deploy/staging.yaml.tt
 - lib/generators/modulorails/healthcheck/health_check_generator.rb
 - lib/generators/modulorails/healthcheck/templates/.modulorails-health_check
 - lib/generators/modulorails/healthcheck/templates/config/initializers/health_check.rb.tt