From 286d2a43b85b81a81e2b19648b66c75a5c79f34e Mon Sep 17 00:00:00 2001 From: Mathew Wicks <5735406+thesuperzapper@users.noreply.github.com> Date: Wed, 4 Sep 2024 15:26:31 -0700 Subject: [PATCH 1/6] Block web crawlers on `v1.7-branch` Signed-off-by: Mathew Wicks <5735406+thesuperzapper@users.noreply.github.com> --- layouts/partials/head.html | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/layouts/partials/head.html b/layouts/partials/head.html index f5de0ca6df..a3c8183d14 100644 --- a/layouts/partials/head.html +++ b/layouts/partials/head.html @@ -5,12 +5,8 @@ {{ end -}} -{{ $outputFormat := partial "outputformat.html" . -}} -{{ if and hugo.IsProduction (ne $outputFormat "print") -}} - -{{ else -}} - -{{ end -}} + + {{ partial "seo_schema" . }} From 15da37083931aa10190b56967325b8b613779d3c Mon Sep 17 00:00:00 2001 From: Mathew Wicks <5735406+thesuperzapper@users.noreply.github.com> Date: Wed, 4 Sep 2024 15:45:04 -0700 Subject: [PATCH 2/6] Enable archived version header Signed-off-by: Mathew Wicks <5735406+thesuperzapper@users.noreply.github.com> --- config.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/config.toml b/config.toml index a8002055d3..f21959456d 100644 --- a/config.toml +++ b/config.toml @@ -114,11 +114,11 @@ ignoreFiles = [ # 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 # version number for this doc set. - version = "master" + version = "v1.7" # Flag used in the "version-banner" partial to decide whether to display a # banner on every page indicating that this is an archived version of the docs. - archived_version = false + 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. @@ -126,7 +126,7 @@ ignoreFiles = [ # A variable used in various docs to determine URLs for config files etc. # To find occurrences, search the repo for 'params "githubbranch"'. - githubbranch = "master" + githubbranch = "v1.7-branch" # These entries appear in the drop-down menu at the top of the website. [[params.versions]] From 72f0a780b8e43100945e60325cc01be9fc0f0461 Mon Sep 17 00:00:00 2001 From: Mathew Wicks <5735406+thesuperzapper@users.noreply.github.com> Date: Wed, 4 Sep 2024 16:44:47 -0700 Subject: [PATCH 3/6] Backport changes from #3863 Signed-off-by: Mathew Wicks <5735406+thesuperzapper@users.noreply.github.com> --- config.toml | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/config.toml b/config.toml index f21959456d..ed621615f0 100644 --- a/config.toml +++ b/config.toml @@ -109,7 +109,7 @@ ignoreFiles = [ gcs_engine_id = "007239566369470735695:624rglujm-w" # Text label for the version menu in the top bar of the website. - version_menu = "Kubeflow Version" + version_menu = "Archive: 1.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 @@ -122,7 +122,7 @@ ignoreFiles = [ # 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"'. @@ -130,59 +130,59 @@ ignoreFiles = [ # 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 = "v1.7" + version = "Archive: 1.7" githubbranch = "v1.7-branch" url = "https://v1-7-branch.kubeflow.org" [[params.versions]] - version = "v1.6" + version = "Archive: 1.6" githubbranch = "v1.6-branch" url = "https://v1-6-branch.kubeflow.org" [[params.versions]] - version = "v1.5" + version = "Archive: 1.5" githubbranch = "v1.5-branch" url = "https://v1-5-branch.kubeflow.org" [[params.versions]] - version = "v1.4" + version = "Archive: 1.4" githubbranch = "v1.4-branch" url = "https://v1-4-branch.kubeflow.org" [[params.versions]] - version = "v1.3" + version = "Archive: 1.3" githubbranch = "v1.3-branch" url = "https://v1-3-branch.kubeflow.org" [[params.versions]] - version = "v1.2" + version = "Archive: 1.2" githubbranch = "v1.2-branch" url = "https://v1-2-branch.kubeflow.org" [[params.versions]] - version = "v1.1" + version = "Archive: 1.1" githubbranch = "v1.1-branch" url = "https://v1-1-branch.kubeflow.org" [[params.versions]] - version = "v1.0" + version = "Archive: 1.0" githubbranch = "v1.0-branch" url = "https://v1-0-branch.kubeflow.org" [[params.versions]] - version = "v0.7" + version = "Archive: 0.7" githubbranch = "v0.7-branch" url = "https://v0-7.kubeflow.org" [[params.versions]] - version = "v0.6" + version = "Archive: 0.6" githubbranch = "v0.6-branch" url = "https://v0-6.kubeflow.org" [[params.versions]] - version = "v0.5" + 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.3" + version = "Archive: 0.3" githubbranch = "v0.3-branch" url = "https://v0-3.kubeflow.org" From d0a41fa69fbee640e1dc9df835b9cec329350dfe Mon Sep 17 00:00:00 2001 From: Mathew Wicks <5735406+thesuperzapper@users.noreply.github.com> Date: Fri, 6 Sep 2024 13:38:11 -0700 Subject: [PATCH 4/6] Align OWNERS to `master` branch Signed-off-by: Mathew Wicks <5735406+thesuperzapper@users.noreply.github.com> --- OWNERS | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/OWNERS b/OWNERS index 3df8e780f8..dad6adc133 100644 --- a/OWNERS +++ b/OWNERS @@ -1,18 +1,7 @@ approvers: - - animeshsingh - - chensun + - andreyvelich - james-jwu - - knkski - - shannonbradshaw - - zijianjoy -reviewers: - - 8bitmp3 - - aronchick - - berndverst - - dansanche - - dsdinter - - Jeffwan - - jinchihe - - nickchase - - pdmack + - jbottum + - johnugeorge - terrytangyuan + - zijianjoy \ No newline at end of file From ddbd7f8041115f79d7e81d28661f6673fa43edb8 Mon Sep 17 00:00:00 2001 From: Mathew Wicks <5735406+thesuperzapper@users.noreply.github.com> Date: Fri, 6 Sep 2024 13:38:38 -0700 Subject: [PATCH 5/6] Remove `Archive: ` version dropdown prefix Signed-off-by: Mathew Wicks <5735406+thesuperzapper@users.noreply.github.com> --- config.toml | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/config.toml b/config.toml index ed621615f0..4bc7da86c8 100644 --- a/config.toml +++ b/config.toml @@ -109,7 +109,7 @@ ignoreFiles = [ gcs_engine_id = "007239566369470735695:624rglujm-w" # Text label for the version menu in the top bar of the website. - version_menu = "Archive: 1.7" + version_menu = "v1.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 @@ -134,55 +134,55 @@ ignoreFiles = [ githubbranch = "master" url = "https://www.kubeflow.org" [[params.versions]] - version = "Archive: 1.7" + version = "v1.7" githubbranch = "v1.7-branch" url = "https://v1-7-branch.kubeflow.org" [[params.versions]] - version = "Archive: 1.6" + version = "v1.6" githubbranch = "v1.6-branch" url = "https://v1-6-branch.kubeflow.org" [[params.versions]] - version = "Archive: 1.5" + version = "v1.5" githubbranch = "v1.5-branch" url = "https://v1-5-branch.kubeflow.org" [[params.versions]] - version = "Archive: 1.4" + version = "v1.4" githubbranch = "v1.4-branch" url = "https://v1-4-branch.kubeflow.org" [[params.versions]] - version = "Archive: 1.3" + version = "v1.3" githubbranch = "v1.3-branch" url = "https://v1-3-branch.kubeflow.org" [[params.versions]] - version = "Archive: 1.2" + version = "v1.2" githubbranch = "v1.2-branch" url = "https://v1-2-branch.kubeflow.org" [[params.versions]] - version = "Archive: 1.1" + version = "v1.1" githubbranch = "v1.1-branch" url = "https://v1-1-branch.kubeflow.org" [[params.versions]] - version = "Archive: 1.0" + version = "v1.0" githubbranch = "v1.0-branch" url = "https://v1-0-branch.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" From 2a74c2c42113c736a6a450e29a35ae82a6bddaef Mon Sep 17 00:00:00 2001 From: Mathew Wicks <5735406+thesuperzapper@users.noreply.github.com> Date: Fri, 6 Sep 2024 13:39:12 -0700 Subject: [PATCH 6/6] Improve archived_version banner Signed-off-by: Mathew Wicks <5735406+thesuperzapper@users.noreply.github.com> --- layouts/partials/version-banner.html | 33 ++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 layouts/partials/version-banner.html diff --git a/layouts/partials/version-banner.html b/layouts/partials/version-banner.html new file mode 100644 index 0000000000..641e73fdc8 --- /dev/null +++ b/layouts/partials/version-banner.html @@ -0,0 +1,33 @@ + +{{- $latest_version_url := .Site.Params.url_latest_version }} +{{- $current_version := replace .Site.Params.version "v" "" | markdownify }} +{{- if .Site.Params.archived_version }} + +
+{{- end }} \ No newline at end of file