🌱 test/e2e: cleanup test files #8557
Conversation
Signed-off-by: Stefan Büringer [email protected]
k8s-ci-robot
added
the
cncf-cla: yes
k8s-ci-robot
added
the
size/XL
|
/assign @killianmuldoon @joekr |
|
/test pull-cluster-api-e2e-full-main |
| @@ -13,9 +13,6 @@ hack/tools/bin | |||
| # E2E test templates | |||
| test/e2e/data/infrastructure-docker/**/cluster-template*.yaml | |||
|
|
|||
| # E2e test extension deployment | |||
| test/e2e/data/test-extension/deployment.yaml | |||
There was a problem hiding this comment.
This file wasn't used since we were installing the test extension via clusterctl
| @@ -488,11 +488,6 @@ generate-e2e-templates-v0.4: $(KUSTOMIZE) | |||
| generate-e2e-templates-v1.0: $(KUSTOMIZE) | |||
| $(KUSTOMIZE) build $(DOCKER_TEMPLATES)/v1.0/cluster-template --load-restrictor LoadRestrictionsNone > $(DOCKER_TEMPLATES)/v1.0/cluster-template.yaml | |||
|
|
|||
| .PHONY: generate-e2e-templates-v1.2 | |||
There was a problem hiding this comment.
We can drop all v1.2 targets/files when we change the clusterctl upgrade tests to not test v1.2=>main anymore
| @@ -920,8 +910,6 @@ release-manifests-dev: $(RELEASE_DIR) $(KUSTOMIZE) ## Build the development mani | |||
| cd $(CAPD_DIR); $(KUSTOMIZE) build config/default > ../../../$(RELEASE_DIR)/infrastructure-components-development.yaml | |||
| cp $(CAPD_DIR)/templates/* $(RELEASE_DIR)/ | |||
| cd $(TEST_EXTENSION_DIR); $(KUSTOMIZE) build config/default > ../../$(RELEASE_DIR)/runtime-extension-components-development.yaml | |||
| cp $(CAPD_DIR)/templates/* $(RELEASE_DIR)/ | |||
There was a problem hiding this comment.
This was duplicate with l.911
| @@ -18,9 +18,11 @@ spec: | |||
| controlPlane: | |||
| metadata: | |||
| labels: | |||
There was a problem hiding this comment.
These files should be created based on the files in main.
Basically the idea is to keep the files for old providers as close to main as we can.
We only should have differences if e.g. we can't set a field because it was only introduced in main.
I synced the v1.4 folder with the main folder and adjusted it accordingly.
|
/hold |
k8s-ci-robot
added
the
do-not-merge/hold
|
/test pull-cluster-api-e2e-workload-upgrade-1-27-latest-main |
|
cc @killianmuldoon when you have some time |
|
/hold cancel |
k8s-ci-robot
removed
the
do-not-merge/hold
k8s-ci-robot
added
the
lgtm
|
LGTM label has been added. Git tree hash: 44a21febbf2878c41f0fc754dbad0091e45851d1
|
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: killianmuldoon The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
k8s-ci-robot
added
the
approved
|
/area e2e-testing |
Signed-off-by: Stefan Büringer [email protected]
What this PR does / why we need it:
Follow-up to cleanup some leftovers from #8430
Which issue(s) this PR fixes (optional, in
fixes #<issue number>(, fixes #<issue_number>, ...)format, will close the issue(s) when PR gets merged):Part of #8429