DevFW-CICD/ingress-nginx-helm
16
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use local image name for e2e tests

Browse source
This commit is contained in:
Antoine Cotten 2018-04-27 14:25:58 +02:00
parent 734361d58a
commit 7c246ec313
No known key found for this signature in database
GPG key ID: EA06C9A94E2B3EA0
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Makefile
View file

@ -117,7 +117,7 @@ endif
$(DOCKER) build -t $(MULTI_ARCH_IMG):$(TAG) $(TEMP_DIR)/rootfs
ifeq ($(ARCH), amd64)
# This is for to maintain the backward compatibility
# This is for maintaining backward compatibility
$(DOCKER) tag $(MULTI_ARCH_IMG):$(TAG) $(IMAGE):$(TAG)
endif
@ -159,7 +159,7 @@ lua-test:
.PHONY: e2e-image
e2e-image: sub-container-amd64
TAG=$(TAG) IMAGE=$(MULTI_ARCH_IMG) docker tag $(IMAGE):$(TAG) $(IMAGE):test
$(DOCKER) tag $(MULTI_ARCH_IMG):$(TAG) $(IMGNAME):e2e
docker images
.PHONY: e2e-test

2
test/manifests/ingress-controller/with-rbac.yaml
View file

@ -16,7 +16,7 @@ spec:
#serviceAccountName: nginx-ingress-serviceaccount
containers:
- name: nginx-ingress-controller
image: quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.14.0
image: nginx-ingress-controller:e2e
args:
- /nginx-ingress-controller
- --default-backend-service=$(POD_NAMESPACE)/default-http-backend