From 26813841b07692912dcfd3ee7341e4f36a63589a Mon Sep 17 00:00:00 2001 From: Mathew Wicks <5735406+thesuperzapper@users.noreply.github.com> Date: Wed, 4 Sep 2024 14:06:44 -0700 Subject: [PATCH 1/9] Block web crawlers on `v0.7-branch` Signed-off-by: Mathew Wicks <5735406+thesuperzapper@users.noreply.github.com> --- layouts/partials/head.html | 7 ++----- netlify.toml | 2 ++ 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/layouts/partials/head.html b/layouts/partials/head.html index 5496ce2217..be95ddbb05 100644 --- a/layouts/partials/head.html +++ b/layouts/partials/head.html @@ -1,11 +1,8 @@ {{ hugo.Generator }} -{{ if eq (getenv "HUGO_ENV") "production" }} - -{{ else }} - -{{ end }} + + {{ range .AlternativeOutputFormats -}} {{ end -}} diff --git a/netlify.toml b/netlify.toml index 2471e0e165..42c9ab5f94 100644 --- a/netlify.toml +++ b/netlify.toml @@ -4,7 +4,9 @@ [context.deploy-preview.environment] HUGO_VERSION = "0.55.6" + NODE_VERSION = "10" [context.production.environment] HUGO_VERSION = "0.55.6" + NODE_VERSION = "10" HUGO_ENV = "production" From 05c5c55ad8aef755d76db6c8d85a28b09c85d77b Mon Sep 17 00:00:00 2001 From: Mathew Wicks <5735406+thesuperzapper@users.noreply.github.com> Date: Wed, 4 Sep 2024 13:39:26 -0700 Subject: [PATCH 2/9] Update Hugo to 0.81.0 Signed-off-by: Mathew Wicks <5735406+thesuperzapper@users.noreply.github.com> --- netlify.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/netlify.toml b/netlify.toml index 42c9ab5f94..4384982f7f 100644 --- a/netlify.toml +++ b/netlify.toml @@ -3,10 +3,10 @@ command = "hugo" [context.deploy-preview.environment] - HUGO_VERSION = "0.55.6" + HUGO_VERSION = "0.81.0" NODE_VERSION = "10" [context.production.environment] - HUGO_VERSION = "0.55.6" + HUGO_VERSION = "0.81.0" NODE_VERSION = "10" HUGO_ENV = "production" From 0a67cab04012c3cfe0fb762608d695bf1dc5bcc7 Mon Sep 17 00:00:00 2001 From: Mathew Wicks <5735406+thesuperzapper@users.noreply.github.com> Date: Wed, 4 Sep 2024 13:49:46 -0700 Subject: [PATCH 3/9] Add missing `package.json` for Netlify Signed-off-by: Mathew Wicks <5735406+thesuperzapper@users.noreply.github.com> --- package.json | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 package.json diff --git a/package.json b/package.json new file mode 100644 index 0000000000..789c952e84 --- /dev/null +++ b/package.json @@ -0,0 +1,8 @@ +{ + "name": "website", + "devDependencies": { + "autoprefixer": "^9.4.3", + "postcss": "^7.0.6", + "postcss-cli": "^6.1.0" + } +} From e46fe5d1e604753b0ac1d6c7fc1260fd1922b839 Mon Sep 17 00:00:00 2001 From: Mathew Wicks <5735406+thesuperzapper@users.noreply.github.com> Date: Wed, 4 Sep 2024 14:26:10 -0700 Subject: [PATCH 4/9] Try Node 12 Signed-off-by: Mathew Wicks <5735406+thesuperzapper@users.noreply.github.com> --- netlify.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/netlify.toml b/netlify.toml index 4384982f7f..623fd3efbd 100644 --- a/netlify.toml +++ b/netlify.toml @@ -4,9 +4,9 @@ [context.deploy-preview.environment] HUGO_VERSION = "0.81.0" - NODE_VERSION = "10" + NODE_VERSION = "12" [context.production.environment] HUGO_VERSION = "0.81.0" - NODE_VERSION = "10" + NODE_VERSION = "12" HUGO_ENV = "production" From 30c5ab349f5151674ecfb13cbbca00e7c9556e3c Mon Sep 17 00:00:00 2001 From: Mathew Wicks <5735406+thesuperzapper@users.noreply.github.com> Date: Wed, 4 Sep 2024 14:56:05 -0700 Subject: [PATCH 5/9] Fix homepage buttons Signed-off-by: Mathew Wicks <5735406+thesuperzapper@users.noreply.github.com> --- themes/docsy/layouts/shortcodes/blocks/cover.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/themes/docsy/layouts/shortcodes/blocks/cover.html b/themes/docsy/layouts/shortcodes/blocks/cover.html index 5e14d6dcaf..6eb762a9ea 100644 --- a/themes/docsy/layouts/shortcodes/blocks/cover.html +++ b/themes/docsy/layouts/shortcodes/blocks/cover.html @@ -31,7 +31,7 @@ {{ with .Get "title" }}

{{ $title := . }}{{ with $logo_image }}{{ $logo_image_resized := (.Fit (printf "70x70 %s" $logo_anchor)) }}{{ end }}{{ $title | html }}

{{ end }} {{ with .Get "subtitle" }}

{{ . | html }}

{{ end }}
- {{ .Inner | markdownify}} + {{ .Inner }}
From 59401159b57e2a3211e66f40f208ce4d9d1db528 Mon Sep 17 00:00:00 2001 From: Mathew Wicks <5735406+thesuperzapper@users.noreply.github.com> Date: Wed, 4 Sep 2024 17:06:21 -0700 Subject: [PATCH 6/9] Backport changes from #3863 Signed-off-by: Mathew Wicks <5735406+thesuperzapper@users.noreply.github.com> --- config.toml | 43 +++++++++++++++++++++---------------------- 1 file changed, 21 insertions(+), 22 deletions(-) diff --git a/config.toml b/config.toml index ee5d6e9335..26d4413cda 100644 --- a/config.toml +++ b/config.toml @@ -106,7 +106,7 @@ privacy_policy = "https://policies.google.com/privacy" gcs_engine_id = "007239566369470735695:624rglujm-w" # Text label for the version menu in the top bar of the website. -version_menu = "v0.7" +version_menu = "Archive: 0.7" # The major.minor version tag for the version of the docs represented in this # branch of the repository. Used in the "version-banner" partial to display a @@ -119,7 +119,7 @@ archived_version = true # A link to latest version of the docs. Used in the "version-banner" partial to # point people to the main doc site. -url_latest_version = "https://kubeflow.org/docs/" +url_latest_version = "https://www.kubeflow.org/docs/" # A variable used in various docs to determine URLs for config files etc. # To find occurrences, search the repo for 'params "githubbranch"'. @@ -128,34 +128,33 @@ githubbranch = "v0.7-branch" # Add new release versions here. These entries appear in the drop-down menu # at the top of the website. [[params.versions]] - version = "master" + version = "Latest" githubbranch = "master" - url = "https://master.kubeflow.org" - + url = "https://www.kubeflow.org" [[params.versions]] - version = "v0.2" - githubbranch = "v0.2-branch" - url = "https://v0-2.kubeflow.org" - + version = "Archive: 0.7" + githubbranch = "v0.7-branch" + url = "https://v0-7.kubeflow.org" [[params.versions]] - version = "v0.3" - githubbranch = "v0.3-branch" - url = "https://v0-3.kubeflow.org" - + version = "Archive: 0.6" + githubbranch = "v0.6-branch" + url = "https://v0-6.kubeflow.org" +[[params.versions]] + version = "Archive: 0.5" + githubbranch = "v0.5-branch" + url = "https://v0-5.kubeflow.org" [[params.versions]] - version = "v0.4" + version = "Archive: 0.4" githubbranch = "v0.4-branch" url = "https://v0-4.kubeflow.org" - [[params.versions]] - version = "v0.5" - githubbranch = "v0.5-branch" - url = "https://v0-5.kubeflow.org" - + version = "Archive: 0.3" + githubbranch = "v0.3-branch" + url = "https://v0-3.kubeflow.org" [[params.versions]] - version = "v0.6" - githubbranch = "v0.6-branch" - url = "https://v0-6.kubeflow.org" + version = "Archive: 0.2" + githubbranch = "v0.2-branch" + url = "https://v0-2.kubeflow.org" # Docsy: User interface configuration [params.ui] From 1cb80fbaf1a3adf3cf94d0dcb7889a578d826983 Mon Sep 17 00:00:00 2001 From: Mathew Wicks <5735406+thesuperzapper@users.noreply.github.com> Date: Fri, 6 Sep 2024 13:09:56 -0700 Subject: [PATCH 7/9] Align OWNERS to `master` branch Signed-off-by: Mathew Wicks <5735406+thesuperzapper@users.noreply.github.com> --- OWNERS | 60 ++++++---------------------------------------------------- 1 file changed, 6 insertions(+), 54 deletions(-) diff --git a/OWNERS b/OWNERS index b431182bf9..dad6adc133 100644 --- a/OWNERS +++ b/OWNERS @@ -1,55 +1,7 @@ approvers: - - abhi-g - - aronchick - - dansanche - - ewilderj - - jinchihe - - jlewi - - kunmingg - - lluunn - - nickchase - - pdmack - - richardsliu - - sarahmaddox - - texasmichelle - - willingc - - dsdinter - - Ark-kun - - gaoning777 - - hongye-sun - - IronPan - - neuromage - - paveldournov - - qimingj - - rileyjbauer - - vicaire - - joeliedtke - - animeshsingh -reviewers: - - abhi-g - - aronchick - - carmine - - dansanche - - inc0 - - jinchihe - - jlewi - - kunmingg - - lluunn - - nickchase - - pdmack - - richardsliu - - sarahmaddox - - texasmichelle - - willingc - - dsdinter - - Ark-kun - - gaoning777 - - hongye-sun - - IronPan - - neuromage - - paveldournov - - qimingj - - rileyjbauer - - thedriftofwords - - vicaire - - animeshsingh + - andreyvelich + - james-jwu + - jbottum + - johnugeorge + - terrytangyuan + - zijianjoy \ No newline at end of file From ca9fd8f2b40aae08509290235cba0db25d92ffd0 Mon Sep 17 00:00:00 2001 From: Mathew Wicks <5735406+thesuperzapper@users.noreply.github.com> Date: Fri, 6 Sep 2024 13:10:27 -0700 Subject: [PATCH 8/9] Improve archived_version banner Signed-off-by: Mathew Wicks <5735406+thesuperzapper@users.noreply.github.com> --- layouts/partials/version-banner.html | 45 ++++++++++++++++++++-------- 1 file changed, 32 insertions(+), 13 deletions(-) diff --git a/layouts/partials/version-banner.html b/layouts/partials/version-banner.html index 617a0ad779..641e73fdc8 100644 --- a/layouts/partials/version-banner.html +++ b/layouts/partials/version-banner.html @@ -1,14 +1,33 @@ - -{{ if .Site.Params.archived_version }} - {{ $color := "primary" }} - {{ $latest := .Site.Params.url_latest_version }} -
- {{ with .Site.Params.version }}

Version {{ . | markdownify }} of the - documentation is no longer actively maintained. The site that you are - currently viewing is an archived snapshot. For up-to-date documentation, - see the - latest version.

- {{ end }} + +{{- $latest_version_url := .Site.Params.url_latest_version }} +{{- $current_version := replace .Site.Params.version "v" "" | markdownify }} +{{- if .Site.Params.archived_version }} + +
+

You are viewing documentation for Kubeflow {{ $current_version }}

+

+ This is a static snapshot from the time of the Kubeflow {{ $current_version }} release. +
+ For up-to-date information, see the latest version. +

-{{ end }} +{{- end }} \ No newline at end of file From d36283a4e1e3c87f88df76129b9b9c602817c6f6 Mon Sep 17 00:00:00 2001 From: Mathew Wicks <5735406+thesuperzapper@users.noreply.github.com> Date: Fri, 6 Sep 2024 13:11:39 -0700 Subject: [PATCH 9/9] Remove `Archive: ` version dropdown prefix Signed-off-by: Mathew Wicks <5735406+thesuperzapper@users.noreply.github.com> --- config.toml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/config.toml b/config.toml index 26d4413cda..2b4394726c 100644 --- a/config.toml +++ b/config.toml @@ -106,7 +106,7 @@ privacy_policy = "https://policies.google.com/privacy" gcs_engine_id = "007239566369470735695:624rglujm-w" # Text label for the version menu in the top bar of the website. -version_menu = "Archive: 0.7" +version_menu = "v0.7" # The major.minor version tag for the version of the docs represented in this # branch of the repository. Used in the "version-banner" partial to display a @@ -132,27 +132,27 @@ githubbranch = "v0.7-branch" githubbranch = "master" url = "https://www.kubeflow.org" [[params.versions]] - version = "Archive: 0.7" + version = "v0.7" githubbranch = "v0.7-branch" url = "https://v0-7.kubeflow.org" [[params.versions]] - version = "Archive: 0.6" + version = "v0.6" githubbranch = "v0.6-branch" url = "https://v0-6.kubeflow.org" [[params.versions]] - version = "Archive: 0.5" + version = "v0.5" githubbranch = "v0.5-branch" url = "https://v0-5.kubeflow.org" [[params.versions]] - version = "Archive: 0.4" + version = "v0.4" githubbranch = "v0.4-branch" url = "https://v0-4.kubeflow.org" [[params.versions]] - version = "Archive: 0.3" + version = "v0.3" githubbranch = "v0.3-branch" url = "https://v0-3.kubeflow.org" [[params.versions]] - version = "Archive: 0.2" + version = "v0.2" githubbranch = "v0.2-branch" url = "https://v0-2.kubeflow.org"