wip

In order to avoid a service interruption during a Kubernetes
(k8s)upgrade, we add a Pod Disruption Budget (PDB) to deployments.

.github/ISSUE_TEMPLATE/Support_question.md

@@ -9,9 +9,9 @@ We primarily use GitHub as an issue tracker. If however you're encountering an i
 
 ---
 
-Please make sure you have read our [main Readme](https://github.com/numerique-gouv/people).
+Please make sure you have read our [main Readme](https://github.com/suitenumerique/people).
 
-Also make sure it was not already answered in [an open or close issue](https://github.com/numerique-gouv/people/issues).
+Also make sure it was not already answered in [an open or close issue](https://github.com/suitenumerique/people/issues).
 
 If your question was not covered, and you feel like it should be, fire away! We'd love to improve our docs! 👌
 

.github/workflows/release-helmchart.yml

@@ -3,10 +3,6 @@ run-name: Release Chart
 
 on:
   push:
-    branches:
-      - 'main'
-    paths:
-      - ./src/helm/desk/**
 
 jobs:
   release:
@@ -20,7 +16,11 @@ jobs:
           fetch-depth: 0
 
       - name: Cleanup
-        run: rm -rf ./src/helm/extra
+        run: |
+          rm -rf ./src/helm/extra
+          rm -rf ./src/helm/dimail
+          rm -rf ./src/helm/mailcatcher
+
 
       - name: Install Helm
         uses: azure/setup-helm@v4

CHANGELOG.md

@@ -8,6 +8,8 @@ and this project adheres to
 
 ## [Unreleased]
 
+## [1.11.0] - 2025-02-07
+
 ### Added
 
 - ✨(api) add count mailboxes to MailDomain serializer
@@ -276,24 +278,25 @@ and this project adheres to
 - ✨(domains) create and manage domains on admin + API
 - ✨(domains) mailbox creation + link to email provisioning API
 
-[unreleased]: https://github.com/numerique-gouv/people/compare/v1.10.1...main
-[1.10.1]: https://github.com/numerique-gouv/people/releases/v1.10.1
-[1.10.0]: https://github.com/numerique-gouv/people/releases/v1.10.0
-[1.9.1]: https://github.com/numerique-gouv/people/releases/v1.9.1
-[1.9.0]: https://github.com/numerique-gouv/people/releases/v1.9.0
-[1.8.0]: https://github.com/numerique-gouv/people/releases/v1.8.0
-[1.7.1]: https://github.com/numerique-gouv/people/releases/v1.7.1
-[1.7.0]: https://github.com/numerique-gouv/people/releases/v1.7.0
-[1.6.1]: https://github.com/numerique-gouv/people/releases/v1.6.1
-[1.6.0]: https://github.com/numerique-gouv/people/releases/v1.6.0
-[1.5.0]: https://github.com/numerique-gouv/people/releases/v1.5.0
-[1.4.1]: https://github.com/numerique-gouv/people/releases/v1.4.1
-[1.4.0]: https://github.com/numerique-gouv/people/releases/v1.4.0
-[1.3.1]: https://github.com/numerique-gouv/people/releases/v1.3.1
-[1.3.0]: https://github.com/numerique-gouv/people/releases/v1.3.0
-[1.2.1]: https://github.com/numerique-gouv/people/releases/v1.2.1
-[1.2.0]: https://github.com/numerique-gouv/people/releases/v1.2.0
-[1.1.0]: https://github.com/numerique-gouv/people/releases/v1.1.0
-[1.0.2]: https://github.com/numerique-gouv/people/releases/v1.0.2
-[1.0.1]: https://github.com/numerique-gouv/people/releases/v1.0.1
-[1.0.0]: https://github.com/numerique-gouv/people/releases/v1.0.0
+[unreleased]: https://github.com/suitenumerique/people/compare/v1.11.0...main
+[1.11.0]: https://github.com/suitenumerique/people/releases/v1.11.0
+[1.10.1]: https://github.com/suitenumerique/people/releases/v1.10.1
+[1.10.0]: https://github.com/suitenumerique/people/releases/v1.10.0
+[1.9.1]: https://github.com/suitenumerique/people/releases/v1.9.1
+[1.9.0]: https://github.com/suitenumerique/people/releases/v1.9.0
+[1.8.0]: https://github.com/suitenumerique/people/releases/v1.8.0
+[1.7.1]: https://github.com/suitenumerique/people/releases/v1.7.1
+[1.7.0]: https://github.com/suitenumerique/people/releases/v1.7.0
+[1.6.1]: https://github.com/suitenumerique/people/releases/v1.6.1
+[1.6.0]: https://github.com/suitenumerique/people/releases/v1.6.0
+[1.5.0]: https://github.com/suitenumerique/people/releases/v1.5.0
+[1.4.1]: https://github.com/suitenumerique/people/releases/v1.4.1
+[1.4.0]: https://github.com/suitenumerique/people/releases/v1.4.0
+[1.3.1]: https://github.com/suitenumerique/people/releases/v1.3.1
+[1.3.0]: https://github.com/suitenumerique/people/releases/v1.3.0
+[1.2.1]: https://github.com/suitenumerique/people/releases/v1.2.1
+[1.2.0]: https://github.com/suitenumerique/people/releases/v1.2.0
+[1.1.0]: https://github.com/suitenumerique/people/releases/v1.1.0
+[1.0.2]: https://github.com/suitenumerique/people/releases/v1.0.2
+[1.0.1]: https://github.com/suitenumerique/people/releases/v1.0.1
+[1.0.0]: https://github.com/suitenumerique/people/releases/v1.0.0

src/backend/core/authentication/backends.py

@@ -120,7 +120,7 @@ class OIDCAuthenticationBackend(MozillaOIDCAuthenticationBackend):
 
         # Data cleaning, to be removed when user organization is null=False
         # or all users have an organization.
-        # See https://github.com/numerique-gouv/people/issues/504
+        # See https://github.com/suitenumerique/people/issues/504
         if not user.organization_id:
             organization_registration_id = claims.get(
                 settings.OIDC_ORGANIZATION_REGISTRATION_ID_FIELD

src/backend/locale/fr_FR/LC_MESSAGES/django.po

@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lasuite-people\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-02-03 10:27+0000\n"
+"POT-Creation-Date: 2025-02-07 20:49+0000\n"
 "PO-Revision-Date: 2024-01-03 23:15\n"
 "Last-Translator: \n"
 "Language-Team: French\n"
@@ -312,7 +312,7 @@ msgstr "Invitations d'équipe"
 msgid "This email is already associated to a registered user."
 msgstr "Cette adresse email est déjà associée à un utilisateur enregistré."
 
-#: core/models.py:965 core/models.py:971
+#: core/models.py:964
 msgid "Invitation to join La Régie!"
 msgstr "Invitation à rejoindre La Régie!"
 
@@ -523,42 +523,49 @@ msgstr "Cette mail a été envoyée à %(email)s par %(name)s [%(href)s]"
 msgid "Synchronise from dimail"
 msgstr "Synchroniser à partir de dimail"
 
-#: mailbox_manager/admin.py:24
+#: mailbox_manager/admin.py:31
 #, python-brace-format
 msgid "Synchronisation failed for {domain.name} with message: [{err}]"
 msgstr "Synchronisation échouée pour {domain.name} avec le message: [{err}]"
 
-#: mailbox_manager/admin.py:30
+#: mailbox_manager/admin.py:37
 #, python-brace-format
 msgid "Synchronisation succeed for {domain.name}. "
 msgstr "Synchronisation réussie pour {domain.name}. "
 
-#: mailbox_manager/admin.py:36
+#: mailbox_manager/admin.py:45
+msgid ""
+"Sync require enabled domains. Excluded domains: {', '.join(excluded_domains)}"
+msgstr ""
+"Le synchro nécessite des domaines activés. Les domaines exclus sont : "
+"{', '.join(excluded_domains)}"
+
+#: mailbox_manager/admin.py:50
 msgid "Check and update status from dimail"
 msgstr "Vérification et mise à jour de l'état à partir de dimail"
 
-#: mailbox_manager/admin.py:52
+#: mailbox_manager/admin.py:66
 #, python-brace-format
 msgid "- <b>{domain.name}</b> with message: '{err}'"
 msgstr "- <b>{domain.name}</b> avec le message: '{err}'"
 
-#: mailbox_manager/admin.py:63
+#: mailbox_manager/admin.py:77
 msgid "Check domains done with success."
 msgstr "Vérification des domains réalisée avec success."
 
-#: mailbox_manager/admin.py:64
+#: mailbox_manager/admin.py:78
 msgid "Domains updated: {', '.join(domains_updated)}"
 msgstr "Domaines mis à jour : {', '.join(domains_updated)}"
 
-#: mailbox_manager/admin.py:66
+#: mailbox_manager/admin.py:80
 msgid "No domain updated."
 msgstr "Aucun domain n'a été mis à jour."
 
-#: mailbox_manager/admin.py:70
+#: mailbox_manager/admin.py:84
 msgid "Check domain failed for:"
 msgstr "La vérification de domain a échoué pour :"
 
-#: mailbox_manager/admin.py:76
+#: mailbox_manager/admin.py:90
 msgid "Domains disabled are excluded from check: {', '.join(excluded_domains)}"
 msgstr ""
 "Les domains désactivés sont exclus de la vérification : {', '."

src/backend/pyproject.toml

@@ -7,7 +7,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "people"
-version = "1.10.1"
+version = "1.11.0"
 authors = [{ "name" = "DINUM", "email" = "dev@mail.numerique.gouv.fr" }]
 classifiers = [
     "Development Status :: 5 - Production/Stable",
@@ -56,10 +56,10 @@ dependencies = [
 ]
 
 [project.urls]
-"Bug Tracker" = "https://github.com/numerique-gouv/people/issues/new"
-"Changelog" = "https://github.com/numerique-gouv/people/blob/main/CHANGELOG.md"
-"Homepage" = "https://github.com/numerique-gouv/people"
-"Repository" = "https://github.com/numerique-gouv/people"
+"Bug Tracker" = "https://github.com/suitenumerique/people/issues/new"
+"Changelog" = "https://github.com/suitenumerique/people/blob/main/CHANGELOG.md"
+"Homepage" = "https://github.com/suitenumerique/people"
+"Repository" = "https://github.com/suitenumerique/people"
 
 [project.optional-dependencies]
 dev = [

src/frontend/apps/desk/package.json

@@ -1,6 +1,6 @@
 {
   "name": "app-desk",
-  "version": "1.10.1",
+  "version": "1.11.0",
   "private": true,
   "scripts": {
     "dev": "next dev",

src/frontend/apps/desk/src/components/Modal.tsx

@@ -15,7 +15,7 @@ export const Modal: React.FC<ModalProps> = ({ children, ...props }) => {
 /**
  * @description used to prevent elements to be navigable by keyboard when only a DOM mutation causes the elements to be
  * in the document
- * @see https://github.com/numerique-gouv/people/pull/379
+ * @see https://github.com/suitenumerique/people/pull/379
  */
 export const usePreventFocusVisible = (elements: string[]) => {
   useEffect(() => {

src/frontend/apps/desk/src/features/language/LanguagePicker.tsx

@@ -62,7 +62,7 @@ export const LanguagePicker = () => {
 
   /**
    * @description prevent select div to receive focus on keyboard navigation so the focus goes directly to inner button
-   * @see https://github.com/numerique-gouv/people/pull/379
+   * @see https://github.com/suitenumerique/people/pull/379
    */
   useEffect(() => {
     if (!document) {

src/frontend/apps/e2e/package.json

@@ -1,6 +1,6 @@
 {
   "name": "app-e2e",
-  "version": "1.10.1",
+  "version": "1.11.0",
   "private": true,
   "scripts": {
     "lint": "eslint . --ext .ts",

src/frontend/package.json

@@ -1,6 +1,6 @@
 {
   "name": "people",
-  "version": "1.10.1",
+  "version": "1.11.0",
   "private": true,
   "workspaces": {
     "packages": [

src/frontend/packages/eslint-config-people/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-config-people",
-  "version": "1.10.1",
+  "version": "1.11.0",
   "license": "MIT",
   "scripts": {
     "lint": "eslint --ext .js ."

src/frontend/packages/i18n/package.json

@@ -1,6 +1,6 @@
 {
   "name": "packages-i18n",
-  "version": "1.10.1",
+  "version": "1.11.0",
   "private": true,
   "scripts": {
     "extract-translation": "yarn extract-translation:desk",

src/helm/desk/Chart.yaml

@@ -1,4 +1,4 @@
 apiVersion: v2
 type: application
 name: desk
-version: 0.0.1
+version: 0.0.2

src/helm/desk/README.md

@@ -37,6 +37,7 @@
 
 | Name                                                  | Description                                                                        | Value                                                                            |
 | ----------------------------------------------------- | ---------------------------------------------------------------------------------- | -------------------------------------------------------------------------------- |
+| `backend.pdb.enabled`                                 | Enable pdb on backend                                                              | `true`                                                                           |
 | `backend.dpAnnotations`                               | Annotations to add to the backend Deployment                                       | `{}`                                                                             |
 | `backend.command`                                     | Override the backend container command                                             | `[]`                                                                             |
 | `backend.args`                                        | Override the backend container args                                                | `[]`                                                                             |
@@ -86,6 +87,7 @@
 
 | Name                                                   | Description                                                                         | Value                     |
 | ------------------------------------------------------ | ----------------------------------------------------------------------------------- | ------------------------- |
+| `frontend.pdb.enabled`                                 | Enable pdb on backend                                                               | `true`                    |
 | `frontend.image.repository`                            | Repository to use to pull desk's frontend container image                           | `lasuite/people-frontend` |
 | `frontend.image.tag`                                   | desk's frontend container tag                                                       | `latest`                  |
 | `frontend.image.pullPolicy`                            | frontend container image pull policy                                                | `IfNotPresent`            |

src/helm/desk/templates/backend_deployment.yaml

@@ -138,3 +138,16 @@ spec:
           emptyDir: {}
           {{- end }}
         {{- end }}
+---
+{{ if .Values.backend.pdb.enabled }}
+apiVersion: policy/v1
+kind: PodDisruptionBudget
+metadata:
+  name: {{ $fullName }}
+  namespace: {{ .Release.Namespace | quote }}
+spec:
+  maxUnavailable: 1
+  selector:
+    matchLabels:
+      {{- include "desk.common.selectorLabels" (list . $component) | nindent 6 }}
+{{ end }}

src/helm/desk/templates/frontend_deployment.yaml

@@ -138,3 +138,16 @@ spec:
           emptyDir: {}
           {{- end }}
         {{- end }}
+---
+{{ if .Values.frontend.pdb.enabled }}
+apiVersion: policy/v1
+kind: PodDisruptionBudget
+metadata:
+  name: {{ $fullName }}
+  namespace: {{ .Release.Namespace | quote }}
+spec:
+  maxUnavailable: 1
+  selector:
+    matchLabels:
+      {{- include "desk.common.selectorLabels" (list . $component) | nindent 6 }}
+{{ end }}

src/helm/desk/values.yaml

@@ -72,6 +72,10 @@ ingressAdmin:
 ## @section backend
 
 backend:
+  ## @param backend.pdb.enabled Enable pdb on backend
+  pdb:
+    enabled: true
+
   ## @param backend.dpAnnotations Annotations to add to the backend Deployment
   dpAnnotations: {}
 
@@ -179,6 +183,10 @@ backend:
 
 ## @section frontend
 frontend:
+  ## @param frontend.pdb.enabled Enable pdb on backend
+  pdb:
+    enabled: true
+
   ## @param frontend.image.repository Repository to use to pull desk's frontend container image
   ## @param frontend.image.tag desk's frontend container tag
   ## @param frontend.image.pullPolicy frontend container image pull policy

src/mail/package.json

@@ -16,7 +16,7 @@
   "volta": {
     "node": "16.15.1"
   },
-  "repository": "https://github.com/numerique-gouv/people",
+  "repository": "https://github.com/suitenumerique/people",
   "author": "DINUM",
   "license": "MIT"
 }

src/tsclient/package.json

@@ -8,7 +8,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/numerique-gouv/people.git"
+    "url": "git+https://github.com/suitenumerique/people.git"
   },
   "author": {
     "name": "DINUM",
@@ -16,9 +16,9 @@
   },
   "license": "MIT",
   "bugs": {
-    "url": "https://github.com/numerique-gouv/people/issues"
+    "url": "https://github.com/suitenumerique/people/issues"
   },
-  "homepage": "https://github.com/numerique-gouv/people#readme",
+  "homepage": "https://github.com/suitenumerique/people#readme",
   "devDependencies": {
     "openapi-typescript-codegen": "0.29.0"
   }