diff --git a/README.md b/README.md index 691e11f3e..5457d145b 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ ![100] [![Build Status][1]][2] [![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/3811/badge)](https://bestpractices.coreinfrastructure.org/projects/3811) -![GitHub release (latest SemVer)](https://img.shields.io/github/v/release/vmware-tanzu/velero) +![GitHub release (latest SemVer)](https://img.shields.io/github/v/release/velero-io/velero) ## Overview @@ -52,14 +52,29 @@ Velero supports IPv4, IPv6, and dual stack environments. Support for this was te The Velero maintainers are continuously working to expand testing coverage, but are not able to test every combination of Velero and supported Kubernetes versions for each Velero release. The table above is meant to track the current testing coverage and the expected supported Kubernetes versions for each Velero version. -If you are interested in using a different version of Kubernetes with a given Velero version, we'd recommend that you perform testing before installing or upgrading your environment. For full information around capabilities within a release, also see the Velero [release notes](https://github.com/vmware-tanzu/velero/releases) or Kubernetes [release notes](https://github.com/kubernetes/kubernetes/tree/master/CHANGELOG). See the Velero [support page](https://velero.io/docs/latest/support-process/) for information about supported versions of Velero. +If you are interested in using a different version of Kubernetes with a given Velero version, we'd recommend that you perform testing before installing or upgrading your environment. For full information around capabilities within a release, also see the Velero [release notes](https://github.com/velero-io/velero/releases) or Kubernetes [release notes](https://github.com/kubernetes/kubernetes/tree/master/CHANGELOG). See the Velero [support page](https://velero.io/docs/latest/support-process/) for information about supported versions of Velero. For each release, Velero maintainers run the test to ensure the upgrade path from n-2 minor release. For example, before the release of v1.10.x, the test will verify that the backup created by v1.9.x and v1.8.x can be restored using the build to be tagged as v1.10.x. -[1]: https://github.com/vmware-tanzu/velero/workflows/Main%20CI/badge.svg -[2]: https://github.com/vmware-tanzu/velero/actions?query=workflow%3A"Main+CI" -[4]: https://github.com/vmware-tanzu/velero/issues -[6]: https://github.com/vmware-tanzu/velero/releases +## Cloud Native Computing Foundation + +Velero is a [Cloud Native Computing Foundation](https://www.cncf.io/) sandbox project. + +

+ + Cloud Native Computing Foundation logo + +

+ +Copyright Contributors to Velero, established as Velero a Series of LF Projects, LLC. +For website terms of use, trademark policy and other project policies please see +. + +[1]: https://github.com/velero-io/velero/workflows/Main%20CI/badge.svg +[2]: https://github.com/velero-io/velero/actions?query=workflow%3A"Main+CI" +[4]: https://github.com/velero-io/velero/issues +[6]: https://github.com/velero-io/velero/releases [9]: https://kubernetes.io/docs/setup/ [10]: https://kubernetes.io/docs/tasks/tools/install-kubectl/#install-with-homebrew-on-macos [11]: https://kubernetes.io/docs/tasks/tools/install-kubectl/#tabset-1 diff --git a/site/assets/_scss/site/objects/_footer.scss b/site/assets/_scss/site/objects/_footer.scss index ba5be8d6a..61f106a3c 100644 --- a/site/assets/_scss/site/objects/_footer.scss +++ b/site/assets/_scss/site/objects/_footer.scss @@ -34,11 +34,20 @@ height: auto; margin-left: 30px; } - .vm-logo { - font-size: .75rem; - img { - max-width: 75px; - margin-left: 30px; + .cncf-affiliation { + color: $footer-foreground; + a { + color: $footer-link-color; + border-bottom: 0; + &:hover { + text-decoration: underline; + } + } + .cncf-logo { + display: inline-block; + margin-top: 0.25rem; + max-width: 300px; + height: auto; } } } \ No newline at end of file diff --git a/site/config.yaml b/site/config.yaml index 8eded5b59..6eddc1e14 100644 --- a/site/config.yaml +++ b/site/config.yaml @@ -7,8 +7,8 @@ frontmatter: date: [":filename", ":default"] params: author: Velero Authors - vm_logo: vm-logo.png logo: Velero.svg + cncf_logo: cncf-white.svg hero: backgroundColor: med-blue versioning: true @@ -47,14 +47,18 @@ params: - v0.5.0 - v0.4.0 - v0.3.0 - gh_repo: https://github.com/vmware-tanzu/velero + gh_repo: https://github.com/velero-io/velero footer: title: Getting Started content: To help you get started, see the documentation. cta_title: '' cta_url: /docs cta_text: Documentation - vm_link: http://vmware.github.io/ + cncf_link: https://www.cncf.io/ + # Set to "" once Velero is promoted to incubating or graduated. + cncf_status: sandbox + lf_policies_link: https://lfprojects.org/policies/ + copyright_holder: Velero a Series of LF Projects, LLC footer_social_links: - title: Twitter fa_icon: fab fa-twitter @@ -70,7 +74,7 @@ params: url: /blog/index.xml - title: GitHub fa_icon: fab fa-github - url: https://github.com/vmware-tanzu/velero + url: https://github.com/velero-io/velero minify: disableCSS: false disableHTML: false diff --git a/site/layouts/_default/footer.html b/site/layouts/_default/footer.html index 998fd760a..6747dca16 100644 --- a/site/layouts/_default/footer.html +++ b/site/layouts/_default/footer.html @@ -38,17 +38,37 @@ alt="Homepage"/> + {{/* CNCF affiliation block — required by CNCF Website Guidelines. + Change `sandbox project` -> `project` when Velero is promoted to + incubating or graduated. See + https://github.com/cncf/foundation/blob/main/policies-guidance/website-guidelines.md */}} +
+
+

+ We are a + Cloud Native Computing Foundation + {{ with .Site.Params.footer.cncf_status }}{{ . }} {{ end }}project. +

+ + + +
+
+
-
- © {{ now.Format "2006" }} {{ .Site.Params.Author }}. - -
This Website Does Not Use Cookies or Other Tracking Technology. This site is powered by Netlify.

- - Terms of Use | - Privacy Policy | - Your California Privacy Rights - +
+

Copyright {{ .Site.Params.footer.copyright_holder }}.

+

+ For website terms of use, trademark policy and other project policies please see + {{ .Site.Params.footer.lf_policies_link }}. +

+

+ This website does not use cookies or other tracking technology. + This site is powered by Netlify. +

diff --git a/site/static/img/cncf-white.svg b/site/static/img/cncf-white.svg new file mode 100644 index 000000000..d94aaf324 --- /dev/null +++ b/site/static/img/cncf-white.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/site/static/img/vm-logo.png b/site/static/img/vm-logo.png deleted file mode 100644 index c216caaad..000000000 Binary files a/site/static/img/vm-logo.png and /dev/null differ