Skip to content

Commit a608d9d

Browse files
authored
Merge pull request #20135 from davivcgarcia/davivcgarcia-issue-19535
Fix refs to old K8s releases on glossary entries
2 parents ec24701 + 88cf57f commit a608d9d

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

content/en/docs/reference/glossary/cloud-controller-manager.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,16 @@ id: cloud-controller-manager
44
date: 2018-04-12
55
full_link: /docs/tasks/administer-cluster/running-cloud-controller/
66
short_description: >
7-
Cloud Controller Manager is an alpha feature in 1.8. In upcoming releases it will be the preferred way to integrate Kubernetes with any cloud.
7+
Cloud Controller Manager is a Kubernetes component that embeds cloud-specific control logic.
88
99
aka:
1010
tags:
1111
- core-object
1212
- architecture
1313
- operation
1414
---
15-
Cloud Controller Manager is an alpha feature in 1.8. In upcoming releases it will be the preferred way to integrate Kubernetes with any cloud.
15+
Cloud Controller Manager is a Kubernetes component that embeds cloud-specific control logic.
1616

1717
<!--more-->
1818

19-
Kubernetes v1.6 contains a new binary called cloud-controller-manager. cloud-controller-manager is a daemon that embeds cloud-specific control loops. These cloud-specific control loops were originally in the kube-controller-manager. Since cloud providers develop and release at a different pace compared to the Kubernetes project, abstracting the provider-specific code to the cloud-controller-manager binary allows cloud vendors to evolve independently from the core Kubernetes code.
19+
Originally part of the kube-controller-manager, the cloud-controller-manager is responsible to decoupling the interoperability logic between Kubernetes and the underlying cloud infrastructure, enabling cloud providers to release features at a different pace compared to the main project.

content/en/docs/reference/glossary/host-aliases.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: HostAliases
33
id: HostAliases
44
date: 2019-01-31
5-
full_link: /docs/reference/generated/kubernetes-api/v1.13/#hostalias-v1-core
5+
full_link: /docs/reference/generated/kubernetes-api/{{< param "version" >}}/#hostalias-v1-core
66
short_description: >
77
A HostAliases is a mapping between the IP address and hostname to be injected into a Pod's hosts file.
88
@@ -14,4 +14,4 @@ tags:
1414

1515
<!--more-->
1616

17-
[HostAliases](/docs/reference/generated/kubernetes-api/v1.13/#hostalias-v1-corev) is an optional list of hostnames and IP addresses that will be injected into the Pod's hosts file if specified. This is only valid for non-hostNetwork Pods.
17+
[HostAliases](/docs/reference/generated/kubernetes-api/{{< param "version" >}}/#hostalias-v1-core) is an optional list of hostnames and IP addresses that will be injected into the Pod's hosts file if specified. This is only valid for non-hostNetwork Pods.

0 commit comments

Comments
 (0)