diff --git a/content/en/docs/concepts/cluster-administration/addons.md b/content/en/docs/concepts/cluster-administration/addons.md index 05a65a1efc049..ac0afcc693129 100644 --- a/content/en/docs/concepts/cluster-administration/addons.md +++ b/content/en/docs/concepts/cluster-administration/addons.md @@ -5,12 +5,12 @@ content_type: concept +{{% thirdparty-content %}} + Add-ons extend the functionality of Kubernetes. This page lists some of the available add-ons and links to their respective installation instructions. -Add-ons in each section are sorted alphabetically - the ordering does not imply any preferential status. - ## Networking and Network Policy diff --git a/content/en/docs/concepts/cluster-administration/networking.md b/content/en/docs/concepts/cluster-administration/networking.md index ff30e60b12091..3b692fb448ab3 100644 --- a/content/en/docs/concepts/cluster-administration/networking.md +++ b/content/en/docs/concepts/cluster-administration/networking.md @@ -79,6 +79,8 @@ as an introduction to various technologies and serves as a jumping-off point. The following networking options are sorted alphabetically - the order does not imply any preferential status. +{{% thirdparty-content %}} + ### ACI [Cisco Application Centric Infrastructure](https://www.cisco.com/c/en/us/solutions/data-center-virtualization/application-centric-infrastructure/index.html) offers an integrated overlay and underlay SDN solution that supports containers, virtual machines, and bare metal servers. [ACI](https://www.github.com/noironetworks/aci-containers) provides container networking integration for ACI. An overview of the integration is provided [here](https://www.cisco.com/c/dam/en/us/solutions/collateral/data-center-virtualization/application-centric-infrastructure/solution-overview-c22-739493.pdf). @@ -112,7 +114,7 @@ Additionally, the CNI can be run alongside [Calico for network policy enforcemen [Azure CNI](https://docs.microsoft.com/en-us/azure/virtual-network/container-networking-overview) is an [open source](https://github.com/Azure/azure-container-networking/blob/master/docs/cni.md) plugin that integrates Kubernetes Pods with an Azure Virtual Network (also known as VNet) providing network performance at par with VMs. Pods can connect to peered VNet and to on-premises over Express Route or site-to-site VPN and are also directly reachable from these networks. Pods can access Azure services, such as storage and SQL, that are protected by Service Endpoints or Private Link. You can use VNet security policies and routing to filter Pod traffic. The plugin assigns VNet IPs to Pods by utilizing a pool of secondary IPs pre-configured on the Network Interface of a Kubernetes node. Azure CNI is available natively in the [Azure Kubernetes Service (AKS)] (https://docs.microsoft.com/en-us/azure/aks/configure-azure-cni). - + ### Big Cloud Fabric from Big Switch Networks @@ -313,5 +315,4 @@ to run, and in both cases, the network provides one IP address per pod - as is s The early design of the networking model and its rationale, and some future plans are described in more detail in the -[networking design document](https://git.k8s.io/community/contributors/design-proposals/network/networking.md). - +[networking design document](https://git.k8s.io/community/contributors/design-proposals/network/networking.md). \ No newline at end of file diff --git a/content/en/docs/reference/using-api/client-libraries.md b/content/en/docs/reference/using-api/client-libraries.md index c4d7e5ea24674..9e4ee1f67e873 100644 --- a/content/en/docs/reference/using-api/client-libraries.md +++ b/content/en/docs/reference/using-api/client-libraries.md @@ -40,6 +40,8 @@ The following client libraries are officially maintained by ## Community-maintained client libraries +{{% thirdparty-content %}} + The following Kubernetes API client libraries are provided and maintained by their authors, not the Kubernetes team. diff --git a/content/en/docs/tasks/administer-cluster/declare-network-policy.md b/content/en/docs/tasks/administer-cluster/declare-network-policy.md index 61add5312ad47..fed4a77f9de69 100644 --- a/content/en/docs/tasks/administer-cluster/declare-network-policy.md +++ b/content/en/docs/tasks/administer-cluster/declare-network-policy.md @@ -9,6 +9,7 @@ content_type: task This document helps you get started using the Kubernetes [NetworkPolicy API](/docs/concepts/services-networking/network-policies/) to declare network policies that govern how pods communicate with each other. +{{% thirdparty-content %}} ## {{% heading "prerequisites" %}} @@ -23,11 +24,6 @@ Make sure you've configured a network provider with network policy support. Ther * [Romana](/docs/tasks/administer-cluster/network-policy-provider/romana-network-policy/) * [Weave Net](/docs/tasks/administer-cluster/network-policy-provider/weave-network-policy/) -{{< note >}} -The above list is sorted alphabetically by product name, not by recommendation or preference. This example is valid for a Kubernetes cluster using any of these providers. -{{< /note >}} - - ## Create an `nginx` deployment and expose it via a service diff --git a/i18n/en.toml b/i18n/en.toml index 69b6c645e63b8..79145e3dd9813 100644 --- a/i18n/en.toml +++ b/i18n/en.toml @@ -207,6 +207,10 @@ other = "Subscribe" [synopsis_heading] other = "Synopsis" + +[thirdparty_message] +other = """This section links to third party projects that provide functionality required by Kubernetes. The Kubernetes project authors aren't responsible for these projects. This page follows CNCF website guidelines by listing projects alphabetically. To add a project to this list, read the content guide before submitting a change.""" + [ui_search_placeholder] other = "Search" diff --git a/layouts/shortcodes/thirdparty-content.html b/layouts/shortcodes/thirdparty-content.html new file mode 100644 index 0000000000000..5a98081e49967 --- /dev/null +++ b/layouts/shortcodes/thirdparty-content.html @@ -0,0 +1,4 @@ +
+ {{ T "caution" | safeHTML }} + {{ T "thirdparty_message" | safeHTML }} +