Skip to content

Commit

Permalink
restructure e2e test resources to be more dry
Browse files Browse the repository at this point in the history
  • Loading branch information
amold1 committed May 1, 2024
1 parent 009cf87 commit 1de01e5
Show file tree
Hide file tree
Showing 23 changed files with 88 additions and 300 deletions.

This file was deleted.

133 changes: 0 additions & 133 deletions e2e/capl-cluster-flavors/default-CAPL-cluster/chainsaw-test.yaml

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,15 @@ spec:
- name: Create Cluster resource
try:
- apply:
file: create-cluster.yaml
file: ../../test-resources/cluster.yaml
catch:
- describe:
apiVersion: cluster.x-k8s.io/v1beta1
kind: Cluster
- name: Create LinodeCluster resource
try:
- apply:
file: create-linodecluster.yaml
file: ../../test-resources/linodecluster.yaml
- assert:
file: assert-linodecluster.yaml
catch:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,15 @@ spec:
- name: Create Cluster resource
try:
- apply:
file: create-cluster.yaml
file: ../../test-resources/cluster.yaml
catch:
- describe:
apiVersion: cluster.x-k8s.io/v1beta1
kind: Cluster
- name: Create LinodeMachine resource
try:
- apply:
file: create-linodemachine.yaml
file: ../../test-resources/linodemachine.yaml
- assert:
file: assert-linodemachine.yaml
catch:
Expand Down

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ spec:
- name: Create Cluster and LinodeVPC resources
try:
- apply:
file: create-cluster-vpc.yaml
file: ../../test-resources/vpc.yaml
- assert:
file: assert-vpc.yaml
catch:
Expand All @@ -46,7 +46,7 @@ spec:
- name: Create LinodeMachine resource
try:
- apply:
file: create-linodemachine.yaml
file: ../../test-resources/linodemachine.yaml
- assert:
file: assert-linodemachine.yaml
catch:
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ spec:
- name: Create LinodeObjectStorageBucket
try:
- apply:
file: create-linodeobjectstoragebucket.yaml
file: ../../test-resources/linodeobjectstoragebucket.yaml
- assert:
file: assert-obj-and-secret.yaml
catch:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ spec:
- name: Create LinodeVPC
try:
- apply:
file: create-vpc.yaml
file: ../../test-resources/vpc.yaml
- assert:
file: assert-vpc.yaml
catch:
Expand Down
15 changes: 15 additions & 0 deletions e2e/test-resources/assert-capi-capl-resources.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
apiVersion: apps/v1
kind: Deployment
metadata:
name: capi-controller-manager
namespace: capi-system
status:
availableReplicas: 1
---
apiVersion: apps/v1
kind: Deployment
metadata:
name: capl-controller-manager
namespace: capl-system
status:
availableReplicas: 1
5 changes: 5 additions & 0 deletions e2e/test-resources/assert-linodemachine.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha1
kind: LinodeMachine
metadata:
labels:
cluster.x-k8s.io/cluster-name: ($cluster)
4 changes: 4 additions & 0 deletions e2e/test-resources/assert-linodevpc.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha1
kind: LinodeVPC
metadata:
name: ($cluster)
File renamed without changes.
14 changes: 14 additions & 0 deletions e2e/test-resources/helmreleaseproxy.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
apiVersion: addons.cluster.x-k8s.io/v1alpha1
kind: HelmReleaseProxy
metadata:
labels:
cluster.x-k8s.io/cluster-name: ($cluster)
status:
conditions:
- type: Ready
status: "True"
- type: ClusterAvailable
status: "True"
- type: HelmReleaseReady
status: "True"
status: deployed
Loading

0 comments on commit 1de01e5

Please sign in to comment.