include IPAMConfig CRD w/ ClusterResourceSets

[jackfrancis]

What type of PR is this?

/kind bug

What this PR does / why we need it:

This PR adds the crd.projectcalico.org definition for IPAMConfig to the ClusterResourceSet definitions we include for test templates that require them (test templates with Windows node pools).

We already include via a ClusterResourceSet resource a kind: IPAMConfig resource in order to fulfill the required calico configuration strictAffinity: true. Not including the reference CRD resource has the effect of forcing the CAPI controller-manager runtime to continually retry the application of the ClusterResourceSet payload of kind: IPAMConfig, and may have the side-effect of disrupting the strictAffinity: true configuration during helm installation of calico.

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
Fixes #3227

Special notes for your reviewer:

Please confirm that if this PR changes any image versions, then that's the sole change this PR makes.

TODOs:

• squashed commits
• includes documentation
• adds unit tests

Release note:

NONE

[jackfrancis]

/test pull-cluster-api-provider-azure-e2e
/test pull-cluster-api-provider-azure-e2e-optional

[jackfrancis]

/retest
/test pull-cluster-api-provider-azure-e2e
/test pull-cluster-api-provider-azure-e2e-optional

[jackfrancis]

/retest
/test pull-cluster-api-provider-azure-e2e

[k8s-ci-robot]

@jackfrancis: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name	Commit	Details	Required	Rerun command
pull-cluster-api-provider-azure-e2e-optional	39c5473	link	false	/test pull-cluster-api-provider-azure-e2e-optional

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

[jackfrancis]

/test pull-cluster-api-provider-azure-e2e

[jackfrancis]

/assign @CecileRobertMichon @marosset

This has now passed the VMSS test 4 times in a row (5th attempt in progress).

It has also never repro'd locally for me after a similar number of E2E runs. Let's get a few more runs documented in the PR to account for the fact that we don't fully understand why not shipping the CRD definition w/ the CRD resource causes unexpected data values later on, but from our statistical observations over the past week we seem to have crossed the boundary of any other possible explanation for VMSS E2E test success other than "this change is one of the possible changes that fixes #3227".

[marosset]

/lgtm

thanks @jackfrancis!

[k8s-ci-robot]

LGTM label has been added.

Git tree hash: e1885b85ec8b600e2827541e37b74b8b88d3be13

[jackfrancis]

/test pull-cluster-api-provider-azure-e2e

[jackfrancis]

I'm going to merge and then cherry-pick this into release-1.7 and release-1.8.

Here is an example of this failure in release-1.7:

• https://prow.k8s.io/view/gs/kubernetes-jenkins/logs/periodic-cluster-api-provider-azure-e2e-v1beta1-release-1-7/1633472207365607424

Here is an example of this failure in release-1.8:

• https://prow.k8s.io/view/gs/kubernetes-jenkins/logs/periodic-cluster-api-provider-azure-e2e-v1beta1-release-1-8/1636534251157458944

[jackfrancis]

/approve

[k8s-ci-robot]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jackfrancis

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 [jackfrancis]

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

[jackfrancis]

/cherry-pick release-1.7

[k8s-infra-cherrypick-robot]

@jackfrancis: once the present PR merges, I will cherry-pick it on top of release-1.7 in a new PR and assign it to you.

In response to this:

/cherry-pick release-1.7

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

[jackfrancis]

/cherry-pick release-1.8

[k8s-infra-cherrypick-robot]

@jackfrancis: once the present PR merges, I will cherry-pick it on top of release-1.8 in a new PR and assign it to you.

In response to this:

/cherry-pick release-1.8

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

[CecileRobertMichon]

great work investigating and root causing this one!

/lgtm

[CecileRobertMichon]

/retest

optional job failed with #3313

[k8s-infra-cherrypick-robot]

@jackfrancis: #3345 failed to apply on top of branch "release-1.7":

Applying: include IPAMConfig CRD w/ ClusterResourceSets
Using index info to reconstruct a base tree...
M	templates/addons/windows/calico/calico.yaml
M	templates/test/ci/cluster-template-prow-ci-version-windows-containerd-2022.yaml
M	templates/test/ci/cluster-template-prow-ci-version.yaml
A	templates/test/ci/cluster-template-prow-intree-cloud-provider-machine-pool.yaml
A	templates/test/ci/cluster-template-prow-intree-cloud-provider.yaml
M	templates/test/ci/cluster-template-prow-machine-pool-ci-version.yaml
A	templates/test/ci/cluster-template-prow-machine-pool-flex.yaml
M	templates/test/ci/cluster-template-prow-machine-pool.yaml
M	templates/test/ci/cluster-template-prow-topology.yaml
M	templates/test/ci/cluster-template-prow.yaml
M	templates/test/dev/cluster-template-custom-builds-machine-pool.yaml
M	templates/test/dev/cluster-template-custom-builds.yaml
Falling back to patching base and 3-way merge...
Auto-merging templates/test/dev/cluster-template-custom-builds.yaml
Auto-merging templates/test/dev/cluster-template-custom-builds-machine-pool.yaml
Auto-merging templates/test/ci/cluster-template-prow.yaml
Auto-merging templates/test/ci/cluster-template-prow-topology.yaml
Auto-merging templates/test/ci/cluster-template-prow-machine-pool.yaml
CONFLICT (modify/delete): templates/test/ci/cluster-template-prow-machine-pool-flex.yaml deleted in HEAD and modified in include IPAMConfig CRD w/ ClusterResourceSets. Version include IPAMConfig CRD w/ ClusterResourceSets of templates/test/ci/cluster-template-prow-machine-pool-flex.yaml left in tree.
Auto-merging templates/test/ci/cluster-template-prow-machine-pool-ci-version.yaml
CONFLICT (modify/delete): templates/test/ci/cluster-template-prow-intree-cloud-provider-machine-pool.yaml deleted in HEAD and modified in include IPAMConfig CRD w/ ClusterResourceSets. Version include IPAMConfig CRD w/ ClusterResourceSets of templates/test/ci/cluster-template-prow-intree-cloud-provider-machine-pool.yaml left in tree.
Auto-merging templates/test/ci/cluster-template-prow-external-cloud-provider-ci-version.yaml
Auto-merging templates/test/ci/cluster-template-prow-ci-version.yaml
Auto-merging templates/test/ci/cluster-template-prow-ci-version-windows-containerd-2022.yaml
Auto-merging templates/addons/windows/calico/calico.yaml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 include IPAMConfig CRD w/ ClusterResourceSets
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-1.7

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

[k8s-infra-cherrypick-robot]

@jackfrancis: new pull request created: #3348

In response to this:

/cherry-pick release-1.8

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.