Skip to content

Commit 87f54e0

Browse files
mattfenwickmattfenwick
authored
Merge pull request #135 from mattfenwick/cleanup
Cleanup and upgrade kind version
2 parents 235f8e3 + 6cac9ad commit 87f54e0

16 files changed

+76
-172
lines changed

‎hack/kind/run-cyclonus.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
set -xv
44
set -euo pipefail
55

6-
KIND_VERSION=${KIND_VERSION:-v0.17.0}
6+
KIND_VERSION=${KIND_VERSION:-v0.18.0}
77
CNI=${CNI:-calico}
88
CLUSTER_NAME="netpol-$CNI"
99
RUN_FROM_SOURCE=${RUN_FROM_SOURCE:-true}

‎pkg/cli/analyze.go

+5-4
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import (
44
"fmt"
55
"strings"
66

7+
"github.com/mattfenwick/collections/pkg/json"
78
"github.com/mattfenwick/collections/pkg/set"
89
"github.com/mattfenwick/cyclonus/pkg/connectivity/probe"
910
"github.com/mattfenwick/cyclonus/pkg/generator"
@@ -123,7 +124,7 @@ func RunAnalyzeCommand(args *AnalyzeArgs) {
123124
kubePolicies = append(kubePolicies, netpol.AllExamples...)
124125
}
125126

126-
logrus.Debugf("parsed policies:\n%s", utils.JsonString(kubePolicies))
127+
logrus.Debugf("parsed policies:\n%s", json.MustMarshalToString(kubePolicies))
127128
policies := matcher.BuildNetworkPolicies(args.SimplifyPolicies, kubePolicies)
128129

129130
for _, mode := range args.Modes {
@@ -182,7 +183,7 @@ type QueryTargetPod struct {
182183

183184
func QueryTargets(explainedPolicies *matcher.Policy, podPath string, pods []*QueryTargetPod) {
184185
if podPath != "" {
185-
podsFromFile, err := utils.ParseJsonFromFile[[]*QueryTargetPod](podPath)
186+
podsFromFile, err := json.ParseFile[[]*QueryTargetPod](podPath)
186187
utils.DoOrDie(err)
187188
pods = append(pods, *podsFromFile...)
188189
}
@@ -220,7 +221,7 @@ func QueryTraffic(explainedPolicies *matcher.Policy, trafficPath string) {
220221
if trafficPath == "" {
221222
logrus.Fatalf("%+v", errors.Errorf("path to traffic file required for QueryTraffic command"))
222223
}
223-
allTraffics, err := utils.ParseJsonFromFile[[]*matcher.Traffic](trafficPath)
224+
allTraffics, err := json.ParseFile[[]*matcher.Traffic](trafficPath)
224225
utils.DoOrDie(err)
225226

226227
for _, traffic := range *allTraffics {
@@ -238,7 +239,7 @@ type SyntheticProbeConnectivityConfig struct {
238239

239240
func ProbeSyntheticConnectivity(explainedPolicies *matcher.Policy, modelPath string, kubePods []v1.Pod, kubeNamespaces []v1.Namespace) {
240241
if modelPath != "" {
241-
config, err := utils.ParseJsonFromFile[SyntheticProbeConnectivityConfig](modelPath)
242+
config, err := json.ParseFile[SyntheticProbeConnectivityConfig](modelPath)
242243
utils.DoOrDie(err)
243244

244245
jobBuilder := &probe.JobBuilder{TimeoutSeconds: 10}

‎pkg/cli/generate.go

+3-2
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import (
44
"fmt"
55
"strings"
66

7+
"github.com/mattfenwick/collections/pkg/json"
78
"github.com/mattfenwick/cyclonus/pkg/connectivity"
89
"github.com/mattfenwick/cyclonus/pkg/connectivity/probe"
910
"github.com/mattfenwick/cyclonus/pkg/generator"
@@ -89,7 +90,7 @@ func SetupGenerateCommand() *cobra.Command {
8990
}
9091

9192
func RunGenerateCommand(args *GenerateArgs) {
92-
fmt.Printf("args: \n%s\n", utils.JsonString(args))
93+
fmt.Printf("args: \n%s\n", json.MustMarshalToString(args))
9394

9495
RunVersionCommand()
9596

@@ -105,7 +106,7 @@ func RunGenerateCommand(args *GenerateArgs) {
105106
utils.DoOrDie(err)
106107
info, err := kubeClient.ClientSet.ServerVersion()
107108
utils.DoOrDie(err)
108-
fmt.Printf("Kubernetes server version: \n%s\n", utils.JsonString(info))
109+
fmt.Printf("Kubernetes server version: \n%s\n", json.MustMarshalToString(info))
109110
kubernetes = kubeClient
110111
}
111112

‎pkg/cli/root.go

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
11
package cli
22

33
import (
4+
"os"
5+
46
"github.com/mattfenwick/cyclonus/pkg/utils"
57
"github.com/pkg/errors"
6-
log "github.com/sirupsen/logrus"
8+
"github.com/sirupsen/logrus"
79
"github.com/spf13/cobra"
8-
"os"
910
)
1011

1112
func RunRootCommand() {
1213
command := SetupRootCommand()
1314
if err := errors.Wrapf(command.Execute(), "run root command"); err != nil {
14-
log.Fatalf("unable to run root command: %+v", err)
15+
logrus.Fatalf("unable to run root command: %+v", err)
1516
os.Exit(1)
1617
}
1718
}

‎pkg/cli/version.go

+3-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ package cli
22

33
import (
44
"fmt"
5-
"github.com/mattfenwick/cyclonus/pkg/utils"
5+
6+
"github.com/mattfenwick/collections/pkg/json"
67
"github.com/spf13/cobra"
78
)
89

@@ -26,7 +27,7 @@ func SetupVersionCommand() *cobra.Command {
2627
}
2728

2829
func RunVersionCommand() {
29-
fmt.Printf("Cyclonus version: \n%s\n", utils.JsonString(map[string]string{
30+
fmt.Printf("Cyclonus version: \n%s\n", json.MustMarshalToString(map[string]string{
3031
"Version": version,
3132
"GitSHA": gitSHA,
3233
"BuildTime": buildTime,

‎pkg/connectivity/printer.go

+5-4
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,13 @@ package connectivity
22

33
import (
44
"fmt"
5-
"github.com/mattfenwick/collections/pkg/slice"
6-
log "github.com/sirupsen/logrus"
7-
"golang.org/x/exp/maps"
85
"math"
96
"strings"
107

8+
"github.com/mattfenwick/collections/pkg/slice"
9+
"github.com/sirupsen/logrus"
10+
"golang.org/x/exp/maps"
11+
1112
"github.com/mattfenwick/cyclonus/pkg/generator"
1213
"github.com/mattfenwick/cyclonus/pkg/utils"
1314
"github.com/olekukonko/tablewriter"
@@ -37,7 +38,7 @@ func (t *Printer) PrintSummary() {
3738
fmt.Printf("Tag results:\n%s\n", t.printMarkdownFeatureTable(summary.TagPrimaryCounts, summary.TagCounts))
3839

3940
if err := PrintJUnitResults(t.JunitResultsFile, t.Results, t.IgnoreLoopback); err != nil {
40-
log.Errorf("unable to dump JUnit test results: %+v", err)
41+
logrus.Errorf("unable to dump JUnit test results: %+v", err)
4142
}
4243
}
4344

‎pkg/connectivity/probe/jobrunner.go

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
package probe
22

33
import (
4+
"strings"
5+
6+
"github.com/mattfenwick/collections/pkg/json"
47
"github.com/mattfenwick/cyclonus/pkg/generator"
58
"github.com/mattfenwick/cyclonus/pkg/kube"
69
"github.com/mattfenwick/cyclonus/pkg/matcher"
7-
"github.com/mattfenwick/cyclonus/pkg/utils"
810
"github.com/mattfenwick/cyclonus/pkg/worker"
911
"github.com/sirupsen/logrus"
10-
"strings"
1112
)
1213

1314
type Runner struct {
@@ -78,7 +79,7 @@ func (s *SimulatedJobRunner) RunJob(job *Job) *JobResult {
7879
allowed := s.Policies.IsTrafficAllowed(job.Traffic())
7980
// TODO could also keep the whole `allowed` struct somewhere
8081

81-
logrus.Tracef("to %s\n%s\n", utils.JsonString(job), allowed.Table())
82+
logrus.Tracef("to %s\n%s\n", json.MustMarshalToString(job), allowed.Table())
8283

8384
var combined, ingress, egress = ConnectivityBlocked, ConnectivityBlocked, ConnectivityBlocked
8485
if allowed.Ingress.IsAllowed() {

‎pkg/kube/ipaddress_tests.go

+7-6
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,12 @@ package kube
22

33
import (
44
"fmt"
5+
"net"
6+
57
. "github.com/onsi/ginkgo/v2"
68
. "github.com/onsi/gomega"
7-
log "github.com/sirupsen/logrus"
9+
"github.com/sirupsen/logrus"
810
v1 "k8s.io/api/networking/v1"
9-
"net"
1011
)
1112

1213
type ipCidrTestCase struct {
@@ -41,7 +42,7 @@ func RunIPAddressTests() {
4142
},
4243
}
4344
for _, c := range testCases {
44-
log.Infof("looking at %+v", c)
45+
logrus.Infof("looking at %+v", c)
4546
isInCidr, err := IsIPInCIDR(c.IP, c.CIDR)
4647
Expect(err).To(BeNil())
4748
Expect(isInCidr).To(Equal(c.IsMember))
@@ -83,7 +84,7 @@ func RunIPAddressTests() {
8384
}
8485

8586
for _, c := range testCases {
86-
log.Infof("looking at %+v", c)
87+
logrus.Infof("looking at %+v", c)
8788
isInCidr, err := IsIPInCIDR(c.IP, c.CIDR)
8889
Expect(err).To(BeNil())
8990
Expect(isInCidr).To(Equal(c.IsMember))
@@ -143,7 +144,7 @@ func RunIPAddressTests() {
143144
},
144145
}
145146
for _, c := range testCases {
146-
log.Infof("looking at %+v", c)
147+
logrus.Infof("looking at %+v", c)
147148
isMatch, err := IsIPAddressMatchForIPBlock(c.IP, c.IPBlock)
148149
Expect(err).To(BeNil())
149150
Expect(isMatch).To(Equal(c.IsMatch))
@@ -182,7 +183,7 @@ func RunIPAddressTests() {
182183
},
183184
}
184185
for _, c := range testCases {
185-
log.Infof("looking at %+v", c)
186+
logrus.Infof("looking at %+v", c)
186187

187188
isMatchWithoutExcept, err := IsIPAddressMatchForIPBlock(c.IP, &v1.IPBlock{
188189
CIDR: c.IPBlock.CIDR,

‎pkg/kube/kubernetes.go

+11-10
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,9 @@ package kube
33
import (
44
"bytes"
55
"context"
6+
67
"github.com/pkg/errors"
7-
log "github.com/sirupsen/logrus"
8+
"github.com/sirupsen/logrus"
89
v1 "k8s.io/api/core/v1"
910
networkingv1 "k8s.io/api/networking/v1"
1011
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -22,7 +23,7 @@ type Kubernetes struct {
2223
}
2324

2425
func NewKubernetesForContext(context string) (*Kubernetes, error) {
25-
log.Debugf("instantiating k8s Clientset for context %s", context)
26+
logrus.Debugf("instantiating k8s Clientset for context %s", context)
2627
kubeConfig, err := clientcmd.NewNonInteractiveDeferredLoadingClientConfig(
2728
clientcmd.NewDefaultClientConfigLoadingRules(),
2829
&clientcmd.ConfigOverrides{CurrentContext: context}).ClientConfig()
@@ -70,13 +71,13 @@ func (k *Kubernetes) CreateNamespace(ns *v1.Namespace) (*v1.Namespace, error) {
7071
}
7172

7273
func (k *Kubernetes) DeleteAllNetworkPoliciesInNamespace(ns string) error {
73-
log.Debugf("deleting all network policies in namespace %s", ns)
74+
logrus.Debugf("deleting all network policies in namespace %s", ns)
7475
netpols, err := k.ClientSet.NetworkingV1().NetworkPolicies(ns).List(context.TODO(), metav1.ListOptions{})
7576
if err != nil {
7677
return errors.Wrapf(err, "unable to list network policies in ns %s", ns)
7778
}
7879
for _, np := range netpols.Items {
79-
log.Debugf("deleting network policy %s/%s", ns, np.Name)
80+
logrus.Debugf("deleting network policy %s/%s", ns, np.Name)
8081
err = k.DeleteNetworkPolicy(np.Namespace, np.Name)
8182
if err != nil {
8283
return err
@@ -99,13 +100,13 @@ func (k *Kubernetes) GetNetworkPoliciesInNamespace(namespace string) ([]networki
99100
}
100101

101102
func (k *Kubernetes) UpdateNetworkPolicy(policy *networkingv1.NetworkPolicy) (*networkingv1.NetworkPolicy, error) {
102-
log.Debugf("updating network policy %s/%s", policy.Namespace, policy.Name)
103+
logrus.Debugf("updating network policy %s/%s", policy.Namespace, policy.Name)
103104
np, err := k.ClientSet.NetworkingV1().NetworkPolicies(policy.Namespace).Update(context.TODO(), policy, metav1.UpdateOptions{})
104105
return np, errors.Wrapf(err, "unable to update network policy %s/%s", policy.Namespace, policy.Name)
105106
}
106107

107108
func (k *Kubernetes) CreateNetworkPolicy(policy *networkingv1.NetworkPolicy) (*networkingv1.NetworkPolicy, error) {
108-
log.Debugf("creating network policy %s/%s", policy.Namespace, policy.Name)
109+
logrus.Debugf("creating network policy %s/%s", policy.Namespace, policy.Name)
109110

110111
createdPolicy, err := k.ClientSet.NetworkingV1().NetworkPolicies(policy.Namespace).Create(context.TODO(), policy, metav1.CreateOptions{})
111112
return createdPolicy, errors.Wrapf(err, "unable to create network policy %s/%s", policy.Namespace, policy.Name)
@@ -118,7 +119,7 @@ func (k *Kubernetes) GetService(namespace string, name string) (*v1.Service, err
118119

119120
func (k *Kubernetes) CreateService(svc *v1.Service) (*v1.Service, error) {
120121
ns := svc.Namespace
121-
log.Debugf("creating service %s/%s", ns, svc.Name)
122+
logrus.Debugf("creating service %s/%s", ns, svc.Name)
122123
createdService, err := k.ClientSet.CoreV1().Services(ns).Create(context.TODO(), svc, metav1.CreateOptions{})
123124
if err != nil {
124125
return nil, errors.Wrapf(err, "unable to create service %s/%s", ns, svc.Name)
@@ -127,7 +128,7 @@ func (k *Kubernetes) CreateService(svc *v1.Service) (*v1.Service, error) {
127128
}
128129

129130
func (k *Kubernetes) DeleteService(namespace string, name string) error {
130-
log.Debugf("deleting service %s/%s", namespace, name)
131+
logrus.Debugf("deleting service %s/%s", namespace, name)
131132
err := k.ClientSet.CoreV1().Services(namespace).Delete(context.TODO(), name, metav1.DeleteOptions{})
132133
return errors.Wrapf(err, "unable to delete service %s/%s", namespace, name)
133134
}
@@ -165,14 +166,14 @@ func (k *Kubernetes) SetPodLabels(namespace string, podName string, labels map[s
165166

166167
func (k *Kubernetes) CreatePod(pod *v1.Pod) (*v1.Pod, error) {
167168
ns := pod.Namespace
168-
log.Debugf("creating pod %s/%s", ns, pod.Name)
169+
logrus.Debugf("creating pod %s/%s", ns, pod.Name)
169170

170171
createdPod, err := k.ClientSet.CoreV1().Pods(ns).Create(context.TODO(), pod, metav1.CreateOptions{})
171172
return createdPod, errors.Wrapf(err, "unable to create pod %s/%s", ns, pod.Name)
172173
}
173174

174175
func (k *Kubernetes) DeletePod(namespace string, podName string) error {
175-
log.Debugf("deleting pod %s/%s", namespace, podName)
176+
logrus.Debugf("deleting pod %s/%s", namespace, podName)
176177
err := k.ClientSet.CoreV1().Pods(namespace).Delete(context.TODO(), podName, metav1.DeleteOptions{})
177178
return errors.Wrapf(err, "unable to delete pod %s/%s", namespace, podName)
178179
}

‎pkg/kube/read.go

+9-8
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,11 @@ import (
55
"path/filepath"
66

77
"github.com/mattfenwick/collections/pkg/builtin"
8+
"github.com/mattfenwick/collections/pkg/file"
89
"github.com/mattfenwick/collections/pkg/slice"
910
"github.com/mattfenwick/cyclonus/pkg/utils"
1011
"github.com/pkg/errors"
11-
log "github.com/sirupsen/logrus"
12+
"github.com/sirupsen/logrus"
1213
networkingv1 "k8s.io/api/networking/v1"
1314
)
1415

@@ -19,11 +20,11 @@ func ReadNetworkPoliciesFromPath(policyPath string) ([]*networkingv1.NetworkPoli
1920
return errors.Wrapf(err, "unable to walk path %s", path)
2021
}
2122
if info.IsDir() {
22-
log.Tracef("not opening dir %s", path)
23+
logrus.Tracef("not opening dir %s", path)
2324
return nil
2425
}
25-
log.Debugf("walking path %s", path)
26-
bytes, err := utils.ReadFileBytes(path)
26+
logrus.Debugf("walking path %s", path)
27+
bytes, err := file.Read(path)
2728
if err != nil {
2829
return err
2930
}
@@ -34,11 +35,11 @@ func ReadNetworkPoliciesFromPath(policyPath string) ([]*networkingv1.NetworkPoli
3435
// TODO try parsing multiple policies separated by '---' lines
3536
// policies, err := yaml.ParseMany[networkingv1.NetworkPolicy](bytes)
3637
// if err == nil {
37-
// log.Debugf("parsed %d policies from %s", len(policies), path)
38+
// logrus.Debugf("parsed %d policies from %s", len(policies), path)
3839
// allPolicies = append(allPolicies, refNetpolList(policies)...)
3940
// return nil
4041
// }
41-
// log.Errorf("unable to parse multiple policies separated by '---' lines: %+v", err)
42+
// logrus.Errorf("unable to parse multiple policies separated by '---' lines: %+v", err)
4243

4344
// try parsing a NetworkPolicyList
4445
policyList, err := utils.ParseYamlStrict[networkingv1.NetworkPolicyList](bytes)
@@ -47,14 +48,14 @@ func ReadNetworkPoliciesFromPath(policyPath string) ([]*networkingv1.NetworkPoli
4748
return nil
4849
}
4950

50-
log.Debugf("unable to parse list of policies: %+v", err)
51+
logrus.Debugf("unable to parse list of policies: %+v", err)
5152

5253
policy, err := utils.ParseYamlStrict[networkingv1.NetworkPolicy](bytes)
5354
if err != nil {
5455
return errors.WithMessagef(err, "unable to parse single policy from yaml at %s", path)
5556
}
5657

57-
log.Debugf("parsed single policy from %s: %+v", path, policy)
58+
logrus.Debugf("parsed single policy from %s: %+v", path, policy)
5859
allPolicies = append(allPolicies, policy)
5960
return nil
6061
})

‎pkg/matcher/explain.go

+4-3
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,14 @@ package matcher
22

33
import (
44
"fmt"
5+
"strings"
6+
7+
"github.com/mattfenwick/collections/pkg/json"
58
"github.com/mattfenwick/collections/pkg/slice"
69
"github.com/mattfenwick/cyclonus/pkg/kube"
7-
"github.com/mattfenwick/cyclonus/pkg/utils"
810
"github.com/olekukonko/tablewriter"
911
"github.com/pkg/errors"
1012
networkingv1 "k8s.io/api/networking/v1"
11-
"strings"
1213
)
1314

1415
type SliceBuilder struct {
@@ -59,7 +60,7 @@ func (s *SliceBuilder) TargetsTableLines(targets []*Target, isIngress bool) {
5960
if len(target.Peers) == 0 {
6061
s.Append("no pods, no ips", "no ports, no protocols")
6162
} else {
62-
for _, peer := range slice.SortOn(func(p PeerMatcher) string { return utils.DumpJSON(p) }, target.Peers) {
63+
for _, peer := range slice.SortOn(func(p PeerMatcher) string { return json.MustMarshalToString(p) }, target.Peers) {
6364
switch a := peer.(type) {
6465
case *AllPeersMatcher:
6566
s.Append("all pods, all ips", "all ports, all protocols")

0 commit comments

Comments
 (0)