Skip to content

Commit c066fd8

Browse files
authored
Merge pull request #79 from xmudrii/registry-k8s-io
Replace k8s.gcr.io with registry.k8s.io
2 parents 66de9e4 + 40db38d commit c066fd8

File tree

4 files changed

+7
-6
lines changed

4 files changed

+7
-6
lines changed

cmd/cyclonus/cmd/worker/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM k8s.gcr.io/e2e-test-images/agnhost:2.36
1+
FROM registry.k8s.io/e2e-test-images/agnhost:2.36
22

33
ENTRYPOINT ["/worker"]
44

cmd/cyclonus/docs/test-runs.md

Lines changed: 1 addition & 1 deletion
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

cmd/cyclonus/hack/kind/run-cyclonus.sh

Lines changed: 2 additions & 2 deletions
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.36
31-
kind load docker-image k8s.gcr.io/e2e-test-images/agnhost:2.36 --name "$CLUSTER_NAME"
30+
docker pull registry.k8s.io/e2e-test-images/agnhost:2.36
31+
kind load docker-image registry.k8s.io/e2e-test-images/agnhost:2.36 --name "$CLUSTER_NAME"
3232

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

cmd/cyclonus/pkg/connectivity/probe/pod.go

Lines changed: 3 additions & 2 deletions
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.36"
16+
agnhostImage = "registry.k8s.io/e2e-test-images/agnhost:2.36"
1617
cyclonusWorkerImage = "mfenwick100/cyclonus-worker:latest"
1718
)
1819

0 commit comments

Comments
 (0)