Skip to content

Commit fdd591e

Browse files
authored
Merge pull request #3525 from cncf/main
[maintain] Merge main into dev-vi
2 parents 32c14c3 + 821376e commit fdd591e

File tree

15 files changed

+64
-44
lines changed

15 files changed

+64
-44
lines changed

.github/workflows/es-spellcheck.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,6 @@ jobs:
2929
set -o errexit
3030
diff content/es/.wordlist.txt <(LC_ALL= sort -f content/es/.wordlist.txt)
3131
- name: GitHub Spellcheck Action
32-
uses: rojopolis/spellcheck-github-actions@0.48.0
32+
uses: rojopolis/spellcheck-github-actions@0.49.0
3333
with:
3434
config_path: content/es/.spellcheck.yml

.github/workflows/spellcheck.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,4 @@ jobs:
2525
- uses: actions/checkout@v4
2626

2727
- name: GitHub Spellcheck Action
28-
uses: rojopolis/spellcheck-github-actions@0.48.0
28+
uses: rojopolis/spellcheck-github-actions@0.49.0

CODEOWNERS

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,8 @@
7171
/i18n/ur.toml @Saim-Safdar @waleed318
7272

7373
# Approvers for Vietnamese contents
74-
/content/vi/ @ntheanh201 @thuanpham582002
75-
/i18n/vi.toml @ntheanh201 @thuanpham582002
74+
/content/vi/ @ntheanh201 @thuanpham582002 @thaomike
75+
/i18n/vi.toml @ntheanh201 @thuanpham582002 @thaomike
7676

7777
# Approvers for Simplified Chinese contents
7878
/content/zh-cn/ @hanyuancheung @Jacob953 @Rocksnake @Submarinee

content/bn/digital-certificate.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: ডিজিটাল সার্টিফিকেট
3-
status: Feedback Appreciated
3+
status: Completed
44
category: প্রযুক্তি
55
tags: ["নিরাপত্তা"]
66
---

content/en/cluster.md

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,17 @@
22
title: Cluster
33
status: Completed
44
category: Concept
5-
tags: ["infrastructure", "fundamental", ""]
5+
tags: ["infrastructure", "fundamental", "architecture"]
66
---
77

8-
A cluster is a group of computers or applications that work together towards a common goal.
9-
In the context of cloud native computing, the term is most often applied to [Kubernetes](/kubernetes/).
10-
A Kubernetes cluster is a set of services (or workloads) that run in their own containers, usually on different machines.
11-
The collection of all these [containerized](/containerization/) services, connected over a network, represent a cluster.
8+
A cluster is a group of computers or applications called [nodes](/nodes/) that work together towards a common goal.
9+
In cloud native computing, the term is often applied when talking about a [Kubernetes](/kubernetes/) cluster.
10+
It can be seen as a specific kind of [distributed system](/distributed-systems/) where the nodes are a bit more tightly coupled.
1211

1312
## Problem it addresses
1413

15-
Software that runs on a single computer presents a single point of failure
16-
if that computer crashes, or someone accidentally unplugs the power cable,
14+
Software that runs on a single computer presents a single point of failure
15+
if that computer crashes, or someone accidentally unplugs the power cable,
1716
then some business-critical system may be taken offline.
1817
That's why modern software is generally built as [distributed applications](/distributed-apps/), grouped together as clusters.
1918

content/en/contribute/_index.md

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,14 +44,18 @@ With solid existing definitions in English, less experienced contributors can lo
4444

4545
Before beginning your Glossary contributor journey, be sure to complete the following steps:
4646

47-
1. Create a [GitHub account](https://docs.github.com/en/get-started/signing-up-for-github/signing-up-for-a-new-github-account), if you don't have one already.
48-
2. Sign the [Contributor License Agreement](https://docs.linuxfoundation.org/lfx/easycla/v2-current/contributors) (CLA).
49-
3. [Verify your commit signature](https://docs.github.com/en/authentication/managing-commit-signature-verification/about-commit-signature-verification)
50-
4. Enable [vigilant mode](https://docs.github.com/en/authentication/managing-commit-signature-verification/displaying-verification-statuses-for-all-of-your-commits#about-vigilant-mode) in your GitHub account to display the "Verified" status on your commits.
47+
1. Create a [GitHub account](https://docs.github.com/en/get-started/signing-up-for-github/signing-up-for-a-new-github-account) if you don't have one already.
48+
2. (If you are developing on your own local development environment)
49+
Set [`user.name`](https://docs.github.com/en/get-started/git-basics/setting-your-username-in-git#setting-your-git-username-for-every-repository-on-your-computer) and
50+
[`user.email`](https://docs.github.com/en/account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-email-preferences/setting-your-commit-email-address#setting-your-email-address-for-every-repository-on-your-computer)
51+
correctly in git config.
52+
3. Whenever you create a commit using the `git commit` command,
53+
add the `-s` option to add a DCO signature to the commit.
54+
Alternatively, you could add an alias to your `gitconfig` by running `git config --global alias.ci "commit -s"`.
5155

5256
## Best practices {#best-practices}
5357

54-
To facilitate the reviewing process, please use [semantic line breaks](https://sembr.org/) (e.g., one line per sentence).
58+
To facilitate the reviewing process, please use [semantic line breaks](https://sembr.org).
5559
We recommend checking out this [markdown cheat sheet](https://www.markdownguide.org/cheat-sheet/)
5660
to correctly format Markdown text in GitHub (e.g., hyperlink, bold, italic).
5761
And when naming .md files, please use lowercase letters and hyphens instead of spaces to separate words and avoid parenthesis.

content/en/digital-certificate.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: Digital Certificate
3-
status: Feedback Appreciated
3+
status: Completed
44
category: technology
55
tags: ["security", "", ""]
66
---

content/en/distributed-systems.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Distributed System
33
status: Completed
44
category: concept
5-
tags: ["architecture", "", ""]
5+
tags: ["architecture", "infrastructure", "fundamental"]
66
---
77

88
A distributed system is a collection of autonomous computing elements
@@ -28,4 +28,5 @@ This can be automated allowing a system to handle a sudden increase in workload
2828

2929
A non-distributed system exposes itself to risks of failure because if one machine fails, the entire system fails.
3030
A distributed system can be designed in such a way that,
31-
even if some machines go down, the overall system can still keep working to produce the same result.
31+
even if some machines go down,
32+
the overall system can still keep working to produce the same result.

content/en/gitops.md

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,28 @@
11
---
22
title: GitOps
3-
status: Feedback Appreciated
3+
status: Completed
44
category: Concept
55
tags: ["methodology", "", ""]
66
---
77

8-
GitOps is a set of best practices based on [shared principles](https://opengitops.dev/),
9-
applied to a workflow that depends on software agents that
10-
enable automation to reconcile a declared system state or configuration in a git repository.
11-
These software agents and practices are used to execute a cohesive workflow that
12-
leverages a source control system like Git as the “single source of truth” and
13-
extends this practice to applications, infrastructure, and operational procedures.
8+
GitOps is a set of practices for managing software applications and infrastructure by continuously evaluating
9+
and reconciling their desired states as defined in a version control system such as Git against their actual state.
10+
Reconciling states includes changing the resources to match the defined state via deployment or updates.
11+
12+
In GitOps, the state or configuration of a system is fully described in files stored in the source of truth, usually the version control system.
13+
It could, however, be another source of truth, such as a Kubernetes Operator or Artifact Storage.
14+
The source of truth is evaluated by the automated processes that align the live system with the defined state.
15+
These processes adjust the live system as needed, ensuring consistency across applications, infrastructure, and operational tasks.
1416

1517
## Problem it addresses
1618

17-
Existing processes for infrastructure configuration management can face challenges
18-
such as configuration drift, failed deployments, relying on a system's previous state for success,
19-
missing documentation, or unknown development history.
20-
Adopting a GitOps workflow can help alleviate these issues, among several others.
19+
Traditional approaches to managing infrastructure and application configurations can result in configuration drift, failed deployments, inconsistent environments, deployment failures, and difficulty tracking historical changes.
20+
These issues can cause instability and increase maintenance overhead.
21+
Configuration drift can be hard to detect and resolve without a source of truth governing it, increasing the time to resolve outages or failures.
2122

2223
## How it helps
2324

24-
GitOps is a paradigm that can be applied to a workflow
25-
to help manage an application and cloud system infrastructure.
26-
It enables organizations several advantages
27-
such as better coordination, transparency, stability, and reliability of a system.
28-
Operating in a close loop ensures the current live state of a system matches
29-
against the desired target state, specified in the git repository.
25+
GitOps helps organizations manage the entire infrastructure, application development, and deployment lifecycle using a single and unified process.
26+
27+
GitOps brings organizations several other advantages, such as transparency and traceability of changes, reliability
28+
and security through declarative states, and rollback, revert, and self-healing attributes.

content/en/nodes.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,15 @@
22
title: Nodes
33
status: Completed
44
category: Concept
5-
tags: ["infrastructure", "fundamental", ""]
5+
tags: ["infrastructure", "fundamental", "architecture"]
66
---
77

88
A node is a computer that works in concert with other computers, or nodes, to accomplish a common task.
99
Take your laptop, modem, and printer, for example.
1010
They are all connected over your wifi network communicating and collaborating, each representing one node.
1111
In [cloud computing](/cloud-computing/), a node can be a physical computer,
12-
a virtual computer, referred to as a [VM](/virtual-machine/), or even a [container](/container/).
12+
a virtual computer, referred to as a [VM](/virtual-machine/),
13+
or even a [container](/container/).
1314

1415
## Problem it addresses
1516

@@ -22,5 +23,4 @@ Thus, nodes run apps or processes as part of a group forming a [cluster](/cluste
2223

2324
A node gives you a distinct unit of compute (memory, CPU, network) that you can assign to a cluster.
2425
In a [cloud native](/cloud-native-tech/) platform or app a node represents a single unit that can perform work.
25-
Ideally, individual nodes are undifferentiated in that
26-
any one node of a particular type is indistinguishable from any other node of the same type.
26+
Ideally, individual nodes are undifferentiated in that any one node of a particular type is indistinguishable from any other node of the same type.

0 commit comments

Comments
 (0)