Skip to content

Commit

Permalink
Merge pull request kubernetes#44792 from cynthia-sg/cynthia-sg/landscape
Browse files Browse the repository at this point in the history
Update references to CNCF landscape (v2)
  • Loading branch information
k8s-ci-robot authored Jan 19, 2024
2 parents 0366496 + 26e760d commit 06fb191
Show file tree
Hide file tree
Showing 34 changed files with 106 additions and 91 deletions.
8 changes: 4 additions & 4 deletions content/de/partners/_index.html
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ <h5>
</h5>
<br>Geprüfte Dienstleister mit umfassender Erfahrung bei der erfolgreichen Einführung von Kubernetes in Unternehmen.
<br><br><br>
<button class="button landscape-trigger landscape-default" data-landscape-types="kubernetes-certified-service-provider" id="kcsp">KCSP Partner anzeigen</button>
<button class="button landscape-trigger landscape-default" data-landscape-types="special--kubernetes-certified-service-provider" id="kcsp">KCSP Partner anzeigen</button>
<br><br>Interessiert daran, ein
<a href="https://www.cncf.io/certification/kcsp/">KCSP</a> zu werden?
</center>
Expand All @@ -27,7 +27,7 @@ <h5>
<b>Zertifizierte Kubernetes-Distributionen, gehostete Plattformen und Installationssysteme</b>
</h5>Die Softwarekonformität stellt sicher, dass die Kubernetes-Version eines jeden Anbieters die erforderlichen APIs unterstützt.
<br><br><br>
<button class="button landscape-trigger" data-landscape-types="certified-kubernetes-distribution,certified-kubernetes-hosted,certified-kubernetes-installer" id="conformance">Konforme Partner anzeigen</button>
<button class="button landscape-trigger" data-landscape-types="platform" id="conformance">Konforme Partner anzeigen</button>
<br><br>Interessiert daran,
<a href="https://www.cncf.io/certification/software-conformance/">Kubernetes Zertifiziert</a> zu werden?
</center>
Expand All @@ -39,7 +39,7 @@ <h5>
</h5>
<br>Geprüfte Schulungsanbieter mit umfassender Erfahrung in der Weiterbildung im Bereich Cloud Native Technology.
<br><br><br>
<button class="button landscape-trigger" data-landscape-types="kubernetes-training-partner" id="ktp">KTP Partner anzeigen</button>
<button class="button landscape-trigger" data-landscape-types="special--kubernetes-training-partner" id="ktp">KTP Partner anzeigen</button>
<br><br>Interessiert daran, ein
<a href="https://www.cncf.io/certification/training/">KTP</a> zu werden?
</center>
Expand All @@ -50,4 +50,4 @@ <h5>

<style>
{{< include "partner-style.css" >}}
</style>
</style>
2 changes: 1 addition & 1 deletion content/de/training/_index.html
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,6 @@ <h2>Kubernetes Schulungspartner</h2>
</center>
</div>
<div class="main-section landscape-section">
{{< cncf-landscape helpers=false category="kubernetes-training-partner" >}}
{{< cncf-landscape helpers=false category="special--kubernetes-training-partner" >}}
</div>
</div>
2 changes: 1 addition & 1 deletion content/en/blog/_posts/2020-12-02-dockershim-faq.md
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ will have strictly better performance and less overhead. However, we encourage y
to explore all the options from the [CNCF landscape] in case another would be an
even better fit for your environment.

[CNCF landscape]: https://landscape.cncf.io/card-mode?category=container-runtime&grouping=category
[CNCF landscape]: https://landscape.cncf.io/?group=projects-and-products&view-mode=card#runtime--container-runtime


### What should I look out for when changing CRI implementations?
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ and consult your Kubernetes hosting vendor (if you have one) what container runt
Read up [container runtime documentation with instructions on how to use containerd and CRI-O](/docs/setup/production-environment/container-runtimes/#container-runtimes)
to help prepare you when you're ready to upgrade to 1.24. CRI-O, containerd, and
Docker with [Mirantis cri-dockerd](https://github.com/Mirantis/cri-dockerd) are
not the only container runtime options, we encourage you to explore the [CNCF landscape on container runtimes](https://landscape.cncf.io/card-mode?category=container-runtime&grouping=category)
not the only container runtime options, we encourage you to explore the [CNCF landscape on container runtimes](https://landscape.cncf.io/?group=projects-and-products&view-mode=card#runtime--container-runtime)
in case another suits you better.

Thank you!
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ will have strictly better performance and less overhead. However, we encourage y
to explore all the options from the [CNCF landscape] in case another would be an
even better fit for your environment.

[CNCF landscape]: https://landscape.cncf.io/card-mode?category=container-runtime&grouping=category
[CNCF landscape]: https://landscape.cncf.io/?group=projects-and-products&view-mode=card#runtime--container-runtime

#### Can I still use Docker Engine as my container runtime?

Expand Down
4 changes: 2 additions & 2 deletions content/en/case-studies/netease/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ <h2>Challenge</h2>

<h2>Solution</h2>

<p>After considering building its own orchestration solution, NetEase decided to base its private cloud platform on <a href="https://kubernetes.io/">Kubernetes</a>. The fact that the technology came out of Google gave the team confidence that it could keep up with NetEase's scale. "After our 2-to-3-month evaluation, we believed it could satisfy our needs," says Feng. The team started working with Kubernetes in 2015, before it was even 1.0. Today, the NetEase internal cloud platform—which also leverages the CNCF projects <a href="https://prometheus.io/">Prometheus</a>, <a href="https://www.envoyproxy.io/">Envoy</a>, <a href="https://goharbor.io/">Harbor</a>, <a href="https://grpc.io/">gRPC</a>, and <a href="https://helm.sh/">Helm</a>—runs 10,000 nodes in a production cluster and can support up to 30,000 nodes in a cluster. Based on its learnings from its internal platform, the company introduced a Kubernetes-based cloud and microservices-oriented PaaS product, <a href="https://landscape.cncf.io/selected=netease-qingzhou-microservice">NetEase Qingzhou Microservice</a>, to outside customers.</p>
<p>After considering building its own orchestration solution, NetEase decided to base its private cloud platform on <a href="https://kubernetes.io/">Kubernetes</a>. The fact that the technology came out of Google gave the team confidence that it could keep up with NetEase's scale. "After our 2-to-3-month evaluation, we believed it could satisfy our needs," says Feng. The team started working with Kubernetes in 2015, before it was even 1.0. Today, the NetEase internal cloud platform—which also leverages the CNCF projects <a href="https://prometheus.io/">Prometheus</a>, <a href="https://www.envoyproxy.io/">Envoy</a>, <a href="https://goharbor.io/">Harbor</a>, <a href="https://grpc.io/">gRPC</a>, and <a href="https://helm.sh/">Helm</a>—runs 10,000 nodes in a production cluster and can support up to 30,000 nodes in a cluster. Based on its learnings from its internal platform, the company introduced a Kubernetes-based cloud and microservices-oriented PaaS product, <a href="https://landscape.cncf.io/?group=projects-and-products&view-mode=card&item=platform--certified-kubernetes-distribution--netease-qingzhou-microservice#runtime--container-runtime">NetEase Qingzhou Microservice</a>, to outside customers.</p>

<h2>Impact</h2>

Expand Down Expand Up @@ -69,7 +69,7 @@ <h2>Impact</h2>
"By engaging with this community, we can gain some experience from it and we can also benefit from it. We can see what are the concerns and the challenges faced by the community, so we can get involved."
{{< /case-studies/quote >}}

<p>Based on the results and learnings from using its internal platform, the company introduced a Kubernetes-based cloud and microservices-oriented PaaS product, <a href="https://landscape.cncf.io/selected=netease-qingzhou-microservice">NetEase Qingzhou Microservice</a>, to outside customers. "The idea is that we can find the problems encountered by our game and e-commerce and cloud music providers, so we can integrate their experiences and provide a platform to satisfy the needs of our users," says Zeng.</p>
<p>Based on the results and learnings from using its internal platform, the company introduced a Kubernetes-based cloud and microservices-oriented PaaS product, <a href="https://landscape.cncf.io/?group=projects-and-products&view-mode=card&item=platform--certified-kubernetes-distribution--netease-qingzhou-microservice#runtime--container-runtime">NetEase Qingzhou Microservice</a>, to outside customers. "The idea is that we can find the problems encountered by our game and e-commerce and cloud music providers, so we can integrate their experiences and provide a platform to satisfy the needs of our users," says Zeng.</p>

<p>With or without the use of the NetEase product, the team encourages other companies to try Kubernetes. "As long as a company has a mature team and enough developers, I think Kubernetes is a very good technology that can help them," says Kubernetes developer Li Lanqing.</p>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ ready clusters.

<!-- body -->

{{< cncf-landscape helpers=true category="certified-kubernetes-hosted" >}}
{{< cncf-landscape helpers=true category="platform--certified-kubernetes-hosted" >}}
Original file line number Diff line number Diff line change
Expand Up @@ -62,12 +62,12 @@ then exposes them to Kubernetes via an adapter by implementing either the

Kubernetes is designed to work with [OpenMetrics](https://openmetrics.io/),
which is one of the
[CNCF Observability and Analysis - Monitoring Projects](https://landscape.cncf.io/card-mode?category=monitoring&project=graduated,incubating,member,no&grouping=category&sort=stars),
[CNCF Observability and Analysis - Monitoring Projects](https://landscape.cncf.io/?group=projects-and-products&view-mode=card#observability-and-analysis--monitoring),
built upon and carefully extending [Prometheus exposition format](https://prometheus.io/docs/instrumenting/exposition_formats/)
in almost 100% backwards-compatible ways.

If you glance over at the
[CNCF Landscape](https://landscape.cncf.io/card-mode?category=monitoring&project=graduated,incubating,member,no&grouping=category&sort=stars),
[CNCF Landscape](https://landscape.cncf.io/?group=projects-and-products&view-mode=card#observability-and-analysis--monitoring),
you can see a number of monitoring projects that can work with Kubernetes by _scraping_
metric data and using that to help you observe your cluster. It is up to you to select the tool
or tools that suit your needs. The CNCF landscape for observability and analytics includes a
Expand All @@ -82,7 +82,7 @@ the scope of Kubernetes documentation because of the very wide scope of possible
solutions.

The choice of monitoring platform depends heavily on your needs, budget, and technical resources.
Kubernetes does not recommend any specific metrics pipeline; [many options](https://landscape.cncf.io/card-mode?category=monitoring&project=graduated,incubating,member,no&grouping=category&sort=stars) are available.
Kubernetes does not recommend any specific metrics pipeline; [many options](https://landscape.cncf.io/?group=projects-and-products&view-mode=card#observability-and-analysis--monitoring) are available.
Your monitoring system should be capable of handling the [OpenMetrics](https://openmetrics.io/) metrics
transmission standard, and needs to chosen to best fit in to your overall design and deployment of
your infrastructure platform.
Expand Down
6 changes: 3 additions & 3 deletions content/en/partners/_index.html
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ <h5>
</h5>
<br>Vetted service providers with deep experience helping enterprises successfully adopt Kubernetes.
<br><br><br>
<button class="button landscape-trigger landscape-default" data-landscape-types="kubernetes-certified-service-provider" id="kcsp">See KCSP Partners</button>
<button class="button landscape-trigger landscape-default" data-landscape-types="special--kubernetes-certified-service-provider" id="kcsp">See KCSP Partners</button>
<br><br>Interested in becoming a
<a href="https://www.cncf.io/certification/kcsp/">KCSP</a>?
</center>
Expand All @@ -27,7 +27,7 @@ <h5>
<b>Certified Kubernetes Distributions, Hosted Platforms, and Installers</b>
</h5>Software conformance ensures that every vendor’s version of Kubernetes supports the required APIs.
<br><br><br>
<button class="button landscape-trigger" data-landscape-types="certified-kubernetes-distribution,certified-kubernetes-hosted,certified-kubernetes-installer" id="conformance">See Conformance Partners</button>
<button class="button landscape-trigger" data-landscape-types="platform" id="conformance">See Conformance Partners</button>
<br><br>Interested in becoming
<a href="https://www.cncf.io/certification/software-conformance/">Kubernetes Certified</a>?
</center>
Expand All @@ -39,7 +39,7 @@ <h5>
</h5>
<br>Vetted training providers who have deep experience in cloud native technology training.
<br><br><br>
<button class="button landscape-trigger" data-landscape-types="kubernetes-training-partner" id="ktp">See KTP Partners</button>
<button class="button landscape-trigger" data-landscape-types="special--kubernetes-training-partner" id="ktp">See KTP Partners</button>
<br><br>Interested in becoming a
<a href="https://www.cncf.io/certification/training/">KTP</a>?
</center>
Expand Down
6 changes: 3 additions & 3 deletions content/en/training/_index.html
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ <h5>
<h5>
<b>Certified Kubernetes Administrator (CKA)</b>
</h5>

<p>The Certified Kubernetes Administrator (CKA) program provides assurance that CKAs have the skills, knowledge, and competency to perform the responsibilities of Kubernetes administrators.</p>
<p>A certified Kubernetes administrator has demonstrated the ability to do basic installation as well as configuring and managing production-grade Kubernetes clusters.</p>
<br>
Expand All @@ -131,7 +131,7 @@ <h5>
<h5>
<b>Certified Kubernetes Security Specialist (CKS)</b>
</h5>

<p>The Certified Kubernetes Security Specialist program provides assurance that the holder is comfortable and competent with a broad range of best practices. CKS certification covers skills for securing container-based applications and Kubernetes platforms during build, deployment and runtime.</p>
<p><em>Candidates for CKS must hold a current Certified Kubernetes Administrator (CKA) certification to demonstrate they possess sufficient Kubernetes expertise before sitting for the CKS.</em></p>
<br>
Expand All @@ -149,6 +149,6 @@ <h2>Kubernetes Training Partners</h2>
</center>
</div>
<div class="main-section landscape-section">
{{< cncf-landscape helpers=false category="kubernetes-training-partner" >}}
{{< cncf-landscape helpers=false category="special--kubernetes-training-partner" >}}
</div>
</div>
12 changes: 6 additions & 6 deletions content/es/partners/_index.html
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ <h5>
</h5>
<br>Proveedores de servicios con amplia experiencia ayudando a las empresas a adoptar Kubernetes con éxito.
<br><br><br>
<button class="button landscape-trigger landscape-default" data-landscape-types="kubernetes-certified-service-provider" id="kcsp">See KCSP Partners</button>
<br><br>Conviértete en
<button class="button landscape-trigger landscape-default" data-landscape-types="special--kubernetes-certified-service-provider" id="kcsp">See KCSP Partners</button>
<br><br>Conviértete en
<a href="https://www.cncf.io/certification/kcsp/">KCSP</a>?
</center>
</div>
Expand All @@ -27,8 +27,8 @@ <h5>
<b>Certified Kubernetes Distributions, Hosted Platforms, and Installers</b>
</h5>La conformidad del software garantiza que la versión de Kubernetes de cada proveedor sea compatible con las API requeridas.
<br><br><br>
<button class="button landscape-trigger" data-landscape-types="certified-kubernetes-distribution,certified-kubernetes-hosted,certified-kubernetes-installer" id="conformance">See Conformance Partners</button>
<br><br>Conviértete en
<button class="button landscape-trigger" data-landscape-types="platform" id="conformance">See Conformance Partners</button>
<br><br>Conviértete en
<a href="https://www.cncf.io/certification/software-conformance/">Certified Kubernetes</a>?
</center>
</div>
Expand All @@ -39,8 +39,8 @@ <h5>
</h5>
<br>Partners de formación que ofrecen cursos de alta calidad y con una amplia experiencia en formación de tecnologías nativas de la nube.
<br><br><br>
<button class="button landscape-trigger" data-landscape-types="kubernetes-training-partner" id="ktp">See KTP Partners</button>
<br><br>Conviértete en
<button class="button landscape-trigger" data-landscape-types="special--kubernetes-training-partner" id="ktp">See KTP Partners</button>
<br><br>Conviértete en
<a href="https://www.cncf.io/certification/training/">KTP</a>?
</center>
</div>
Expand Down
13 changes: 6 additions & 7 deletions content/fr/partners/_index.html
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ <h5>
</h5>
<br>Des fournisseurs de services aguerris ayant une expérience approfondie dans l'aide aux entreprises pour l'adoption de Kubernetes.
<br><br><br>
<button class="button landscape-trigger landscape-default" data-landscape-types="kubernetes-certified-service-provider" id="kcsp">Voir les partenaires KCSP</button>
<br><br>Intéressé par devenir un
<button class="button landscape-trigger landscape-default" data-landscape-types="special--kubernetes-certified-service-provider" id="kcsp">Voir les partenaires KCSP</button>
<br><br>Intéressé par devenir un
<a href="https://www.cncf.io/certification/kcsp/">KCSP</a> ?
</center>
</div>
Expand All @@ -28,8 +28,8 @@ <h5>
<b>Distributions Kubernetes, plates-formes hébergées et installateurs certifiés</b>
</h5>La conformité logicielle garantit que chaque version de Kubernetes du fournisseur prend en charge les API requises.
<br><br><br>
<button class="button landscape-trigger" data-landscape-types="certified-kubernetes-distribution,certified-kubernetes-hosted,certified-kubernetes-installer" id="conformance">Voir les partenaires de conformité</button>
<br><br>Intéressé par devenir
<button class="button landscape-trigger" data-landscape-types="platform" id="conformance">Voir les partenaires de conformité</button>
<br><br>Intéressé par devenir
<a href="https://www.cncf.io/certification/software-conformance/">Agréé Kubernetes</a> ?
</center>
</div>
Expand All @@ -40,8 +40,8 @@ <h5>
</h5>
<br>Fournisseurs de formation sélectionnés ayant une expérience approfondie de la formation aux technologies cloud natives.
<br><br><br>
<button class="button landscape-trigger" data-landscape-types="kubernetes-training-partner" id="ktp">Voir les partenaires KTP</button>
<br><br>Intéressé par devenir un
<button class="button landscape-trigger" data-landscape-types="special--kubernetes-training-partner" id="ktp">Voir les partenaires KTP</button>
<br><br>Intéressé par devenir un
<a href="https://www.cncf.io/certification/training/">KTP</a> ?
</center>
</div>
Expand All @@ -52,4 +52,3 @@ <h5>
<style>
{{< include "partner-style.css" >}}
</style>

Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ weight: 30

<!-- body -->

{{< cncf-landscape helpers=true category="certified-kubernetes-hosted" >}}
{{< cncf-landscape helpers=true category="platform--certified-kubernetes-hosted" >}}
Loading

0 comments on commit 06fb191

Please sign in to comment.