Skip to content

Commit

Permalink
Merge branch 'cncf:main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
ydFu authored Sep 6, 2023
2 parents 556db70 + 10d0408 commit 228db24
Show file tree
Hide file tree
Showing 8 changed files with 17 additions and 18 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/check-outdated-content.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ jobs:
echo "OUTPUT_DIR=${OUTPUT_DIR}" >> $GITHUB_ENV
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0 # fetch all history for all tags and branches

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/es-spellcheck.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
name: Run PySpelling tool to verify spanish spelling issues
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Check word list sort
run: |
set -o errexit
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/spellcheck.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
# Steps represent a sequence of tasks that will be executed as part of the job
steps:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: GitHub Spellcheck Action
uses: rojopolis/[email protected]
8 changes: 4 additions & 4 deletions content/en/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,11 @@ and many more contributors.
For a complete contributor list, please refer to [this GitHub page](https://github.com/cncf/glossary/graphs/contributors).

The Glossary is maintained by
[Catherine Paganini](https://www.linkedin.com/in/catherinepaganini/en/),
[Jason Morgan](https://www.linkedin.com/in/jasonmorgan2/),
[Jihoon Seo](https://www.linkedin.com/in/jihoon-seo/),
[Noah Ispas](https://www.linkedin.com/in/noah-ispas-0665b42a/),
and [Seokho Son](https://www.linkedin.com/in/seokho-son/).
[Seokho Son](https://www.linkedin.com/in/seokho-son/),
[Jihoon Seo](https://www.linkedin.com/in/jihoon-seo/),
[Jorge Castro](https://www.linkedin.com/in/jorge-castro2112/),
and [Nate W.](https://www.linkedin.com/in/nate-double-u/).

## License

Expand Down
4 changes: 2 additions & 2 deletions content/en/contribute/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ Once you select a term to work on, comment on the issue.
![Claiming an issue](/images/how-to/claiming-an-issue.png)

Additionally, notify the maintainers on the [#glossary](https://cloud-native.slack.com/archives/C02TX20MQBB) channel of the CNCF Slack workspace and
tag _@Catherine Paganini_, _@Seokho Son_, _@Jihoon Seo_, and/or _@iamnoah_ to be sure they don't miss it.
tag _@iamnoah_, _@nate-double-u_, _@Seokho Son_, _@Jihoon Seo_, and/or _@castrojo_ to be sure they don't miss it.

For the next steps, please refer to the [Submitting a new term (creating a PR)](#submitting-a-new-term) section.

Expand Down Expand Up @@ -125,7 +125,7 @@ Next, the maintainers will triage the issue.
That means they will assess if the term should be part of the Glossary.
Not every term will be admitted. To be included in the Glossary, they should be established and widely-used cloud native concepts.

Please let the maintainers know that you've proposed a new term on Slack and tag _@Catherine Paganini_, _@Seokho Son_, _@Jihoon Seo_, and/or _@iamnoah_ so that hey don't miss it.
Please let the maintainers know that you've proposed a new term on Slack and tag _@iamnoah_, _@nate-double-u_, _@Seokho Son_, _@Jihoon Seo_, and/or _@castrojo_ so that they don't miss it.
If you want to work on the definition, let the maintainers know and they'll assign it to you.

### Submitting a new term (creating a PR) {#submitting-a-new-term}
Expand Down
6 changes: 3 additions & 3 deletions content/en/devsecops.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ Like DevOps, DevSecOps is a cultural shift, pushed by the technologies adopted,

## Problem it addresses

DevOps practices include [continuous integration](/continuous-integration/) and [continuous deployment](/continuous-delivery/)
and accelerate application development and release cycles.
DevOps practices include [continuous integration](/continuous-integration/), [continuous delivery](/continuous-delivery/),
and [continuous deployment](/continuous-deployment/) and accelerate application development and release cycles.
Unfortunately, automated release processes that fail to represent
all organizational stakeholders adequately can exacerbate existing issues.
A process that rapidly releases new software without considering security needs
can degrade an organizations’ security posture.
can degrade an organization's security posture.

## How it helps

Expand Down
10 changes: 5 additions & 5 deletions content/en/serverless.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,24 +9,24 @@ tags: ["architecture", "", ""]

Serverless is a cloud native development model that allows developers to
build and run applications without having to manage servers.
There are still servers in serverless, but they are [abstracted](/abstraction/) away from app development.
While servers do still exist within the serverless paradigm, they are [abstracted](/abstraction/) away from the application development process.
A cloud provider handles the routine work of provisioning, maintaining, and [scaling](/scalability/) the server infrastructure.
Developers can simply package their code in [containers](/container/) for deployment.
Developers can conveniently package their code into [containers](/container/) for deployment.
Once deployed, serverless apps respond to demand and automatically scale up and down as needed.
Serverless offerings from public cloud providers are usually metered on-demand through an event-driven execution model.
As a result, when a serverless function is sitting idle, it doesn’t cost anything.
Consequently, when a serverless function is in an idle state, there are no associated costs.

## Problem it addresses

Under a standard [Infrastructure-as-a-Service (IaaS)](/infrastructure-as-a-service/) [cloud computing](/cloud-computing/) model,
users pre-purchase units of capacity, meaning you pay a public cloud provider for always-on server components to run your apps.
It’s the user’s responsibility to scale up server capacity during times of high demand and
to scale down when that capacity is no longer needed.
The cloud infrastructure necessary to run an app is active even when the app isn’t being used.
The cloud infrastructure required to operate an application remains active even when the application is not in use.

## How it helps

With serverless architecture, by contrast, apps are launched only as needed.
Contrasting with traditional approaches, the serverless architecture launches applications only when they are needed.
When an event triggers app code to run, the public cloud provider dynamically allocates resources for that code.
The user stops paying when the code finishes executing.
In addition to the cost and efficiency benefits,
Expand Down
1 change: 0 additions & 1 deletion content/en/virtual-machine.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ easily create and destroy VMs without impacting the underlying hardware.

## Problem it addresses

Virtual machines take advantage of virtualization.
When a [bare metal](/bare-metal-machine/) machine is bound to a single operating system,
how well the machine's resources can be used is somewhat limited.
Also, when an operating system is bound to a single physical machine,
Expand Down

0 comments on commit 228db24

Please sign in to comment.