Skip to content

Fix secret and service referenceGrant check when restarting controller #59

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 23, 2023
Merged

Fix secret and service referenceGrant check when restarting controller #59

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 16 additions & 4 deletions internal/pkg/cache.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -582,7 +582,13 @@ func (c *SIGCache) syncCoreV1Resources(mgr manager.Manager) error {
} else {
for _, svc := range svcList.Items {
slog.Debugf("found svc %s", utils.Keyname(svc.Namespace, svc.Name))
c.Service[utils.Keyname(svc.Namespace, svc.Name)] = svc.DeepCopy()
// listed services has no TypeMeta set, complement it for referenceGrant check.
typed := svc.DeepCopy()
typed.TypeMeta = metav1.TypeMeta{
APIVersion: v1.SchemeGroupVersion.Version,
Kind: reflect.TypeOf(svc).Name(),
}
c.Service[utils.Keyname(svc.Namespace, svc.Name)] = typed
}
}

Expand All @@ -608,9 +614,15 @@ func (c *SIGCache) syncCoreV1Resources(mgr manager.Manager) error {
if secList, err := kubeClient.CoreV1().Secrets(v1.NamespaceAll).List(context.TODO(), metav1.ListOptions{}); err != nil {
return err
} else {
for _, sec := range secList.Items {
slog.Debugf("found secret %s", sec.Name)
c.Secret[utils.Keyname(sec.Namespace, sec.Name)] = sec.DeepCopy()
for _, scrt := range secList.Items {
slog.Debugf("found secret %s", scrt.Name)
// listed secrets has no TypeMeta set, complement it for referenceGrant check.
typed := scrt.DeepCopy()
typed.TypeMeta = metav1.TypeMeta{
APIVersion: v1.SchemeGroupVersion.Version,
Kind: reflect.TypeOf(scrt).Name(),
}
c.Secret[utils.Keyname(scrt.Namespace, scrt.Name)] = typed
}
}

Expand Down