⚠️ use kustomize for generating e2e templates #3651

fabriziopandini · 2020-09-16T12:19:24Z

What this PR does / why we need it:
This PR introduces the usage of Kustomize for generating templates for E2E tests.

Additionally

MHC-remediation has a new dedicated template
all the other templates are without the MachineHealthCheck object so there is no more the risk that remediations kick in the middle of another test

Also, in order to simplify things, this PR drops the distinction between CI and DEV test config

Which issue(s) this PR fixes:
Fixes #3461

Release Note:
If you are using Cluster-API e2e tests:

for the e2e kcp-adoption test you show now use different labels in your template; use kcp-adoption.step1 instead of initial and kcp-adoption.step2 instead of kcp
for the e2e mhc test; the template for this test should now be called cluster-template-mhc.yaml instead of mhc

fabriziopandini · 2020-09-16T12:24:35Z

scripts/ci-e2e.sh

@@ -31,7 +31,7 @@ source "${REPO_ROOT}/hack/ensure-kustomize.sh"
 # Configure provider images generation;
 # please ensure the generated image name matches image names used in the E2E_CONF_FILE
 export REGISTRY=gcr.io/k8s-staging-cluster-api
-export TAG=ci
+export TAG=dev


from @vincepri #3639 (comment)

Why change the tag for the CI?

In order to simplify things, we are now going to maintain a single E2E configuration, instead of maintaining one for CI and one for DEV.
Using TAG=dev also in CI is the simplest option because it is the one used by default by all the make docker-build targets

fabriziopandini · 2020-09-16T12:28:16Z

test/e2e/Makefile

@@ -28,7 +28,7 @@ export GOPROXY
 REPO_ROOT := $(shell git rev-parse --show-toplevel)

 help:  ## Display this help
-	@awk 'BEGIN {FS = ":.*##"; printf "\nUsage:\n  make \033[36m<target>\033[0m\n"} /^[a-zA-Z_-]+:.*?##/ { printf "  \033[36m%-15s\033[0m %s\n", $$1, $$2 } /^##@/ { printf "\n\033[1m%s\033[0m\n", substr($$0, 5) } ' $(MAKEFILE_LIST)
+	@awk 'BEGIN {FS = ":.*##"; printf "\nUsage:\n  make \033[36m<target>\033[0m\n"} /^[a-zA-Z_-]+:.*?##/ { printf "  \033[36m%-25s\033[0m %s\n", $$1, $$2 } /^##@/ { printf "\n\033[1m%s\033[0m\n", substr($$0, 5) } ' $(MAKEFILE_LIST)


from @vincepri #3639 (comment)

Was this change intentional? What does it do?

Yes, it simply increases the spaces between the make target and the description in the help so the output is nicer now that there is a new cluster-templates target that is longer than the 15spaces used before

fabriziopandini · 2020-09-16T12:32:36Z

test/e2e/config/docker.yaml

@@ -5,17 +5,17 @@
 # - control-plane kubeadm
 # - docker

-# For creating local dev images run ./scripts/ci-e2e.sh
+# For creating local dev images run make docker-build-e2e from the main CAPI repository


from @sedefsavas #3639 (comment)

I think we can keep run ./scripts/ci-e2e.sh here, because running make docker-build-e2e will not create images with the tag dev this file is using.

Uhmm, the default in the make file is TAG=dev

cluster-api/Makefile

Line 88 in 19e40cd

TAG ?= dev

cluster-api/test/infrastructure/docker/Makefile

Line 50 in 19e40cd

TAG ?= dev

LOL, I've done the same in #3593 after much yak shaving.

fabriziopandini · 2020-09-16T12:36:25Z

test/e2e/data/infrastructure-docker/cluster-template/kustomization.yaml

@@ -0,0 +1,5 @@
+bases:


from @sedefsavas #3639 (comment)

nit. We can generate cluster-template.yaml on the fly and use that as a base to avoid extra changes we will need to do here when apis change.

I'm not sure to fully understand your suggestion...

Similar to how CAPV is doing:

https://github.com/kubernetes-sigs/cluster-api-provider-vsphere/blob/de70ff05039df7ab15a4ba11a3f559f4e92f9df7/Makefile#L120

Generate cluster-temlate.yaml and then use that as base, then generate e2e specific templates using Kustomize.

test/e2e/Makefile

fabriziopandini · 2020-09-16T12:44:18Z

test/e2e/data/infrastructure-docker/cluster-template-kcp-adoption.yaml

-###
-apiVersion: infrastructure.cluster.x-k8s.io/v1alpha3
-kind: DockerCluster
+apiVersion: v1


I would like to gitignore the generated cluster-templates and keep under source control only the bases, but it seems that this makes the apidiff batch to fail 🤔
@vincepri suggestions?

If you get apidiff to run before generating cluster templates, should be ok?

Yes this, if we're making changes to the files and causing a dirty git tree, we should do that after running apidiff

fabriziopandini · 2020-09-16T12:50:45Z

/area testing
/milestone v0.3.10

fabriziopandini · 2020-09-16T13:44:28Z

/test pull-cluster-api-e2e-full

test/e2e/Makefile

randomvariable · 2020-09-16T15:38:28Z

/lgtm

Need an override on test.

vincepri · 2020-09-16T15:39:36Z

/test pull-cluster-api-test
/approve

k8s-ci-robot · 2020-09-16T15:39:47Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: vincepri

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:

~~OWNERS~~ [vincepri]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

Co-authored-by: Naadir Jeewa <naadir@randomvariable.co.uk>

test/e2e/data/infrastructure-docker/bases/mhc.yaml

randomvariable · 2020-09-16T16:12:36Z

/lgtm

k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Sep 16, 2020

k8s-ci-robot requested review from benmoss and ncdc September 16, 2020 12:19

k8s-ci-robot added the size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. label Sep 16, 2020

fabriziopandini commented Sep 16, 2020

View reviewed changes

fabriziopandini mentioned this pull request Sep 16, 2020

🌱 Fix self-hosted flakes in E2E tests #3639

Merged

fabriziopandini commented Sep 16, 2020

View reviewed changes

test/e2e/Makefile Show resolved Hide resolved

fabriziopandini commented Sep 16, 2020

View reviewed changes

k8s-ci-robot added this to the v0.3.10 milestone Sep 16, 2020

k8s-ci-robot added the area/testing Issues or PRs related to testing label Sep 16, 2020

use kustomize for e2e templates

40011b9

fabriziopandini force-pushed the use-kustomize-for-e2e-templates branch from 8cdceba to 40011b9 Compare September 16, 2020 13:19

randomvariable reviewed Sep 16, 2020

View reviewed changes

test/e2e/Makefile Outdated Show resolved Hide resolved

k8s-ci-robot assigned randomvariable Sep 16, 2020

k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Sep 16, 2020

k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Sep 16, 2020

Add 0-9 to make help to allow *-e2e to show up

7d4dde8

Co-authored-by: Naadir Jeewa <naadir@randomvariable.co.uk>

k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Sep 16, 2020

vincepri reviewed Sep 16, 2020

View reviewed changes

test/e2e/data/infrastructure-docker/bases/mhc.yaml Show resolved Hide resolved

k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Sep 16, 2020

k8s-ci-robot merged commit b79d3ec into kubernetes-sigs:master Sep 16, 2020

fabriziopandini deleted the use-kustomize-for-e2e-templates branch September 17, 2020 09:50

This was referenced Sep 17, 2020

Improve MHC e2e tests #3656

Closed

🌱 Remove e2e templates from the code base #3657

Merged

⚠️ add docker machine pool and e2e tests for machine pool #3506

Merged

nader-ziada mentioned this pull request Sep 23, 2020

🌱 bump capi to v0.3.10 kubernetes-sigs/cluster-api-provider-azure#954

Merged

3 tasks

fabriziopandini changed the title ~~🌱 use kustomize for generating e2e templates~~ ⚠️ use kustomize for generating e2e templates Sep 24, 2020

sedefsavas mentioned this pull request Dec 1, 2020

[e2e] Use kustomize for generating template flavors for different tests kubernetes-sigs/cluster-api-provider-aws#2134

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

⚠️ use kustomize for generating e2e templates #3651

⚠️ use kustomize for generating e2e templates #3651

fabriziopandini commented Sep 16, 2020 •

edited

Loading

fabriziopandini Sep 16, 2020

fabriziopandini Sep 16, 2020

fabriziopandini Sep 16, 2020

randomvariable Sep 16, 2020

fabriziopandini Sep 16, 2020

sedefsavas Sep 16, 2020

fabriziopandini Sep 16, 2020

randomvariable Sep 16, 2020

vincepri Sep 16, 2020

fabriziopandini commented Sep 16, 2020

fabriziopandini commented Sep 16, 2020

randomvariable commented Sep 16, 2020

vincepri commented Sep 16, 2020

k8s-ci-robot commented Sep 16, 2020

randomvariable commented Sep 16, 2020

⚠️ use kustomize for generating e2e templates #3651

⚠️ use kustomize for generating e2e templates #3651

Conversation

fabriziopandini commented Sep 16, 2020 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

fabriziopandini commented Sep 16, 2020

fabriziopandini commented Sep 16, 2020

randomvariable commented Sep 16, 2020

vincepri commented Sep 16, 2020

k8s-ci-robot commented Sep 16, 2020

randomvariable commented Sep 16, 2020

fabriziopandini commented Sep 16, 2020 •

edited

Loading