fix: resolve KEP READMEs via GitHub tree lookup; dedup NCO events by region

Author: TineoC

content/en/resources/keps/_content.gotmpl

@@ -1,5 +1,6 @@
 {{- $kepDataSourceUrl := "https://storage.googleapis.com/k8s-keps/keps.json" -}}
 {{- $rawBaseUrl := "https://raw.githubusercontent.com/kubernetes/enhancements/master/keps/" -}}
+{{- $repoBaseUrl := "https://raw.githubusercontent.com/kubernetes/enhancements/master/" -}}
 {{- $kepData := slice -}}
 
 {{/* Global Options for GetRemote */}}
@@ -39,6 +40,30 @@
   {{- end -}}
 {{- end -}}
 
+{{- /* Build directory lookup from GitHub tree to handle KEPs in subdirectories */ -}}
+{{- $kepDirMap := dict -}}
+{{- $treeApiUrl := "https://api.github.com/repos/kubernetes/enhancements/git/trees/master?recursive=1" -}}
+{{- $treeOpts := merge $globalOpts (dict "key" "enhancements-keps-tree" "method" "get") -}}
+{{- with try (resources.GetRemote $treeApiUrl $treeOpts) -}}
+  {{- with .Err -}}
+    {{- warnf "Cannot fetch GitHub tree for KEP directory lookup: %s" . -}}
+  {{- else with .Value -}}
+    {{- with try (.Content | transform.Unmarshal) -}}
+      {{- with .Err -}}
+        {{- warnf "Cannot parse GitHub tree: %s" . -}}
+      {{- else with .Value -}}
+        {{- range $entry := .tree -}}
+          {{- if and (eq $entry.type "blob") (strings.HasSuffix $entry.path "README.md") (strings.HasPrefix $entry.path "keps/") -}}
+            {{- $dirPath := path.Dir $entry.path -}}
+            {{- $kepName := path.Base $dirPath -}}
+            {{- $kepDirMap = merge $kepDirMap (dict $kepName $dirPath) -}}
+          {{- end -}}
+        {{- end -}}
+      {{- end -}}
+    {{- end -}}
+  {{- end -}}
+{{- end -}}
+
 {{/* Define stages that are "beyond provisional" */}}
 {{- $validStages := slice "alpha" "beta" "stable" "deprecated" -}}
 {{- $validStatuses := slice "implementable" "implemented" -}}
@@ -74,8 +99,18 @@
       "toc_hide" true
     -}}
 
+    {{/* Resolve actual KEP directory from GitHub tree (handles subdirectory nesting) */}}
+    {{- $actualKepDir := index $kepDirMap $kep.name -}}
+    {{- $kepPrefix := printf "keps/" -}}
+    {{- $kepRelDir := "" -}}
+    {{- if $actualKepDir -}}
+      {{- $kepRelDir = strings.TrimPrefix $kepPrefix $actualKepDir -}}
+    {{- else -}}
+      {{- $kepRelDir = printf "%s/%s" $kep.owningSig $kep.name -}}
+    {{- end -}}
+
     {{/* Fetch README Content */}}
-    {{- $readmeUrl := printf "%s%s/%s/README.md" $rawBaseUrl $kep.owningSig $kep.name -}}
+    {{- $readmeUrl := printf "%s%s/README.md" $rawBaseUrl $kepRelDir -}}
     {{- $readmeContent := "" -}}
     {{- $readmeOpts := merge $globalOpts (dict "key" (printf "kep-readme-%s" $kep.kepNumber)) -}}
 
@@ -90,7 +125,7 @@
     {{- end -}}
 
     {{- if $needsFallback -}}
-      {{- $readmeUrlUpper := printf "%s%s/%s/README.MD" $rawBaseUrl $kep.owningSig $kep.name -}}
+      {{- $readmeUrlUpper := printf "%s%s/README.MD" $rawBaseUrl $kepRelDir -}}
       {{- $readmeOptsUpper := merge $globalOpts (dict "key" (printf "kep-readme-%s-upper" $kep.kepNumber)) -}}
       {{- $resourceFetchAttempt = try (resources.GetRemote $readmeUrlUpper $readmeOptsUpper) -}}
     {{- end -}}
@@ -106,8 +141,7 @@
         {{- $readmeContent = replace $readmeContent "((http" "(http" -}}
 
         {{- /* Fix relative image and link paths to point to GitHub */ -}}
-        {{- $repoBaseUrl := "https://raw.githubusercontent.com/kubernetes/enhancements/master/" -}}
-        {{- $kepDirUrl := printf "%skeps/%s/%s/" $repoBaseUrl $kep.owningSig $kep.name -}}
+        {{- $kepDirUrl := printf "%s%s/" $rawBaseUrl $kepRelDir -}}
 
         {{- /* 1. Fix absolute-looking paths (starting with /) */ -}}
         {{- $readmeContent = replaceRE `!\[(.*?)\]\(/(.*?)\)` (printf "![${1}](%s${2})" $repoBaseUrl) $readmeContent -}}

layouts/shortcodes/nco-next-session.html

@@ -543,6 +543,13 @@ <h3 class="fw-bold text-dark h3 mt-1 mb-0" id="nco-fallback-date-display">—</h
       var nextSessions = events.filter(function (e) {
         return Math.abs(new Date(e.start.dateTime || e.start.date) - firstDate) < 86400000;
       });
+      var seen = {};
+      nextSessions = nextSessions.filter(function (e) {
+        var key = e.start.dateTime || e.start.date;
+        if (seen[key]) return false;
+        seen[key] = true;
+        return true;
+      });
       if (!nextSessions.length) { runFallback(); return; }
 
       dateEl.textContent = firstDate.toLocaleDateString(undefined, {
@@ -559,16 +566,9 @@ <h3 class="fw-bold text-dark h3 mt-1 mb-0" id="nco-fallback-date-display">—</h
         return '';
       }
 
-      gridEl.innerHTML = '';
-      var sessionCount = { emea: 0, amer: 0 };
-
-      nextSessions.slice(0, 2).forEach(function (ev) {
-        var startHour = new Date(ev.start.dateTime || ev.start.date).getUTCHours();
-        var isEMEA    = startHour < 12;
-        var label     = isEMEA ? emeaLabel : amerLabel;
-        var times     = isEMEA ? emeaTimes : amerTimes;
-        sessionCount[isEMEA ? 'emea' : 'amer']++;
-
+      function renderEventRow(ev, region) {
+        var isEMEA = region === 'emea';
+        var label  = isEMEA ? emeaLabel : amerLabel;
         var joinLink = extractJoinLink(ev);
         var calEvLink = ev.htmlLink || '';
 
@@ -649,11 +649,11 @@ <h3 class="fw-bold text-dark h3 mt-1 mb-0" id="nco-fallback-date-display">—</h
         }
         if (hasActions) row.appendChild(actionsWrap);
 
-        gridEl.appendChild(row);
-      });
+        return row;
+      }
 
-      if (sessionCount.emea === 0 || sessionCount.amer === 0) {
-        var missing = sessionCount.emea === 0 ? 'EMEA/APAC' : 'AMER';
+      function renderMissingRow(region) {
+        var label = region === 'emea' ? 'EMEA/APAC' : 'AMER';
         var row = document.createElement('div');
         row.className = 'nco-session-row py-3 border-bottom d-flex align-items-center justify-content-between gap-3';
 
@@ -672,7 +672,7 @@ <h3 class="fw-bold text-dark h3 mt-1 mb-0" id="nco-fallback-date-display">—</h
         var txtWrap = document.createElement('div');
         var missingDiv = document.createElement('div');
         missingDiv.className = 'text-muted small';
-        missingDiv.textContent = missing + ' — details pending';
+        missingDiv.textContent = label + ' — details pending';
         txtWrap.appendChild(missingDiv);
         leftWrap.appendChild(txtWrap);
         row.appendChild(leftWrap);
@@ -692,9 +692,29 @@ <h3 class="fw-bold text-dark h3 mt-1 mb-0" id="nco-fallback-date-display">—</h
         rightWrap.appendChild(calCheckBtn);
         row.appendChild(rightWrap);
 
-        gridEl.appendChild(row);
+        return row;
       }
 
+      gridEl.innerHTML = '';
+      var emeaEvent = null;
+      var amerEvent = null;
+      for (var i = 0; i < nextSessions.length; i++) {
+        var ev = nextSessions[i];
+        var startHour = new Date(ev.start.dateTime || ev.start.date).getUTCHours();
+        if (startHour < 12 && !emeaEvent) {
+          emeaEvent = ev;
+        } else if (startHour >= 12 && !amerEvent) {
+          amerEvent = ev;
+        }
+        if (emeaEvent && amerEvent) break;
+      }
+
+      if (emeaEvent) gridEl.appendChild(renderEventRow(emeaEvent, 'emea'));
+      if (!emeaEvent) gridEl.appendChild(renderMissingRow('emea'));
+
+      if (amerEvent) gridEl.appendChild(renderEventRow(amerEvent, 'amer'));
+      if (!amerEvent) gridEl.appendChild(renderMissingRow('amer'));
+
       show(cardEl);
     })
     .catch(function () { runFallback(); });