Skip to content

Commit

Permalink
fixes for e2e test errors
Browse files Browse the repository at this point in the history
  • Loading branch information
detiber committed Nov 9, 2020
1 parent 5318c8f commit 961fccb
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 10 deletions.
6 changes: 5 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -226,9 +226,13 @@ $(KUBEBUILDER):
test: generate fmt vet crds
go test ./... -coverprofile cover.out

.PHONY: e2e-image
e2e-image:
docker build --tag=docker.io/packethost/cluster-api-provider-packet:e2e .

# Run e2e tests
.PHONY: e2e
e2e:
e2e: e2e-image
# This is the name used inside the component.yaml for the container that runs the manager
# The image gets loaded inside kind from ./test/e2e/config/packet-dev.yaml
$(E2E_FLAGS) $(MAKE) -C $(TEST_E2E_DIR) run
Expand Down
2 changes: 1 addition & 1 deletion config/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ bases:
#- webhook # Disable this if you're not using the webhook functionality.
- default
images:
- name: packet-controller # images with this name
- name: docker.io/packethost/cluster-api-provider-packet:e2e # images with this name
newTag: v0.3.5 # {"type":"string","x-kustomize":{"setter":{"name":"image-tag","value":"v0.3.5"}}}
newName: docker.io/packethost/cluster-api-provider-packet # and this name
2 changes: 1 addition & 1 deletion config/manager/manager_image_patch.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ spec:
spec:
containers:
# Change the value of image field below to your controller image URL
- image: packethost/cluster-api-provider-packet
- image: docker.io/packethost/cluster-api-provider-packet:e2e
name: manager
9 changes: 2 additions & 7 deletions test/e2e/config/packet-dev.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
# - cluster-api
# - bootstrap kubeadm
# - control-plane kubeadm
# - packet

images:
- name: "packethost/cluster-api-packet-controller"
- name: "docker.io/packethost/cluster-api-provider-packet:e2e"
loadBehavior: mustLoad

providers:

- name: cluster-api
type: CoreProvider
versions:
Expand Down Expand Up @@ -51,11 +51,6 @@ providers:
versions:
- name: v0.3.0
value: "../../../config"
replacements:
- old: "imagePullPolicy: Always"
new: "imagePullPolicy: IfNotPresent"
- old: "--enable-leader-election"
new: "--enable-leader-election=false"
files:
- sourcePath: "../../../metadata.yaml"
targetName: "metadata.yaml"
Expand Down

0 comments on commit 961fccb

Please sign in to comment.