Skip to content

Commit

Permalink
Merge pull request #2745 from spiffxp/psc-rename
Browse files Browse the repository at this point in the history
groups: rename PSC to committee-security-response
  • Loading branch information
k8s-ci-robot committed Sep 16, 2021
2 parents 593306d + a7cfd02 commit a70c2e7
Show file tree
Hide file tree
Showing 8 changed files with 18 additions and 18 deletions.
2 changes: 1 addition & 1 deletion OWNERS_ALIASES
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ aliases:
- karenhchu
- tashimi
- tpepper
committee-product-security:
committee-security-response:
- cjcullen
- cji
- joelsmith
Expand Down
2 changes: 1 addition & 1 deletion SECURITY_CONTACTS
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Defined below are the security contacts for this repo.
#
# They are the contact point for the Product Security Committee to reach out
# They are the contact point for the Security Response Committee to reach out
# to for triaging and handling of incoming issues.
#
# The below names agree to abide by the
Expand Down
9 changes: 0 additions & 9 deletions groups/committee-product-security/OWNERS

This file was deleted.

9 changes: 9 additions & 0 deletions groups/committee-security-response/OWNERS
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# See the OWNERS docs at https://go.k8s.io/owners

approvers:
- committee-security-response
reviewers:
- committee-security-response

labels:
- committee/security-response
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ groups:
- tabitha.c.sable@gmail.com
- timallclair@gmail.com
members:
# Associate PSC members
# Associate SRC members
- mok@vmware.com
- sfowler@redhat.com
- taahm@google.com
Expand Down Expand Up @@ -78,9 +78,9 @@ groups:
- email-id: security-discuss-private@kubernetes.io
name: security-discuss-private
description: |-
Private discussion forum for PSC members.
Private discussion forum for SRC members.
https://github.com/kubernetes/security#product-security-committee-psc
https://github.com/kubernetes/security#security-response-committee-psc
settings:
WhoCanPostMessage: "ANYONE_CAN_POST"
ReconcileMembers: "true"
Expand Down
4 changes: 2 additions & 2 deletions groups/groups_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -236,10 +236,10 @@ func TestK8sInfraRBACGroupConventions(t *testing.T) {
}
}

// Enforce conventions for PSC groups
// Enforce conventions for SRC groups
// - groups can't own other groups, so for groups that should be owned by
// security@kubernetes.io should own, make sure the owners match
func TestProductSecurityCommitteeGroups(t *testing.T) {
func TestSecurityResponseCommitteeGroups(t *testing.T) {
pscGroups := []string{
"distributors-announce@kubernetes.io",
"security-discuss-private@kubernetes.io",
Expand Down
2 changes: 1 addition & 1 deletion groups/restrictions.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ restrictions:
- path: "committee-code-of-conduct/groups.yaml"
allowedGroups:
- "^conduct@kubernetes.io$"
- path: "committee-product-security/groups.yaml"
- path: "committee-security-response/groups.yaml"
allowedGroups:
- "^distributors-announce@kubernetes.io$"
- "^security@kubernetes.io$"
Expand Down
2 changes: 1 addition & 1 deletion groups/sig-release/groups.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,7 @@ groups:
description: |-
Private list for coordinating security releases.
Membership is restricted to the Product Security Committee,
Membership is restricted to the Security Response Committee,
SIG Release Chairs, Patch Release Team, and Branch Managers.
settings:
WhoCanPostMessage: "ANYONE_CAN_POST"
Expand Down

0 comments on commit a70c2e7

Please sign in to comment.