Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CAPZ Win FV fixes #9150

Merged
merged 8 commits into from
Aug 29, 2024
Merged

Conversation

coutinhop
Copy link
Contributor

Add timeout and retry to command that waits for CAPZ deployments.

Move process/testing/winfv to process/testing/winfv-felix and adjust scripts accordingly.

Add RELEASE_STREAM=local option to use local manifests and make CI runs use it.

Description

Related issues/PRs

Todos

  • Tests
  • Documentation
  • Release note

Release Note

TBD

Reminder for the reviewer

Make sure that this PR has the correct labels and milestone set.

Every PR needs one docs-* label.

  • docs-pr-required: This change requires a change to the documentation that has not been completed yet.
  • docs-completed: This change has all necessary documentation completed.
  • docs-not-required: This change has no user-facing impact and requires no docs.

Every PR needs one release-note-* label.

  • release-note-required: This PR has user-facing changes. Most PRs should have this label.
  • release-note-not-required: This PR has no user-facing changes.

Other optional labels:

  • cherry-pick-candidate: This PR should be cherry-picked to an earlier release. For bug fixes only.
  • needs-operator-pr: This PR is related to install and requires a corresponding change to the operator.

@coutinhop coutinhop added docs-not-required Docs not required for this change release-note-not-required Change has no user-facing impact labels Aug 21, 2024
@coutinhop coutinhop self-assigned this Aug 21, 2024
@coutinhop coutinhop requested a review from a team as a code owner August 21, 2024 01:15
@marvin-tigera marvin-tigera added this to the Calico v3.29.0 milestone Aug 21, 2024
Add timeout and retry to command that waits for CAPZ deployments.

Move process/testing/winfv to process/testing/winfv-felix and adjust scripts accordingly.

Add RELEASE_STREAM=local option to use local manifests and make CI runs use it.
metadata.mk Show resolved Hide resolved
…clusters).

Update resource group and managed identity required for CAPZ machinepool-windows template.

General updates to CAPZ Win FV scripts.
metadata.mk Outdated
KINDEST_NODE_VERSION=v1.29.7
KIND_VERSION=v0.22.0
KINDEST_NODE_VERSION=v1.29.2
KINDEST_NODE_VERSION_CAPZ=v1.28.9
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm thinking of disassociating the kind version used in capz from the general kind version in metadata.mk,

Agree. I feel we should keep all capz configurations to process/testing/winfv-felix/capz/ directory. It would be easier to maintain.

@@ -17,13 +20,14 @@ export AZURE_NODE_MACHINE_TYPE="${AZURE_NODE_MACHINE_TYPE:="Standard_D2s_v3"}"
SCRIPT_CURRENT_DIR="$( cd -- "$(dirname "$0")" >/dev/null 2>&1 && pwd -P )"
METADATAMK=${SCRIPT_CURRENT_DIR}/../../../../metadata.mk
if [ -f "${METADATAMK}" ]; then
export KUBE_VERSION=$(grep KINDEST_NODE_VERSION= ${METADATAMK} | cut -d "=" -f 2)
export KUBE_VERSION=$(grep KINDEST_NODE_VERSION_CAPZ= ${METADATAMK} | cut -d "=" -f 2)
export KIND_VERSION=$(grep KIND_VERSION= ${METADATAMK} | cut -d "=" -f 2)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As I commented above, I think we should remove this section of the code where kind_version is derived from metadata.mk.

Copy link
Member

@song-jiang song-jiang left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@coutinhop coutinhop merged commit 025e960 into projectcalico:master Aug 29, 2024
3 checks passed
@coutinhop coutinhop deleted the pedro-winfv-capz-1 branch August 29, 2024 21:50
coutinhop added a commit to coutinhop/calico that referenced this pull request Sep 17, 2024
* CAPZ Win FV fixes

Add timeout and retry to command that waits for CAPZ deployments.

Move process/testing/winfv to process/testing/winfv-felix and adjust scripts accordingly.

Add RELEASE_STREAM=local option to use local manifests and make CI runs use it.

* Fix package versions and fix azure identity authentication

* Set required env vars for machinepool-windows template

* Set k8s kindest/node version to v1.28.9 (v1.29 currently breaks CAPZ clusters).

Update resource group and managed identity required for CAPZ machinepool-windows template.

General updates to CAPZ Win FV scripts.

* Fix incorrect PRODUCT in setup-fv-capz.sh

* Use specific kind and kindest/node versions in CAPZ instead of metadata.mk
coutinhop added a commit that referenced this pull request Sep 18, 2024
* Update k8s to v1.28.14

* Update kubectl download URL

* Use ASO as windows cni-plugin fv infrastructure (#8863)

* Fix windows cni-plugin fv to use correct apiserver port number (#8955)

* CAPZ Win FV fixes (#9150)

* CAPZ Win FV fixes

Add timeout and retry to command that waits for CAPZ deployments.

Move process/testing/winfv to process/testing/winfv-felix and adjust scripts accordingly.

Add RELEASE_STREAM=local option to use local manifests and make CI runs use it.

* Fix package versions and fix azure identity authentication

* Set required env vars for machinepool-windows template

* Set k8s kindest/node version to v1.28.9 (v1.29 currently breaks CAPZ clusters).

Update resource group and managed identity required for CAPZ machinepool-windows template.

General updates to CAPZ Win FV scripts.

* Fix incorrect PRODUCT in setup-fv-capz.sh

* Use specific kind and kindest/node versions in CAPZ instead of metadata.mk

* Merge pull request #9065 from coutinhop/pedro-CORE-10548

[CORE-10548] Revert windows endpoint mgr logic change

* Use v3.28 release stream for felix win fvs

---------

Co-authored-by: Song Jiang <[email protected]>
Co-authored-by: marvin-tigera <[email protected]>
@coutinhop coutinhop mentioned this pull request Sep 18, 2024
3 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
docs-not-required Docs not required for this change release-note-not-required Change has no user-facing impact
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants