Skip to content

fix: index readiness trackers by GK (not GVK) #2635

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
ritazh merged 2 commits into from
Mar 27, 2023
Merged

fix: index readiness trackers by GK (not GVK) #2635

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dfa3b4d
Index readiness trackers by GK (not GVK)
davis-haba Mar 23, 2023
e442ff1
Merge branch 'master' into ai-tracker-fix
ritazh Mar 27, 2023
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
15 changes: 8 additions & 7 deletions pkg/readiness/ready_tracker.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,32 +122,33 @@ func (t *Tracker) For(gvk schema.GroupVersionKind) Expectations {
return noopExpectations{}
}

// Do not compare versions. Internally, we index trackers by GroupKind
switch {
case gvk.GroupVersion() == v1beta1.SchemeGroupVersion && gvk.Kind == "ConstraintTemplate":
case gvk.Group == v1beta1.SchemeGroupVersion.Group && gvk.Kind == "ConstraintTemplate":
if operations.HasValidationOperations() {
return t.templates
}
return noopExpectations{}
case gvk.GroupVersion() == configv1alpha1.GroupVersion && gvk.Kind == "Config":
case gvk.Group == configv1alpha1.GroupVersion.Group && gvk.Kind == "Config":
return t.config
case gvk.GroupVersion() == externaldatav1beta1.SchemeGroupVersion && gvk.Kind == "Provider":
case gvk.Group == externaldatav1beta1.SchemeGroupVersion.Group && gvk.Kind == "Provider":
return t.externalDataProvider
case gvk.GroupVersion() == mutationv1.GroupVersion && gvk.Kind == "AssignMetadata":
case gvk.Group == mutationv1.GroupVersion.Group && gvk.Kind == "AssignMetadata":
if t.mutationEnabled {
return t.assignMetadata
}
return noopExpectations{}
case gvk.GroupVersion() == mutationv1.GroupVersion && gvk.Kind == "Assign":
case gvk.Group == mutationv1.GroupVersion.Group && gvk.Kind == "Assign":
if t.mutationEnabled {
return t.assign
}
return noopExpectations{}
case gvk.GroupVersion() == mutationv1.GroupVersion && gvk.Kind == "ModifySet":
case gvk.Group == mutationv1.GroupVersion.Group && gvk.Kind == "ModifySet":
if t.mutationEnabled {
return t.modifySet
}
return noopExpectations{}
case gvk.GroupVersion() == mutationsv1alpha1.GroupVersion && gvk.Kind == "AssignImage":
case gvk.Group == mutationsv1alpha1.GroupVersion.Group && gvk.Kind == "AssignImage":
if t.mutationEnabled {
return t.assignImage
}
Expand Down
2 changes: 2 additions & 0 deletions pkg/readiness/ready_tracker_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ import (
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/client-go/rest"
ctrl "sigs.k8s.io/controller-runtime"
ctrlclient "sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/client/apiutil"
"sigs.k8s.io/controller-runtime/pkg/log/zap"
Expand All @@ -59,6 +60,7 @@ func setupManager(t *testing.T) (manager.Manager, *watch.Manager) {
t.Helper()

logger := zap.New(zap.UseDevMode(true), zap.WriteTo(testutils.NewTestWriter(t)))
ctrl.SetLogger(logger)
metrics.Registry = prometheus.NewRegistry()
mgr, err := manager.New(cfg, manager.Options{
HealthProbeBindAddress: "127.0.0.1:29090",
Expand Down
21 changes: 21 additions & 0 deletions pkg/readiness/testdata/99-assignimage.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
apiVersion: mutations.gatekeeper.sh/v1alpha1
kind: AssignImage
metadata:
name: demo
spec:
applyTo:
- groups: [ "" ]
kinds: [ "Pod" ]
versions: [ "v1" ]
location: "spec.containers[name:*].image"
parameters:
assignDomain: "barcorp.org"
assignTag: ":latest"
assignPath: "newpath/newrepo"
match:
source: "All"
scope: Namespaced
kinds:
- apiGroups: [ "*" ]
kinds: [ "Pod" ]

2 changes: 1 addition & 1 deletion pkg/readiness/testdata_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ func makeAssignImage(name string) *mutationsv1alpha1.AssignImage {
return &mutationsv1alpha1.AssignImage{
TypeMeta: metav1.TypeMeta{
APIVersion: "mutations.gatekeeper.sh/v1alpha1",
Kind: "Assign",
Kind: "AssignImage",
},
ObjectMeta: metav1.ObjectMeta{
Name: name,
Expand Down