Skip to content

Commit

Permalink
Merge branch 'main' into patch-1
Browse files Browse the repository at this point in the history
  • Loading branch information
brandtkeller authored Nov 8, 2024
2 parents 8bf5909 + 38d8049 commit 94739e6
Show file tree
Hide file tree
Showing 30 changed files with 1,098 additions and 72 deletions.
23 changes: 10 additions & 13 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@

- [Meeting Information](#meeting-information)
- [Slack Information](#communications)
- [Members](#members)
- [Working Groups](#working-groups)

## About Us
Expand Down Expand Up @@ -56,6 +55,7 @@ Join our open discussions and share news:

- **Americas**: Weekly on Wednesdays at 10 am (UTC-7). [Zoom link](https://zoom-lfx.platform.linuxfoundation.org/meeting/92340369657?password=76e24ffd-69f2-41a8-8aed-13796805225d), Meeting ID: 923 4036 9657.
- **EMEA**: Bi-weekly on Wednesdays at 1 pm UTC+0 (adjusts for daylight saving). [Zoom link](https://zoom-lfx.platform.linuxfoundation.org/meeting/98348738138?password=70e6a945-563a-491f-8485-ecf7394ec13a), Meeting ID: 983 4873 8138.
- **APAC**: Bi-weekly on Wednesdays at 11 am (UTC+9). [Zoom link](https://zoom-lfx.platform.linuxfoundation.org/meeting/94315508827?password=0d7eaab8-a217-4c1b-b0a5-27ceded5743f), Meeting ID: 943 1550 8827.

Check your local timezone [here](https://time.is/). Meetings are listed on the [CNCF calendar](https://www.cncf.io/calendar/) and the [TAG Security Calendar](https://calendar.google.com/calendar/u/0?cid=MGI4dTVlbDh0YTRzOTN0MmNtNzJ0dXZoaGtAZ3JvdXAuY2FsZW5kYXIuZ29vZ2xlLmNvbQ).

Expand All @@ -70,10 +70,6 @@ If you are new to the group, we encourage you to check out our

Explore groups affiliated with or relevant to Security TAG [here](governance/related-groups/README.md)

## Members

<!-- cSpell:disable -->

## Leadership

Details about the TAG Chairs, Tech Leads, and TOC Liaisons can be found on the [CNCF Technical Advisory Groups (TAGs) information page](https://github.com/cncf/toc/blob/main/tags/cncf-tags.md)
Expand All @@ -88,14 +84,15 @@ The TAG's working groups focus on specific areas and organize most community act
These groups facilitate discussions, engagement, and publications with key stakeholders, operating differently based on their needs.
Each group, led by a responsible leader, reaches consensus on issues and manages logistics. All materials, such as reports, white papers, documents, and reference architectures, are in the repository's /community directory.

| Project | Leads |
|---------------------------------|---------------------------------------------|
| [Automated Governance](/community/working-groups/automated-governance/README.md) | Matthew Flannery, Brandt Keller |
| [Catalog of Supply Chain Compromises](/community/catalog/README.md) | Santiago Arias Torres |
| [Compliance](/community/working-groups/compliance/README.md) | Anca Sailer, Robert Ficcaglia |
| [Controls](/community/working-groups/controls/README.md) | Jon Zeolla |
| [Security Reviews](/community/assessments/README.md) | Justin Cappos, Eddie Knight|
| [Software Supply Chain](/community/working-groups/supply-chain-security/README.md) | Marina Moore, Michael Liebermann, John Kjell |
| Project | Leads | STAG Rep |
|---------------------------------|---------------------------------------------|---------------------------------|
| [Automated Governance](/community/working-groups/automated-governance/README.md) | Brandt Keller | Matthew Flannery |
| [Catalog of Supply Chain Compromises](/community/catalog/README.md) | Santiago Arias Torres | Marina Moore |
| [Commons](/community/working-groups/commons/README.md) | Eddie Knight | Marco De Benedictis |
| [Compliance](/community/working-groups/compliance/README.md) | Anca Sailer, Robert Ficcaglia | Brandt Keller |
| [Controls](/community/working-groups/controls/README.md) | Jon Zeolla | Brandt Keller |
| [Security Reviews](/community/assessments/README.md) | Justin Cappos | Eddie Knight |
| [Software Supply Chain](/community/working-groups/supply-chain-security/README.md) | Michael Lieberman, John Kjell | Marina Moore |

## Additional information

Expand Down
2 changes: 1 addition & 1 deletion ci/links.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ shopt -s globstar
FAILURE=0

git config --global --add safe.directory /usr/src/app
npm install -g markdown-link-check
npm install -g markdown-link-check@3.12.2
git fetch origin main:main
# To run this on the entire repo, replace the following command with `$(find ./ -type f | grep .md)`
for file_name in $(git diff --name-only $HEAD main -- ./**/*.md); do
Expand Down
3 changes: 3 additions & 0 deletions ci/lint-config.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,8 @@
"code_blocks": false,
"tables": false,
"line_length": 512
},
"MD024": {
"siblings_only": true
}
}
11 changes: 9 additions & 2 deletions ci/spelling-config.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
"words": [
"ABAC",
"addfetnetgrent",
"AEST",
"Anca",
"Aniszczyk",
"antifragile",
"APAC",
Expand All @@ -24,6 +26,7 @@
"cisecurity",
"CISO",
"cloudcustodian",
"CLOMonitor",
"CMMC",
"CNCF",
"CNSC",
Expand Down Expand Up @@ -55,7 +58,9 @@
"exploitability",
"Expressibility",
"Fianu",
"Ficcaglia",
"FIPS",
"Flannery",
"Flibble",
"frontmatter",
"Gamal",
Expand All @@ -65,8 +70,8 @@
"GUAC",
"helm",
"HIPAA",
"HITRUST",
"Hirschberg",
"HITRUST",
"hotspots",
"hyperconverged",
"Inclusivity",
Expand All @@ -79,6 +84,7 @@
"kata",
"KETRMAX",
"keycloak",
"Kjell",
"Kube",
"kubecon",
"Kubernetes",
Expand Down Expand Up @@ -174,6 +180,7 @@
"Virtool",
"Wolt",
"Yubi",
"Zalman"
"Zalman",
"Zeolla"
]
}
Loading

0 comments on commit 94739e6

Please sign in to comment.