Skip to content

Commit 691a791

Browse files
jweite-amazonjweite-amazon
authored
Merge pull request #165 from jweite-amazon/e2e-toxiproxy
E2e toxiproxy
2 parents d6f485f + d66275e commit 691a791

26 files changed

+910
-38
lines changed

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ test/e2e/data/infrastructure-cloudstack/v1beta*/*yaml
4040

4141
# ACS Credentials file.
4242
cloud-config
43+
cloud-config.yaml
4344

4445
# Editor and IDE paraphernalia
4546
.idea

‎Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ tilt-up: cluster-api kind-cluster cluster-api/tilt-settings.json manifests ## Se
236236

237237
.PHONY: kind-cluster
238238
kind-cluster: cluster-api ## Create a kind cluster with a local Docker repository.
239-
-./cluster-api/hack/kind-install-for-capd.sh
239+
./cluster-api/hack/kind-install-for-capd.sh
240240

241241
cluster-api: ## Clone cluster-api repository for tilt use.
242242
git clone --branch v1.0.0 --depth 1 https://github.com/kubernetes-sigs/cluster-api.git
@@ -271,7 +271,7 @@ JOB ?= .*
271271
run-e2e: e2e-essentials ## Run e2e testing. JOB is an optional REGEXP to select certainn test cases to run. e.g. JOB=PR-Blocking, JOB=Conformance
272272
$(KUBECTL) apply -f cloud-config.yaml && \
273273
cd test/e2e && \
274-
$(REPO_ROOT)/$(GINKGO_V1) -v -trace -tags=e2e -focus=$(JOB) -skip=Conformance -nodes=1 -noColor=false ./... -- \
274+
$(REPO_ROOT)/$(GINKGO_V1) -v -trace -tags=e2e -focus=$(JOB) -skip=Conformance -skipPackage=helpers -nodes=1 -noColor=false ./... -- \
275275
-e2e.artifacts-folder=${REPO_ROOT}/_artifacts \
276276
-e2e.config=${REPO_ROOT}/test/e2e/config/cloudstack.yaml \
277277
-e2e.skip-resource-cleanup=false -e2e.use-existing-cluster=true

‎config/crd/bases/infrastructure.cluster.x-k8s.io_cloudstackaffinitygroups.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1-
21
---
32
apiVersion: apiextensions.k8s.io/v1
43
kind: CustomResourceDefinition
54
metadata:
65
annotations:
7-
controller-gen.kubebuilder.io/version: v0.4.1
6+
controller-gen.kubebuilder.io/version: v0.8.0
87
creationTimestamp: null
98
name: cloudstackaffinitygroups.infrastructure.cluster.x-k8s.io
109
spec:

‎config/crd/bases/infrastructure.cluster.x-k8s.io_cloudstackclusters.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1-
21
---
32
apiVersion: apiextensions.k8s.io/v1
43
kind: CustomResourceDefinition
54
metadata:
65
annotations:
7-
controller-gen.kubebuilder.io/version: v0.4.1
6+
controller-gen.kubebuilder.io/version: v0.8.0
87
creationTimestamp: null
98
name: cloudstackclusters.infrastructure.cluster.x-k8s.io
109
spec:

‎config/crd/bases/infrastructure.cluster.x-k8s.io_cloudstackfailuredomains.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1-
21
---
32
apiVersion: apiextensions.k8s.io/v1
43
kind: CustomResourceDefinition
54
metadata:
65
annotations:
7-
controller-gen.kubebuilder.io/version: v0.4.1
6+
controller-gen.kubebuilder.io/version: v0.8.0
87
creationTimestamp: null
98
name: cloudstackfailuredomains.infrastructure.cluster.x-k8s.io
109
spec:

‎config/crd/bases/infrastructure.cluster.x-k8s.io_cloudstackisolatednetworks.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1-
21
---
32
apiVersion: apiextensions.k8s.io/v1
43
kind: CustomResourceDefinition
54
metadata:
65
annotations:
7-
controller-gen.kubebuilder.io/version: v0.4.1
6+
controller-gen.kubebuilder.io/version: v0.8.0
87
creationTimestamp: null
98
name: cloudstackisolatednetworks.infrastructure.cluster.x-k8s.io
109
spec:

‎config/crd/bases/infrastructure.cluster.x-k8s.io_cloudstackmachines.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1-
21
---
32
apiVersion: apiextensions.k8s.io/v1
43
kind: CustomResourceDefinition
54
metadata:
65
annotations:
7-
controller-gen.kubebuilder.io/version: v0.4.1
6+
controller-gen.kubebuilder.io/version: v0.8.0
87
creationTimestamp: null
98
name: cloudstackmachines.infrastructure.cluster.x-k8s.io
109
spec:

‎config/crd/bases/infrastructure.cluster.x-k8s.io_cloudstackmachinestatecheckers.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1-
21
---
32
apiVersion: apiextensions.k8s.io/v1
43
kind: CustomResourceDefinition
54
metadata:
65
annotations:
7-
controller-gen.kubebuilder.io/version: v0.4.1
6+
controller-gen.kubebuilder.io/version: v0.8.0
87
creationTimestamp: null
98
name: cloudstackmachinestatecheckers.infrastructure.cluster.x-k8s.io
109
spec:

‎config/crd/bases/infrastructure.cluster.x-k8s.io_cloudstackmachinetemplates.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1-
21
---
32
apiVersion: apiextensions.k8s.io/v1
43
kind: CustomResourceDefinition
54
metadata:
65
annotations:
7-
controller-gen.kubebuilder.io/version: v0.4.1
6+
controller-gen.kubebuilder.io/version: v0.8.0
87
creationTimestamp: null
98
name: cloudstackmachinetemplates.infrastructure.cluster.x-k8s.io
109
spec:

‎config/crd/bases/infrastructure.cluster.x-k8s.io_cloudstackzones.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1-
21
---
32
apiVersion: apiextensions.k8s.io/v1
43
kind: CustomResourceDefinition
54
metadata:
65
annotations:
7-
controller-gen.kubebuilder.io/version: v0.4.1
6+
controller-gen.kubebuilder.io/version: v0.8.0
87
creationTimestamp: null
98
name: cloudstackzones.infrastructure.cluster.x-k8s.io
109
spec:

0 commit comments

Comments
 (0)