add arm64 support for connectivity checkers

This was merged in cilium/cilium cilium/cilium#15894 Signed-off-by: André Martins <andre@cilium.io>
cilium · Apr 29, 2021 · b1d9f63 · b1d9f63
1 parent a9ed772
commit b1d9f63
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/connectivity/check/check.go b/connectivity/check/check.go
@@ -1395,7 +1395,7 @@ func (k *K8sConnectivityCheck) deploy(ctx context.Context) error {
 			Name:   echoSameNodeDeploymentName,
 			Kind:   kindEchoName,
 			Port:   8080,
-			Image:  "quay.io/cilium/json-mock:1.2",
+			Image:  "ConnectivityCheckJSONMockImage",
 			Labels: map[string]string{"other": "echo"},
 			Affinity: &corev1.Affinity{
 				PodAffinity: &corev1.PodAffinity{
@@ -1427,7 +1427,7 @@ func (k *K8sConnectivityCheck) deploy(ctx context.Context) error {
 			Name:    ClientDeploymentName,
 			Kind:    kindClientName,
 			Port:    8080,
-			Image:   "quay.io/cilium/alpine-curl:1.1",
+			Image:   "ConnectivityCheckAlpineCurlImage",
 			Command: []string{"/bin/ash", "-c", "sleep 10000000"},
 		})
 		_, err = k.clients.src.CreateDeployment(ctx, k.params.TestNamespace, clientDeployment, metav1.CreateOptions{})
@@ -1444,7 +1444,7 @@ func (k *K8sConnectivityCheck) deploy(ctx context.Context) error {
 			Name:    Client2DeploymentName,
 			Kind:    kindClientName,
 			Port:    8080,
-			Image:   "quay.io/cilium/alpine-curl:1.1",
+			Image:   "ConnectivityCheckAlpineCurlImage",
 			Command: []string{"/bin/ash", "-c", "sleep 10000000"},
 			Labels:  map[string]string{"other": "client"},
 		})
@@ -1478,7 +1478,7 @@ func (k *K8sConnectivityCheck) deploy(ctx context.Context) error {
 				Name:  echoOtherNodeDeploymentName,
 				Kind:  kindEchoName,
 				Port:  8080,
-				Image: "quay.io/cilium/json-mock:1.2",
+				Image: "ConnectivityCheckJSONMockImage",
 				Affinity: &corev1.Affinity{
 					PodAntiAffinity: &corev1.PodAntiAffinity{
 						RequiredDuringSchedulingIgnoredDuringExecution: []corev1.PodAffinityTerm{

diff --git a/defaults/defaults.go b/defaults/defaults.go
@@ -86,6 +86,9 @@ const (
 
 	ConnectivityCheckNamespace = "cilium-test"
 
+	ConnectivityCheckAlpineCurlImage = "quay.io/cilium/alpine-curl:v1.3.0@sha256:1d928912e5d9dc9994b038b5df7434790c4bb9bd64f60570d78c1dee13befc76"
+	ConnectivityCheckJSONMockImage   = "quay.io/cilium/json-mock:v1.3.0@sha256:2729064827fa9dbfface8d3df424feb6c792a0ba07117b844349635c93c06d2b"
+
 	ConfigMapName = "cilium-config"
 	Version       = "v1.9.6"