From 0ee0d7cce7c7aa587ea145ca32045438a2d0198a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Munsch?= Date: Thu, 12 Nov 2026 10:46:37 +0100 Subject: [PATCH] refactor: update configuration files for improved structure - Added new database and queue configuration files. - Enhanced .env.example with additional environment variables. - Updated manifest.yaml for better deployment settings. --- .env.example | 33 ++++- config/database.php | 220 +++++++++++++++++++++++++++++ config/filesystems.php | 16 +++ config/queue.php | 132 +++++++++++++++++ manifest.yaml | 314 +++++++++++++++++++++++++++++------------ 5 files changed, 616 insertions(+), 99 deletions(-) create mode 100644 config/database.php create mode 100644 config/queue.php diff --git a/.env.example b/.env.example index 567a5608..e8ba3589 100644 --- a/.env.example +++ b/.env.example @@ -1,3 +1,4 @@ +# APP APP_NAME=Laravel APP_ENV=local APP_KEY= @@ -5,9 +6,11 @@ APP_DEBUG=true APP_URL=http://localhost APP_CURRENCY=EUR +# LOG LOG_CHANNEL=stack LOG_LEVEL=debug +# DB DB_CONNECTION=mysql DB_HOST=127.0.0.1 DB_PORT=3306 @@ -15,14 +18,32 @@ DB_DATABASE=laravel DB_USERNAME=root DB_PASSWORD= +# BROADCAST, CACHE, QUEUE BROADCAST_DRIVER=log CACHE_STORE=file QUEUE_CONNECTION=sync -SESSION_DRIVER=file + +# SESSION +SESSION_STORE=file SESSION_LIFETIME=120 +SESSION_ENCRYPT=false +SESSION_SECURE_COOKIE=false +SESSION_PATH=/ +SESSION_DOMAIN= -FILESYSTEM_DISK=local +# S3 +AWS_ACCESS_KEY_ID=minioadmin +AWS_SECRET_ACCESS_KEY=minioadmin +AWS_DEFAULT_REGION=us-east-1 +AWS_BUCKET=ovoteam +AWS_ENDPOINT=http://127.0.0.1:9000 +AWS_URL=http://127.0.0.1:9000/ovoteam +AWS_USE_PATH_STYLE_ENDPOINT=true +# FILESYSTEM +FILESYSTEM_DISK=s3-public + +# MAIL MAIL_MAILER=log MAIL_SCHEME=null MAIL_HOST=127.0.0.1 @@ -40,10 +61,10 @@ CRM_ENDPOINT= CRM_TOKEN= CRM_PASSWORD= -# Sentry +# SENTRY SENTRY_LARAVEL_DSN= -# Matomo +# MATOMO MATOMO_SITE_ID= # UWIL ADMIN SECURE @@ -52,13 +73,13 @@ UWIL_ADMIN_SECURE_CIDR_LIST="" # - LIST SEPARATED WITH ',' (Optional) UWIL_ADMIN_SECURE_CIDR_PROJECT_ALLOWED_LIST="" -# Arcadia API +# ARCADIA API ARCADIA_API_ENDPOINT= ARCADIA_API_APIKEY= ARCADIA_API_SECRET= ARCADIA_API_IGNORE_SELF_SIGNED_CERT=false -# Serial Caster +# SERIAL CASTER SERIAL_CASTER_SEED=12345 # LDC diff --git a/config/database.php b/config/database.php new file mode 100644 index 00000000..9430ac4a --- /dev/null +++ b/config/database.php @@ -0,0 +1,220 @@ + env('DB_CONNECTION', 'sqlite'), + + /* + |-------------------------------------------------------------------------- + | Database Connections + |-------------------------------------------------------------------------- + | + | Below are all of the database connections defined for your application. + | An example configuration is provided for each database system which + | is supported by Laravel. You're free to add / remove connections. + | + */ + + 'connections' => [ + + 'sqlite' => [ + 'driver' => 'sqlite', + 'url' => env('DB_URL'), + 'database' => env('DB_DATABASE', database_path('database.sqlite')), + 'prefix' => '', + 'prefix_indexes' => null, + 'mask_bindings_in_exception_messages' => env('DB_MASK_BINDINGS', false), + 'foreign_key_constraints' => env('DB_FOREIGN_KEYS', true), + 'busy_timeout' => null, + 'journal_mode' => null, + 'synchronous' => null, + 'transaction_mode' => 'DEFERRED', + 'pragmas' => [], + ], + + 'mysql' => [ + 'driver' => 'mysql', + 'url' => env('DB_URL'), + 'host' => env('DB_HOST', '127.0.0.1'), + 'port' => env('DB_PORT', '3306'), + 'database' => env('DB_DATABASE', 'laravel'), + 'username' => env('DB_USERNAME', 'root'), + 'password' => env('DB_PASSWORD', ''), + 'unix_socket' => env('DB_SOCKET', ''), + 'charset' => env('DB_CHARSET', 'utf8mb4'), + 'collation' => env('DB_COLLATION', 'utf8mb4_unicode_ci'), + 'prefix' => '', + 'prefix_indexes' => true, + 'mask_bindings_in_exception_messages' => env('DB_MASK_BINDINGS', false), + 'strict' => true, + 'engine' => null, + 'options' => extension_loaded('pdo_mysql') ? array_filter([ + Mysql::ATTR_SSL_CA => env('MYSQL_ATTR_SSL_CA'), + ]) : [], + ], + + 'mariadb' => [ + 'driver' => 'mariadb', + 'url' => env('DB_URL'), + 'host' => env('DB_HOST', '127.0.0.1'), + 'port' => env('DB_PORT', '3306'), + 'database' => env('DB_DATABASE', 'laravel'), + 'username' => env('DB_USERNAME', 'root'), + 'password' => env('DB_PASSWORD', ''), + 'unix_socket' => env('DB_SOCKET', ''), + 'charset' => env('DB_CHARSET', 'utf8mb4'), + 'collation' => env('DB_COLLATION', 'utf8mb4_unicode_ci'), + 'prefix' => '', + 'prefix_indexes' => true, + 'mask_bindings_in_exception_messages' => env('DB_MASK_BINDINGS', false), + 'strict' => true, + 'engine' => null, + 'options' => extension_loaded('pdo_mysql') ? array_filter([ + Mysql::ATTR_SSL_CA => env('MYSQL_ATTR_SSL_CA'), + ]) : [], + ], + + 'pgsql' => [ + 'driver' => 'pgsql', + 'url' => env('DB_URL'), + 'host' => env('DB_HOST', '127.0.0.1'), + 'port' => env('DB_PORT', '5432'), + 'database' => env('DB_DATABASE', 'laravel'), + 'username' => env('DB_USERNAME', 'root'), + 'password' => env('DB_PASSWORD', ''), + 'charset' => env('DB_CHARSET', 'utf8'), + 'prefix' => '', + 'prefix_indexes' => true, + 'mask_bindings_in_exception_messages' => env('DB_MASK_BINDINGS', false), + 'search_path' => 'public', + 'sslmode' => 'prefer', + 'pooled' => env('DB_POOLED', false), + 'direct' => array_filter([ + 'host' => env('DB_DIRECT_HOST'), + 'port' => env('DB_DIRECT_PORT'), + 'username' => env('DB_DIRECT_USERNAME'), + 'password' => env('DB_DIRECT_PASSWORD'), + 'sslmode' => env('DB_DIRECT_SSLMODE'), + ]), + ], + + 'sqlsrv' => [ + 'driver' => 'sqlsrv', + 'url' => env('DB_URL'), + 'host' => env('DB_HOST', 'localhost'), + 'port' => env('DB_PORT', '1433'), + 'database' => env('DB_DATABASE', 'laravel'), + 'username' => env('DB_USERNAME', 'root'), + 'password' => env('DB_PASSWORD', ''), + 'charset' => env('DB_CHARSET', 'utf8'), + 'prefix' => '', + 'prefix_indexes' => true, + 'mask_bindings_in_exception_messages' => env('DB_MASK_BINDINGS', false), + // 'encrypt' => env('DB_ENCRYPT', 'yes'), + // 'trust_server_certificate' => env('DB_TRUST_SERVER_CERTIFICATE', 'false'), + ], + + ], + + /* + |-------------------------------------------------------------------------- + | Migration Repository Table + |-------------------------------------------------------------------------- + | + | This table keeps track of all the migrations that have already run for + | your application. Using this information, we can determine which of + | the migrations on disk haven't actually been run on the database. + | + */ + + 'migrations' => [ + 'table' => 'migrations', + 'update_date_on_publish' => true, + ], + + /* + |-------------------------------------------------------------------------- + | Redis Databases + |-------------------------------------------------------------------------- + | + | Redis is an open source, fast, and advanced key-value store that also + | provides a richer body of commands than a typical key-value system + | such as Memcached. You may define your connection settings here. + | + */ + + 'redis' => [ + + 'client' => env('REDIS_CLIENT', 'phpredis'), + + 'options' => [ + 'cluster' => env('REDIS_CLUSTER', 'redis'), + 'prefix' => env('REDIS_PREFIX', Str::slug((string) env('APP_NAME', 'laravel'))), + 'persistent' => env('REDIS_PERSISTENT', false), + ], + + 'default' => [ + 'url' => env('REDIS_URL'), + 'host' => env('REDIS_HOST', '127.0.0.1'), + 'username' => env('REDIS_USERNAME'), + 'password' => env('REDIS_PASSWORD'), + 'port' => env('REDIS_PORT', '6379'), + 'database' => env('REDIS_DB', '0'), + 'scheme' => env('REDIS_SCHEME', 'tcp'), + 'prefix' => env('REDIS_DB_PREFIX', env('REDIS_PREFIX', 'ovoteam') . ':database:'), + 'max_retries' => env('REDIS_MAX_RETRIES', 3), + 'backoff_algorithm' => env('REDIS_BACKOFF_ALGORITHM', 'decorrelated_jitter'), + 'backoff_base' => env('REDIS_BACKOFF_BASE', 100), + 'backoff_cap' => env('REDIS_BACKOFF_CAP', 1000), + ], + + 'cache' => [ + 'url' => env('REDIS_URL'), + 'host' => env('REDIS_HOST', '127.0.0.1'), + 'username' => env('REDIS_USERNAME'), + 'password' => env('REDIS_PASSWORD'), + 'port' => env('REDIS_PORT', '6379'), + 'database' => env('REDIS_CACHE_DB', '1'), + 'scheme' => env('REDIS_SCHEME', 'tcp'), + 'prefix' => env('REDIS_CACHE_DB_PREFIX', env('REDIS_PREFIX', 'ovoteam') . ':cache:'), + 'max_retries' => env('REDIS_MAX_RETRIES', 3), + 'backoff_algorithm' => env('REDIS_BACKOFF_ALGORITHM', 'decorrelated_jitter'), + 'backoff_base' => env('REDIS_BACKOFF_BASE', 100), + 'backoff_cap' => env('REDIS_BACKOFF_CAP', 1000), + ], + + 'session' => [ + 'url' => env('REDIS_URL'), + 'host' => env('REDIS_HOST', '127.0.0.1'), + 'username' => env('REDIS_USERNAME'), + 'password' => env('REDIS_PASSWORD'), + 'port' => env('REDIS_PORT', '6379'), + 'database' => env('REDIS_SESSION_DB', '0'), + 'scheme' => env('REDIS_SCHEME', 'tcp'), + 'prefix' => env('REDIS_SESSION_DB_PREFIX', env('REDIS_PREFIX', 'ovoteam') . ':session:'), + 'max_retries' => env('REDIS_MAX_RETRIES', 3), + 'backoff_algorithm' => env('REDIS_BACKOFF_ALGORITHM', 'decorrelated_jitter'), + 'backoff_base' => env('REDIS_BACKOFF_BASE', 100), + 'backoff_cap' => env('REDIS_BACKOFF_CAP', 1000), + ], + + ], + +]; diff --git a/config/filesystems.php b/config/filesystems.php index 4e5aea19..72e4cb81 100644 --- a/config/filesystems.php +++ b/config/filesystems.php @@ -62,6 +62,22 @@ return [ 'report' => false, ], + 's3-public' => [ + 'driver' => 'scoped', + 'disk' => 's3', + 'prefix' => 'public', + 'visibility' => 'public', + 'throw' => false, + ], + + 's3-private' => [ + 'driver' => 'scoped', + 'disk' => 's3', + 'prefix' => 'private', + 'visibility' => 'private', + 'throw' => false, + ], + ], /* diff --git a/config/queue.php b/config/queue.php new file mode 100644 index 00000000..771a3362 --- /dev/null +++ b/config/queue.php @@ -0,0 +1,132 @@ + env('QUEUE_CONNECTION', 'database'), + + /* + |-------------------------------------------------------------------------- + | Queue Connections + |-------------------------------------------------------------------------- + | + | Here you may configure the connection options for every queue backend + | used by your application. An example configuration is provided for + | each backend supported by Laravel. You're also free to add more. + | + | Drivers: "sync", "database", "beanstalkd", "sqs", "redis", + | "deferred", "failover", "null" + | + */ + + 'connections' => [ + + 'sync' => [ + 'driver' => 'sync', + ], + + 'database' => [ + 'driver' => 'database', + 'connection' => env('DB_QUEUE_CONNECTION'), + 'table' => env('DB_QUEUE_TABLE', 'jobs'), + 'queue' => env('DB_QUEUE', 'default'), + 'retry_after' => (int) env('DB_QUEUE_RETRY_AFTER', 90), + 'after_commit' => false, + ], + + 'beanstalkd' => [ + 'driver' => 'beanstalkd', + 'host' => env('BEANSTALKD_QUEUE_HOST', 'localhost'), + 'queue' => env('BEANSTALKD_QUEUE', 'default'), + 'retry_after' => (int) env('BEANSTALKD_QUEUE_RETRY_AFTER', 90), + 'block_for' => 0, + 'after_commit' => false, + ], + + 'sqs' => [ + 'driver' => 'sqs', + 'key' => env('AWS_ACCESS_KEY_ID'), + 'secret' => env('AWS_SECRET_ACCESS_KEY'), + 'prefix' => env('SQS_PREFIX', 'https://sqs.us-east-1.amazonaws.com/your-account-id'), + 'queue' => env('SQS_QUEUE', 'default'), + 'suffix' => env('SQS_SUFFIX'), + 'region' => env('AWS_DEFAULT_REGION', 'us-east-1'), + 'after_commit' => false, + 'overflow' => [ + 'enabled' => env('SQS_OVERFLOW_ENABLED', false), + 'store' => env('SQS_OVERFLOW_STORE'), + 'always' => false, + 'delete_after_processing' => true, + 'flush_on_clear' => env('SQS_OVERFLOW_FLUSH_ON_CLEAR', false), + ], + ], + + 'redis' => [ + 'driver' => 'redis', + 'connection' => env('REDIS_QUEUE_CONNECTION', 'default'), + 'queue' => env('REDIS_QUEUE', 'default'), + 'retry_after' => (int) env('REDIS_QUEUE_RETRY_AFTER', 90), + 'block_for' => null, + 'after_commit' => false, + ], + + 'deferred' => [ + 'driver' => 'deferred', + ], + + 'failover' => [ + 'driver' => 'failover', + 'connections' => [ + 'database', + 'deferred', + ], + ], + + ], + + /* + |-------------------------------------------------------------------------- + | Job Batching + |-------------------------------------------------------------------------- + | + | The following options configure the database and table that store job + | batching information. These options can be updated to any database + | connection and table which has been defined by your application. + | + */ + + 'batching' => [ + 'database' => env('DB_CONNECTION', 'sqlite'), + 'table' => 'job_batches', + ], + + /* + |-------------------------------------------------------------------------- + | Failed Queue Jobs + |-------------------------------------------------------------------------- + | + | These options configure the behavior of failed queue job logging so you + | can control how and where failed jobs are stored. Laravel ships with + | support for storing failed jobs in a simple file or in a database. + | + | Supported drivers: "database-uuids", "dynamodb", "file", "null" + | + */ + + 'failed' => [ + 'driver' => env('QUEUE_FAILED_DRIVER', 'database-uuids'), + 'database' => env('DB_CONNECTION', 'sqlite'), + 'table' => 'failed_jobs', + ], + +]; diff --git a/manifest.yaml b/manifest.yaml index 65ea3535..08864f07 100644 --- a/manifest.yaml +++ b/manifest.yaml @@ -3,81 +3,151 @@ kind: ConfigMap metadata: name: ${CI_PROJECT_PATH_SLUG}-config-map data: - APP_NAME: "${APP_APP_NAME}" + APP_CURRENCY: "${APP_APP_CURRENCY}" + APP_DEBUG: "${APP_APP_DEBUG}" APP_ENV: "${APP_APP_ENV}" APP_KEY: "${APP_APP_KEY}" - APP_DEBUG: "${APP_APP_DEBUG}" + APP_MAINTENANCE_DRIVER: "cache" + APP_MAINTENANCE_STORE: "redis" + APP_NAME: "${APP_APP_NAME}" APP_URL: "https://${REDIRECT}${APP_DOMAIN}" - APP_CURRENCY: "${APP_APP_CURRENCY}" - LOG_CHANNEL: "k8s" + ARCADIA_API_APIKEY: "${APP_ARCADIA_API_APIKEY}" + ARCADIA_API_ENDPOINT: "${APP_ARCADIA_API_ENDPOINT}" + ARCADIA_API_SECRET: "${APP_ARCADIA_API_SECRET}" + AWS_ACCESS_KEY_ID: ${APP_OVH_S3_ACCESS_KEY_ID} + AWS_BUCKET: ${APP_OVH_S3_BUCKET} + AWS_DEFAULT_REGION: ${APP_GLOBAL_OVH_S3_REGION} + AWS_ENDPOINT: ${APP_GLOBAL_OVH_S3_ENDPOINT} + AWS_SECRET_ACCESS_KEY: ${APP_OVH_S3_SECRET_ACCESS_KEY} + AWS_URL: "${APP_OVH_S3_URL}" + AWS_USE_PATH_STYLE_ENDPOINT: "true" + CACHE_PREFIX: "" CACHE_STORE: "${APP_CACHE_STORE}" - QUEUE_CONNECTION: "${APP_QUEUE_CONNECTION}" - SESSION_DRIVER: "${APP_SESSION_DRIVER}" - FILESYSTEM_DISK: "${APP_FILESYSTEM_DISK}" - DB_HOST: "${APP_GLOBAL_OVH_MYSQL_HOST}" - DB_PORT: "${APP_GLOBAL_OVH_MYSQL_PORT}" - DB_DATABASE: "${APP_DB_DATABASE}" + CRM_ENDPOINT: "${APP_CRM_ENDPOINT}" + CRM_PASSWORD: "${APP_CRM_PASSWORD}" + CRM_TOKEN: "${APP_CRM_TOKEN}" DB_CONNECTION: "mysql" - DB_USERNAME: "${APP_DB_USERNAME}" + DB_DATABASE: "${APP_DB_DATABASE}" + DB_HOST: "${APP_GLOBAL_OVH_MYSQL_HOST}" DB_PASSWORD: "${APP_DB_PASSWORD}" - MAIL_MAILER: "${APP_MAIL_MAILER}" - MAIL_HOST: "${APP_MAIL_HOST}" - MAIL_PORT: "${APP_MAIL_PORT}" - MAIL_USERNAME: "${APP_MAIL_USERNAME}" - MAIL_PASSWORD: "${APP_MAIL_PASSWORD}" + DB_PORT: "${APP_GLOBAL_OVH_MYSQL_PORT}" + DB_USERNAME: "${APP_DB_USERNAME}" + FILESYSTEM_DISK: "${APP_FILESYSTEM_DISK}" + LDC_HEADQUARTERS_PHONE_RECEPTION: "${APP_LDC_HEADQUARTERS_PHONE_RECEPTION}" + LOG_CHANNEL: "k8s" MAIL_ENCRYPTION: "${APP_MAIL_ENCRYPTION}" - MAIL_SCHEME: "${APP_MAIL_SCHEME}" MAIL_FROM_ADDRESS: "${APP_MAIL_FROM_ADDRESS}" MAIL_FROM_NAME: "${APP_APP_NAME}" + MAIL_HOST: "${APP_MAIL_HOST}" + MAIL_MAILER: "${APP_MAIL_MAILER}" + MAIL_PASSWORD: "${APP_MAIL_PASSWORD}" + MAIL_PORT: "${APP_MAIL_PORT}" + MAIL_SCHEME: "${APP_MAIL_SCHEME}" MAIL_TO_CONTACT: "${APP_MAIL_TO_CONTACT}" MAIL_TO_REGATE: "${APP_MAIL_TO_REGATE}" - SENTRY_LARAVEL_DSN: "${APP_SENTRY_LARAVEL_DSN}" - CRM_ENDPOINT: "${APP_CRM_ENDPOINT}" - CRM_TOKEN: "${APP_CRM_TOKEN}" - CRM_PASSWORD: "${APP_CRM_PASSWORD}" + MAIL_USERNAME: "${APP_MAIL_USERNAME}" MATOMO_SITE_ID: "${APP_MATOMO_SITE_ID}" - UWIL_ADMIN_SECURE_CIDR_LIST: "${APP_GLOBAL_UWIL_ADMIN_SECURE_CIDR_LIST}" - ARCADIA_API_ENDPOINT: "${APP_ARCADIA_API_ENDPOINT}" - ARCADIA_API_APIKEY: "${APP_ARCADIA_API_APIKEY}" - ARCADIA_API_SECRET: "${APP_ARCADIA_API_SECRET}" + QUEUE_CONNECTION: "database" + REDIS_CLIENT: "phpredis" + REDIS_HOST: "${APP_GLOBAL_OVH_REDIS_HOST}" + REDIS_PASSWORD: "${APP_REDIS_PASSWORD}" + REDIS_PORT: "${APP_GLOBAL_OVH_REDIS_PORT}" + REDIS_PREFIX: "${APP_REDIS_PREFIX}" + REDIS_SCHEME: "${APP_GLOBAL_OVH_REDIS_SCHEME}" + REDIS_USERNAME: "${APP_REDIS_USERNAME}" + SENTRY_LARAVEL_DSN: "${APP_SENTRY_LARAVEL_DSN}" SERIAL_CASTER_SEED: "${APP_SERIAL_CASTER_SEED}" - LDC_HEADQUARTERS_PHONE_RECEPTION: "${APP_LDC_HEADQUARTERS_PHONE_RECEPTION}" ---- -apiVersion: v1 -kind: PersistentVolumeClaim -metadata: - name: ${CI_PROJECT_PATH_SLUG}-pvc-storage -spec: - storageClassName: "csi-cinder-classic" - accessModes: - - ReadWriteOnce - resources: - requests: - storage: $APP_PVC_SIZE + SESSION_CONNECTION: "${APP_SESSION_CONNECTION}" + SESSION_DRIVER: "${APP_SESSION_DRIVER}" + UWIL_ADMIN_SECURE_CIDR_LIST: "${APP_GLOBAL_UWIL_ADMIN_SECURE_CIDR_LIST}" --- apiVersion: apps/v1 kind: Deployment metadata: name: ${CI_PROJECT_PATH_SLUG}-deployment + labels: + app: ${CI_PROJECT_PATH_SLUG}-app spec: - replicas: 1 selector: matchLabels: app: ${CI_PROJECT_PATH_SLUG}-app + strategy: + type: RollingUpdate + rollingUpdate: + maxUnavailable: 0 + maxSurge: 1 template: metadata: labels: app: ${CI_PROJECT_PATH_SLUG}-app spec: + securityContext: + runAsUser: 82 + runAsGroup: 82 + fsGroup: 82 + fsGroupChangePolicy: OnRootMismatch + terminationGracePeriodSeconds: 30 + imagePullSecrets: + - name: docker-registry-credentials + affinity: + podAntiAffinity: + requiredDuringSchedulingIgnoredDuringExecution: + - labelSelector: + matchExpressions: + - key: app + operator: In + values: + - ${CI_PROJECT_PATH_SLUG}-app + topologyKey: kubernetes.io/hostname + namespaces: + - ${KUBE_NAMESPACE} + volumes: + - name: laravel-cache + emptyDir: {} + - name: laravel-views + emptyDir: {} containers: - name: ${CI_PROJECT_PATH_SLUG}-container image: $IMAGE_TAG + imagePullPolicy: IfNotPresent env: - name: XDG_CONFIG_HOME # For tinker value: /tmp envFrom: - configMapRef: name: ${CI_PROJECT_PATH_SLUG}-config-map + ports: + - name: http + containerPort: 80 + protocol: TCP + volumeMounts: + - name: laravel-cache + mountPath: /app/srcs/bootstrap/cache + - name: laravel-views + mountPath: /app/srcs/storage/framework/views + readinessProbe: + httpGet: + path: /up + port: http + initialDelaySeconds: 10 + periodSeconds: 10 + timeoutSeconds: 3 + failureThreshold: 3 + livenessProbe: + httpGet: + path: /up + port: http + initialDelaySeconds: 30 + periodSeconds: 20 + timeoutSeconds: 3 + failureThreshold: 3 + startupProbe: + httpGet: + path: /up + port: http + periodSeconds: 5 + timeoutSeconds: 3 + failureThreshold: 24 resources: limits: cpu: "${APP_CI_CPU_LIMIT}" @@ -85,9 +155,11 @@ spec: requests: cpu: "${APP_CI_CPU_REQUEST}" memory: "${APP_CI_MEMORY_REQUEST}" - volumeMounts: - - name: storage - mountPath: /app/srcs/storage + securityContext: + # TODO : valider le POC + # readOnlyRootFilesystem: true + # TODO : a priori incompatible avec PVC + # allowPrivilegeEscalation: false - name: ${CI_PROJECT_PATH_SLUG}-queue-worker image: $IMAGE_TAG lifecycle: @@ -108,20 +180,11 @@ spec: envFrom: - configMapRef: name: ${CI_PROJECT_PATH_SLUG}-config-map - volumeMounts: - - name: storage - mountPath: /app/srcs/storage - imagePullSecrets: - - name: docker-registry-credentials - securityContext: - runAsUser: 82 - runAsGroup: 82 - fsGroup: 82 - fsGroupChangePolicy: "OnRootMismatch" - volumes: - - name: storage - persistentVolumeClaim: - claimName: ${CI_PROJECT_PATH_SLUG}-pvc-storage + securityContext: + # TODO : valider le POC + # readOnlyRootFilesystem: true + # TODO : a priori incompatible avec PVC + # allowPrivilegeEscalation: false --- apiVersion: v1 kind: Service @@ -131,8 +194,10 @@ spec: selector: app: ${CI_PROJECT_PATH_SLUG}-app ports: - - port: 80 - targetPort: 80 + - name: http + port: 80 + targetPort: http + protocol: TCP --- apiVersion: traefik.io/v1alpha1 kind: IngressRoute @@ -149,11 +214,57 @@ spec: - name: ${CI_PROJECT_PATH_SLUG}-service port: 80 middlewares: - - name: redirect-no-www-to-www + - name: redirect-no-www-to-www tls: secretName: ${CRT_TLS_NAME} --- +apiVersion: autoscaling/v2 +kind: HorizontalPodAutoscaler +metadata: + name: ${CI_PROJECT_PATH_SLUG}-hpa +spec: + scaleTargetRef: + apiVersion: apps/v1 + kind: Deployment + name: ${CI_PROJECT_PATH_SLUG}-deployment + minReplicas: 1 + maxReplicas: 2 + metrics: + - type: Resource + resource: + name: cpu + target: + type: Utilization + averageUtilization: 60 + - type: Resource + resource: + name: memory + target: + type: Utilization + averageUtilization: 75 + behavior: + scaleUp: + stabilizationWindowSeconds: 0 + selectPolicy: Max + policies: + - type: Percent + value: 100 + periodSeconds: 60 + - type: Pods + value: 2 + periodSeconds: 60 + scaleDown: + stabilizationWindowSeconds: 300 + selectPolicy: Min + policies: + - type: Percent + value: 25 + periodSeconds: 60 + - type: Pods + value: 1 + periodSeconds: 60 +--- apiVersion: batch/v1 kind: CronJob metadata: @@ -167,41 +278,58 @@ spec: spec: template: spec: - affinity: - podAffinity: - requiredDuringSchedulingIgnoredDuringExecution: - - labelSelector: - matchExpressions: - - key: app - operator: In - values: - - ${CI_PROJECT_PATH_SLUG}-app - topologyKey: "kubernetes.io/hostname" - namespaces: [ $KUBE_NAMESPACE ] - containers: - - name: ${CI_PROJECT_PATH_SLUG}-scheduled - image: $IMAGE_TAG - imagePullPolicy: IfNotPresent - command: - - "php" - args: - - "artisan" - - "schedule:run" - envFrom: - - configMapRef: - name: ${CI_PROJECT_PATH_SLUG}-config-map - volumeMounts: - - name: storage - mountPath: /app/srcs/storage - imagePullSecrets: - - name: docker-registry-credentials - volumes: - - name: storage - persistentVolumeClaim: - claimName: ${CI_PROJECT_PATH_SLUG}-pvc-storage + restartPolicy: OnFailure securityContext: runAsUser: 82 runAsGroup: 82 fsGroup: 82 - fsGroupChangePolicy: "OnRootMismatch" - restartPolicy: OnFailure + fsGroupChangePolicy: OnRootMismatch + affinity: + podAffinity: + requiredDuringSchedulingIgnoredDuringExecution: + - labelSelector: + matchExpressions: + - key: app + operator: In + values: + - ${CI_PROJECT_PATH_SLUG}-app + topologyKey: kubernetes.io/hostname + namespaces: + - ${KUBE_NAMESPACE} + imagePullSecrets: + - name: docker-registry-credentials + volumes: + - name: laravel-cache + emptyDir: {} + - name: laravel-views + emptyDir: {} + containers: + - name: ${CI_PROJECT_PATH_SLUG}-scheduled + image: $IMAGE_TAG + imagePullPolicy: IfNotPresent + workingDir: /app/srcs + command: + - php + args: + - artisan + - schedule:run + envFrom: + - configMapRef: + name: ${CI_PROJECT_PATH_SLUG}-config-map + volumeMounts: + - name: laravel-cache + mountPath: /app/srcs/bootstrap/cache + - name: laravel-views + mountPath: /app/srcs/storage/framework/views + resources: + requests: + cpu: "${APP_CI_CPU_REQUEST}" + memory: "${APP_CI_MEMORY_REQUEST}" + limits: + cpu: "${APP_CI_CPU_LIMIT}" + memory: "${APP_CI_MEMORY_LIMIT}" + securityContext: + # TODO : valider le POC + # readOnlyRootFilesystem: true + # TODO : a priori incompatible avec PVC + # allowPrivilegeEscalation: false