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.

Sign up for GitHub

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

Jump to bottom

Fix AzureDisk Helm chart install for Windows #2880

Merged
merged 1 commit into from
Dec 1, 2022
Merged

Fix AzureDisk Helm chart install for Windows #2880

merged 1 commit into from
Dec 1, 2022

Conversation

CecileRobertMichon
Copy link
Contributor

@CecileRobertMichon CecileRobertMichon commented Nov 30, 2022 •
edited
Loading

What type of PR is this?
/kind failing-test

What this PR does / why we need it: Following #2495 merging, some of the SIG Windows jobs starting failing. This is because we are now installing AzureDisk CSI driver on every conformance test cluster. In order to make it work with all clusters, including the ones with Windows nodes we made the following changes:

  • set windows.useHostProcessContainers to true : this ensures with use HostProcess for the AzureDisk windows pods
  • set controller.replicas=1: this is to make sure we only run 1 replica of the azuredisk controller because some of our test clusters only have 1 Linux node available
  • set controller.runOnControlPlane=true: to make sure we always run the controller pod on a control plane node

This also changes the namespace where the AzureDisk CSI driver is installed to kube-system instead of default (because that is what the examples in https://github.com/kubernetes-sigs/azuredisk-csi-driver/tree/master/charts#azure-disk-csi-driver-v1 use)
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 #

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

@k8s-ci-robot k8s-ci-robot added do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Nov 30, 2022
@CecileRobertMichon
Copy link
Contributor Author

/test ls

@k8s-ci-robot k8s-ci-robot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Nov 30, 2022
@k8s-ci-robot
Copy link
Contributor

@CecileRobertMichon: The specified target(s) for /test were not found.
The following commands are available to trigger required jobs:

  • /test pull-cluster-api-provider-azure-build
  • /test pull-cluster-api-provider-azure-ci-entrypoint
  • /test pull-cluster-api-provider-azure-e2e
  • /test pull-cluster-api-provider-azure-test
  • /test pull-cluster-api-provider-azure-verify

The following commands are available to trigger optional jobs:

  • /test pull-cluster-api-provider-azure-apidiff
  • /test pull-cluster-api-provider-azure-apiversion-upgrade
  • /test pull-cluster-api-provider-azure-capi-e2e
  • /test pull-cluster-api-provider-azure-conformance
  • /test pull-cluster-api-provider-azure-conformance-with-ci-artifacts
  • /test pull-cluster-api-provider-azure-e2e-csi-migration
  • /test pull-cluster-api-provider-azure-e2e-exp
  • /test pull-cluster-api-provider-azure-e2e-optional
  • /test pull-cluster-api-provider-azure-e2e-workload-upgrade
  • /test pull-cluster-api-provider-azure-windows-containerd-upstream-with-ci-artifacts
  • /test pull-cluster-api-provider-azure-windows-containerd-upstream-with-ci-artifacts-serial-slow

Use /test all to run the following jobs that were automatically triggered:

  • pull-cluster-api-provider-azure-apidiff
  • pull-cluster-api-provider-azure-build
  • pull-cluster-api-provider-azure-ci-entrypoint
  • pull-cluster-api-provider-azure-e2e
  • pull-cluster-api-provider-azure-test
  • pull-cluster-api-provider-azure-verify

In response to this:

/test ls

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
Copy link
Contributor Author

/test pull-cluster-api-provider-azure-windows-containerd-upstream-with-ci-artifacts

@k8s-ci-robot k8s-ci-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Nov 30, 2022
@CecileRobertMichon
Copy link
Contributor Author

/test pull-cluster-api-provider-azure-windows-containerd-upstream-with-ci-artifacts

@k8s-ci-robot k8s-ci-robot added size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Nov 30, 2022
@CecileRobertMichon
Copy link
Contributor Author

/test pull-cluster-api-provider-azure-windows-containerd-upstream-with-ci-artifacts

@CecileRobertMichon
Copy link
Contributor Author

/test pull-cluster-api-provider-azure-windows-containerd-upstream-with-ci-artifacts

2 similar comments
@CecileRobertMichon
Copy link
Contributor Author

/test pull-cluster-api-provider-azure-windows-containerd-upstream-with-ci-artifacts

@CecileRobertMichon
Copy link
Contributor Author

/test pull-cluster-api-provider-azure-windows-containerd-upstream-with-ci-artifacts

@CecileRobertMichon CecileRobertMichon changed the title [DO NOT MERGE] test broken windows job Fix AzureDisk Helm chart install for Windows Dec 1, 2022
@k8s-ci-robot k8s-ci-robot added release-note-none Denotes a PR that doesn't merit a release note. and removed do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. labels Dec 1, 2022
@CecileRobertMichon
Copy link
Contributor Author

/test pull-cluster-api-provider-azure-windows-containerd-upstream-with-ci-artifacts
/hold for test result above
/assign @marosset @jackfrancis

@k8s-ci-robot k8s-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Dec 1, 2022
@jackfrancis
Copy link
Contributor

/lgtm
/approve

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Dec 1, 2022
@jackfrancis
Copy link
Contributor

/hold cancel

@k8s-ci-robot
Copy link
Contributor

[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:

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

@k8s-ci-robot k8s-ci-robot added approved Indicates a PR has been approved by an approver from all required OWNERS files. and removed do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. labels Dec 1, 2022
@jackfrancis
Copy link
Contributor

/cherry-pick release-1.6

@k8s-infra-cherrypick-robot
Copy link

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

In response to this:

/cherry-pick release-1.6

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-ci-robot k8s-ci-robot merged commit 4597d38 into kubernetes-sigs:main Dec 1, 2022
@k8s-ci-robot k8s-ci-robot added this to the v1.7 milestone Dec 1, 2022
@k8s-infra-cherrypick-robot
Copy link

@jackfrancis: #2880 failed to apply on top of branch "release-1.6":

Applying: Fix AzureDisk Helm values to work with Windows
Using index info to reconstruct a base tree...
M	test/e2e/cloud-provider-azure.go
Falling back to patching base and 3-way merge...
Auto-merging test/e2e/cloud-provider-azure.go
CONFLICT (content): Merge conflict in test/e2e/cloud-provider-azure.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Fix AzureDisk Helm values to work with Windows
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.6

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
Copy link
Contributor

Oh nevermind we don't need to cherry-pick this (and the huge PR that must come before it) into release-1.6 because the conformance implementation in that branch will still allow sig-windows tests to pass using the prior (no csi stuff) testing scenario.

cc @CecileRobertMichon @marosset

@CecileRobertMichon
Copy link
Contributor Author

Yeah we definitely don't want to cherry-pick the Calico PR so let's not cherry-pick this either

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@alexeldeib alexeldeib Awaiting requested review from alexeldeib

@jackfrancis jackfrancis Awaiting requested review from jackfrancis

Assignees

@jackfrancis jackfrancis

@marosset marosset

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. release-note-none Denotes a PR that doesn't merit a release note. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Milestone
v1.7
Development

Successfully merging this pull request may close these issues.
5 participants
@CecileRobertMichon @k8s-ci-robot @jackfrancis @k8s-infra-cherrypick-robot @marosset