From 012befe5088cd1b0f42b6435243b507d1c28f828 Mon Sep 17 00:00:00 2001
From: Daniel Hiller <dhiller@redhat.com>
Date: Thu, 28 Nov 2024 17:03:27 +0100
Subject: [PATCH] sigs,generate: improve validation, update sig-list generation
 (#350)

* sigs,validator: update validator code

Update validator code to take into account new sigs.yaml fields.
Add validation for chairs, leads, labels and directories.

Signed-off-by: Daniel Hiller <dhiller@redhat.com>

* update sig-list md template - missing values

Signed-off-by: Daniel Hiller <dhiller@redhat.com>

* generate: add sig validator call

Signed-off-by: Daniel Hiller <dhiller@redhat.com>

* sigs.yaml: remove non existing dirs and OWNERS

Signed-off-by: Daniel Hiller <dhiller@redhat.com>

* sigs.yaml,wg-arch,wg-code-quality: correct labels

Update labels to future correct ones.

Signed-off-by: Daniel Hiller <dhiller@redhat.com>

* sigs.yaml,chairs: add kubevirt community chair

Add aburdenthehand as community chair.

Note: this is only stating the obvious

Signed-off-by: Daniel Hiller <dhiller@redhat.com>

* sigs.yaml,sig-list: run make generate

Updates yaml formatting and regenerates the sig-list markdown.

Signed-off-by: Daniel Hiller <dhiller@redhat.com>

---------

Signed-off-by: Daniel Hiller <dhiller@redhat.com>
---
 Makefile                              |   1 +
 generators/cmd/sigs/sig-list.gomd     |   2 +-
 pkg/labels/file.go                    |  40 +++
 pkg/labels/types.go                   |  43 +++
 pkg/orgs/file.go                      |  40 +++
 pkg/orgs/types.go                     |  46 +++
 pkg/orgs/types_test.go                | 164 +++++++++
 pkg/sigs/{sigs.go => file.go}         |   0
 pkg/sigs/types.go                     |  21 +-
 sig-list.md                           |  26 +-
 sigs.yaml                             | 456 +++++++++++++-------------
 validators/cmd/sigs/sigs-validator.go | 181 ++++++++--
 12 files changed, 735 insertions(+), 285 deletions(-)
 create mode 100644 pkg/labels/file.go
 create mode 100644 pkg/labels/types.go
 create mode 100644 pkg/orgs/file.go
 create mode 100644 pkg/orgs/types.go
 create mode 100644 pkg/orgs/types_test.go
 rename pkg/sigs/{sigs.go => file.go} (100%)

diff --git a/Makefile b/Makefile
index 663c0daa..ea5491a6 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,5 @@
 generate:
+	go run ./validators/cmd/sigs --dry-run=false
 	go run ./generators/cmd/sigs
 
 validate-sigs:
diff --git a/generators/cmd/sigs/sig-list.gomd b/generators/cmd/sigs/sig-list.gomd
index 22005e81..793bffe5 100644
--- a/generators/cmd/sigs/sig-list.gomd
+++ b/generators/cmd/sigs/sig-list.gomd
@@ -19,7 +19,7 @@
     */
 -}}
 {{- /* gotype: kubevirt.io/community/generators/cmd/sigs.SigListTemplateData */ -}}
-{{ define "group" }}|[{{ .Name }}]({{ .Dir }}/charter.md) |{{ if .Label }}[{{ .Label }}](https://github.com/kubevirt/kubevirt/labels/{{ .Label }}){{ end }} | {{ if .Leadership }}<ol>{{ range $index2, $chair := .Leadership.Chairs }}<li>[{{ $chair.Name }}](https://github.com/{{ $chair.Github }}), {{ $chair.Company }}</li>{{ end }}</ol>{{ end }} |{{ if .Contact }}[Slack]({{ .Contact.Slack}})<br/> [Mailing List]({{ .Contact.MailingList }}){{ end }} |<ul>{{ range $index3, $meeting := .Meetings }}<li>{{ $meeting.Description }}: [ {{ $meeting.Day }} at {{ $meeting.Time }} {{ $meeting.TZ }} ({{ $meeting.Frequency }}) ]({{ $meeting.URL }})</li>{{ end }}</ul> |{{ end }}
+{{ define "group" }}|{{ if .Dir }}[{{ end }}{{ .Name }}{{ if .Dir }}]({{ .Dir }}/charter.md){{ end }} |{{ if .Label }}[{{ .Label }}](https://github.com/kubevirt/kubevirt/labels/{{ .Label }}){{ end }} |{{ if .Leadership }}<ol>{{ range $index2, $chair := .Leadership.Chairs }}<li>[{{ $chair.Name }}](https://github.com/{{ $chair.Github }}), {{ $chair.Company }}</li>{{ end }}</ol>{{ end }} |{{ if .Contact }}[Slack]({{ .Contact.Slack}})<br/> [Mailing List]({{ .Contact.MailingList }}){{ end }} |<ul>{{ range $index3, $meeting := .Meetings }}<li>{{ $meeting.Description }}: [ {{ $meeting.Day }} at {{ $meeting.Time }} {{ $meeting.TZ }} ({{ $meeting.Frequency }}) ]({{ $meeting.URL }})</li>{{ end }}</ul> |{{ end }}
 <!---
 This is an autogenerated file!
 
diff --git a/pkg/labels/file.go b/pkg/labels/file.go
new file mode 100644
index 00000000..0acd79dd
--- /dev/null
+++ b/pkg/labels/file.go
@@ -0,0 +1,40 @@
+/*
+ * This file is part of the KubeVirt project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * Copyright the KubeVirt Authors.
+ *
+ */
+
+package labels
+
+import (
+	"fmt"
+	"gopkg.in/yaml.v3"
+	"os"
+)
+
+func ReadFile(path string) (*LabelsYAML, error) {
+	buf, err := os.ReadFile(path)
+	if err != nil {
+		return nil, fmt.Errorf("error reading %s: %v", path, err)
+	}
+
+	labelsYAML := &LabelsYAML{}
+	err = yaml.Unmarshal(buf, labelsYAML)
+	if err != nil {
+		return nil, fmt.Errorf("in file %q: %v", path, err)
+	}
+	return labelsYAML, err
+}
diff --git a/pkg/labels/types.go b/pkg/labels/types.go
new file mode 100644
index 00000000..63b22ede
--- /dev/null
+++ b/pkg/labels/types.go
@@ -0,0 +1,43 @@
+/*
+ * This file is part of the KubeVirt project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * Copyright the KubeVirt Authors.
+ *
+ */
+
+package labels
+
+type PreviousLabel struct {
+	Name  string
+	Color string `yaml:",omitempty"`
+}
+type Label struct {
+	Name        string
+	Color       string           `yaml:",omitempty"`
+	Description string           `yaml:",omitempty"`
+	Target      string           `yaml:",omitempty"`
+	ProwPlugin  string           `yaml:",omitempty"`
+	AddedBy     string           `yaml:",omitempty"`
+	Previously  []*PreviousLabel `yaml:",omitempty"`
+}
+
+type Repo struct {
+	Labels []*Label
+}
+
+type LabelsYAML struct {
+	Default *Repo
+	Repos   map[string]*Repo
+}
diff --git a/pkg/orgs/file.go b/pkg/orgs/file.go
new file mode 100644
index 00000000..e53570a0
--- /dev/null
+++ b/pkg/orgs/file.go
@@ -0,0 +1,40 @@
+/*
+ * This file is part of the KubeVirt project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * Copyright the KubeVirt Authors.
+ *
+ */
+
+package orgs
+
+import (
+	"fmt"
+	"gopkg.in/yaml.v3"
+	"os"
+)
+
+func ReadFile(path string) (*Orgs, error) {
+	buf, err := os.ReadFile(path)
+	if err != nil {
+		return nil, fmt.Errorf("error reading %s: %v", path, err)
+	}
+
+	orgs := &Orgs{}
+	err = yaml.Unmarshal(buf, orgs)
+	if err != nil {
+		return nil, fmt.Errorf("in file %q: %v", path, err)
+	}
+	return orgs, err
+}
diff --git a/pkg/orgs/types.go b/pkg/orgs/types.go
new file mode 100644
index 00000000..902e0dba
--- /dev/null
+++ b/pkg/orgs/types.go
@@ -0,0 +1,46 @@
+/*
+ * This file is part of the KubeVirt project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * Copyright the KubeVirt Authors.
+ *
+ */
+
+package orgs
+
+import "strings"
+
+type Org struct {
+	Admins  []string
+	Members []string
+}
+
+func (receiver Org) HasMember(githubHandle string) bool {
+	lowerCaseHandle := strings.ToLower(githubHandle)
+	for _, admin := range receiver.Admins {
+		if strings.ToLower(admin) == lowerCaseHandle {
+			return true
+		}
+	}
+	for _, member := range receiver.Members {
+		if strings.ToLower(member) == lowerCaseHandle {
+			return true
+		}
+	}
+	return false
+}
+
+type Orgs struct {
+	Orgs map[string]Org
+}
diff --git a/pkg/orgs/types_test.go b/pkg/orgs/types_test.go
new file mode 100644
index 00000000..80f7d098
--- /dev/null
+++ b/pkg/orgs/types_test.go
@@ -0,0 +1,164 @@
+/*
+ * This file is part of the KubeVirt project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * Copyright the KubeVirt Authors.
+ *
+ */
+
+package orgs
+
+import "testing"
+
+func TestOrg_HasMember(t *testing.T) {
+	type fields struct {
+		Admins  []string
+		Members []string
+	}
+	type args struct {
+		githubHandle string
+	}
+	tests := []struct {
+		name   string
+		fields fields
+		args   args
+		want   bool
+	}{
+		{
+			name: "has member",
+			fields: fields{
+				Admins: []string{
+					"admin1",
+					"admin2",
+					"admin3",
+				},
+				Members: []string{
+					"member1",
+					"member2",
+					"member3",
+				},
+			},
+			args: args{
+				"member1",
+			},
+			want: true,
+		},
+		{
+			name: "has admin",
+			fields: fields{
+				Admins: []string{
+					"admin1",
+					"admin2",
+					"admin3",
+				},
+				Members: []string{
+					"member1",
+					"member2",
+					"member3",
+				},
+			},
+			args: args{
+				"admin3",
+			},
+			want: true,
+		},
+		{
+			name: "has member (lowercase)",
+			fields: fields{
+				Admins: []string{
+					"admin1",
+					"admin2",
+					"admin3",
+				},
+				Members: []string{
+					"member1",
+					"member2",
+					"member3",
+				},
+			},
+			args: args{
+				"Member1",
+			},
+			want: true,
+		},
+		{
+			name: "has admin (lowercase)",
+			fields: fields{
+				Admins: []string{
+					"admin1",
+					"admin2",
+					"admin3",
+				},
+				Members: []string{
+					"member1",
+					"member2",
+					"member3",
+				},
+			},
+			args: args{
+				"Admin1",
+			},
+			want: true,
+		},
+		{
+			name: "has member (uppercase)",
+			fields: fields{
+				Admins: []string{
+					"admin1",
+					"admin2",
+					"admin3",
+				},
+				Members: []string{
+					"Member1",
+					"member2",
+					"member3",
+				},
+			},
+			args: args{
+				"member1",
+			},
+			want: true,
+		},
+		{
+			name: "has admin (uppercase)",
+			fields: fields{
+				Admins: []string{
+					"Admin1",
+					"admin2",
+					"admin3",
+				},
+				Members: []string{
+					"member1",
+					"member2",
+					"member3",
+				},
+			},
+			args: args{
+				"admin1",
+			},
+			want: true,
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			receiver := Org{
+				Admins:  tt.fields.Admins,
+				Members: tt.fields.Members,
+			}
+			if got := receiver.HasMember(tt.args.githubHandle); got != tt.want {
+				t.Errorf("HasMember() = %v, want %v", got, tt.want)
+			}
+		})
+	}
+}
diff --git a/pkg/sigs/sigs.go b/pkg/sigs/file.go
similarity index 100%
rename from pkg/sigs/sigs.go
rename to pkg/sigs/file.go
diff --git a/pkg/sigs/types.go b/pkg/sigs/types.go
index d379e043..b14f7194 100644
--- a/pkg/sigs/types.go
+++ b/pkg/sigs/types.go
@@ -27,10 +27,12 @@ type Sigs struct {
 }
 
 type Group struct {
-	Dir              string
 	Name             string
+	Dir              string        `yaml:",omitempty"`
+	Description      string        `yaml:",omitempty"`
 	MissionStatement string        `yaml:"mission_statement,omitempty"`
 	Label            string        `yaml:",omitempty"`
+	Leads            []*Lead       `yaml:",omitempty"`
 	Leadership       *Leadership   `yaml:",omitempty"`
 	Meetings         []*Meeting    `yaml:",omitempty"`
 	Contact          *Contact      `yaml:",omitempty"`
@@ -40,8 +42,8 @@ type Group struct {
 type Contact struct {
 	Slack       string     `yaml:"slack"`
 	MailingList string     `yaml:"mailing_list"`
-	Teams       []*Team    `yaml:"teams"`
-	Liaison     *OrgMember `yaml:"liaison"`
+	Teams       []*Team    `yaml:"teams,omitempty"`
+	Liaison     *OrgMember `yaml:"liaison,omitempty"`
 }
 
 type Team struct {
@@ -56,23 +58,26 @@ type Meeting struct {
 	TZ            string
 	Frequency     string
 	URL           string
-	ArchiveURL    string `yaml:"archive_url"`
-	RecordingsURL string `yaml:"recordings_url"`
+	ArchiveURL    string `yaml:"archive_url,omitempty"`
+	RecordingsURL string `yaml:"recordings_url,omitempty"`
 }
 
 type Leadership struct {
-	Chairs []*OrgMember
+	Chairs []*Chair `yaml:",omitempty"`
 }
 
 type OrgMember struct {
 	Github  string
-	Name    string
+	Name    string `yaml:",omitempty"`
 	Company string `yaml:",omitempty"`
 }
 
+type Chair OrgMember
+type Lead OrgMember
+
 type SubProject struct {
 	Name        string
 	Description string `yaml:",omitempty"`
 	Owners      []string
-	Leads       []*OrgMember `yaml:",omitempty"`
+	Leads       []*Lead `yaml:",omitempty"`
 }
diff --git a/sig-list.md b/sig-list.md
index 5934bcb9..eb575f97 100644
--- a/sig-list.md
+++ b/sig-list.md
@@ -21,7 +21,7 @@ Each group's material is in its subdirectory in this project.
 
 | Name | Label [1] | Chairs [2] | Contact | Meetings |
 |------|-----------|------------|---------|----------|
-|[KubeVirt Community](kubevirt-community/charter.md) | | <ol></ol> |[Slack](virtualization)<br/> [Mailing List](https://groups.google.com/forum/#!forum/kubevirt-dev) |<ul><li>Regular KubeVirt Community Meeting: [ Wednesday at 15:00 UTC (weekly) ](https://zoom.us/j/92221936273)</li></ul> |
+|KubeVirt Community | |<ol><li>[Andrew Burden](https://github.com/aburdenthehand), Red Hat</li></ol> |[Slack](virtualization)<br/> [Mailing List](https://groups.google.com/forum/#!forum/kubevirt-dev) |<ul><li>Regular KubeVirt Community Meeting: [ Wednesday at 15:00 UTC (weekly) ](https://zoom.us/j/92221936273)</li></ul> |
 
 
 
@@ -30,15 +30,15 @@ Each group's material is in its subdirectory in this project.
 
 | Name | Label [1] | Chairs [2] | Contact | Meetings |
 |------|-----------|------------|---------|----------|
-|[sig-compute](sig-compute/charter.md) |[sig/compute](https://github.com/kubevirt/kubevirt/labels/sig/compute) | <ol><li>[Itamar Holder](https://github.com/iholder101), Red Hat</li><li>[Jed Lejosne](https://github.com/jean-edouard), Red Hat</li></ol> |[Slack](kubevirt-dev)<br/> [Mailing List](https://groups.google.com/forum/#!forum/kubevirt-dev) |<ul></ul> |
-|[documentation](sig-documentation/charter.md) |[sig/documentation](https://github.com/kubevirt/kubevirt/labels/sig/documentation) |  | |<ul></ul> |
-|[storage](sig-storage/charter.md) |[sig/storage](https://github.com/kubevirt/kubevirt/labels/sig/storage) | <ol><li>[Alice Frosi](https://github.com/alicefr), Red Hat</li><li>[Michael Henriksen](https://github.com/mhenriks), Red Hat</li></ol> | |<ul><li>KubeVirt Storage SIG Meeting: [ Monday at 1:00 PM UTC (bimonthly) ](https://zoom.us/j/97050528531)</li></ul> |
-|[testing](sig-testing/charter.md) |[sig/testing](https://github.com/kubevirt/kubevirt/labels/sig/testing) |  | |<ul></ul> |
-|[network](sig-network/charter.md) |[sig/network](https://github.com/kubevirt/kubevirt/labels/sig/network) | <ol><li>[Edward Haas](https://github.com/eddev), Red Hat</li><li>[Miguel Duarte Barroso](https://github.com/maiqueb), Red Hat</li></ol> | |<ul></ul> |
-|[KubeVirt Perf and Scale SIG](sig-scale/charter.md) |[sig/scale](https://github.com/kubevirt/kubevirt/labels/sig/scale) | <ol><li>[Ryan Hallisey](https://github.com/rthallisey), Nvidia</li><li>[Alay Patel](https://github.com/alaypatel07), Nvidia</li></ol> |[Slack](kubevirt-dev)<br/> [Mailing List](https://groups.google.com/forum/#!forum/kubevirt-dev) |<ul><li>KubeVirt Perf and Scale SIG Meeting: [ Thursday at 14:00 UTC (bimonthy) ](https://zoom.us/j/3205945033)</li></ul> |
-|[observability](sig-observability/charter.md) |[sig/observability](https://github.com/kubevirt/kubevirt/labels/sig/observability) | <ol><li>[Shirly Radco](https://github.com/sradco), Red Hat</li><li>[João Vilaça](https://github.com/machadovilaca), Red Hat</li></ol> |[Slack](kubevirt-dev)<br/> [Mailing List](https://groups.google.com/forum/#!forum/kubevirt-dev) |<ul><li>KubeVirt Observability SIG Meeting: [ Tuesday at 12:30 UTC (weekly) ](https://zoom.us/j/98887071488)</li></ul> |
-|[KubeVirt Buildsystem SIG](sig-buildsystem/charter.md) |[sig/buildsystem](https://github.com/kubevirt/kubevirt/labels/sig/buildsystem) | <ol><li>[Daniel Hiller](https://github.com/dhiller), Red Hat</li><li>[Brian Carey](https://github.com/brianmcarey), Red Hat</li><li>[Luboslav Pivarc](https://github.com/xpivarc), Red Hat</li></ol> | |<ul></ul> |
-|[KubeVirt CI Operations Group](sig-ci/charter.md) |[sig/ci](https://github.com/kubevirt/kubevirt/labels/sig/ci) | <ol><li>[Brian Carey](https://github.com/brianmcarey), Red Hat</li><li>[Daniel Hiller](https://github.com/dhiller), Red Hat</li></ol> |[Slack](kubevirt-dev)<br/> [Mailing List](https://groups.google.com/forum/#!forum/kubevirt-dev) |<ul><li>KubeVirt CI Taskforce Sync meeting: [ Monday at 09:00 CET (weekly) ](https://zoom.us/j/96583958896)</li><li>KubeVirt tests quarantine catch-up: [ Wednesday at 08:45 CET (weekly) ](https://zoom.us/j/94552009485)</li></ul> |
+|[sig-compute](sig-compute/charter.md) |[sig/compute](https://github.com/kubevirt/kubevirt/labels/sig/compute) |<ol><li>[Itamar Holder](https://github.com/iholder101), Red Hat</li><li>[Jed Lejosne](https://github.com/jean-edouard), Red Hat</li></ol> |[Slack](kubevirt-dev)<br/> [Mailing List](https://groups.google.com/forum/#!forum/kubevirt-dev) |<ul></ul> |
+|documentation |[sig/documentation](https://github.com/kubevirt/kubevirt/labels/sig/documentation) | | |<ul></ul> |
+|[storage](sig-storage/charter.md) |[sig/storage](https://github.com/kubevirt/kubevirt/labels/sig/storage) |<ol><li>[Alice Frosi](https://github.com/alicefr), Red Hat</li><li>[Michael Henriksen](https://github.com/mhenriks), Red Hat</li></ol> | |<ul><li>KubeVirt Storage SIG Meeting: [ Monday at 1:00 PM UTC (bimonthly) ](https://zoom.us/j/97050528531)</li></ul> |
+|testing |[sig/testing](https://github.com/kubevirt/kubevirt/labels/sig/testing) | | |<ul></ul> |
+|[network](sig-network/charter.md) |[sig/network](https://github.com/kubevirt/kubevirt/labels/sig/network) |<ol><li>[Edward Haas](https://github.com/eddev), Red Hat</li><li>[Miguel Duarte Barroso](https://github.com/maiqueb), Red Hat</li></ol> | |<ul></ul> |
+|[KubeVirt Perf and Scale SIG](sig-scale/charter.md) |[sig/scale](https://github.com/kubevirt/kubevirt/labels/sig/scale) |<ol><li>[Ryan Hallisey](https://github.com/rthallisey), Nvidia</li><li>[Alay Patel](https://github.com/alaypatel07), Nvidia</li></ol> |[Slack](kubevirt-dev)<br/> [Mailing List](https://groups.google.com/forum/#!forum/kubevirt-dev) |<ul><li>KubeVirt Perf and Scale SIG Meeting: [ Thursday at 14:00 UTC (bimonthy) ](https://zoom.us/j/3205945033)</li></ul> |
+|[observability](sig-observability/charter.md) |[sig/observability](https://github.com/kubevirt/kubevirt/labels/sig/observability) |<ol><li>[Shirly Radco](https://github.com/sradco), Red Hat</li><li>[João Vilaça](https://github.com/machadovilaca), Red Hat</li></ol> |[Slack](kubevirt-dev)<br/> [Mailing List](https://groups.google.com/forum/#!forum/kubevirt-dev) |<ul><li>KubeVirt Observability SIG Meeting: [ Tuesday at 12:30 UTC (weekly) ](https://zoom.us/j/98887071488)</li></ul> |
+|[KubeVirt Buildsystem SIG](sig-buildsystem/charter.md) |[sig/buildsystem](https://github.com/kubevirt/kubevirt/labels/sig/buildsystem) |<ol><li>[Daniel Hiller](https://github.com/dhiller), Red Hat</li><li>[Brian Carey](https://github.com/brianmcarey), Red Hat</li><li>[Luboslav Pivarc](https://github.com/xpivarc), Red Hat</li></ol> | |<ul></ul> |
+|[KubeVirt CI Operations Group](sig-ci/charter.md) |[sig/ci](https://github.com/kubevirt/kubevirt/labels/sig/ci) |<ol><li>[Brian Carey](https://github.com/brianmcarey), Red Hat</li><li>[Daniel Hiller](https://github.com/dhiller), Red Hat</li></ol> |[Slack](kubevirt-dev)<br/> [Mailing List](https://groups.google.com/forum/#!forum/kubevirt-dev) |<ul><li>KubeVirt CI Taskforce Sync meeting: [ Monday at 09:00 CET (weekly) ](https://zoom.us/j/96583958896)</li><li>KubeVirt tests quarantine catch-up: [ Wednesday at 08:45 CET (weekly) ](https://zoom.us/j/94552009485)</li></ul> |
 
 
 
@@ -47,9 +47,9 @@ Each group's material is in its subdirectory in this project.
 
 | Name | Label [1] | Chairs [2] | Contact | Meetings |
 |------|-----------|------------|---------|----------|
-|[S390x architecture working group](wg-arch-s390x/charter.md) |[wg-arch-s390x](https://github.com/kubevirt/kubevirt/labels/wg-arch-s390x) | <ol><li>[Jan Schintag](https://github.com/jschintag), IBM</li><li>[Cheryl Fillekes](https://github.com/cfilleke), IBM</li><li>[vamsikrishna-siddu](https://github.com/vamsikrishna-siddu), IBM</li></ol> | |<ul></ul> |
-|[ARM architecture working group](wg-arch-arm/charter.md) |[wg-arch-arm](https://github.com/kubevirt/kubevirt/labels/wg-arch-arm) | <ol><li>[Howard Zhang](https://github.com/zhlhahaha), ARM</li></ol> | |<ul></ul> |
-|[Code-Quality Working Group](wg-code-quality/charter.md) |[wg/code-quality](https://github.com/kubevirt/kubevirt/labels/wg/code-quality) | <ol><li>[Edward Haas](https://github.com/EdDev), Red Hat</li><li>[Itamar Holder](https://github.com/iholder101), Red Hat</li></ol> |[Slack](kubevirt-dev)<br/> [Mailing List](https://groups.google.com/forum/#!forum/kubevirt-dev) |<ul><li>KubeVirt Code-Quality Working Group meeting: [ Thu at 09:00 UTC (biweekly) ](https://zoom.us/j/93168599900)</li></ul> |
+|[S390x architecture working group](wg-arch-s390x/charter.md) |[wg/arch-s390x](https://github.com/kubevirt/kubevirt/labels/wg/arch-s390x) |<ol><li>[Jan Schintag](https://github.com/jschintag), IBM</li><li>[Cheryl Fillekes](https://github.com/cfilleke), IBM</li><li>[vamsikrishna-siddu](https://github.com/vamsikrishna-siddu), IBM</li></ol> | |<ul></ul> |
+|[ARM architecture working group](wg-arch-arm/charter.md) |[wg/arch-arm](https://github.com/kubevirt/kubevirt/labels/wg/arch-arm) |<ol><li>[Howard Zhang](https://github.com/zhlhahaha), ARM</li></ol> | |<ul></ul> |
+|[Code-Quality Working Group](wg-code-quality/charter.md) |[wg/code-quality](https://github.com/kubevirt/kubevirt/labels/wg/code-quality) |<ol><li>[Edward Haas](https://github.com/EdDev), Red Hat</li><li>[Itamar Holder](https://github.com/iholder101), Red Hat</li></ol> |[Slack](kubevirt-dev)<br/> [Mailing List](https://groups.google.com/forum/#!forum/kubevirt-dev) |<ul><li>KubeVirt Code-Quality Working Group meeting: [ Thu at 09:00 UTC (biweekly) ](https://zoom.us/j/93168599900)</li></ul> |
 
 
 
diff --git a/sigs.yaml b/sigs.yaml
index 56be0ad2..7500f2a4 100644
--- a/sigs.yaml
+++ b/sigs.yaml
@@ -1,18 +1,18 @@
 sigs:
-    - dir: sig-compute
+    - name: sig-compute
+      dir: sig-compute
       label: sig/compute
       leadership:
         chairs:
-          - github: iholder101
-            name: "Itamar Holder"
-            company: Red Hat
-          - github: jean-edouard
-            name: "Jed Lejosne"
-            company: Red Hat
+            - github: iholder101
+              name: Itamar Holder
+              company: Red Hat
+            - github: jean-edouard
+              name: Jed Lejosne
+              company: Red Hat
       contact:
         slack: kubevirt-dev
         mailing_list: https://groups.google.com/forum/#!forum/kubevirt-dev
-      name: sig-compute
       subprojects:
         - name: kubevirt
           owners:
@@ -30,7 +30,7 @@ sigs:
             - https://raw.githubusercontent.com/kubevirt/node-labeller/master/OWNERS
             - https://raw.githubusercontent.com/kubevirt/kubevirt-template-validator/master/OWNERS
             - https://raw.githubusercontent.com/kubevirt/hyperconverged-cluster-operator/main/OWNERS
-            - https://raw.githubusercontent.com/kubevirt/kvm-info-nfd-plugin/master/OWNERS
+            - https://raw.githubusercontent.com/kubevirt/cluster-network-addons-operator/main/OWNERS
             - https://raw.githubusercontent.com/kubevirt/node-maintenance-operator/master/OWNERS
             - https://raw.githubusercontent.com/kubevirt/kubectl-virt-plugin/main/OWNERS
             - https://raw.githubusercontent.com/kubevirt/krew-index/master/OWNERS
@@ -43,13 +43,6 @@ sigs:
             - https://raw.githubusercontent.com/kubevirt/kubectl-virt-plugin/main/OWNERS
         - name: instancetype
           description: The instance type and preference CRDs, APIs and feature set.
-          leads:
-            - github: lyarwood
-              name: "Lee Yarwood"
-              company: Red Hat
-            - github: 0xFelix
-              name: "Felix Matouschek"
-              company: Red Hat
           owners:
             - https://raw.githubusercontent.com/kubevirt/kubevirt/main/pkg/instancetype/OWNERS
             - https://raw.githubusercontent.com/kubevirt/kubevirt/main/tests/instancetype/OWNERS
@@ -58,9 +51,15 @@ sigs:
             - https://raw.githubusercontent.com/kubevirt/kubevirt/main/staging/src/kubevirt.io/api/instancetype/OWNERS
             - https://raw.githubusercontent.com/kubevirt/kubevirt/main/pkg/virtctl/create/instancetype/OWNERS
             - https://raw.githubusercontent.com/kubevirt/kubevirt/main/pkg/virtctl/create/preference/OWNERS
-    - dir: sig-documentation
+          leads:
+            - github: lyarwood
+              name: Lee Yarwood
+              company: Red Hat
+            - github: 0xFelix
+              name: Felix Matouschek
+              company: Red Hat
+    - name: documentation
       label: sig/documentation
-      name: documentation
       subprojects:
         - name: documentation
           owners:
@@ -68,21 +67,21 @@ sigs:
             - https://raw.githubusercontent.com/kubevirt/kubevirt.github.io/main/OWNERS
             - https://raw.githubusercontent.com/kubevirt/user-guide/main/OWNERS
             - https://raw.githubusercontent.com/kubevirt/kubevirt-tutorial/main/OWNERS
-    - dir: sig-storage
+    - name: storage
+      dir: sig-storage
       label: sig/storage
-      name: storage
       leadership:
         chairs:
-          - github: alicefr
-            name: "Alice Frosi"
-            company: Red Hat
-          - github: mhenriks
-            name: "Michael Henriksen"
-            company: Red Hat
+            - github: alicefr
+              name: Alice Frosi
+              company: Red Hat
+            - github: mhenriks
+              name: Michael Henriksen
+              company: Red Hat
       meetings:
         - description: KubeVirt Storage SIG Meeting
           day: Monday
-          time: "1:00 PM"
+          time: 1:00 PM
           tz: UTC
           frequency: bimonthly
           url: https://zoom.us/j/97050528531
@@ -91,88 +90,81 @@ sigs:
         - name: containerized-data-importer
           owners:
             - https://raw.githubusercontent.com/kubevirt/containerized-data-importer/main/OWNERS
-    - dir: sig-testing
+    - name: testing
       label: sig/testing
-      name: testing
       subprojects:
         - name: kubevirtci
           owners:
             - https://raw.githubusercontent.com/kubevirt/kubevirtci/main/OWNERS
             - https://raw.githubusercontent.com/kubevirt/project-infra/main/OWNERS
-    - dir: sig-network
+    - name: network
+      dir: sig-network
       label: sig/network
-      name: network
       leadership:
         chairs:
-          - name: "Edward Haas"
-            github: eddev
-            company: Red Hat
-          - name: "Miguel Duarte Barroso"
-            github: maiqueb
-            company: Red Hat
+            - github: eddev
+              name: Edward Haas
+              company: Red Hat
+            - github: maiqueb
+              name: Miguel Duarte Barroso
+              company: Red Hat
       subprojects:
         - name: kubevirt-network
-          leads:
-          - name: "Edward Haas"
-            github: eddev
-            company: Red Hat
           owners:
             - https://raw.githubusercontent.com/kubevirt/kubevirt/main/OWNERS_ALIASES
             - https://raw.githubusercontent.com/kubevirt/user-guide/main/OWNERS_ALIASES
-        - name: CNAO
           leads:
-            - name: "Ram Lavi"
-              github: RamLavi
+            - github: eddev
+              name: Edward Haas
               company: Red Hat
+        - name: CNAO
           owners:
             - https://raw.githubusercontent.com/kubevirt/cluster-network-addons-operator/main/OWNERS
-        - name: kubemacpool
           leads:
-            - name: "Ram Lavi"
-              github: RamLavi
+            - github: RamLavi
+              name: Ram Lavi
               company: Red Hat
+        - name: kubemacpool
           owners:
             - https://raw.githubusercontent.com/k8snetworkplumbingwg/kubemacpool/main/OWNERS
-        - name: macvtap-cni
           leads:
-            - name: "Miguel Duarte Barroso"
-              github: maiqueb
+            - github: RamLavi
+              name: Ram Lavi
               company: Red Hat
+        - name: macvtap-cni
           owners:
             - https://raw.githubusercontent.com/kubevirt/macvtap-cni/main/OWNERS
-        - name: ipam-extensions
           leads:
-            - name: "Miguel Duarte Barroso"
-              github: maiqueb
+            - github: maiqueb
+              name: Miguel Duarte Barroso
               company: Red Hat
+        - name: ipam-extensions
           owners:
             - https://raw.githubusercontent.com/kubevirt/ipam-extensions/main/OWNERS
-        - name: multus-dynamic-networks-controller
           leads:
-            - name: "Miguel Duarte Barroso"
-              github: maiqueb
+            - github: maiqueb
+              name: Miguel Duarte Barroso
               company: Red Hat
+        - name: multus-dynamic-networks-controller
           owners:
             - https://raw.githubusercontent.com/k8snetworkplumbingwg/multus-dynamic-networks-controller/refs/heads/main/.github/CODEOWNERS
-    - dir: sig-scale
-      label: sig/scale
-      name: KubeVirt Perf and Scale SIG
+          leads:
+            - github: maiqueb
+              name: Miguel Duarte Barroso
+              company: Red Hat
+    - name: KubeVirt Perf and Scale SIG
+      dir: sig-scale
       mission_statement: |
         Define and drive scalability and performance goals within KubeVirt.  This includes documenting, testing, and measuring performance and scalability for a KubeVirt release.
-      subprojects:
-        - name: kubevirt
-          owners:
-            - https://raw.githubusercontent.com/kubevirt/kubevirt/main/tools/OWNERS
-            - https://raw.githubusercontent.com/kubevirt/kubevirt/main/hack/OWNERS
-            - https://raw.githubusercontent.com/kubevirt/kubevirt/main/tests/performance/OWNERS
+      label: sig/scale
       leadership:
         chairs:
-          - github: rthallisey
-            name: "Ryan Hallisey"
-            company: Nvidia
-          - github: alaypatel07
-            name: "Alay Patel"
-            company: Nvidia
+            - github: rthallisey
+              name: Ryan Hallisey
+              company: Nvidia
+            - github: alaypatel07
+              name: Alay Patel
+              company: Nvidia
       meetings:
         - description: KubeVirt Perf and Scale SIG Meeting
           day: Thursday
@@ -188,31 +180,25 @@ sigs:
         teams:
             - name: kubevirt-community
               description: General Discussion
-    - dir: sig-observability
-      label: sig/observability
-      name: observability
-      mission_statement: |
-        Provide advanced observability, enabling seamless monitoring and management of virtual machine workloads within KubeVirt. This includes adding metrics, alerts, logs, documenting and testing for each KubeVirt release.
       subprojects:
         - name: kubevirt
           owners:
-            - https://raw.githubusercontent.com/kubevirt/monitoring/main/OWNERS
-            - https://raw.githubusercontent.com/kubevirt/kubevirt/main/OWNERS
-            - https://raw.githubusercontent.com/kubevirt/containerized-data-importer/main/OWNERS
-            - https://raw.githubusercontent.com/kubevirt/cluster-network-addons-operator/main/OWNERS
-            - https://raw.githubusercontent.com/kubevirt/ssp-operator/master/OWNERS
-            - https://raw.githubusercontent.com/kubevirt/hostpath-provisioner/main/OWNERS
-            - https://raw.githubusercontent.com/kubevirt/hostpath-provisioner-operator/main/OWNERS
-            - https://raw.githubusercontent.com/kubevirt/hyperconverged-cluster-operator/master/OWNERS
-            - https://raw.githubusercontent.com/kubevirt/must-gather/main/OWNERS
+            - https://raw.githubusercontent.com/kubevirt/kubevirt/main/tools/OWNERS
+            - https://raw.githubusercontent.com/kubevirt/kubevirt/main/hack/OWNERS
+            - https://raw.githubusercontent.com/kubevirt/kubevirt/main/tests/performance/OWNERS
+    - name: observability
+      dir: sig-observability
+      mission_statement: |
+        Provide advanced observability, enabling seamless monitoring and management of virtual machine workloads within KubeVirt. This includes adding metrics, alerts, logs, documenting and testing for each KubeVirt release.
+      label: sig/observability
       leadership:
         chairs:
-          - github: sradco
-            name: "Shirly Radco"
-            company: Red Hat
-          - github: machadovilaca
-            name: "João Vilaça"
-            company: Red Hat
+            - github: sradco
+              name: Shirly Radco
+              company: Red Hat
+            - github: machadovilaca
+              name: João Vilaça
+              company: Red Hat
       meetings:
         - description: KubeVirt Observability SIG Meeting
           day: Tuesday
@@ -227,186 +213,200 @@ sigs:
         teams:
             - name: kubevirt-community
               description: General Discussion
-    - dir: sig-buildsystem
-      name: KubeVirt Buildsystem SIG
       subprojects:
-      - name: kubevirt-buildsystem
-        owners:
-        - https://raw.githubusercontent.com/kubevirt/kubevirt/main/OWNERS
-        - https://raw.githubusercontent.com/kubevirt/kubevirt/main/automation/OWNERS
-        - https://raw.githubusercontent.com/kubevirt/kubevirt/main/hack/OWNERS
-        - https://raw.githubusercontent.com/kubevirt/kubevirt/main/hack/builder/OWNERS
-        - https://raw.githubusercontent.com/kubevirt/kubevirt/main/bazel/OWNERS
-      - name: arch-s390x
-        description: |
-          The arch-s390x subproject takes care of all matters related to building and compiling for s390x architecture.
-        leads:
-        - github: jschintag
-          name: "Jan Schintag"
-          company: IBM
-        - github: cfilleke
-          name: "Cheryl Fillekes"
-          company: IBM
-        - github: vamsikrishna-siddu
-          name: "vamsikrishna-siddu"
-          company: IBM
-        owners:
-        - https://raw.githubusercontent.com/kubevirt/kubevirt/main/OWNERS
-        - https://raw.githubusercontent.com/kubevirt/kubevirtci/main/OWNERS
-        - https://raw.githubusercontent.com/kubevirt/containerized-data-importer/main/OWNERS
-      - name: arch-arm
-        description: |
-          The arch-arm subproject takes care of all matters related to building and compiling for arm architecture.
-        leads:
-        - github: zhlhahaha
-          name: "Howard Zhang"
-          company: ARM
-        owners:
-        - https://raw.githubusercontent.com/kubevirt/kubevirt/main/OWNERS
-        - https://raw.githubusercontent.com/kubevirt/kubevirtci/main/OWNERS
+        - name: kubevirt
+          owners:
+            - https://raw.githubusercontent.com/kubevirt/monitoring/main/OWNERS
+            - https://raw.githubusercontent.com/kubevirt/kubevirt/main/OWNERS
+            - https://raw.githubusercontent.com/kubevirt/containerized-data-importer/main/OWNERS
+            - https://raw.githubusercontent.com/kubevirt/cluster-network-addons-operator/main/OWNERS
+            - https://raw.githubusercontent.com/kubevirt/ssp-operator/master/OWNERS
+            - https://raw.githubusercontent.com/kubevirt/hostpath-provisioner/main/OWNERS
+            - https://raw.githubusercontent.com/kubevirt/hostpath-provisioner-operator/main/OWNERS
+            - https://raw.githubusercontent.com/kubevirt/hyperconverged-cluster-operator/master/OWNERS
+            - https://raw.githubusercontent.com/kubevirt/must-gather/main/OWNERS
+    - name: KubeVirt Buildsystem SIG
+      dir: sig-buildsystem
       mission_statement: |
         SIG buildsystem takes care of all things building and automating for the KubeVirt project - they ensure new and existing contributors have a smooth contribution experience, i.o.w. contributors shouldn't have the feeling that they are wasting their time.
         This includes bazel, test automation and updates, also support of failing builds or test lanes in case of infrastructural or configuration problems.
       label: sig/buildsystem
       leadership:
         chairs:
-          - github: dhiller
-            name: "Daniel Hiller"
-            company: Red Hat
-          - github: brianmcarey
-            name: "Brian Carey"
-            company: Red Hat
-          - github: xpivarc
-            name: "Luboslav Pivarc"
-            company: Red Hat
-    - dir: sig-ci
-      label: sig/ci
-      name: KubeVirt CI Operations Group
+            - github: dhiller
+              name: Daniel Hiller
+              company: Red Hat
+            - github: brianmcarey
+              name: Brian Carey
+              company: Red Hat
+            - github: xpivarc
+              name: Luboslav Pivarc
+              company: Red Hat
+      subprojects:
+        - name: kubevirt-buildsystem
+          owners:
+            - https://raw.githubusercontent.com/kubevirt/kubevirt/main/OWNERS
+            - https://raw.githubusercontent.com/kubevirt/kubevirt/main/automation/OWNERS
+            - https://raw.githubusercontent.com/kubevirt/kubevirt/main/hack/OWNERS
+            - https://raw.githubusercontent.com/kubevirt/kubevirt/main/hack/builder/OWNERS
+            - https://raw.githubusercontent.com/kubevirt/kubevirt/main/bazel/OWNERS
+        - name: arch-s390x
+          description: |
+            The arch-s390x subproject takes care of all matters related to building and compiling for s390x architecture.
+          owners:
+            - https://raw.githubusercontent.com/kubevirt/kubevirt/main/OWNERS
+            - https://raw.githubusercontent.com/kubevirt/kubevirtci/main/OWNERS
+            - https://raw.githubusercontent.com/kubevirt/containerized-data-importer/main/OWNERS
+          leads:
+            - github: jschintag
+              name: Jan Schintag
+              company: IBM
+            - github: cfilleke
+              name: Cheryl Fillekes
+              company: IBM
+            - github: vamsikrishna-siddu
+              name: vamsikrishna-siddu
+              company: IBM
+        - name: arch-arm
+          description: |
+            The arch-arm subproject takes care of all matters related to building and compiling for arm architecture.
+          owners:
+            - https://raw.githubusercontent.com/kubevirt/kubevirt/main/OWNERS
+            - https://raw.githubusercontent.com/kubevirt/kubevirtci/main/OWNERS
+          leads:
+            - github: zhlhahaha
+              name: Howard Zhang
+              company: ARM
+    - name: KubeVirt CI Operations Group
+      dir: sig-ci
       mission_statement: |
         Ensure that the CI infrastructure is operational, that CI jobs are executed in a timely manner and PRs of any of the onboarded projects are not blocked.
+      label: sig/ci
       leadership:
         chairs:
-        - github: brianmcarey
-          name: "Brian Carey"
-          company: Red Hat
-        - github: dhiller
-          name: "Daniel Hiller"
-          company: Red Hat
+            - github: brianmcarey
+              name: Brian Carey
+              company: Red Hat
+            - github: dhiller
+              name: Daniel Hiller
+              company: Red Hat
       meetings:
-      - description: KubeVirt CI Taskforce Sync meeting
-        day: Monday
-        time: "09:00"
-        tz: CET
-        frequency: weekly
-        url: https://zoom.us/j/96583958896
-        archive_url: https://docs.google.com/document/d/1pWg6JvjStffoZ0NnVk4ALQOs3MYOdHtBpkLBlJlHTqA/edit
-      - description: KubeVirt tests quarantine catch-up
-        day: Wednesday
-        time: "08:45"
-        tz: CET
-        frequency: weekly
-        url: https://zoom.us/j/94552009485
-        archive_url: https://docs.google.com/document/d/1pWg6JvjStffoZ0NnVk4ALQOs3MYOdHtBpkLBlJlHTqA/edit
+        - description: KubeVirt CI Taskforce Sync meeting
+          day: Monday
+          time: "09:00"
+          tz: CET
+          frequency: weekly
+          url: https://zoom.us/j/96583958896
+          archive_url: https://docs.google.com/document/d/1pWg6JvjStffoZ0NnVk4ALQOs3MYOdHtBpkLBlJlHTqA/edit
+        - description: KubeVirt tests quarantine catch-up
+          day: Wednesday
+          time: "08:45"
+          tz: CET
+          frequency: weekly
+          url: https://zoom.us/j/94552009485
+          archive_url: https://docs.google.com/document/d/1pWg6JvjStffoZ0NnVk4ALQOs3MYOdHtBpkLBlJlHTqA/edit
       contact:
         slack: kubevirt-dev
         mailing_list: https://groups.google.com/forum/#!forum/kubevirt-dev
         teams:
-        - name: kubevirt-community
-          description: General Discussion
+            - name: kubevirt-community
+              description: General Discussion
       subprojects:
-      - name: ci-s390x
-        description: |
-          The ci-s390x subproject takes care of all matters related to CI for s390x architecture.
-        leads:
-        - github: jschintag
-          name: "Jan Schintag"
-          company: IBM
-        - github: cfilleke
-          name: "Cheryl Fillekes"
-          company: IBM
-        - github: vamsikrishna-siddu
-          name: "vamsikrishna-siddu"
-          company: IBM
-        - github: chandramerla
-          name: "Chandra Merla"
-          company: IBM
-        owners:
-        - https://raw.githubusercontent.com/kubevirt/project-infra/main/OWNERS
-      - name: ci-arm
-        description: |
-          The ciarch-arm subproject takes care of all matters related to CI for arm architecture.
-        leads:
-        - github: zhlhahaha
-          name: "Howard Zhang"
-          company: ARM
-        owners:
-        - https://raw.githubusercontent.com/kubevirt/project-infra/main/OWNERS
+        - name: ci-s390x
+          description: |
+            The ci-s390x subproject takes care of all matters related to CI for s390x architecture.
+          owners:
+            - https://raw.githubusercontent.com/kubevirt/project-infra/main/OWNERS
+          leads:
+            - github: jschintag
+              name: Jan Schintag
+              company: IBM
+            - github: cfilleke
+              name: Cheryl Fillekes
+              company: IBM
+            - github: vamsikrishna-siddu
+              name: vamsikrishna-siddu
+              company: IBM
+            - github: chandramerla
+              name: Chandra Merla
+              company: IBM
+        - name: ci-arm
+          description: |
+            The ciarch-arm subproject takes care of all matters related to CI for arm architecture.
+          owners:
+            - https://raw.githubusercontent.com/kubevirt/project-infra/main/OWNERS
+          leads:
+            - github: zhlhahaha
+              name: Howard Zhang
+              company: ARM
 workinggroups:
-    - dir: wg-arch-s390x
-      name: S390x architecture working group
+    - name: S390x architecture working group
+      dir: wg-arch-s390x
       mission_statement: |
         WG ARCH s390x takes care of all things related to supporting s390x architecture on KubeVirt clusters.
         This includes all build processes, also support of failing builds or test lanes.
-      label: wg-arch-s390x
+      label: wg/arch-s390x
       leadership:
         chairs:
-        - github: jschintag
-          name: "Jan Schintag"
-          company: IBM
-        - github: cfilleke
-          name: "Cheryl Fillekes"
-          company: IBM
-        - github: vamsikrishna-siddu
-          name: "vamsikrishna-siddu"
-          company: IBM
-    - dir: wg-arch-arm
-      name: ARM architecture working group
+            - github: jschintag
+              name: Jan Schintag
+              company: IBM
+            - github: cfilleke
+              name: Cheryl Fillekes
+              company: IBM
+            - github: vamsikrishna-siddu
+              name: vamsikrishna-siddu
+              company: IBM
+    - name: ARM architecture working group
+      dir: wg-arch-arm
       mission_statement: |
         WG ARCH ARM takes care of all things related to supporting ARM architecture on KubeVirt clusters.
         This includes all build processes, also support of failing builds or test lanes.
-      label: wg-arch-arm
+      label: wg/arch-arm
       leadership:
         chairs:
-        - github: zhlhahaha
-          name: "Howard Zhang"
-          company: ARM
-    - dir: wg-code-quality
-      name: Code-Quality Working Group
+            - github: zhlhahaha
+              name: Howard Zhang
+              company: ARM
+    - name: Code-Quality Working Group
+      dir: wg-code-quality
       mission_statement: |
         The Code-Quality Working Group aims to create an inter-SIG process for identifying, agreeing on and addressing code quality issues
       label: wg/code-quality
       leadership:
         chairs:
-        - github: EdDev
-          name: Edward Haas
-          company: Red Hat
-        - github: iholder101
-          name: Itamar Holder
-          company: Red Hat
+            - github: EdDev
+              name: Edward Haas
+              company: Red Hat
+            - github: iholder101
+              name: Itamar Holder
+              company: Red Hat
       meetings:
-      - description: KubeVirt Code-Quality Working Group meeting
-        day: Thu
-        time: "09:00"
-        tz: UTC
-        frequency: biweekly
-        url: https://zoom.us/j/93168599900
-        archive_url: https://docs.google.com/document/d/1fBgXan7AQ1LZOmQpNq38H11MmtfuWxOz9DPypyV9UL0/edit
+        - description: KubeVirt Code-Quality Working Group meeting
+          day: Thu
+          time: "09:00"
+          tz: UTC
+          frequency: biweekly
+          url: https://zoom.us/j/93168599900
+          archive_url: https://docs.google.com/document/d/1fBgXan7AQ1LZOmQpNq38H11MmtfuWxOz9DPypyV9UL0/edit
       contact:
         slack: kubevirt-dev
         mailing_list: https://groups.google.com/forum/#!forum/kubevirt-dev
         teams:
-        - name: wg-code-quality
-          description: Code-Quality Working Group
+            - name: wg-code-quality
+              description: Code-Quality Working Group
         liaison:
-          github: dhiller
-          name: "Daniel Hiller"
+            github: dhiller
+            name: Daniel Hiller
 usergroups:
-    - dir: kubevirt-community
-      name: KubeVirt Community
+    - name: KubeVirt Community
       mission_statement: |
         Lorem Ipsum.
       leadership:
-        chairs: []
+        chairs:
+            - github: aburdenthehand
+              name: Andrew Burden
+              company: Red Hat
       meetings:
         - description: Regular KubeVirt Community Meeting
           day: Wednesday
diff --git a/validators/cmd/sigs/sigs-validator.go b/validators/cmd/sigs/sigs-validator.go
index f888bc8f..f71d30e8 100644
--- a/validators/cmd/sigs/sigs-validator.go
+++ b/validators/cmd/sigs/sigs-validator.go
@@ -4,17 +4,22 @@ import (
 	"flag"
 	"fmt"
 	"io/ioutil"
+	"kubevirt.io/community/pkg/labels"
+	"kubevirt.io/community/pkg/orgs"
 	"kubevirt.io/community/pkg/sigs"
-	"log"
 	"net/http"
 	"os"
 
+	log "github.com/sirupsen/logrus"
+
 	yaml "gopkg.in/yaml.v3"
 )
 
 type options struct {
-	dryRun       bool
-	sigsFilePath string
+	dryRun               bool
+	sigsFilePath         string
+	labelsConfigFilePath string
+	orgsConfigFilePath   string
 }
 
 func (o *options) Validate() error {
@@ -31,7 +36,10 @@ func gatherOptions() options {
 	o := options{}
 	fs := flag.NewFlagSet(os.Args[0], flag.ExitOnError)
 	fs.BoolVar(&o.dryRun, "dry-run", true, "Dry run for testing. Uses API tokens but does not mutate.")
-	fs.StringVar(&o.sigsFilePath, "sigs_file_path", "./sigs.yaml", "File path to the sigs.yaml file to check.")
+	fs.StringVar(&o.sigsFilePath, "sigs_file_path", "./sigs.yaml", "DEPRECATED: file path to the sigs.yaml file to check")
+	fs.StringVar(&o.sigsFilePath, "sigs-file-path", "./sigs.yaml", "file path to the sigs.yaml file to check")
+	fs.StringVar(&o.labelsConfigFilePath, "labels-file-path", "../project-infra/github/ci/prow-deploy/kustom/base/configs/current/labels/labels.yaml", "file path to the labels.yaml file to check")
+	fs.StringVar(&o.orgsConfigFilePath, "orgs-file-path", "../project-infra/github/ci/prow-deploy/kustom/base/configs/current/orgs/orgs.yaml", "file path to the orgs.yaml file to check")
 	err := fs.Parse(os.Args[1:])
 	if err != nil {
 		log.Fatalf("error parsing arguments %v: %v", os.Args[1:], err)
@@ -39,57 +47,160 @@ func gatherOptions() options {
 	return o
 }
 
+func init() {
+	log.SetFormatter(&log.JSONFormatter{})
+}
+
 func main() {
-	options := gatherOptions()
-	if err := options.Validate(); err != nil {
+	opts := gatherOptions()
+	if err := opts.Validate(); err != nil {
 		log.Fatalf("invalid arguments: %v", err)
 	}
-	log.Printf("dry-run: %v", options.dryRun)
+	log.Infof("dry-run: %v", opts.dryRun)
 
-	sigs, err := sigs.ReadFile(options.sigsFilePath)
+	sigsYAML, err := sigs.ReadFile(opts.sigsFilePath)
 	if err != nil {
 		log.Fatalf("invalid arguments: %v", err)
 	}
 
-	for _, sig := range sigs.Sigs {
-		for _, subProject := range sig.SubProjects {
-			log.Printf("checking sig %s subproject %s", sig.Name, subProject.Name)
-			foundOwners := make([]string, 0)
-			for _, ownersFileURL := range subProject.Owners {
-				response, err := http.DefaultClient.Head(ownersFileURL)
-				if err != nil {
-					log.Printf("failed to retrieve %q, continuing with next", ownersFileURL)
-					continue
-				}
-				defer response.Body.Close()
-				if response.StatusCode >= http.StatusOK && response.StatusCode < http.StatusMultipleChoices {
-					foundOwners = append(foundOwners, ownersFileURL)
-				} else {
-					log.Printf("failed to retrieve %q: %d", ownersFileURL, response.StatusCode)
-				}
-			}
-			subProject.Owners = foundOwners
-		}
+	labelsYAML, err := labels.ReadFile(opts.labelsConfigFilePath)
+	if err != nil {
+		log.Fatalf("invalid arguments: %v", err)
 	}
 
-	output, err := yaml.Marshal(sigs)
+	orgsYAML, err := orgs.ReadFile(opts.orgsConfigFilePath)
 	if err != nil {
-		log.Fatalf("in file %q: %v", options.sigsFilePath, err)
+		log.Fatalf("invalid arguments: %v", err)
+	}
+
+	kubevirtOrg := orgsYAML.Orgs["kubevirt"]
+
+	for _, sig := range sigsYAML.Sigs {
+		validateGroup("sig", sig, labelsYAML, kubevirtOrg)
+	}
+
+	for _, wg := range sigsYAML.Workinggroups {
+		validateGroup("wg", wg, labelsYAML, kubevirtOrg)
 	}
-	if options.dryRun {
+
+	for _, ug := range sigsYAML.Usergroups {
+		validateGroup("ug", ug, labelsYAML, kubevirtOrg)
+	}
+
+	for _, committee := range sigsYAML.Committees {
+		validateGroup("committee", committee, labelsYAML, kubevirtOrg)
+	}
+
+	output, err := yaml.Marshal(sigsYAML)
+	if err != nil {
+		log.Fatalf("in file %q: %v", opts.sigsFilePath, err)
+	}
+	if opts.dryRun {
 		_, err := os.Stdout.Write(output)
 		if err != nil {
-			log.Fatalf("file %q: %v", options.sigsFilePath, err)
+			log.Fatalf("file %q: %v", opts.sigsFilePath, err)
 		}
 	} else {
-		stat, err := os.Stat(options.sigsFilePath)
+		stat, err := os.Stat(opts.sigsFilePath)
+		if err != nil {
+			log.Fatalf("stat for file %q failed: %v", opts.sigsFilePath, err)
+		}
+		err = ioutil.WriteFile(opts.sigsFilePath, output, stat.Mode())
 		if err != nil {
-			log.Fatalf("stat for file %q failed: %v", options.sigsFilePath, err)
+			log.Fatalf("write to file %q failed: %v", opts.sigsFilePath, err)
 		}
-		err = ioutil.WriteFile(options.sigsFilePath, output, stat.Mode())
+	}
+
+}
+
+func validateGroup(groupType string, groupToValidate *sigs.Group, labelsYAML *labels.LabelsYAML, kubevirtOrg orgs.Org) {
+	groupLog := log.WithField(groupType, groupToValidate.Name)
+
+	// check dir exists
+	if groupToValidate.Dir != "" {
+		stat, err := os.Stat(groupToValidate.Dir)
 		if err != nil {
-			log.Fatalf("write to file %q failed: %v", options.sigsFilePath, err)
+			groupLog.Errorf("dir %q not found: %v", groupToValidate.Dir, err)
+			groupToValidate.Dir = ""
+		} else if !stat.IsDir() {
+			groupLog.Errorf("dir %q is not a directory", groupToValidate.Dir)
+			groupToValidate.Dir = ""
+		}
+	}
+
+	// check label exists
+	if groupToValidate.Label != "" {
+		foundLabel := false
+		for _, label := range labelsYAML.Default.Labels {
+			if label.Name == groupToValidate.Label {
+				foundLabel = true
+				break
+			}
+		}
+		if !foundLabel {
+			groupLog.Errorf("label %q not found", groupToValidate.Label)
+			groupToValidate.Label = ""
 		}
 	}
 
+	// check leads - github handles are part of org
+	var checkedMembers []*sigs.Lead
+	for _, orgMember := range groupToValidate.Leads {
+		if !kubevirtOrg.HasMember(orgMember.Github) {
+			groupLog.Errorf("lead %q not found", orgMember)
+		} else {
+			checkedMembers = append(checkedMembers, orgMember)
+		}
+	}
+	groupToValidate.Leads = checkedMembers
+
+	// check chairs - github handles are part of org
+	if groupToValidate.Leadership != nil {
+		var checkedLeadership []*sigs.Chair
+		for _, orgMember := range groupToValidate.Leadership.Chairs {
+			if !kubevirtOrg.HasMember(orgMember.Github) {
+				groupLog.Errorf("leadership chair %q not found", orgMember)
+			} else {
+				checkedLeadership = append(checkedLeadership, orgMember)
+			}
+		}
+		groupToValidate.Leadership.Chairs = checkedLeadership
+	}
+
+	// check subprojects
+	for _, subProject := range groupToValidate.SubProjects {
+		subprojectLog := groupLog.WithField("subproject", subProject.Name)
+		foundOwners := validateOwnersReferences(subProject, subprojectLog)
+		subProject.Owners = foundOwners
+
+		// check subproject leads - github handles are part of org
+		var checkedSubprojectChairs []*sigs.Lead
+		for _, orgMember := range subProject.Leads {
+			if !kubevirtOrg.HasMember(orgMember.Github) {
+				subprojectLog.Errorf("lead %q not found", orgMember)
+			} else {
+				checkedSubprojectChairs = append(checkedSubprojectChairs, orgMember)
+			}
+		}
+		subProject.Leads = checkedSubprojectChairs
+
+	}
+}
+
+func validateOwnersReferences(subProject *sigs.SubProject, subprojectLog *log.Entry) []string {
+	foundOwners := make([]string, 0)
+	for _, ownersFileURL := range subProject.Owners {
+		response, err := http.DefaultClient.Head(ownersFileURL)
+		if err != nil {
+			subprojectLog.Errorf("failed to retrieve %q, continuing with next", ownersFileURL)
+			continue
+		}
+		defer response.Body.Close()
+		if response.StatusCode >= http.StatusOK && response.StatusCode < http.StatusMultipleChoices {
+			foundOwners = append(foundOwners, ownersFileURL)
+		} else {
+			subprojectLog.Errorf("failed to retrieve %q: %d", ownersFileURL, response.StatusCode)
+		}
+	}
+	return foundOwners
 }