Merge remote-tracking branch 'upstream/main' into dev-es

Author: krol3

.github/ISSUE_TEMPLATE/new-term.yml

@@ -38,7 +38,7 @@ body:
           required: true
         - label: I understand that maintainers will assess if the term should be part of the Glossary. (Please be patient)
           required: true
-        - label: I want to work on this term. (If not checked, maintainers will assign another volunteer)
+        - label: I want to work on this term and confirm that I meet the criteria as outlined in "[who can contribute](https://glossary.cncf.io/contribute/#who-can-contribute)". (If not checked, maintainers will assign another volunteer)
           required: false
   - type: textarea
     id: note

.github/ISSUE_TEMPLATE/update-term.yml

@@ -28,7 +28,7 @@ body:
       options:
         - label: I understand that maintainers will confirm if the term should be updated. (Please be patient)
           required: true
-        - label: I want to work on this suggestion. (If not checked, maintainers will assign another volunteer)
+        - label: I want to work on this suggestion and confirm that I meet the criteria as outlined in "[who can contribute](https://glossary.cncf.io/contribute/#who-can-contribute)".. (If not checked, maintainers will assign another volunteer)
           required: false
   - type: textarea
     id: note

.github/labeler.yml

@@ -1,34 +1,40 @@
 lang/ar:
-- content/ar/*
+- content/ar/**
 
 lang/bn:
-- content/bn/*
+- content/bn/**
 
 lang/de:
-- content/de/*
+- content/de/**
 
 lang/en:
-- content/en/*
+- content/en/**
 
 lang/es:
-- content/es/*
+- content/es/**
 
 lang/fr:
-- content/fr/*
+- content/fr/**
+
+lang/hi:
+- content/hi/**
 
 lang/it:
-- content/it/*
+- content/it/**
 
-lang/hi:
-- content/hi/*
+lang/ja:
+- content/ja/**
 
 lang/ko:
-- content/ko/*
+- content/ko/**
 
 lang/pt:
-- content/pt-br/*
+- content/pt-br/**
+
+lang/tw:
+- content/zh-tw/**
 
 lang/zh:
-- content/zh-cn/*
+- content/zh-cn/**
 
 

.github/settings.yml

@@ -31,24 +31,27 @@ collaborators:
     permission: admin
 
   - username: jihoon-seo
-    permission: maintain
+    permission: admin
 
   - username: iamNoah1
-    permission: maintain  
+    permission: admin
 
   - username: thetwopct
     permission: push
 
   # English approvers (approver for all files in repository)
 
-  
+  - username: nate-double-u
+    permission: admin
+
+  - username: castrojo
+    permission: push
 
   # Localization approvers
+  
   # l10n ko approvers
   # Note: seokho-son is both Maintainer (maintain) and Korean approver (push)
   # Note: jihoon-seo is both Maintainer (maintain) and Korean approver (push)
-  - username: Eviekim
-    permission: push
 
   - username: yunkon-kim
     permission: push
@@ -80,7 +83,6 @@ collaborators:
     permission: push
 
   # l10n de approvers
-  # Note: CathPag is both Maintainer (maintain) and de approver (push)
   # Note: iamNoah1 is both Maintainer (maintain) and de approver (push)
   - username: DaveVentura
     permission: push
@@ -115,16 +117,16 @@ collaborators:
     permission: push
 
   # l10n bn approvers
-  - username: mitul3737
+  - username: Arindam200
     permission: push
 
-  - username: Mouly22
+  - username: Imtiaz1234
     permission: push
 
-  - username: ikramulkayes
+  - username: mitul3737
     permission: push
 
-  - username: Imtiaz1234
+  - username: sajibAdhi
     permission: push
 
   # l10n es approvers
@@ -143,7 +145,7 @@ collaborators:
   - username: 92nqb
     permission: push
 
-  # l10n zh approvers
+  # l10n zh-cn approvers
   - username: hanyuancheung
     permission: push
 
@@ -166,13 +168,64 @@ collaborators:
   - username: Krast76
     permission: push
 
+  - username: sestegra
+    permission: push
+
+  - username: guillaumebernard84
+    permission: push
+
   # l10n ur approvers
   - username: Saim-Safdar
     permission: push
 
   - username: waleed318
     permission: push
 
+  # l10n zh-tw approvers
+  - username: hwchiu
+    permission: push
+
+  - username: johnlinp
+    permission: push
+
+  - username: pichuang
+    permission: push
+
+  - username: ydFu
+    permission: push
+
+  # l10n ja approvers
+  - username: inductor
+    permission: push
+
+  - username: kaitoii11
+    permission: push
+
+  - username: naonishijima
+    permission: push
+
+  - username: yuichi-nakamura
+    permission: push
+
+  # l10n tr approvers
+  - username: aliok
+    permission: push
+
+  - username: halil-bugol
+    permission: push
+
+  - username: developer-guy
+    permission: push
+
+  - username: eminalemdar
+    permission: push
+
+  # l10n ru approvers
+  - username: shurup
+    permission: push
+
+  - username: kirkonru
+    permission: push
 
 branches:
 
@@ -193,6 +246,8 @@ branches:
          - seokho-son
          - iamNoah1
          - jihoon-seo
+         - nate-double-u
+         - castrojo
         teams: []
       enforce_admins: null
       required_linear_history: null
@@ -209,7 +264,6 @@ branches:
         # Ko approvers
         users:
          - seokho-son
-         - Eviekim
          - jihoon-seo
          - yunkon-kim
         teams: []
@@ -321,10 +375,10 @@ branches:
         apps: []
         # bn approvers
         users:
-         - mitul3737
-         - Mouly22
-         - ikramulkayes
+         - Arindam200
          - Imtiaz1234
+         - mitul3737
+         - sajibAdhi
         teams: []
       enforce_admins: null
       required_linear_history: null
@@ -349,7 +403,7 @@ branches:
       enforce_admins: null
       required_linear_history: null
 
-  # l10n branch for zh contents only
+  # l10n branch for zh-cn contents only
   - name: dev-zh
     protection:
       required_pull_request_reviews:
@@ -358,7 +412,7 @@ branches:
       required_status_checks: null
       restrictions:
         apps: []
-        # zh approvers
+        # zh-cn approvers
         users:
          - hanyuancheung
          - Jacob953
@@ -382,6 +436,8 @@ branches:
          - huats
          - fydrah
          - Krast76
+         - sestegra
+         - guillaumebernard84
         teams: []
       enforce_admins: null
       required_linear_history: null
@@ -402,3 +458,77 @@ branches:
         teams: []
       enforce_admins: null
       required_linear_history: null
+
+  # l10n branch for zh-tw contents only
+  - name: dev-tw
+    protection:
+      required_pull_request_reviews:
+        required_approving_review_count: 2
+        require_code_owner_reviews: true
+      required_status_checks: null
+      restrictions:
+        apps: []
+        # zh-tw approvers
+        users:
+         - hwchiu
+         - johnlinp
+         - pichuang
+         - ydFu
+        teams: []
+      enforce_admins: null
+      required_linear_history: null
+
+  # l10n branch for ja contents only
+  - name: dev-ja
+    protection:
+      required_pull_request_reviews:
+        required_approving_review_count: 2
+        require_code_owner_reviews: true
+      required_status_checks: null
+      restrictions:
+        apps: []
+        # ja approvers
+        users:
+         - inductor
+         - kaitoii11
+         - naonishijima
+         - yuichi-nakamura
+        teams: []
+      enforce_admins: null
+      required_linear_history: null
+      
+  # l10n branch for tr contents only
+  - name: dev-tr
+    protection:
+      required_pull_request_reviews:
+        required_approving_review_count: 2
+        require_code_owner_reviews: true
+      required_status_checks: null
+      restrictions:
+        apps: []
+        # tr approvers
+        users:
+         - aliok
+         - halil-bugol
+         - developer-guy
+         - eminalemdar
+        teams: []
+      enforce_admins: null
+      required_linear_history: null
+
+  # l10n branch for ru contents only
+  - name: dev-ru
+    protection:
+      required_pull_request_reviews:
+        required_approving_review_count: 2
+        require_code_owner_reviews: true
+      required_status_checks: null
+      restrictions:
+        apps: []
+        # ru approvers
+        users:
+         - shurup
+         - kirkonru
+        teams: []
+      enforce_admins: null
+      required_linear_history: null