Skip to content

Commit

Permalink
final touches
Browse files Browse the repository at this point in the history
  • Loading branch information
@Peac36
Peac36 committed Sep 6, 2024
1 parent 33629db commit 2663369
Show file tree
Hide file tree
Showing 5 changed files with 26 additions and 32 deletions.
11 changes: 5 additions & 6 deletions cmd/policy-assistant/pkg/cli/analyze.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ var AllModes = []string{
ProbeMode,
}

const DefaultTimeout = 180
const DefaultTimeout = 3 * time.Minute

type AnalyzeArgs struct {
AllNamespaces bool
Expand All @@ -63,7 +63,7 @@ type AnalyzeArgs struct {
// synthetic probe
ProbePath string

Timeout int
Timeout time.Duration
}

func SetupAnalyzeCommand() *cobra.Command {
Expand All @@ -90,8 +90,7 @@ func SetupAnalyzeCommand() *cobra.Command {
command.Flags().StringVar(&args.TargetPodPath, "target-pod-path", "", "path to json target pod file -- json array of dicts")
command.Flags().StringVar(&args.TrafficPath, "traffic-path", "", "path to json traffic file, containing of a list of traffic objects")
command.Flags().StringVar(&args.ProbePath, "probe-path", "", "path to json model file for synthetic probe")

command.Flags().IntVar(&args.Timeout, "timeout", DefaultTimeout, "timeout time in seconds")
command.Flags().DurationVar(&args.Timeout, "kube-client-timeout", DefaultTimeout, "kube client timeout")

return command
}
Expand All @@ -118,7 +117,7 @@ func RunAnalyzeCommand(args *AnalyzeArgs) {

includeANPS, includeBANPSs := shouldIncludeANPandBANP(kubeClient.ClientSet)

ctx, cancel := context.WithTimeout(context.TODO(), time.Duration(args.Timeout)*time.Second)
ctx, cancel := context.WithTimeout(context.TODO(), args.Timeout)
defer cancel()

kubePolicies, kubeANPs, kubeBANP, netpolErr, anpErr, banpErr = kube.ReadNetworkPoliciesFromKube(ctx, kubeClient, namespaces, includeANPS, includeBANPSs)
Expand Down Expand Up @@ -349,7 +348,7 @@ func shouldIncludeANPandBANP(client *kubernetes.Clientset) (bool, bool) {
case "BaselineAdminNetworkPolicy":
includeBANP = true
default:
panic(fmt.Sprintf("unexpected resource kind %s", res.Kind))
continue
}
}
}
Expand Down
14 changes: 7 additions & 7 deletions cmd/policy-assistant/pkg/kube/ikubernetes.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ type IKubernetes interface {
UpdateAdminNetworkPolicy(ctx context.Context, policy *v1alpha1.AdminNetworkPolicy) (*v1alpha1.AdminNetworkPolicy, error)
DeleteAdminNetworkPolicy(ctx context.Context, name string) error

GetBaseAdminNetworkPolicies(ctx context.Context) ([]v1alpha1.BaselineAdminNetworkPolicy, error)
GetBaselineAdminNetworkPolicy(ctx context.Context) (*v1alpha1.BaselineAdminNetworkPolicy, error)
CreateBaselineAdminNetworkPolicy(ctx context.Context, policy *v1alpha1.BaselineAdminNetworkPolicy) (*v1alpha1.BaselineAdminNetworkPolicy, error)
UpdateBaselineAdminNetworkPolicy(ctx context.Context, policy *v1alpha1.BaselineAdminNetworkPolicy) (*v1alpha1.BaselineAdminNetworkPolicy, error)
DeleteBaselineAdminNetworkPolicy(ctx context.Context, name string) error
Expand Down Expand Up @@ -95,12 +95,12 @@ func GetServicesInNamespaces(kubernetes IKubernetes, namespaces []string) ([]v1.
return allServices, nil
}

func GetAdminNetworkPoliciesInNamespaces(ctx context.Context, kubernetes IKubernetes) ([]v1alpha1.AdminNetworkPolicy, error) {
func GetAdminNetworkPolicies(ctx context.Context, kubernetes IKubernetes) ([]v1alpha1.AdminNetworkPolicy, error) {
return kubernetes.GetAdminNetworkPolicies(ctx)
}

func GetBaseAdminNetworkPoliciesInNamespaces(ctx context.Context, kubernetes IKubernetes) ([]v1alpha1.BaselineAdminNetworkPolicy, error) {
return kubernetes.GetBaseAdminNetworkPolicies(ctx)
func GetBaselineAdminNetworkPolicy(ctx context.Context, kubernetes IKubernetes) (*v1alpha1.BaselineAdminNetworkPolicy, error) {
return kubernetes.GetBaselineAdminNetworkPolicy(ctx)
}

type MockNamespace struct {
Expand All @@ -113,7 +113,7 @@ type MockNamespace struct {
type MockKubernetes struct {
AdminNetworkPolicies []v1alpha1.AdminNetworkPolicy
AdminNetworkPolicyError error
BaseNetworkPolicies []v1alpha1.BaselineAdminNetworkPolicy
BaselineNetworkPolicy *v1alpha1.BaselineAdminNetworkPolicy
BaseAdminNetworkPolicyError error
Namespaces map[string]*MockNamespace
NetworkPolicyError error
Expand Down Expand Up @@ -410,8 +410,8 @@ func (k *MockKubernetes) DeleteAdminNetworkPolicy(ctx context.Context, name stri
return ErrNotImplemented
}

func (m *MockKubernetes) GetBaseAdminNetworkPolicies(ctx context.Context) ([]v1alpha1.BaselineAdminNetworkPolicy, error) {
return m.BaseNetworkPolicies, m.BaseAdminNetworkPolicyError
func (m *MockKubernetes) GetBaselineAdminNetworkPolicy(ctx context.Context) (*v1alpha1.BaselineAdminNetworkPolicy, error) {
return m.BaselineNetworkPolicy, m.BaseAdminNetworkPolicyError
}

func (k *MockKubernetes) CreateBaselineAdminNetworkPolicy(ctx context.Context, policy *v1alpha1.BaselineAdminNetworkPolicy) (*v1alpha1.BaselineAdminNetworkPolicy, error) {
Expand Down
10 changes: 7 additions & 3 deletions cmd/policy-assistant/pkg/kube/kubernetes.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -132,12 +132,16 @@ func (k *Kubernetes) DeleteAdminNetworkPolicy(ctx context.Context, name string)
return ErrNotImplemented
}

func (k *Kubernetes) GetBaseAdminNetworkPolicies(ctx context.Context) ([]v1alpha12.BaselineAdminNetworkPolicy, error) {
banp, err := k.alphaClientSet.BaselineAdminNetworkPolicies().List(ctx, metav1.ListOptions{})
func (k *Kubernetes) GetBaselineAdminNetworkPolicy(ctx context.Context) (*v1alpha12.BaselineAdminNetworkPolicy, error) {
banps, err := k.alphaClientSet.BaselineAdminNetworkPolicies().List(ctx, metav1.ListOptions{})

if err != nil {
return nil, err
}
return banp.Items, nil
if len(banps.Items) == 1 {
return &banps.Items[0], nil
}
return nil, nil
}

func (k *Kubernetes) CreateBaselineAdminNetworkPolicy(ctx context.Context, policy *v1alpha12.BaselineAdminNetworkPolicy) (*v1alpha12.BaselineAdminNetworkPolicy, error) {
Expand Down
11 changes: 2 additions & 9 deletions cmd/policy-assistant/pkg/kube/read.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ func ReadNetworkPoliciesFromKube(ctx context.Context, kubeClient IKubernetes, na
if !includeANPs {
return
}
anps, anpErr = GetAdminNetworkPoliciesInNamespaces(ctx, kubeClient)
anps, anpErr = GetAdminNetworkPolicies(ctx, kubeClient)
return
}(&wg)

Expand All @@ -145,14 +145,7 @@ func ReadNetworkPoliciesFromKube(ctx context.Context, kubeClient IKubernetes, na
if !includeBANPs {
return
}
result, err := GetBaseAdminNetworkPoliciesInNamespaces(ctx, kubeClient)
if err != nil {
banpErr = err
}
if len(result) > 0 {
banp = &result[0]
}

banp, banpErr = GetBaselineAdminNetworkPolicy(ctx, kubeClient)
return
}(&wg)

Expand Down
12 changes: 5 additions & 7 deletions cmd/policy-assistant/pkg/kube/read_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
func TestReadNetworkPoliciesFromKube(t *testing.T) {
scenarios := map[string]struct {
AdminNetworkPolicies []v1alpha12.AdminNetworkPolicy
BaselineAdminNetworkPolicies []v1alpha12.BaselineAdminNetworkPolicy
BaselineAdminNetworkPolicies *v1alpha12.BaselineAdminNetworkPolicy
NetworkPolicies []v1.NetworkPolicy

expectedNetErr error
Expand All @@ -35,10 +35,8 @@ func TestReadNetworkPoliciesFromKube(t *testing.T) {
expectedAnpErr: context.DeadlineExceeded,
},
"return base admin network policies": {
BaselineAdminNetworkPolicies: []v1alpha12.BaselineAdminNetworkPolicy{
{
ObjectMeta: metav1.ObjectMeta{Name: "base-admin-network-policy"},
},
BaselineAdminNetworkPolicies: &v1alpha12.BaselineAdminNetworkPolicy{
ObjectMeta: metav1.ObjectMeta{Name: "base-admin-network-policy"},
},
},
"parse error on network policies retrieval": {
Expand All @@ -61,7 +59,7 @@ func TestReadNetworkPoliciesFromKube(t *testing.T) {
k := &MockKubernetes{
AdminNetworkPolicies: scenario.AdminNetworkPolicies,
AdminNetworkPolicyError: scenario.expectedAnpErr,
BaseNetworkPolicies: scenario.BaselineAdminNetworkPolicies,
BaselineNetworkPolicy: scenario.BaselineAdminNetworkPolicies,
BaseAdminNetworkPolicyError: scenario.expectedBanpErr,
Namespaces: map[string]*MockNamespace{},
NetworkPolicyError: scenario.expectedNetErr,
Expand Down Expand Up @@ -99,7 +97,7 @@ func TestReadNetworkPoliciesFromKube(t *testing.T) {
}

if scenario.BaselineAdminNetworkPolicies != nil {
if banp.Name != scenario.BaselineAdminNetworkPolicies[0].Name {
if banp.Name != scenario.BaselineAdminNetworkPolicies.Name {
t.Fatalf("Unexpected BANP: %v, expected %v", banp.Name, banp.Name)
}
}
Expand Down

0 comments on commit 2663369

Please sign in to comment.