diff --git a/data/i18n/en/en.toml b/data/i18n/en/en.toml index eee6e8661b353..d38f0e9c70c53 100644 --- a/data/i18n/en/en.toml +++ b/data/i18n/en/en.toml @@ -49,26 +49,20 @@ other = "CVE ID" [cve_issue_url] other = "CVE GitHub Issue URL" -[cve_json_external_url] -other = "external_url" - -[cve_json_id] -other = "id" - -[cve_json_summary] -other = "summary" - -[cve_json_url] -other = "url" - [cve_summary] other = "Issue Summary" [cve_table] other = "Official Kubernetes CVE List" -[cve_url] -other = "CVE URL" +[cve_table_date_before] +other = "(last updated: " + +[cve_table_date_format] +other = "02 Jan 2006 15:04:05 MST" + +[cve_table_date_after] +other = ")" [deprecation_title] other = "You are viewing documentation for Kubernetes version:" diff --git a/layouts/_default/cve-feed.json b/layouts/_default/cve-feed.json index a185fde22fc77..3812e9533b776 100644 --- a/layouts/_default/cve-feed.json +++ b/layouts/_default/cve-feed.json @@ -1,23 +1 @@ -{ - "version": "https://jsonfeed.org/version/1.1", - "title": "Auto-refreshing Official CVE Feed", - "home_page_url": "https://kubernetes.io", - "feed_url": "https://kubernetes.io/docs/reference/issues-security/official-cve-feed/index.json", - "description": "Auto-refreshing official CVE feed for Kubernetes repository", - "authors": [ - { - "name": "Kubernetes Community", - "url": "https://www.kubernetes.dev" - } - ], - "items": [ - {{ range $i, $e := getJSON .Site.Params.cveFeedBucket }} - {{ if $i }}, {{ end }} - { - {{ T "cve_json_id" | jsonify }}: {{ .cve_id | jsonify }}, - {{ T "cve_json_url" | jsonify }}: {{ .issue_url | jsonify }}, - {{ T "cve_json_external_url" | jsonify }}: {{ .cve_url | jsonify}}, - {{ T "cve_json_summary" | jsonify }}: {{ replace (.summary | jsonify ) "\\u003e" ">" }} - }{{ end }} - ] -} +{{ getJSON .Site.Params.cveFeedBucket | jsonify }} diff --git a/layouts/shortcodes/cve-feed.html b/layouts/shortcodes/cve-feed.html index 1c04efab7ea8b..887999305ab0f 100644 --- a/layouts/shortcodes/cve-feed.html +++ b/layouts/shortcodes/cve-feed.html @@ -1,19 +1,23 @@ +{{ $feed := getJSON .Site.Params.cveFeedBucket }} +{{ if ne $feed.version "https://jsonfeed.org/version/1.1" }} + {{ errorf "Build Failed. CVE feed does not comply with JSON feed v1.1" }} +{{ end }}
| {{ T "cve_id" }} | -{{ T "cve_summary"}} | +{{ T "cve_summary" }} | {{ T "cve_issue_url" }} | |
|---|---|---|---|---|
| {{ .cve_id | htmlEscape | safeHTML }} | +{{ .id | htmlEscape | safeHTML }} | {{ .summary | htmlEscape | safeHTML }} | -#{{ .number }} | +#{{ ._kubernetes_io.issue_number }} |