diff --git a/README.md b/README.md index f0361de..04d27b3 100644 --- a/README.md +++ b/README.md @@ -200,6 +200,7 @@ done - Displayed the Elasticsearch PHP client version on the `esinfo.php` page. - Removed the condition checking for **k8s** or **k3s** in Kubernetes deployment. - Added configuration and secret values for the `kind` system. +- Added configuration and secret values for the `k8s` system. - Added build multi-platform docker image **Bug Fixes:** diff --git a/helm/templates/php-fpm/configmap-site.yaml b/helm/templates/php-fpm/configmap-site.yaml index 03d6140..e57fe1a 100644 --- a/helm/templates/php-fpm/configmap-site.yaml +++ b/helm/templates/php-fpm/configmap-site.yaml @@ -13,10 +13,10 @@ data: DB_NAME: "{{ required ".Values.site.phpfpmSite.db.name entry is required!" .Values.site.phpfpmSite.db.name }}" DB_PORT: "{{ required ".Values.site.phpfpmSite.db.port entry is required!" .Values.site.phpfpmSite.db.port }}" DB_TABLE: "{{ required ".Values.site.phpfpmSite.db.tabl entry is required!" .Values.site.phpfpmSite.db.tabl }}" - PMA_URL: "http://{{ required ".Values.site.urlPma entry is required!" .Values.site.urlPma }}" + PMA_URL: "{{ required ".Values.site.proto entry is required!" .Values.site.proto }}://{{ required ".Values.site.urlPma entry is required!" .Values.site.urlPma }}" #PMA_URL: "{{ required ".Values.site.urlPma entry is required!" .Values.site.urlPma }}" ES_HOST: "{{ required ".Values.site.phpfpmSite.es.host entry is required!" .Values.site.phpfpmSite.es.host }}" ES_USER: "{{ required ".Values.site.phpfpmSite.es.user entry is required!" .Values.site.phpfpmSite.es.user }}" ES_INDEX: "{{ required ".Values.site.phpfpmSite.es.index entry is required!" .Values.site.phpfpmSite.es.index }}" - KIBANA_URL: "http://{{ required ".Values.site.urlKibana entry is required!" .Values.site.urlKibana }}" + KIBANA_URL: "{{ required ".Values.site.proto entry is required!" .Values.site.proto }}://{{ required ".Values.site.urlKibana entry is required!" .Values.site.urlKibana }}" #KIBANA_URL: "{{ required ".Values.site.urlKibana entry is required!" .Values.site.urlKibana }}" diff --git a/helm/values-k8s-configs.yaml b/helm/values-k8s-configs.yaml new file mode 100644 index 0000000..2e0e74e --- /dev/null +++ b/helm/values-k8s-configs.yaml @@ -0,0 +1,125 @@ +common: + pvc: + # k3s + #accessModes: [ "ReadWriteOnce" ] + #storageClassName: local-path + # kind + #accessModes: [ "ReadWriteOnce" ] + #storageClassName: standard + # k8s + accessModes: [ "ReadWriteMany" ] + storageClassName: longhorn + ingress: + #k3s + #ingressClassName: traefik + # kind + #ingressClassName: nginx + # k8s + ingressClassName: nginx + +# elasticsearch +elastic: + priorityClassName: system-cluster-critical + imageTag: 9.0.2 + persistentVolumeClaim: + storageRequest: 500M + host: http://service-elasticsearch:9200 + +# kibana +kibana: + imageTag: 9.0.2 + username: kibana_system_user + priorityClassName: system-node-critical +# host: http://service-elasticsearch:9200 + +# mariadb +mariadb: + repository: mariadb + pullPolicy: Always + tag: "10.11.7" + #tag: "11.2" + databaseName: gmo_db + innoDbBufferPoolSize: 256M + queryCacheSize: 256M + queryCacheLimit: 4M + ressourceRequest: + memory: 300Mi + cpu: 100m + ephemeralStorage: 128M + ressourceLimit: + memory: 1250Mi #1250 Mo RAM, au delà eviction + cpu: 200m # 0.1 core de CPU, au delà CPU Throttle + ephemeralStorage: 512M #512 Mo de storage non persistent (en + de ce qui est dans l'image), au delà éviction + terminationGracePeriodSeconds: 60 + persistentVolumeClaim: + storageRequest: 500M + backupDbStorageRequest: 500M + +# site +site: + tls: + enabled: true #k8s ssl by k8s, kind ssl by haproxy + host: wwwgmok8s.gmolab.net + proto: https + urlPma: wwwgmok8s-pma.gmolab.net + urlKibana: wwwgmok8s-kibana.gmolab.net + replicas: 1 + priorityClassName: business-app-critical + terminationGracePeriodSeconds: 60 + filesMountPath: /var/www/html/web + sourcesMountPath: /var/www/html + ssl_crt: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUZmekNDQTJlZ0F3SUJBZ0lKQU5YN2sxZ3dnOVNkTUEwR0NTcUdTSWIzRFFFQkN3VUFNSUcrTVFzd0NRWUQKVlFRR0V3SkRTREVOTUFzR0ExVUVDQk1FVm1GMVpERU5NQXNHQTFVRUJ4TUVUbmx2YmpFaE1COEdBMVVFQ2hNWQpSMDFQSUV4aFltOXlZWFJ2YVhKbElDaG5iVzlzWVdJcE1UQXdMZ1lEVlFRTEV5ZFRTVXhCUWlBb1UzbHpkR1Z0ClpTQnBibVp2Y20xaGRHbHZiaUJzWVdKdmNtRjBiMmx5WlNreEVqQVFCZ05WQkFNVENVZE5UMHhoWWlCRFFURW8KTUNZR0NTcUdTSWIzRFFFSkFSWVpaWGh3Ykc5cGRDNW5iVzkwWldOb1FHZHRZV2xzTG1OdmJUQWVGdzB5TlRBMApNalF3T0RBeU1qVmFGdzB5TmpBME1qUXdPREF5TWpWYU1JSEJNUXN3Q1FZRFZRUUdFd0pEU0RFTk1Bc0dBMVVFCkNCTUVWbUYxWkRFTk1Bc0dBMVVFQnhNRVRubHZiakVoTUI4R0ExVUVDaE1ZUjAxUElFeGhZbTl5WVhSdmFYSmwKSUNobmJXOXNZV0lwTVRBd0xnWURWUVFMRXlkVFNVeEJRaUFvVTNsemRHVnRaU0JwYm1admNtMWhkR2x2YmlCcwpZV0p2Y21GMGIybHlaU2t4RlRBVEJnTlZCQU1VRENvdVoyMXZiR0ZpTG01bGRERW9NQ1lHQ1NxR1NJYjNEUUVKCkFSWVpaWGh3Ykc5cGRDNW5iVzkwWldOb1FHZHRZV2xzTG1OdmJUQ0NBU0l3RFFZSktvWklodmNOQVFFQkJRQUQKZ2dFUEFEQ0NBUW9DZ2dFQkFKVXY0S1NWcndpWGFGUWZvMTBvVTVzYkIzRFM4K0djWTB1NW51VjFSN2F5SFhoaAp0ejhxYUJGaTJ3NllOVmRNNGJtSmRsNDluMk5aMmEwQlp4MmM1SFF5blc2Nk90WFZIWUVVL3RlYVlHZmJlYnpsCjhFMFVvMmFqMVQvNGNFQ0dLakxyam1DS04xQWpyVFpLVThVWWh2STJUa3NWN1EveEd3WUZ4Z3I4SXI2NlQ5WGsKa3V6bTIyUXVSb2Z5bXFLbnh4NXg0TStXQWNvZG0zRHQrTE5XNWVpYUZOMmR4L0I1S2hPMndTSWxEdHhxK3ZKNwpwR0Jxb0xQWGcwQkltRm0vUEtlQlI3KzRMR01JbG5uZ05lTzI3WmZRa2VMQmgwTDhkTklKdzFId29JdXdNdGRYCnhWM040TDByZmdQcmdKditIeHJQdXlDRGhlZEU5UWQwZEU1bWk1OENBd0VBQWFON01Ia3dDUVlEVlIwVEJBSXcKQURBWEJnTlZIUkVFRURBT2dnd3FMbWR0YjJ4aFlpNXVaWFF3RXdZRFZSMGxCQXd3Q2dZSUt3WUJCUVVIQXdFdwpIUVlEVlIwT0JCWUVGQ1AzTWRaYVBHKzdlZG5EUHA4eHhpdndtNEpKTUI4R0ExVWRJd1FZTUJhQUZPVVNUYWp0CnRranZWQUtqc3pQemJ3RExtL2x1TUEwR0NTcUdTSWIzRFFFQkN3VUFBNElDQVFDT0pCb2dEMFlPMHk0SGdscEkKaFAwVTFQbXdUMGFObFpGNW9teXFOeGZGVHFWN2FXRnhTM2I5VWVUL09GUUlkYThzdlhsYXFTN0xLZk5zamVYagpCeC9YOG1NWUJ1Zm50bkppUGZFVTZJdGRUVmhaY1RIYlJRTFkyVjVuZ21WV3ErQ2xVMklsWmtSeWtELzcvc0NaCnV6ODhKUEJXZ1R4MnV2QXh4NGI0bFAzUzF6L1VSVmczVzR5ei9pTUVNQ1M2Ymgra3FuUXdFM05HeFZmc2swOU0KdFhnWW1jQXZrZFpNcVNJOFVYRC9pTXNLV1NYd0JFeVFVQVJ4Wi9jMVJSSzhHVGpRMUNySHE5TFM0T1R3Qnc5aAorUWxoZU0yQUhKRzdES2tLbHJENkVzN0l5RkUrOG0zVzRtbkk2S2M4anRhYVZTeGdYeTBDZmtDQ2xMaTQxV3Y5CjJ5ZGY0N3ArOTUvN1ZvUUFKQXg5MWdxL3AxcWc1V0JCeVBMNWFMS2FzTnNkUjhrOUdLYk5BVVBZZGZvUzdiTGEKcjBzTGJlYitGUmgvVEt3dFh0RWJNVGRZN1hNTWE3ZG5CeEViRWs0ZHRjZTZvZkZJRnJVUzJ0eDU0cUdzaEd2QwpiNjV0N0U3MHFvWTRTck1KWVB5amlLVjNMYnoyMWgwRVh2dXBlekpsWHQ5SHZmME41OWdKSGZONmFIOGV0TU9xCmoxalptTHpCSDRGZ3cyQlZxSGR0b1JtYjB2UHVpcGtobjVHMzYzWXQxQU1pQzdtdVcvSVYreUNiRkYxN3p0c0wKUWxiQmxoSkZDQU5KQjd5WFo4cGFtMGVuVVZVUi81TUF2U0hIV1ZwcDI2RDZmUFJWbldmQTNhc09LdDNza0hOVApBb0Fpam5uZER6Y1diWmN1cWlJRHZLK3lNQT09Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K + nginxSite: + repository: nginxinc/nginx-unprivileged + pullPolicy: Always + tag: "1.26" + nginxConfigPath: /etc/nginx/conf.d/default.conf + ressourceRequest: + memory: 16M #16 Mo RAM + cpu: 50m # 0.05 core de CPU + ephemeralStorage: 512M #512 Mo de storage non persistent (en + de ce qui est dans l'image) + ressourceLimit: + memory: 128M #128 Mo RAM, au delà eviction + cpu: 500m # 0.5 core de CPU, au delà CPU Throttle + ephemeralStorage: 512M #512 Mo de storage non persistent (en + de ce qui est dans l'image), au delà éviction + persistentVolumeClaim: + storageRequest: 500M + ingress: + site: + hosts: + - wwwgmok8s.gmolab.net + pma: + hosts: + - wwwgmok8s-pma.gmolab.net + kibana: + hosts: + - wwwgmok8s-kibana.gmolab.net +# php-fpm + phpfpmSite: + repository: gmouchet/wwwgmo-php-fpm + imageTag: 3.3.0 + pullPolicy: Always + ressourceRequest: + memory: 16M #16 Mo RAM + cpu: 50m # 0.05 core de CPU + ephemeralStorage: 512M #512 Mo de storage non persistent (en + de ce qui est dans l'image) + ressourceLimit: + memory: 128M #128 Mo RAM, au delà eviction + cpu: 500m # 0.5 core de CPU, au delà CPU Throttle + ephemeralStorage: 512M #512 Mo de storage non persistent (en + de ce qui est dans l'image), au delà éviction + site: + title: "Stack GMo - PHP-FPM - MariaDB - Elasticsearch" + db: + name: gmo_db + user: gmo_db + host: service-mariadb + port: 3306 + tabl: tbl_email + es: + host: service-elasticsearch:9200 + user: elastic + index: wwwgmo_index + + + + \ No newline at end of file diff --git a/helm/values-k8s-secrets.yaml b/helm/values-k8s-secrets.yaml new file mode 100644 index 0000000..609f0c5 --- /dev/null +++ b/helm/values-k8s-secrets.yaml @@ -0,0 +1,13 @@ +site: + ssl_key: LS0tLS1CRUdJTiBQUklWQVRFIEtFWS0tLS0tCk1JSUV2UUlCQURBTkJna3Foa2lHOXcwQkFRRUZBQVNDQktjd2dnU2pBZ0VBQW9JQkFRQ1ZMK0NrbGE4SWwyaFUKSDZOZEtGT2JHd2R3MHZQaG5HTkx1WjdsZFVlMnNoMTRZYmMvS21nUll0c09tRFZYVE9HNWlYWmVQWjlqV2RtdApBV2Nkbk9SME1wMXV1anJWMVIyQkZQN1htbUJuMjNtODVmQk5GS05tbzlVLytIQkFoaW95NjQ1Z2lqZFFJNjAyClNsUEZHSWJ5Tms1TEZlMFA4UnNHQmNZSy9DSyt1ay9WNUpMczV0dGtMa2FIOHBxaXA4Y2VjZURQbGdIS0hadHcKN2ZpelZ1WG9taFRkbmNmd2VTb1R0c0VpSlE3Y2F2cnllNlJnYXFDejE0TkFTSmhadnp5bmdVZS91Q3hqQ0paNQo0RFhqdHUyWDBKSGl3WWRDL0hUU0NjTlI4S0NMc0RMWFY4VmR6ZUM5SzM0RDY0Q2IvaDhhejdzZ2c0WG5SUFVICmRIUk9ab3VmQWdNQkFBRUNnZ0VBRGpNRXRrV0tQUGx1M3ZXS21VeEVTNGY5WTZTckVtSE4wRXIyTDdBWThrVHUKVkhpTElNSksyTDl5OVdiNzlMZUc2SFRkUlBKU2l2bmwrUGNnTnd1cGNYeDd5dFV1SjdvUUE5V0VFcHRKUDdsVApxSmRZdkNLOFpxd3Q3aTBabEsvd1c1dXdsOG12K0JCZE9tOUZSOXQzYjBoSFFyMloxdmJ1SG9XZ0tETFZUOEoxCis1MXlISC9VbGlIb0E4bzkxYUd3K3F5KzllWlJrdGpxSmlOWXpGMUMzVDB5Sk1yQXdxZXU4Z09ic2k3c2kwMWkKZ254d1VISDVVckNjaXZRTzQxWFBjUW5QYzQ5dTE4bkFRSGRxTTZNL05yTzZwWENUTnY0OHY2OEZsaDlmanBqawpvUDVJN0IwRThOTE5ZSDkyMEJUbE1hRFUvYVAwdE9HRXJHblgyWElBY1FLQmdRQzZRbFpJMjAyTmZMWnVSVmhoCjBMN3A4VklXWnE3UEl2US9tRHF4Rlc4WllkQk14RXY2UFZVTTl6VHVsVVh2TlM2SE9ncHAxUGxGVVNHM2dQRzUKZU1nR1piTTZjczJwM1dmOVVjZ1ZQYXM3Q2lGYnRZZXdJS0dYMWY5OHFMTU4ybkFTd2dVU0N5eUQrZER0UVpDWQp1VlRybnhZbUkrOHlBUFpOR3pSVUVNUnh1UUtCZ1FETkRBalpWTmNOeGJaVW1YWkZrMEp1YnNLUGZVMStYZVdrCkxCYkVCaDZwVG5hOWNVTE5Cc0F1ZjI4cEpFS1FQeXc4SVFEUDIwaDJXWUdIQ1FtNFZyMEM1TVN3TFVxNGdsalgKNHJ3bmxSZE44MDNqbjJTVUJjV1lGSGdNc1EyN2ZRT2lvNnVnUnUrZ0U2ZDMwa0lYTW1waUp4eHNuN3V5L0JBOAp1Z0pBc1R6MEZ3S0JnRE56ejlJZ2dyUHJGNW91bmRPbmpwV2hqRU9UNmdaZWFZcUh5dTdRTlBpV0JLeXdMU3piCmRIczRidTdaWFpCTzZLT0NiUTMvUHp6ZXhLbWtmU0gzTTRwUTNjbnZuTkNuME9veGhVd1kxUXhpS0FUbGlLNG0KMVh6VUtOZU80cWVaQ0F5bWZEQVgxaHcvRG0vOEJLMnJ4TUd5R0xSQWlQc1BPUHJqNFBpNENReEJBb0dBTmw0bgpob0N4V095QWtPUHo4VFMvbTRwd3VoMHVUQUJYb0hVMFFCdWpTNThMYXVXNklhVFZsajZoMmRYTWRIVGJwTUhYCmRrV2RiQXdGaFNtSFUwSmtjWHo1RGdHa1cxSHNmcW1XM0NQeS91OHhTdFo3azZnSUlXL2orUEdGUTU0OU5ZV1MKUHpndjExRCt5WTJOaXBzS2pDWDBxblNjRHpRNGxmRjRJWEVkU1ZjQ2dZRUF0VVQ2Y1BYdnYxamM4WVUvN3BjTApXR21WYldjcDNXbW5VK2FoaXBVM2l6YmxEUGkvWUR0aVhKSFVoYUl1TnZySVBKL2VIT1psejRPcVViS015YzFyCjV2blUrajg3MnZOdGViVkphemd1SHBHTzY3SVFrNHdJamp0TlQrQUYybUhjdnJUVTYyay9hWHJFSGN4ekZMMTMKcW1TcHNUVWtJYXFaZ2VMUERWMWNOZWc9Ci0tLS0tRU5EIFBSSVZBVEUgS0VZLS0tLS0K + +mariadb: + rootPass: pa55w0rd + dbPass: passw0rd + +elastic: + password: pa55w0rd + +kibana: + password: kibanaPass55w0rd +