Skip to content

Commit

Permalink
Merge pull request cncf#2909 from palark/en-add-related-links
Browse files Browse the repository at this point in the history
[en] More interlinking for containerisation & virtualisation
  • Loading branch information
iamNoah1 authored Feb 28, 2024
2 parents d3efe4f + b932930 commit 0142fd4
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 6 deletions.
2 changes: 1 addition & 1 deletion content/en/container-orchestration.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ status: Completed
category: Concept
---

[Container](/container/) orchestration refers to managing and automating the lifecycle of containerized applications in dynamic environments.
[Container](/container/) orchestration refers to managing and automating the lifecycle of [containerized](/containerization/) applications in dynamic environments.
It's executed through a container orchestrator (in most cases, [Kubernetes](/kubernetes)), which enables deployments, (auto)scaling, auto-healing, and monitoring.
Orchestration is a metaphor:
The orchestration tool conducts containers like a music conductor, ensuring every container (or musician) does what it should.
Expand Down
2 changes: 1 addition & 1 deletion content/en/containerization.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ As long as the output is a container image that adheres to this standard, which

## Problem it addresses

Before containers became prevalent, organizations relied on virtual machines (VMs) to
Before [containers](/container/) became prevalent, organizations relied on [virtual machines](/virtual-machine/) (VMs) to
orchestrate multiple applications on a single [bare-metal machine](/bare-metal-machine/).
VMs are significantly larger than containers and require a hypervisor to run.
Due to the storage, backup, and transfer of these larger VM templates, creating the VM templates is also slow.
Expand Down
7 changes: 4 additions & 3 deletions content/en/continuous-delivery.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,9 @@ in which code changes are automatically deployed into an acceptance environment
(or, in the case of continuous deployment, into production).
CD crucially includes procedures to ensure that software is adequately tested
before deployment and provides a way to rollback changes if deemed necessary.
Continuous integration (CI) is the first step towards continuous delivery
(i.e., changes have to merge cleanly before being tested and deployed).
[Continuous integration](/continuous-integration/) (CI) is the first step towards
continuous delivery (i.e., changes have to merge cleanly before being tested and
deployed).

## Problem it addresses

Expand All @@ -26,7 +27,7 @@ deploying more changes at once and increasing the risk that something goes wrong
CD strategies create a fully automated path to production
that tests and deploys the software using various deployment strategies
such as [canary](/canary-deployment/) or [blue-green](/blue-green-deployment/) releases.
This allows developers to deploy code frequently, giving them peace of mind that the new revision has been tested.
This allows developers to deploy code frequently, giving them peace of mind that the new revision has been tested.

## Related terms

Expand Down
2 changes: 1 addition & 1 deletion content/en/virtual-machine.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,4 @@ VMs allow you to use your existing physical hardware resources better
by placing multiple virtual machines on a single physical machine.
Not bound to a particular physical machine, VMs are also more resilient than physical machines.
When a physical machine needs to go offline,
the VMs running on it can be moved to another machine with little to no downtime
the VMs running on it can be moved to another machine with little to no downtime.

0 comments on commit 0142fd4

Please sign in to comment.