diff --git a/communication/slack-config/channels.yaml b/communication/slack-config/channels.yaml index a3bb0a1b599..04277ac5802 100644 --- a/communication/slack-config/channels.yaml +++ b/communication/slack-config/channels.yaml @@ -216,7 +216,7 @@ channels: - name: k8s-dual-stack archived: true - name: k8s-image-swapper - - name: k8s-infra-alerts + # k8s-infra-alerts is defined in sig-k8s-infra/ - name: k8s-release archived: true - name: k8spin @@ -580,8 +580,7 @@ channels: id: C0409NGC1TK - name: wg-etcd-operator - name: wg-iot-edge - - name: sig-k8s-infra - id: CCK68P2Q2 + # sig-k8s-infra is defined in sig-k8s-infra/ - name: wg-lts - name: wg-machine-learning archived: true diff --git a/communication/slack-config/restrictions.yaml b/communication/slack-config/restrictions.yaml index 2bcd1e017df..eb04e4b36c9 100755 --- a/communication/slack-config/restrictions.yaml +++ b/communication/slack-config/restrictions.yaml @@ -24,6 +24,10 @@ restrictions: - "^kubernetes-docs-[a-z]{2}(-maintainers)?$" - "^sig-docs$" - "^sig-docs-.*$" + - path: "sig-k8s-infra/*.yaml" + channels: + - "^k8s-infra-.*$" + - "^sig-k8s-infra$" - path: "sig-network/*.yaml" channels: - "^sig-network-.*$" diff --git a/communication/slack-config/sig-k8s-infra/OWNERS b/communication/slack-config/sig-k8s-infra/OWNERS new file mode 100644 index 00000000000..29e2509dedb --- /dev/null +++ b/communication/slack-config/sig-k8s-infra/OWNERS @@ -0,0 +1,8 @@ +# See the OWNERS docs at https://go.k8s.io/owners + +reviewers: + - sig-k8s-infra-leads +approvers: + - sig-k8s-infra-leads +labels: + - sig/k8s-infra diff --git a/communication/slack-config/sig-k8s-infra/config.yaml b/communication/slack-config/sig-k8s-infra/config.yaml new file mode 100644 index 00000000000..3778e0f08cc --- /dev/null +++ b/communication/slack-config/sig-k8s-infra/config.yaml @@ -0,0 +1,4 @@ +channels: + - name: k8s-infra-alerts + - name: sig-k8s-infra + id: CCK68P2Q2 diff --git a/communication/slack-config/usergroups.yaml b/communication/slack-config/usergroups.yaml index 0a25f8b28ef..11f5eeeaef8 100644 --- a/communication/slack-config/usergroups.yaml +++ b/communication/slack-config/usergroups.yaml @@ -38,6 +38,19 @@ usergroups: - sandipanpanda - sreeram-venkitesh + - name: k8s-infra-leads + long_name: SIG K8S Infra leads + description: |- + Leads of the Infrastructure SIG. Ping for a community-owned infrastructure problem. + channels: + - k8s-infra-alerts + - sig-k8s-infra + members: + - ameukam + - bentheelder + - dims + - upodroid + - xmudrii # Should match the membership of the following teams at all times: # - https://git.k8s.io/security/#product-security-committee-psc diff --git a/communication/slack-config/users.yaml b/communication/slack-config/users.yaml index 0a49e4576c0..ea79ce95f71 100644 --- a/communication/slack-config/users.yaml +++ b/communication/slack-config/users.yaml @@ -309,6 +309,7 @@ users: tsuzu: UP5JBA094 Tunde: UAY977ENN typeid: U05M1L6EPS6 + upodroid: U01FLMDKY3B valaparthvi: U016TMJVDAA varshaprasad96: UK59YP2DA varshasuryawanshi: U07EPRHR6LQ