Merge pull request #2367 from cncf/main

Merge `main` to `dev-fr` branch

Author: seokho-son

.github/labeler.yml

@@ -1,40 +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/*
+- content/hi/**
 
 lang/it:
-- content/it/*
+- content/it/**
 
 lang/ja:
-- content/ja/*
+- content/ja/**
 
 lang/ko:
-- content/ko/*
+- content/ko/**
 
 lang/pt:
-- content/pt-br/*
+- content/pt-br/**
 
 lang/tw:
-- content/zh-tw/*
+- content/zh-tw/**
 
 lang/zh:
-- content/zh-cn/*
+- content/zh-cn/**
 
 

.github/settings.yml

@@ -83,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
@@ -180,6 +179,12 @@ collaborators:
     permission: push
 
   # l10n zh-tw approvers
+  - username: hwchiu
+    permission: push
+
+  - username: johnlinp
+    permission: push
+
   - username: pichuang
     permission: push
 
@@ -196,6 +201,9 @@ collaborators:
   - username: naonishijima
     permission: push
 
+  - username: yuichi-nakamura
+    permission: push
+
   # l10n tr approvers
   - username: aliok
     permission: push
@@ -209,6 +217,13 @@ collaborators:
   - username: eminalemdar
     permission: push
 
+  # l10n ru approvers
+  - username: shurup
+    permission: push
+
+  - username: kirkonru
+    permission: push
+
 branches:
 
   # Default branch of this repository for configurations and English contents
@@ -451,6 +466,8 @@ branches:
         apps: []
         # zh-tw approvers
         users:
+         - hwchiu
+         - johnlinp
          - pichuang
          - ydFu
         teams: []
@@ -471,6 +488,7 @@ branches:
          - inductor
          - kaitoii11
          - naonishijima
+         - yuichi-nakamura
         teams: []
       enforce_admins: null
       required_linear_history: null
@@ -493,3 +511,20 @@ branches:
         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

.github/workflows/check-outdated-content.yaml

@@ -4,18 +4,19 @@ name: Check outdated content
 on: 
   pull_request:
     branches:
-      - 'dev-ko' # add other branches or use wildcard 'dev-**'
+      - 'dev-ko'
+      - 'dev-es'
     paths:
       - 'content/en/**.md'
 
 jobs:
   check-outdated-content:
     name: Check outdated content
 
-    # if: contains(fromJSON('["dev-ko", "dev-xx"]'), github.base_ref) 
+    if: contains(fromJSON('["dev-ko","dev-es"]'), github.base_ref)
     # Ref: https://docs.github.com/en/actions/learn-github-actions/expressions
 
-    if: github.base_ref == 'dev-ko'
+    #if: github.base_ref == 'dev-ko'
 
     # Condition to run this workflow on the upstream repository
     #if: github.repository == 'cncf/glossary'
@@ -38,21 +39,26 @@ jobs:
         # Set output direcory
         OUTPUT_DIR="./outdated"
         
-        # Set L10n directory and code
+        # Set L10n code
+        L10N_CODE="${L10N_BRANCH//dev-/}"
+        echo "(DEBUG) L10N Code: ${L10N_CODE}"
+
+        # Set L10n directory
         case "${L10N_BRANCH}" in
-          dev-ko)          
-          L10N_DIR="content/ko/"
-          L10N_CODE="ko"
+          dev-pt)
+          L10N_DIR="./content/pt-br/"
+          ;;
+          dev-zh)
+          L10N_DIR="./content/zh-cn/"
+          ;;
+          dev-tw)
+          L10N_DIR="./content/zh-tw/"
+          ;;
+          *)
+          L10N_DIR="./content/${L10N_CODE}/"
           ;;
-          
-          #dev-pt)
-          #L10N_DIR="content/pt-br/"
-          #L10N_CODE="pt"
-          #;;
         esac
-        
         echo "(DEBUG) L10N Directory: ${L10N_DIR}"
-        echo "(DEBUG) L10N Code: ${L10N_CODE}"
         
         # Set L10N_DIR, L10N_CODE, and OUTPUT_DIR as environment variables
         # Ref: https://docs.github.com/en/actions/using-workflows/workflow-commands-for-github-actions#setting-an-environment-variable
@@ -61,7 +67,7 @@ jobs:
         echo "OUTPUT_DIR=${OUTPUT_DIR}" >> $GITHUB_ENV
     
     - name: Checkout 
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         fetch-depth: 0 # fetch all history for all tags and branches
 
@@ -89,12 +95,12 @@ jobs:
         # Get the lastest branch name from 'GITHUB_REF' 
         # The latest branch can be 'upstream/main' or 'forked/dev-ko' (rebased)
         LATEST_BRANCH=${GITHUB_REF#refs/}
-        echo "(DUBUG) LATEST_BRANCH: ${LATEST_BRANCH}"
+        echo "(DEBUG) LATEST_BRANCH: ${LATEST_BRANCH}"
         
         # Get the old branch from 'github.base_ref' 
         # The old branch can be 'upstream/dev-ko'
         OLD_BRANCH="origin/${{github.base_ref}}"
-        echo "(DUBUG) OLD_BRANCH: ${OLD_BRANCH}"
+        echo "(DEBUG) OLD_BRANCH: ${OLD_BRANCH}"
 
         L10N_INFO_JSON=$(cat <<EOF
         {
@@ -144,7 +150,7 @@ jobs:
               fi
 
             else
-              echo "(DEBUG) ${FILE_PATH} dose not exist."
+              echo "(DEBUG) ${FILE_PATH} does not exist."
               # File dose not exist (e.g, changed, renamed or removed)
               echo "Could not find ${FILE_PATH} in content/en/" > ${OUTPUT_DIR}/${FILE_PATH}
               echo "Need to check if it has been changed, renamed or removed" >> ${OUTPUT_DIR}/${FILE_PATH}
@@ -167,4 +173,4 @@ jobs:
 #         content-filepath:  ${{ steps.checker.outputs.output_path }}
 #         labels: |
 #           outdated
-#           lang/ko
+#           lang/ko

.github/workflows/es-spellcheck.yml

@@ -23,7 +23,7 @@ jobs:
     name: Run PySpelling tool to verify spanish spelling issues
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Check word list sort
         run: |
           set -o errexit

.github/workflows/spellcheck.yml

@@ -22,7 +22,7 @@ jobs:
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: GitHub Spellcheck Action
         uses: rojopolis/[email protected]

CODEOWNERS

@@ -5,12 +5,13 @@
 # when someone opens a pull request that modifies code that they own.
 
 # These owners will be default owners for everything in this repository.
-# These owners consist of Maintainers and English approvers.
-* @caniszczyk @CathPag @jasonmorgan @seokho-son @iamNoah1 @jihoon-seo @nate-double-u
+# These owners consist of Maintainers
+* @caniszczyk @seokho-son @iamNoah1 @jihoon-seo @nate-double-u
 
 
 # Approvers for English content
-/content/en/ @caniszczyk @CathPag @jasonmorgan @seokho-son @iamNoah1 @jihoon-seo @nate-double-u @castrojo
+/content/en/ @caniszczyk @seokho-son @iamNoah1 @jihoon-seo @nate-double-u @castrojo
+/i18n/en.toml @caniszczyk @seokho-son @iamNoah1 @jihoon-seo @nate-double-u @castrojo
 
 
 # These are the owners (approvers) for localization contents
@@ -19,42 +20,60 @@
 
 # Approvers for Arabic contents
 /content/ar/ @TarekMSayed @same7ammar @AShabana @arezk84
+/i18n/ar.toml @TarekMSayed @same7ammar @AShabana @arezk84
 
 # Approvers for Bengali contents
 /content/bn/ @Arindam200 @Imtiaz1234 @mitul3737 @sajibAdhi
+/i18n/bn.toml @Arindam200 @Imtiaz1234 @mitul3737 @sajibAdhi
 
 # Approvers for German contents
 /content/de/ @iamNoah1 @DaveVentura @CathPag @bcubk
+/i18n/de.toml @iamNoah1 @DaveVentura @CathPag @bcubk
 
 # Approvers for Spanish contents
 /content/es/ @raelga @ramrodo @electrocucaracha @krol3 @92nqb
+/i18n/es.toml @raelga @ramrodo @electrocucaracha @krol3 @92nqb
 
 # Approvers for French contents
 /content/fr/ @huats @fydrah @Krast76 @sestegra
+/i18n/fr.toml @huats @fydrah @Krast76 @sestegra
 
 # Approvers for Hindi contents
 /content/hi/ @Garima-Negi @sayantani11 @anubha-v-ardhan @jayesh-srivastava
+/i18n/hi.toml @Garima-Negi @sayantani11 @anubha-v-ardhan @jayesh-srivastava
 
 # Approvers for Italian contents
 /content/it/ @fsbaraglia @ugho16 @annalisag-spark @sistella
+/i18n/it.toml @fsbaraglia @ugho16 @annalisag-spark @sistella
 
 # Approvers for Japanese contents
-/content/ja/ @inductor @naonishijima @kaitoii11
+/content/ja/ @inductor @naonishijima @kaitoii11 @yuichi-nakamura
+/i18n/ja.toml @inductor @naonishijima @kaitoii11 @yuichi-nakamura
 
 # Approvers for Korean contents
 /content/ko/ @seokho-son @jihoon-seo @yunkon-kim
+/i18n/ko.toml @seokho-son @jihoon-seo @yunkon-kim
 
 # Approvers for Portuguese contents
 /content/pt-br/ @edsoncelio @brunoguidone @jessicalins @MrErlison
+/i18n/pt-br.toml @edsoncelio @brunoguidone @jessicalins @MrErlison
+
+# Approvers for Russian contents
+/content/ru/ @shurup @kirkonru
+/i18n/ru.toml @shurup @kirkonru
 
 # Approvers for Turkish contents
 /content/tr/ @aliok @halil-bugol @developer-guy @eminalemdar
+/i18n/tr.toml @aliok @halil-bugol @developer-guy @eminalemdar
 
 # Approvers for Urdu contents
 /content/ur/ @Saim-Safdar @waleed318
+/i18n/ur.toml @Saim-Safdar @waleed318
 
 # Approvers for Simplified Chinese contents
 /content/zh-cn/ @hanyuancheung @Jacob953 @Rocksnake @Submarinee
+/i18n/zh-cn.toml @hanyuancheung @Jacob953 @Rocksnake @Submarinee
 
 # Approvers for Traditional Chinese contents
-/content/zh-tw/ @pichuang @ydFu
+/content/zh-tw/ @pichuang @ydFu @hwchiu @johnlinp
+/i18n/zh-tw.toml @pichuang @ydFu @hwchiu @johnlinp

CONTRIBUTING.md

@@ -9,6 +9,6 @@ Below are the guidelines for how to contribute to the code that runs the CNCF Gl
 ## How can I contribute?
 
 1. **Report a bug**. If you see a technical issue with the CNCF Glossary site or something that doesn't look right, search [the existing issues](https://github.com/cncf/glossary/issues) to see if it has been reported already. If not, please [create a new issue](https://github.com/cncf/glossary/issues/new) describing the bug. Please provide all steps necessary to reproduce the bug and screenshots if applicable.
-2. **Fix a bug**. Find [an issue](https://github.com/cncf/glossary/issues) you want to fix and submit a PR for approval. 
+2. **Fix a bug**. Find [an issue](https://github.com/cncf/glossary/issues) you want to fix and submit a PR for approval.
 
 Read [more about the code that runs the Glossary site](https://github.com/cncf/glossary/blob/main/spin-new-glossary.md) and [how to set up your own local development instance](https://github.com/cncf/glossary#setting-up-a-local-instance). To connect with our community and ask questions, please join [the #glossary channel on the CNCF slack](https://cloud-native.slack.com/archives/C02TX20MQBB).

LOCALIZATION.md

@@ -133,11 +133,12 @@ Once the PR is merged, the localized content will go live on its website 🎉
 
 To join an existing team, hop on the #glossary-localizations and #glossary-localization-[language name] channels on the CNCF Slack. Introduce yourself, let the team know you want to contribute, and the team will take it from there.
 
-If the team seems inactive (no response after several days), reach out to @Seokho Son, @Catherine Paganini, @jmo, @Jihoon Seo or @Noah Ispas on the #glossary-localizations channel.  
+If the team seems inactive (no response after several days), reach out to @Seokho Son, @Jihoon Seo, @nate-double-u, or @Noah Ispas on the #glossary-localizations channel.  
 
 --- 
 
 # Localization team guidelines
+
 Every localization team may have its own process of working on localizing terms. However, here are some guidelines that are common for all localization teams:
 
 1. Only terms with the status `Completed` in the English version are ready to be localized.

README.md

@@ -12,12 +12,30 @@ If you'd like to help with the glossary we'd love to have your contributions! Pl
 
 ## Acknowledgements
 
-The Cloud Native Glossary was initiated by the CNCF Marketing 
-Committee (Business Value Subcommittee) and includes contributions 
-from [Catherine Paganini](https://www.linkedin.com/in/catherinepaganini/en/), [Chris Aniszczyk](https://www.linkedin.com/in/caniszczyk/),
-[Daniel Jones](https://www.linkedin.com/in/danieljoneseb/?originalSubdomain=uk), [Jason Morgan](https://www.linkedin.com/in/jasonmorgan2/), [Katelin Ramer](https://www.linkedin.com/in/katelinramer/) and [Mike Foster](https://www.linkedin.com/in/mfosterche/?originalSubdomain=ca).
-
-## License 
+The Cloud Native Glossary was initiated by the CNCF Marketing Committee
+(Business Value Subcommittee) and includes contributions from 
+[Catherine Paganini](https://www.linkedin.com/in/catherinepaganini/en/), 
+[Chris Aniszczyk](https://www.linkedin.com/in/caniszczyk/), 
+[Daniel Jones](https://www.linkedin.com/in/danieljoneseb/?originalSubdomain=uk), 
+[Jason Morgan](https://www.linkedin.com/in/jasonmorgan2/), 
+[Katelin Ramer](https://www.linkedin.com/in/katelinramer/), 
+[Mike Foster](https://www.linkedin.com/in/mfosterche/?originalSubdomain=ca), 
+and many more contributors. 
+For a complete contributor list, please refer to [this GitHub page](https://github.com/cncf/glossary/graphs/contributors).
+
+The Glossary is maintained by 
+[Seokho Son](https://www.linkedin.com/in/seokho-son/),
+[Noah Ispas](https://www.linkedin.com/in/noah-ispas-0665b42a/), 
+[Jihoon Seo](https://www.linkedin.com/in/jihoon-seo/),
+[Nate W.](https://www.linkedin.com/in/nate-double-u/),
+and [Jorge Castro](https://www.linkedin.com/in/jorge-castro2112/).
+
+[Catherine Paganini](https://www.linkedin.com/in/catherinepaganini/en/),
+and [Jason Morgan](https://www.linkedin.com/in/jasonmorgan2/)
+are Emeritus Maintainers, and we are deeply grateful
+for their invaluable contributions over the years.
+
+## License
 
 All code contributions are under the Apache 2.0 license. Documentation is distributed under CC BY 4.0.