Skip to content

Commit

Permalink
Add extra sec resources (#183)
Browse files Browse the repository at this point in the history
  • Loading branch information
@anjmao
anjmao committed Sep 2, 2024
1 parent 84da1bc commit cfe3548
Show file tree
Hide file tree
Showing 3 changed files with 161 additions and 4 deletions.
50 changes: 50 additions & 0 deletions internal/services/controller/controller.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,9 @@ import (
autoscalingv1 "k8s.io/api/autoscaling/v1"
batchv1 "k8s.io/api/batch/v1"
corev1 "k8s.io/api/core/v1"
networkingv1 "k8s.io/api/networking/v1"
policyv1 "k8s.io/api/policy/v1"
rbacv1 "k8s.io/api/rbac/v1"
storagev1 "k8s.io/api/storage/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime/schema"
Expand Down Expand Up @@ -722,6 +724,54 @@ func getConditionalInformers(clientset kubernetes.Interface, cfg *config.Control
return df.ForResource(crd.RecommendationGVR).Informer()
},
},
{
resource: networkingv1.SchemeGroupVersion.WithResource("ingresses"),
apiType: reflect.TypeOf(&networkingv1.Ingress{}),
permissionVerbs: []string{"get", "list", "watch"},
informerFactory: func() cache.SharedIndexInformer {
return f.Networking().V1().Ingresses().Informer()
},
},
{
resource: networkingv1.SchemeGroupVersion.WithResource("networkpolicies"),
apiType: reflect.TypeOf(&networkingv1.NetworkPolicy{}),
permissionVerbs: []string{"get", "list", "watch"},
informerFactory: func() cache.SharedIndexInformer {
return f.Networking().V1().NetworkPolicies().Informer()
},
},
{
resource: rbacv1.SchemeGroupVersion.WithResource("roles"),
apiType: reflect.TypeOf(&rbacv1.Role{}),
permissionVerbs: []string{"get", "list", "watch"},
informerFactory: func() cache.SharedIndexInformer {
return f.Rbac().V1().Roles().Informer()
},
},
{
resource: rbacv1.SchemeGroupVersion.WithResource("rolebindings"),
apiType: reflect.TypeOf(&rbacv1.RoleBinding{}),
permissionVerbs: []string{"get", "list", "watch"},
informerFactory: func() cache.SharedIndexInformer {
return f.Rbac().V1().RoleBindings().Informer()
},
},
{
resource: rbacv1.SchemeGroupVersion.WithResource("clusterroles"),
apiType: reflect.TypeOf(&rbacv1.ClusterRole{}),
permissionVerbs: []string{"get", "list", "watch"},
informerFactory: func() cache.SharedIndexInformer {
return f.Rbac().V1().ClusterRoles().Informer()
},
},
{
resource: rbacv1.SchemeGroupVersion.WithResource("clusterrolebindings"),
apiType: reflect.TypeOf(&rbacv1.ClusterRoleBinding{}),
permissionVerbs: []string{"get", "list", "watch"},
informerFactory: func() cache.SharedIndexInformer {
return f.Rbac().V1().ClusterRoleBindings().Informer()
},
},
}

for _, cmNamespace := range cfg.ConfigMapNamespaces {
Expand Down
111 changes: 107 additions & 4 deletions internal/services/controller/controller_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,9 @@ import (
authorizationv1 "k8s.io/api/authorization/v1"
autoscalingv1 "k8s.io/api/autoscaling/v1"
v1 "k8s.io/api/core/v1"
networkingv1 "k8s.io/api/networking/v1"
policyv1 "k8s.io/api/policy/v1"
rbacv1 "k8s.io/api/rbac/v1"
storagev1 "k8s.io/api/storage/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
Expand Down Expand Up @@ -74,18 +76,18 @@ func TestController_ShouldReceiveDeltasBasedOnAvailableResources(t *testing.T) {
apiResourceError error
}{
"All supported objects are found and received in delta": {
expectedReceivedObjectsCount: 15,
expectedReceivedObjectsCount: 21,
},
"when fetching api resources produces multiple errors should exclude those resources": {
apiResourceError: fmt.Errorf("unable to retrieve the complete list of server APIs: %v:"+
"stale GroupVersion discovery: some error,%v: another error",
policyv1.SchemeGroupVersion.String(), storagev1.SchemeGroupVersion.String()),
expectedReceivedObjectsCount: 13,
expectedReceivedObjectsCount: 19,
},
"when fetching api resources produces single error should exclude that resource": {
apiResourceError: fmt.Errorf("unable to retrieve the complete list of server APIs: %v:"+
"stale GroupVersion discovery: some error", storagev1.SchemeGroupVersion.String()),
expectedReceivedObjectsCount: 14,
expectedReceivedObjectsCount: 20,
},
}

Expand Down Expand Up @@ -707,7 +709,56 @@ func loadInitialHappyPathData(t *testing.T, scheme *runtime.Scheme) (map[string]
recommendationData, err := delta.Encode(recommendation)
require.NoError(t, err)

clientset := fake.NewSimpleClientset(node, pod, cfgMap, pdb, hpa, csi)
ingress := &networkingv1.Ingress{
ObjectMeta: metav1.ObjectMeta{Namespace: v1.NamespaceDefault, Name: "ingress"},
}
ingressData, err := delta.Encode(ingress)
require.NoError(t, err)

netpolicy := &networkingv1.NetworkPolicy{
ObjectMeta: metav1.ObjectMeta{Namespace: v1.NamespaceDefault, Name: "netpolicy"},
}
netpolicyData, err := delta.Encode(netpolicy)
require.NoError(t, err)

role := &rbacv1.Role{
ObjectMeta: metav1.ObjectMeta{Namespace: v1.NamespaceDefault, Name: "role"},
}
roleData, err := delta.Encode(role)
require.NoError(t, err)

roleBinding := &rbacv1.RoleBinding{
ObjectMeta: metav1.ObjectMeta{Namespace: v1.NamespaceDefault, Name: "rolebinding"},
}
roleBindingData, err := delta.Encode(roleBinding)
require.NoError(t, err)

clusterRole := &rbacv1.ClusterRole{
ObjectMeta: metav1.ObjectMeta{Namespace: v1.NamespaceDefault, Name: "clusterrole"},
}
clusterRoleData, err := delta.Encode(clusterRole)
require.NoError(t, err)

clusterRoleBinding := &rbacv1.ClusterRoleBinding{
ObjectMeta: metav1.ObjectMeta{Namespace: v1.NamespaceDefault, Name: "clusterrolebinding"},
}
clusterRoleBindingData, err := delta.Encode(clusterRoleBinding)
require.NoError(t, err)

clientset := fake.NewSimpleClientset(
node,
pod,
cfgMap,
pdb,
hpa,
csi,
ingress,
netpolicy,
role,
roleBinding,
clusterRole,
clusterRoleBinding,
)
dynamicClient := dynamic_fake.NewSimpleDynamicClient(scheme, provisioners, machines, awsNodeTemplates, nodePools, nodeClaims, ec2NodeClasses, datadogExtendedDSReplicaSet, rollout, recommendation)
clientset.Fake.Resources = []*metav1.APIResourceList{
{
Expand Down Expand Up @@ -853,6 +904,52 @@ func loadInitialHappyPathData(t *testing.T, scheme *runtime.Scheme) (map[string]
},
},
},
{
GroupVersion: networkingv1.SchemeGroupVersion.String(),
APIResources: []metav1.APIResource{
{
Group: "v1",
Name: "ingress",
Kind: "Ingress",
Verbs: []string{"get", "list", "watch"},
},
{
Group: "v1",
Name: "networkpolicies",
Kind: "NetworkPolicy",
Verbs: []string{"get", "list", "watch"},
},
},
},
{
GroupVersion: rbacv1.SchemeGroupVersion.String(),
APIResources: []metav1.APIResource{
{
Group: "v1",
Name: "roles",
Kind: "Role",
Verbs: []string{"get", "list", "watch"},
},
{
Group: "v1",
Name: "rolebindings",
Kind: "RoleBinding",
Verbs: []string{"get", "list", "watch"},
},
{
Group: "v1",
Name: "clusterroles",
Kind: "ClusterRole",
Verbs: []string{"get", "list", "watch"},
},
{
Group: "v1",
Name: "clusterrolebindings",
Kind: "ClusterRoleBinding",
Verbs: []string{"get", "list", "watch"},
},
},
},
}
objects := make(map[string]*json.RawMessage)
objects["Node"] = nodeData
Expand All @@ -870,6 +967,12 @@ func loadInitialHappyPathData(t *testing.T, scheme *runtime.Scheme) (map[string]
objects["ExtendedDaemonSetReplicaSet"] = datadogExtendedDSReplicaSetData
objects["Rollout"] = rolloutData
objects["Recommendation"] = recommendationData
objects["Ingress"] = ingressData
objects["NetworkPolicy"] = netpolicyData
objects["Role"] = roleData
objects["RoleBinding"] = roleBindingData
objects["ClusterRole"] = clusterRoleData
objects["ClusterRoleBinding"] = clusterRoleBindingData

return objects, clientset, dynamicClient
}
Expand Down
4 changes: 4 additions & 0 deletions internal/services/controller/scheme/register.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,9 @@ import (
autoscalingv1 "k8s.io/api/autoscaling/v1"
batchv1 "k8s.io/api/batch/v1"
corev1 "k8s.io/api/core/v1"
networkingv1 "k8s.io/api/networking/v1"
policyv1 "k8s.io/api/policy/v1"
rbacv1 "k8s.io/api/rbac/v1"
storagev1 "k8s.io/api/storage/v1"
"k8s.io/apimachinery/pkg/runtime"
utilruntime "k8s.io/apimachinery/pkg/util/runtime"
Expand All @@ -36,6 +38,8 @@ var builder = runtime.SchemeBuilder{
datadoghqv1alpha1.SchemeBuilder.AddToScheme,
argorollouts.SchemeBuilder.AddToScheme,
crd.AddToScheme,
networkingv1.AddToScheme,
rbacv1.AddToScheme,
}

func init() {
Expand Down

0 comments on commit cfe3548

Please sign in to comment.