Skip to content

Commit 3af04f3

Browse files
committed
Updated the makefile to build the executable
1 parent ecfbb88 commit 3af04f3

File tree

3 files changed

+16
-18
lines changed

3 files changed

+16
-18
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ generate-code:
5454
$(info Generating deepcopy...)
5555
${BIN_DIR}/deepcopy-gen -i ./pkg/apis/controller/v1beta1/ -O zz_generated.deepcopy
5656

57-
images: verify-tag-name
57+
images: verify-tag-name mcad-controller
5858
$(info List executable directory)
5959
$(info repo id: ${git_repository_id})
6060
$(info branch: ${GIT_BRANCH})

hack/run-e2e-kind.sh

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ export CLEANUP_CLUSTER=${CLEANUP_CLUSTER:-"true"}
3333
export CLUSTER_CONTEXT="--name test"
3434
# Using older image due to older version of kubernetes cluster"
3535
export IMAGE_ECHOSERVER="kicbase/echo-server:1.0"
36+
export IMAGE_UBUNTULATEST="ubuntu:latest"
3637
export KIND_OPT=${KIND_OPT:=" --config ${ROOT_DIR}/hack/e2e-kind-config.yaml"}
3738
export KA_BIN=_output/bin
3839
export WAIT_TIME="20s"
@@ -113,26 +114,23 @@ function kind-up-cluster {
113114
fi
114115
CLUSTER_STARTED="true"
115116

116-
docker pull ${IMAGE_ECHOSERVER}
117+
docker pull ${IMAGE_ECHOSERVER} ${IMAGE_UBUNTU_LATEST}
117118
if [[ "$MCAD_IMAGE_PULL_POLICY" = "Always" ]]
118119
then
119120
docker pull ${IMAGE_MCAD}
120121
fi
121122
docker images
122-
123-
kind load docker-image ${IMAGE_ECHOSERVER} ${CLUSTER_CONTEXT}
124-
if [ $? -ne 0 ]
125-
then
126-
echo "Failed to load image ${IMAGE_ECHOSERVER} in cluster"
127-
exit 1
128-
fi
129-
130-
kind load docker-image ${IMAGE_MCAD} ${CLUSTER_CONTEXT}
131-
if [ $? -ne 0 ]
132-
then
133-
echo "Failed to load image ${IMAGE_MCAD} in cluster"
134-
exit 1
135-
fi
123+
124+
for image in ${IMAGE_ECHOSERVER} ${IMAGE_UBUNTU_LATEST} ${IMAGE_MCAD}
125+
do
126+
127+
kind load docker-image ${image} ${CLUSTER_CONTEXT}
128+
if [ $? -ne 0 ]
129+
then
130+
echo "Failed to load image ${IMAGE_ECHOSERVER} in cluster"
131+
exit 1
132+
fi
133+
done
136134
}
137135

138136
# clean up
@@ -389,4 +387,4 @@ kind-up-cluster
389387
kube-test-env-up
390388

391389
echo "==========================>>>>> Running E2E tests... <<<<<=========================="
392-
go test ./test/e2e -v -timeout 55m
390+
go test ./test/e2e -v -timeout 75m

test/yaml/0001-aw-generic-deployment-3.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ spec:
2525
spec:
2626
containers:
2727
- name: 0001-aw-generic-deployment-3
28-
image: k8s.gcr.io/echoserver:1.4
28+
image: kicbase/echo-server:1.0
2929
ports:
3030
- containerPort: 80
3131
resources:

0 commit comments

Comments
 (0)