From d8d41116f65df15946c0af437c8029c38af6e831 Mon Sep 17 00:00:00 2001 From: Zach Corleissen Date: Tue, 23 Oct 2018 15:56:53 -0700 Subject: [PATCH] Update site config for l10n teams and 1.11 info (#10667) Update OWNERS_ALIASES to be current Fix OWNERS files syntax Fix currentUrl Fix currentUrl even more Standardize value of currentUrl Fix layout shortcode syntax --- OWNERS | 15 +-- OWNERS_ALIASES | 94 +++++++++++++++++-- config.toml | 103 ++++++++++++++------- content/en/OWNERS | 11 +++ content/ja/OWNERS | 11 +++ content/ko/OWNERS | 11 +++ content/zh/OWNERS | 11 +++ layouts/shortcodes/deprecationwarning.html | 2 +- 8 files changed, 204 insertions(+), 54 deletions(-) create mode 100644 content/en/OWNERS create mode 100644 content/ja/OWNERS create mode 100644 content/ko/OWNERS create mode 100644 content/zh/OWNERS diff --git a/OWNERS b/OWNERS index 4efb99c115..da9dee9771 100644 --- a/OWNERS +++ b/OWNERS @@ -1,19 +1,10 @@ # Reviewers can /lgtm /approve but not sufficient for auto-merge without an # approver reviewers: -- zhangxiaoyu-zidif -- xiangpengzhao -- stewart-yu -- Rajakavitha1 +- sig-docs-en-reviews + # Approvers have all the ability of reviewers but their /approve makes # auto-merge happen if a /lgtm exists, or vice versa, or they can do both # No need for approvers to also be listed as reviewers approvers: -- heckj -- bradamant3 -- bradtopol -- steveperry-53 -- zacharysarah -- chenopis -- mistyhacks -- tengqm +- sig-docs-en-owners diff --git a/OWNERS_ALIASES b/OWNERS_ALIASES index c846b2d3c7..2abc1776c2 100644 --- a/OWNERS_ALIASES +++ b/OWNERS_ALIASES @@ -41,9 +41,11 @@ aliases: - chrislovecnm - mfburnett sig-azure: #Microsoft Azure - - slack - - colemickens - - jdumars + - andyzhangx + - feiskyer + - justaugustus + - karataliu + - khenidak sig-big-data: #GH: sig-big-data-pr-reviews - foxish sig-cli: #Team: CLI; GH: sig-cli-pr-reviews; e.g. kubectl @@ -61,11 +63,25 @@ aliases: - smarterclayton - soltysh - sttts - sig-cluster-lifecycle: #GH: sig-cluster-lifecycle-pr-reviews + sig-cluster-lifecycle-kubeadm-approvers: # Approving changes to kubeadm documentation - timothysc + - lukemarsden - luxas - roberthbailey - - fabriziopandini + - fabriziopandini + sig-cluster-lifecycle-kubeadm-reviewers: # Reviewing kubeadm documentation + - timothysc + - lukemarsden + - luxas + - roberthbailey + - fabriziopandini + - kad + - xiangpengzhao + - stealthybox + - liztio + - chuckha + - detiber + - dixudx sig-cluster-ops: - zehicle - jdumars @@ -81,12 +97,71 @@ aliases: - apelisse - grodrigues3 - spxtr - sig-docs: #Team: documentation; GH: sig-docs-pr-reviews + sig-docs: #Team: documentation; GH: sig-docs-maintainers - bradamant3 - - steveperry-53 - - zacharysarah - bradtopol - - heckj + - chenopis + - jaredbhatti + - kbarnard10 + - mistyhacks + - ryanmcginnis + - steveperry-53 + - tengqm + - tfogo + - xiangpengzhao + - zacharysarah + - zhangxiaoyu-zidif + - zparnold + sig-docs-en-owners: #Team: Documentation; GH: sig-docs-en-owners + - bradamant3 + - bradtopol + - chenopis + - jaredbhatti + - kbarnard10 + - mistyhacks + - ryanmcginnis + - steveperry-53 + - stewart-yu + - tengqm + - tfogo + - zacharysarah + - zparnold + sig-docs-en-reviews: #Team: Documentation; GH: sig-docs-pr-reviews + - jimangel + - rajakavitha1 + - stewart-yu + - xiangpengzhao + - zhangxiaoyu + sig-docs-ja-owners: #Team: Japanese docs localization; GH: sig-docs-ja-owners + - cstoku + - nasa9084 + - tnir + sig-docs-ja-reviews: #Team: Japanese docs PR reviews; GH:sig-docs-ja-reviews + - cstoku + - makocchi-git + - MasayaAoyama + - nasa9084 + - tnir + sig-docs-ko-owners: #Team Korean docs localization; GH: sig-docs-ko-owners + - ClaudiaJKang + - gochist + sig-docs-ko-reviews: #Team Korean docs reviews; GH: sig-docs-ko-reviews + - ClaudiaJKang + - gochist + - ianychoi + sig-docs-zh-owners: #Team Chinese docs localization; GH: sig-docs-zh-owners + - dchen1107 + - haibinxie + - hanjiayao + - lichuqiang + - tengqm + - xiangpengzhao + - zhangxiaoyu-zidif + sig-docs-zh-reviews: #Team Chinese docs reviews; GH: sig-docs-zh-reviews + - idealhack + - tengqm + - xiangpengzhao + - zhangxiaoyu-zidif sig-federation: #Team: Federation; e.g. Federated Clusters - csbell sig-gcp: #Google Cloud Platform; GH: sig-gcp-pr-reviews @@ -197,3 +272,4 @@ aliases: - floreks sig-windows: - michmike + \ No newline at end of file diff --git a/config.toml b/config.toml index cb1b0e5d8f..812c24969b 100644 --- a/config.toml +++ b/config.toml @@ -7,7 +7,7 @@ enableRobotsTXT = true disableKinds = ["taxonomy", "taxonomyTerm"] -ignoreFiles = [ "^OWNERS$", "README.md", "^node_modules$" ] +ignoreFiles = [ "^OWNERS$", "README[-]+[a-z]*\\.md", "^node_modules$", "content/en/docs/doc-contributor-tools" ] contentDir = "content/en" @@ -19,6 +19,12 @@ pygmentsUseClasses = false # See https://help.farbox.com/pygments.html pygmentsStyle = "emacs" +# Enable Git variables like commit, lastmod +enableGitInfo = true + +# Norwegian ("no") is sometimes but not currently used for testing. +disableLanguages = ["no"] + [blackfriday] hrefTargetBlank = true fractions = false @@ -27,49 +33,79 @@ fractions = false date = ["date", ":filename", "publishDate", "lastmod"] [permalinks] - blog = "/:section/:year/:month/:day/:slug/" +blog = "/:section/:year/:month/:day/:slug/" # Be explicit about the output formats. We (currently) only want an RSS feed for the home page. [outputs] -home = [ "HTML", "RSS"] +home = [ "HTML", "RSS", "HEADERS" ] page = [ "HTML"] section = [ "HTML"] +# Add a "text/netlify" media type for auto-generating the _headers file +[mediaTypes] +[mediaTypes."text/netlify"] +delimiter = "" + [outputFormats] [outputFormats.RSS] baseName = "feed" +# _headers file output (uses the template at layouts/index.headers) +[outputFormats.HEADERS] +mediatype = "text/netlify" +baseName = "_headers" +isPlainText = true +notAlternative = true + [params] time_format_blog = "Monday, January 02, 2006" description = "Production-Grade Container Orchestration" showedit = true -latest = "v1.11" +latest = "v1.12" -fullversion = "v1.11.0" +fullversion = "v1.11.3" version = "v1.11" -githubbranch = "master" -docsbranch = "master" -deprecated = false +githubbranch = "v1.11.3" +docsbranch = "release-1.11" +deprecated = true currentUrl = "https://kubernetes.io/docs/home/" -nextUrl = "http://kubernetes-io-vnext-staging.netlify.com/" +nextUrl = "https://kubernetes-io-vnext-staging.netlify.com/" githubWebsiteRepo = "github.com/kubernetes/website" githubWebsiteRaw = "raw.githubusercontent.com/kubernetes/website" +[params.pushAssets] +css = [ + "callouts", + "styles", + "custom-jekyll/tags" +] +js = [ + "custom-jekyll/tags", + "script" +] + [[params.versions]] -fullversion = "v1.11.0" -version = "v1.11" -githubbranch = "v1.11.0" -docsbranch = "release-1.11" +fullversion = "v1.12.0" +version = "v1.12" +githubbranch = "v1.12.0" +docsbranch = "release-1.12" url = "https://kubernetes.io" +[[params.versions]] +fullversion = "v1.11.3" +version = "v1.11" +githubbranch = "v1.11.3" +docsbranch = "release-1.11" +url = "https://v1-11.docs.kubernetes.io" + [[params.versions]] fullversion = "v1.10.3" version = "v1.10" githubbranch = "v1.10.3" docsbranch = "release-1.10" -url = "https://kubernetes.io" +url = "https://v1-10.docs.kubernetes.io" [[params.versions]] fullversion = "v1.9.7" @@ -78,21 +114,6 @@ githubbranch = "v1.9.7" docsbranch = "release-1.9" url = "https://v1-9.docs.kubernetes.io" -[[params.versions]] -fullversion = "v1.8.4" -version = "v1.8" -githubbranch = "v1.8.4" -docsbranch = "release-1.8" -url = "https://v1-8.docs.kubernetes.io" - -[[params.versions]] -fullversion = "v1.7.6" -version = "v1.7" -githubbranch = "v1.7.6" -docsbranch = "release-1.7" -url = "https://v1-7.docs.kubernetes.io" - - # Language definitions. [languages] @@ -102,11 +123,29 @@ description = "Production-Grade Container Orchestration" languageName ="English" # Weight used for sorting. weight = 1 -[languages.cn] + +[languages.zh] title = "Kubernetes" description = "Production-Grade Container Orchestration" -languageName ="Chinese" +languageName = "中文 Chinese" weight = 2 -contentDir = "content/cn" +contentDir = "content/zh" +[languages.ko] +title = "Kubernetes" +description = "Production-Grade Container Orchestration" +languageName = "한국어 Korean" +weight = 3 +contentDir = "content/ko" +[languages.no] +title = "Kubernetes" +description = "Production-Grade Container Orchestration" +languageName ="Norsk" +weight = 4 +contentDir = "content/no" + +[languages.no.params] +time_format_blog = "02.01.2006" +# A list of language codes to look for untranslated content, ordered from left to right. +language_alternatives = ["en"] diff --git a/content/en/OWNERS b/content/en/OWNERS new file mode 100644 index 0000000000..a6c31a257b --- /dev/null +++ b/content/en/OWNERS @@ -0,0 +1,11 @@ +# This is the directory for English source content. +# Teams and members are visible at https://github.com/orgs/kubernetes/teams. + +reviewers: +- sig-docs-en-reviews + +approvers: +- sig-docs-en-owners + +labels: +- language/en \ No newline at end of file diff --git a/content/ja/OWNERS b/content/ja/OWNERS new file mode 100644 index 0000000000..e1a864bc2d --- /dev/null +++ b/content/ja/OWNERS @@ -0,0 +1,11 @@ +# This is the localization project for Japanese. +# Teams and members are visible at https://github.com/orgs/kubernetes/teams. + +reviewers: +- sig-docs-ja-reviews + +approvers: +- sig-docs-ja-owners + +labels: +- language/ja \ No newline at end of file diff --git a/content/ko/OWNERS b/content/ko/OWNERS new file mode 100644 index 0000000000..45a4bc5870 --- /dev/null +++ b/content/ko/OWNERS @@ -0,0 +1,11 @@ +# This is the localization project for Korean. +# Teams and members are visible at https://github.com/orgs/kubernetes/teams. + +reviewers: +- sig-docs-ko-reviews + +approvers: +- sig-docs-ko-owners + +labels: +- language/ko diff --git a/content/zh/OWNERS b/content/zh/OWNERS new file mode 100644 index 0000000000..7eec09c28c --- /dev/null +++ b/content/zh/OWNERS @@ -0,0 +1,11 @@ +# This is the localization project for Chinese. +# Teams and members are visible at https://github.com/orgs/kubernetes/teams. + +reviewers: +- sig-docs-zh-reviews + +approvers: +- sig-docs-zh-owners + +labels: +- language/zh diff --git a/layouts/shortcodes/deprecationwarning.html b/layouts/shortcodes/deprecationwarning.html index 25bc7e2c41..a3975386e5 100644 --- a/layouts/shortcodes/deprecationwarning.html +++ b/layouts/shortcodes/deprecationwarning.html @@ -4,7 +4,7 @@

Documentation for Kubernetes {{ .Page.Param "version" }} is no longer actively maintained. The version you are currently viewing is a static snapshot. - For up-to-date documentation, see the latest version. + For up-to-date documentation, see the latest version.