Skip to content

Commit 06fb191

Browse files
authored
Merge pull request #44792 from cynthia-sg/cynthia-sg/landscape
Update references to CNCF landscape (v2)
2 parents 0366496 + 26e760d commit 06fb191

File tree

34 files changed

+106
-91
lines changed

34 files changed

+106
-91
lines changed

content/de/partners/_index.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ <h5>
1616
</h5>
1717
<br>Geprüfte Dienstleister mit umfassender Erfahrung bei der erfolgreichen Einführung von Kubernetes in Unternehmen.
1818
<br><br><br>
19-
<button class="button landscape-trigger landscape-default" data-landscape-types="kubernetes-certified-service-provider" id="kcsp">KCSP Partner anzeigen</button>
19+
<button class="button landscape-trigger landscape-default" data-landscape-types="special--kubernetes-certified-service-provider" id="kcsp">KCSP Partner anzeigen</button>
2020
<br><br>Interessiert daran, ein
2121
<a href="https://www.cncf.io/certification/kcsp/">KCSP</a> zu werden?
2222
</center>
@@ -27,7 +27,7 @@ <h5>
2727
<b>Zertifizierte Kubernetes-Distributionen, gehostete Plattformen und Installationssysteme</b>
2828
</h5>Die Softwarekonformität stellt sicher, dass die Kubernetes-Version eines jeden Anbieters die erforderlichen APIs unterstützt.
2929
<br><br><br>
30-
<button class="button landscape-trigger" data-landscape-types="certified-kubernetes-distribution,certified-kubernetes-hosted,certified-kubernetes-installer" id="conformance">Konforme Partner anzeigen</button>
30+
<button class="button landscape-trigger" data-landscape-types="platform" id="conformance">Konforme Partner anzeigen</button>
3131
<br><br>Interessiert daran,
3232
<a href="https://www.cncf.io/certification/software-conformance/">Kubernetes Zertifiziert</a> zu werden?
3333
</center>
@@ -39,7 +39,7 @@ <h5>
3939
</h5>
4040
<br>Geprüfte Schulungsanbieter mit umfassender Erfahrung in der Weiterbildung im Bereich Cloud Native Technology.
4141
<br><br><br>
42-
<button class="button landscape-trigger" data-landscape-types="kubernetes-training-partner" id="ktp">KTP Partner anzeigen</button>
42+
<button class="button landscape-trigger" data-landscape-types="special--kubernetes-training-partner" id="ktp">KTP Partner anzeigen</button>
4343
<br><br>Interessiert daran, ein
4444
<a href="https://www.cncf.io/certification/training/">KTP</a> zu werden?
4545
</center>
@@ -50,4 +50,4 @@ <h5>
5050

5151
<style>
5252
{{< include "partner-style.css" >}}
53-
</style>
53+
</style>

content/de/training/_index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,6 @@ <h2>Kubernetes Schulungspartner</h2>
132132
</center>
133133
</div>
134134
<div class="main-section landscape-section">
135-
{{< cncf-landscape helpers=false category="kubernetes-training-partner" >}}
135+
{{< cncf-landscape helpers=false category="special--kubernetes-training-partner" >}}
136136
</div>
137137
</div>

content/en/blog/_posts/2020-12-02-dockershim-faq.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ will have strictly better performance and less overhead. However, we encourage y
129129
to explore all the options from the [CNCF landscape] in case another would be an
130130
even better fit for your environment.
131131

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

134134

135135
### What should I look out for when changing CRI implementations?

content/en/blog/_posts/2021-11-12-are-you-ready-for-dockershim-removal/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ and consult your Kubernetes hosting vendor (if you have one) what container runt
6565
Read up [container runtime documentation with instructions on how to use containerd and CRI-O](/docs/setup/production-environment/container-runtimes/#container-runtimes)
6666
to help prepare you when you're ready to upgrade to 1.24. CRI-O, containerd, and
6767
Docker with [Mirantis cri-dockerd](https://github.com/Mirantis/cri-dockerd) are
68-
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)
68+
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)
6969
in case another suits you better.
7070

7171
Thank you!

content/en/blog/_posts/2022-02-17-updated-dockershim-faq.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ will have strictly better performance and less overhead. However, we encourage y
9999
to explore all the options from the [CNCF landscape] in case another would be an
100100
even better fit for your environment.
101101

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

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

content/en/case-studies/netease/index.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ <h2>Challenge</h2>
2323

2424
<h2>Solution</h2>
2525

26-
<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>
26+
<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>
2727

2828
<h2>Impact</h2>
2929

@@ -69,7 +69,7 @@ <h2>Impact</h2>
6969
"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."
7070
{{< /case-studies/quote >}}
7171

72-
<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>
72+
<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>
7373

7474
<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>
7575

content/en/docs/setup/production-environment/turnkey-solutions.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@ ready clusters.
1111

1212
<!-- body -->
1313

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

content/en/docs/tasks/debug/debug-cluster/resource-usage-monitoring.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,12 +62,12 @@ then exposes them to Kubernetes via an adapter by implementing either the
6262

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

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

8484
The choice of monitoring platform depends heavily on your needs, budget, and technical resources.
85-
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.
85+
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.
8686
Your monitoring system should be capable of handling the [OpenMetrics](https://openmetrics.io/) metrics
8787
transmission standard, and needs to chosen to best fit in to your overall design and deployment of
8888
your infrastructure platform.

content/en/partners/_index.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ <h5>
1616
</h5>
1717
<br>Vetted service providers with deep experience helping enterprises successfully adopt Kubernetes.
1818
<br><br><br>
19-
<button class="button landscape-trigger landscape-default" data-landscape-types="kubernetes-certified-service-provider" id="kcsp">See KCSP Partners</button>
19+
<button class="button landscape-trigger landscape-default" data-landscape-types="special--kubernetes-certified-service-provider" id="kcsp">See KCSP Partners</button>
2020
<br><br>Interested in becoming a
2121
<a href="https://www.cncf.io/certification/kcsp/">KCSP</a>?
2222
</center>
@@ -27,7 +27,7 @@ <h5>
2727
<b>Certified Kubernetes Distributions, Hosted Platforms, and Installers</b>
2828
</h5>Software conformance ensures that every vendor’s version of Kubernetes supports the required APIs.
2929
<br><br><br>
30-
<button class="button landscape-trigger" data-landscape-types="certified-kubernetes-distribution,certified-kubernetes-hosted,certified-kubernetes-installer" id="conformance">See Conformance Partners</button>
30+
<button class="button landscape-trigger" data-landscape-types="platform" id="conformance">See Conformance Partners</button>
3131
<br><br>Interested in becoming
3232
<a href="https://www.cncf.io/certification/software-conformance/">Kubernetes Certified</a>?
3333
</center>
@@ -39,7 +39,7 @@ <h5>
3939
</h5>
4040
<br>Vetted training providers who have deep experience in cloud native technology training.
4141
<br><br><br>
42-
<button class="button landscape-trigger" data-landscape-types="kubernetes-training-partner" id="ktp">See KTP Partners</button>
42+
<button class="button landscape-trigger" data-landscape-types="special--kubernetes-training-partner" id="ktp">See KTP Partners</button>
4343
<br><br>Interested in becoming a
4444
<a href="https://www.cncf.io/certification/training/">KTP</a>?
4545
</center>

content/en/training/_index.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ <h5>
121121
<h5>
122122
<b>Certified Kubernetes Administrator (CKA)</b>
123123
</h5>
124-
124+
125125
<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>
126126
<p>A certified Kubernetes administrator has demonstrated the ability to do basic installation as well as configuring and managing production-grade Kubernetes clusters.</p>
127127
<br>
@@ -131,7 +131,7 @@ <h5>
131131
<h5>
132132
<b>Certified Kubernetes Security Specialist (CKS)</b>
133133
</h5>
134-
134+
135135
<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>
136136
<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>
137137
<br>
@@ -149,6 +149,6 @@ <h2>Kubernetes Training Partners</h2>
149149
</center>
150150
</div>
151151
<div class="main-section landscape-section">
152-
{{< cncf-landscape helpers=false category="kubernetes-training-partner" >}}
152+
{{< cncf-landscape helpers=false category="special--kubernetes-training-partner" >}}
153153
</div>
154154
</div>

0 commit comments

Comments
 (0)