Skip to content

Commit 7e48d04

Browse files
Add sidecar to e2e tests suit
1 parent 7bbfb0f commit 7e48d04

File tree

2 files changed

+16
-8
lines changed

2 files changed

+16
-8
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ run-e2e:
147147
$(KUSTOMIZE) build config/default > release_it.yaml
148148
git checkout ./config/default/manager_auth_proxy_patch.yaml
149149
git checkout ./config/manager/kustomization.yaml
150-
KUBE_CONFIG=$(HOME)/.kube/config KIND_BIN=${KIND} WIREGUARD_OPERATOR_RELEASE_PATH="../../release_it.yaml" AGENT_IMAGE=${AGENT_IMAGE} MANAGER_IMAGE=${MANAGER_IMAGE} go test ./internal/it/ -v -count=1
150+
KUBE_CONFIG=$(HOME)/.kube/config KIND_BIN=${KIND} WIREGUARD_OPERATOR_RELEASE_PATH="../../release_it.yaml" AGENT_IMAGE=${SIDECAR_IMAGE} AGENT_IMAGE=${AGENT_IMAGE} MANAGER_IMAGE=${MANAGER_IMAGE} go test ./internal/it/ -v -count=1
151151

152152
docker-push: ## Push docker image with the manager.
153153
docker push ${IMG}

internal/it/suite_test.go

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,13 @@ package it
33
import (
44
"context"
55
"fmt"
6+
"log"
7+
"os"
8+
"os/exec"
9+
"strings"
10+
"testing"
11+
"time"
12+
613
"github.com/go-logr/stdr"
714
"github.com/jodevsa/wireguard-operator/pkg/api/v1alpha1"
815
. "github.com/onsi/ginkgo"
@@ -12,17 +19,11 @@ import (
1219
"k8s.io/client-go/kubernetes/scheme"
1320
"k8s.io/client-go/rest"
1421
"k8s.io/client-go/tools/clientcmd"
15-
"log"
16-
"os"
17-
"os/exec"
1822
"sigs.k8s.io/controller-runtime/pkg/client"
1923
"sigs.k8s.io/controller-runtime/pkg/envtest"
2024
"sigs.k8s.io/kind/pkg/apis/config/v1alpha4"
2125
kind "sigs.k8s.io/kind/pkg/cluster"
2226
log2 "sigs.k8s.io/kind/pkg/log"
23-
"strings"
24-
"testing"
25-
"time"
2627
//+kubebuilder:scaffold:imports
2728
)
2829

@@ -34,6 +35,7 @@ var k8sClient client.Client
3435
var testEnv *envtest.Environment
3536
var releasePath string
3637
var agentImage string
38+
var sidecarImage string
3739
var managerImage string
3840
var kindBinary string
3941
var kubeConfigPath string
@@ -184,7 +186,13 @@ var _ = BeforeSuite(func() {
184186
cmd = exec.Command(kindBinary, "load", "docker-image", agentImage, "--name", testClusterName)
185187
b, err = cmd.Output()
186188
if err != nil {
187-
log.Error(err, "unable to load local image agent:dev")
189+
log.Error(err, "unable to load local image for agent")
190+
return
191+
}
192+
cmd = exec.Command(kindBinary, "load", "docker-image", sidecarImage, "--name", testClusterName)
193+
b, err = cmd.Output()
194+
if err != nil {
195+
log.Error(err, "unable to load local image for sidecar")
188196
return
189197
}
190198

0 commit comments

Comments
 (0)