Skip to content

Commit 830716a

Browse files
mattfenwickmattfenwick
authored
Merge pull request #138 from jaydeokar/image_repository_parameter
Add option to specify image repository for pulling agnhost image
2 parents ace09a0 + c53de46 commit 830716a

File tree

7 files changed

+35
-26
lines changed

7 files changed

+35
-26
lines changed

‎cmd/worker/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM k8s.gcr.io/e2e-test-images/agnhost:2.43
1+
FROM registry.k8s.io/e2e-test-images/agnhost:2.43
22

33
ENTRYPOINT ["/worker"]
44

‎docs/test-runs.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ namespace x). There are three modes to test network policies in:
2424

2525
Tests can run over multiple protocols and ports. A typical test run includes protocols TCP and UDP (often
2626
SCTP as well), and ports 80 and 81. Each port/protocol combination is served by a container running `agnhost` (docker
27-
image: k8s.gcr.io/e2e-test-images/agnhost) which is capable of serving a specific protocol on a specific port. Thus,
27+
image: registry.k8s.io/e2e-test-images/agnhost) which is capable of serving a specific protocol on a specific port. Thus,
2828
if your test includes protocols TCP and UDP, and ports 80 and 81, each pod will have 4 containers. Named ports are
2929
included as well -- `serve-80-udp` is the name for port 80 on UDP.
3030

‎hack/kind/run-cyclonus.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ pushd "$CNI"
2727
popd
2828

2929
# preload agnhost image
30-
docker pull k8s.gcr.io/e2e-test-images/agnhost:2.43
31-
kind load docker-image k8s.gcr.io/e2e-test-images/agnhost:2.43 --name "$CLUSTER_NAME"
30+
docker pull registry.k8s.io/e2e-test-images/agnhost:2.43
31+
kind load docker-image registry.k8s.io/e2e-test-images/agnhost:2.43 --name "$CLUSTER_NAME"
3232

3333
# make sure that the new kind cluster is the current kubectl context
3434
kind get clusters

‎pkg/cli/generate.go

+3-1
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ type GenerateArgs struct {
4444
DryRun bool
4545
JobTimeoutSeconds int
4646
JunitResultsFile string
47+
ImageRegistry string
4748
//BatchJobs bool
4849
}
4950

@@ -85,6 +86,7 @@ func SetupGenerateCommand() *cobra.Command {
8586
command.Flags().BoolVar(&args.DryRun, "dry-run", false, "if true, don't actually do anything: just print out what would be done")
8687

8788
command.Flags().StringVar(&args.JunitResultsFile, "junit-results-file", "", "output junit results to the specified file")
89+
command.Flags().StringVar(&args.ImageRegistry, "image-registry", "registry.k8s.io", "Image registry for agnhost")
8890

8991
return command
9092
}
@@ -113,7 +115,7 @@ func RunGenerateCommand(args *GenerateArgs) {
113115
serverProtocols := parseProtocols(args.ServerProtocols)
114116

115117
batchJobs := false // args.BatchJobs
116-
resources, err := probe.NewDefaultResources(kubernetes, args.ServerNamespaces, args.ServerPods, args.ServerPorts, serverProtocols, externalIPs, args.PodCreationTimeoutSeconds, batchJobs)
118+
resources, err := probe.NewDefaultResources(kubernetes, args.ServerNamespaces, args.ServerPods, args.ServerPorts, serverProtocols, externalIPs, args.PodCreationTimeoutSeconds, batchJobs, args.ImageRegistry)
117119
utils.DoOrDie(err)
118120

119121
interpreterConfig := &connectivity.InterpreterConfig{

‎pkg/cli/probe.go

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
package cli
22

33
import (
4+
"strings"
5+
46
"github.com/mattfenwick/cyclonus/pkg/connectivity"
57
"github.com/mattfenwick/cyclonus/pkg/connectivity/probe"
68
"github.com/mattfenwick/cyclonus/pkg/generator"
@@ -11,7 +13,6 @@ import (
1113
v1 "k8s.io/api/core/v1"
1214
networkingv1 "k8s.io/api/networking/v1"
1315
"k8s.io/apimachinery/pkg/util/intstr"
14-
"strings"
1516
)
1617

1718
type ProbeArgs struct {
@@ -34,6 +35,7 @@ type ProbeArgs struct {
3435
ServerPorts []int
3536
ServerNamespaces []string
3637
ServerPods []string
38+
ImageRegistry string
3739
}
3840

3941
func SetupProbeCommand() *cobra.Command {
@@ -66,6 +68,7 @@ func SetupProbeCommand() *cobra.Command {
6668
command.Flags().IntVar(&args.PerturbationWaitSeconds, "perturbation-wait-seconds", 5, "number of seconds to wait after perturbing the cluster (i.e. create a network policy, modify a ns/pod label) before running probes, to give the CNI time to update the cluster state")
6769
command.Flags().IntVar(&args.PodCreationTimeoutSeconds, "pod-creation-timeout-seconds", 60, "number of seconds to wait for pods to create, be running and have IP addresses")
6870
command.Flags().StringVar(&args.PolicyPath, "policy-path", "", "path to yaml network policy to create in kube; if empty, will not create any policies")
71+
command.Flags().StringVar(&args.ImageRegistry, "image-registry", "registry.k8s.io", "Image registry for agnhost")
6972

7073
return command
7174
}
@@ -82,7 +85,7 @@ func RunProbeCommand(args *ProbeArgs) {
8285
protocols := parseProtocols(args.Protocols)
8386
serverProtocols := parseProtocols(args.ServerProtocols)
8487

85-
resources, err := probe.NewDefaultResources(kubernetes, args.ServerNamespaces, args.ServerPods, args.ServerPorts, serverProtocols, externalIPs, args.PodCreationTimeoutSeconds, false)
88+
resources, err := probe.NewDefaultResources(kubernetes, args.ServerNamespaces, args.ServerPods, args.ServerPorts, serverProtocols, externalIPs, args.PodCreationTimeoutSeconds, false, args.ImageRegistry)
8689
utils.DoOrDie(err)
8790

8891
interpreterConfig := &connectivity.InterpreterConfig{

‎pkg/connectivity/probe/pod.go

+19-16
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,18 @@ package probe
22

33
import (
44
"fmt"
5+
"strings"
6+
57
"github.com/mattfenwick/collections/pkg/slice"
68
"github.com/mattfenwick/cyclonus/pkg/generator"
79
"github.com/mattfenwick/cyclonus/pkg/kube"
810
"github.com/pkg/errors"
911
v1 "k8s.io/api/core/v1"
1012
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
11-
"strings"
1213
)
1314

1415
const (
15-
agnhostImage = "k8s.gcr.io/e2e-test-images/agnhost:2.43"
16+
agnhostImage = "e2e-test-images/agnhost:2.43"
1617
cyclonusWorkerImage = "mfenwick100/cyclonus-worker:latest"
1718
)
1819

@@ -26,11 +27,11 @@ func NewPod(ns string, name string, labels map[string]string, ip string, contain
2627
}
2728
}
2829

29-
func NewDefaultPod(ns string, name string, ports []int, protocols []v1.Protocol, batchJobs bool) *Pod {
30+
func NewDefaultPod(ns string, name string, ports []int, protocols []v1.Protocol, batchJobs bool, imageRegistry string) *Pod {
3031
var containers []*Container
3132
for _, port := range ports {
3233
for _, protocol := range protocols {
33-
containers = append(containers, NewDefaultContainer(port, protocol, batchJobs))
34+
containers = append(containers, NewDefaultContainer(port, protocol, batchJobs, imageRegistry))
3435
}
3536
}
3637
return &Pod{
@@ -163,20 +164,22 @@ func (p *Pod) PodString() PodString {
163164
}
164165

165166
type Container struct {
166-
Name string
167-
Port int
168-
Protocol v1.Protocol
169-
PortName string
170-
BatchJobs bool
167+
Name string
168+
Port int
169+
Protocol v1.Protocol
170+
PortName string
171+
BatchJobs bool
172+
ImageRegistry string
171173
}
172174

173-
func NewDefaultContainer(port int, protocol v1.Protocol, batchJobs bool) *Container {
175+
func NewDefaultContainer(port int, protocol v1.Protocol, batchJobs bool, imageRegistry string) *Container {
174176
return &Container{
175-
Name: fmt.Sprintf("cont-%d-%s", port, strings.ToLower(string(protocol))),
176-
Port: port,
177-
Protocol: protocol,
178-
PortName: fmt.Sprintf("serve-%d-%s", port, strings.ToLower(string(protocol))),
179-
BatchJobs: batchJobs,
177+
Name: fmt.Sprintf("cont-%d-%s", port, strings.ToLower(string(protocol))),
178+
Port: port,
179+
Protocol: protocol,
180+
PortName: fmt.Sprintf("serve-%d-%s", port, strings.ToLower(string(protocol))),
181+
BatchJobs: batchJobs,
182+
ImageRegistry: imageRegistry,
180183
}
181184
}
182185

@@ -192,7 +195,7 @@ func (c *Container) Image() string {
192195
if c.BatchJobs {
193196
return cyclonusWorkerImage
194197
}
195-
return agnhostImage
198+
return c.ImageRegistry + "/" + agnhostImage
196199
}
197200

198201
func (c *Container) KubeContainer() v1.Container {

‎pkg/connectivity/probe/resources.go

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

33
import (
4+
"time"
5+
46
"github.com/mattfenwick/collections/pkg/slice"
57
"github.com/mattfenwick/cyclonus/pkg/kube"
68
"github.com/pkg/errors"
79
"github.com/sirupsen/logrus"
810
"golang.org/x/exp/maps"
911
v1 "k8s.io/api/core/v1"
1012
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
11-
"time"
1213
)
1314

1415
type Resources struct {
@@ -17,7 +18,7 @@ type Resources struct {
1718
//ExternalIPs []string
1819
}
1920

20-
func NewDefaultResources(kubernetes kube.IKubernetes, namespaces []string, podNames []string, ports []int, protocols []v1.Protocol, externalIPs []string, podCreationTimeoutSeconds int, batchJobs bool) (*Resources, error) {
21+
func NewDefaultResources(kubernetes kube.IKubernetes, namespaces []string, podNames []string, ports []int, protocols []v1.Protocol, externalIPs []string, podCreationTimeoutSeconds int, batchJobs bool, imageRegistry string) (*Resources, error) {
2122
//sort.Strings(externalIPs) // TODO why is this here?
2223

2324
r := &Resources{
@@ -27,7 +28,7 @@ func NewDefaultResources(kubernetes kube.IKubernetes, namespaces []string, podNa
2728

2829
for _, ns := range namespaces {
2930
for _, podName := range podNames {
30-
r.Pods = append(r.Pods, NewDefaultPod(ns, podName, ports, protocols, batchJobs))
31+
r.Pods = append(r.Pods, NewDefaultPod(ns, podName, ports, protocols, batchJobs, imageRegistry))
3132
}
3233
r.Namespaces[ns] = map[string]string{"ns": ns}
3334
}

0 commit comments

Comments
 (0)