Rebase dev-ru with the main branch

.github/auto-comment-config.yaml

@@ -0,0 +1,7 @@
+label_mappings:
+  - labels: 
+      - hold
+    comment: Wait, please do not proceed with this yet.
+  - labels: 
+      - lang/en
+    comment: To see where this is in the review pipeline and follow the progress, please look at the [definition review board](https://github.com/orgs/cncf/projects/26/views/1).

.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
@@ -172,6 +171,9 @@ collaborators:
   - username: sestegra
     permission: push
 
+  - username: guillaumebernard84
+    permission: push
+
   # l10n ur approvers
   - username: Saim-Safdar
     permission: push
@@ -180,6 +182,12 @@ collaborators:
     permission: push
 
   # l10n zh-tw approvers
+  - username: hwchiu
+    permission: push
+
+  - username: johnlinp
+    permission: push
+
   - username: pichuang
     permission: push
 
@@ -196,6 +204,9 @@ collaborators:
   - username: naonishijima
     permission: push
 
+  - username: yuichi-nakamura
+    permission: push
+
   # l10n tr approvers
   - username: aliok
     permission: push
@@ -209,6 +220,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
@@ -418,6 +436,8 @@ branches:
          - huats
          - fydrah
          - Krast76
+         - sestegra
+         - guillaumebernard84
         teams: []
       enforce_admins: null
       required_linear_history: null
@@ -450,6 +470,8 @@ branches:
         apps: []
         # zh-tw approvers
         users:
+         - hwchiu
+         - johnlinp
          - pichuang
          - ydFu
         teams: []
@@ -470,6 +492,7 @@ branches:
          - inductor
          - kaitoii11
          - naonishijima
+         - yuichi-nakamura
         teams: []
       enforce_admins: null
       required_linear_history: null
@@ -492,3 +515,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/auto-comment.yml

@@ -0,0 +1,70 @@
+name: Auto Comment on Labeled PR
+
+on:
+  pull_request_target:
+    types:
+      - labeled
+      - unlabeled
+
+permissions:
+  pull-requests: write
+
+jobs:
+  comment:
+    runs-on: ubuntu-latest
+    steps:
+    # Checkout the repository code to the runner.
+    - name: Checkout code
+      uses: actions/checkout@v4
+
+    # Create a bin directory in the runner's home
+    - name: Create bin directory
+      run: |
+        mkdir -p $HOME/bin
+        echo "$HOME/bin" >> $GITHUB_PATH
+
+    # Install the latest jq and yq from GitHub releases
+    - name: Install jq and yq
+      run: |
+        wget https://github.com/jqlang/jq/releases/latest/download/jq-linux-amd64 -O $HOME/bin/jq
+        chmod +x $HOME/bin/jq
+        wget https://github.com/mikefarah/yq/releases/latest/download/yq_linux_amd64 -O $HOME/bin/yq
+        chmod +x $HOME/bin/yq      
+
+    # Main logic for adding comments based on labels.
+    - name: Comment on PR based on external config
+      run: |
+        # Fetch the labels attached to the PR from the GitHub event JSON.
+        pr_labels=$(jq -r '.pull_request.labels[] | .name' "$GITHUB_EVENT_PATH" | tr '\n' ' ')
+
+        # Define the path to the external YAML config file.
+        config_file=".github/auto-comment-config.yaml"
+
+        # Get the number of label-comment mappings defined in the config file.
+        num_mappings=$(yq e '.label_mappings | length' "$config_file")
+
+        # Loop through each label-comment mapping in the config file.
+        for (( i=0; i<$num_mappings; i++ )); do
+          # Fetch the labels and comment for the current mapping.
+          mapfile -t labels < <(yq e ".label_mappings[$i].labels[]" "$config_file")
+          comment=$(yq e ".label_mappings[$i].comment" "$config_file")
+
+          # Check if all required labels from the current mapping are present in the PR.
+          for label in "${labels[@]}"; do
+            if [[ ! $pr_labels == *"$label"* ]]; then
+              echo "One or more required labels not found. Skipping."
+              continue 2  # Skip to the next iteration of the outer loop.
+            fi
+          done
+
+          # Fetch the PR number from the GitHub event JSON.
+          pr_number=$(jq -r '.pull_request.number' "$GITHUB_EVENT_PATH")
+
+          # If all required labels are found, add the comment to the PR.
+          echo "All required labels found. Adding comment."
+          gh pr comment "$pr_number" --body "$comment"
+
+        done
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      shell: bash

.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
         {
@@ -127,24 +133,24 @@ jobs:
             echo "(DEBUG) FILE_DIR: ${FILE_DIR}"
             echo "(DEBUG) FILE_NAME: ${FILE_NAME}"
             echo "(DEBUG) Localized file path: $L10N_FILE_PATH"
-            echo "(DEBUG) Original file path: ./content/en/${FILE_PATH}"
+            echo "(DEBUG) Original file path: content/en/${FILE_PATH}"
 
             # Create subdirectories
             mkdir -p ${OUTPUT_DIR}/${FILE_DIR}
 
             # Actually compare between the old and lastest English content and log diff in the file
-            if [[ -f "./content/en/${FILE_PATH}" ]]; then
+            if [[ -f "content/en/${FILE_PATH}" ]]; then
               # File exists
               # Check changes
-              git diff ${OLD_BRANCH}..${LATEST_BRANCH} -- ./content/en/${FILE_PATH} > temp.diff
+              git diff ${OLD_BRANCH}..${LATEST_BRANCH} -- content/en/${FILE_PATH} > temp.diff
 
               if [[ -s "temp.diff" ]]; then
                 echo "(DEBUG) ${FILE_PATH} is outdated."
                 mv temp.diff ${OUTPUT_DIR}/${FILE_PATH}
               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,12 +23,12 @@ 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
           diff content/es/.wordlist.txt <(LC_ALL= sort -f content/es/.wordlist.txt)
       - name: GitHub Spellcheck Action
-        uses: rojopolis/spellcheck-github-actions@0.33.0
+        uses: rojopolis/spellcheck-github-actions@0.33.1
         with:
           config_path: content/es/.spellcheck.yml

.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/spellcheck-github-actions@0.33.0
+        uses: rojopolis/spellcheck-github-actions@0.33.1

.gitignore

@@ -4,3 +4,6 @@ resources/
 node_modules/
 .hugo_build.lock
 .DS_Store
+
+# Local Netlify folder
+.netlify