Custom builds: fall back to curl with az login fails #5109

nawazkh · 2024-09-04T23:14:46Z

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

What this PR does / why we need it:

This PR enables custom build templates to use curl when az login fails.
This PR is based off of use az to download storage blobs for custom builds #4724

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:

cherry-pick candidate

TODOs:

squashed commits
includes documentation
adds unit tests

Release note:

Custom build templates to use curl when az login fails

k8s-ci-robot · 2024-09-04T23:14:48Z

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

codecov · 2024-09-04T23:21:00Z

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 51.35%. Comparing base (d8788d2) to head (d95876f).
Report is 8 commits behind head on main.

Additional details and impacted files

@@            Coverage Diff             @@
##             main    #5109      +/-   ##
==========================================
- Coverage   51.36%   51.35%   -0.01%     
==========================================
  Files         273      273              
  Lines       24676    24676              
==========================================
- Hits        12674    12672       -2     
- Misses      11212    11214       +2     
  Partials      790      790

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

nawazkh · 2024-09-13T19:50:40Z

Will squash after tests go green.

nawazkh · 2024-09-13T19:50:49Z

/test

k8s-ci-robot · 2024-09-13T19:50:53Z

@nawazkh: The /test command needs one or more targets.
The following commands are available to trigger required jobs:

/test pull-cluster-api-provider-azure-apiversion-upgrade
/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-e2e-aks
/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-capi-e2e
/test pull-cluster-api-provider-azure-conformance
/test pull-cluster-api-provider-azure-conformance-custom-builds
/test pull-cluster-api-provider-azure-conformance-dual-stack-with-ci-artifacts
/test pull-cluster-api-provider-azure-conformance-ipv6-with-ci-artifacts
/test pull-cluster-api-provider-azure-conformance-with-ci-artifacts
/test pull-cluster-api-provider-azure-e2e-optional
/test pull-cluster-api-provider-azure-e2e-workload-upgrade
/test pull-cluster-api-provider-azure-windows-custom-builds
/test pull-cluster-api-provider-azure-windows-with-ci-artifacts

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-conformance
pull-cluster-api-provider-azure-conformance-custom-builds
pull-cluster-api-provider-azure-conformance-dual-stack-with-ci-artifacts
pull-cluster-api-provider-azure-conformance-ipv6-with-ci-artifacts
pull-cluster-api-provider-azure-conformance-with-ci-artifacts
pull-cluster-api-provider-azure-e2e
pull-cluster-api-provider-azure-e2e-aks
pull-cluster-api-provider-azure-test
pull-cluster-api-provider-azure-verify
pull-cluster-api-provider-azure-windows-custom-builds
pull-cluster-api-provider-azure-windows-with-ci-artifacts

In response to this:

/test

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-sigs/prow repository.

nawazkh · 2024-09-13T19:51:03Z

/test all

nawazkh · 2024-09-13T22:49:29Z

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

templates/test/ci/prow-ci-version/patches/oot-credential-provider-kcp.yaml

nawazkh · 2024-09-19T17:24:40Z

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

nawazkh · 2024-10-02T16:48:54Z

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

nawazkh · 2024-10-03T16:36:38Z

/test pull-cluster-api-provider-azure-conformance-with-ci-artifacts

willie-yao

Looks good overall! Just 2 minor comments.

templates/test/ci/prow-ci-version/patches/oot-credential-provider-win.yaml

templates/test/dev/patches/control-plane-custom-builds.yaml

willie-yao · 2024-10-04T21:27:50Z

/retest

k8s-ci-robot · 2024-10-04T22:20:00Z

@nawazkh: 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-load-test-custom-builds	`d95876f`	link	false	`/test pull-cluster-api-provider-azure-load-test-custom-builds`

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-sigs/prow repository. I understand the commands that are listed here.

nawazkh · 2024-10-04T22:30:57Z

Are we still expecting pull-cluster-api-provider-azure-load-test-custom-builds to fail for these PRs, @Jont828 ?

jackfrancis

/lgtm
/approve

k8s-ci-robot · 2024-10-07T17:27:00Z

LGTM label has been added.

Git tree hash: 090d0d93be03cbc7d940122f445e817fdf1005a3

k8s-ci-robot · 2024-10-07T17:27:01Z

[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

nawazkh · 2024-10-11T17:36:19Z

/cherry-pick release-1.17

nawazkh · 2024-10-11T17:36:23Z

/cherry-pick release-1.16

k8s-infra-cherrypick-robot · 2024-10-11T17:37:02Z

@nawazkh: #5109 failed to apply on top of branch "release-1.16":

Applying: fall back to curl when az login --identity fails
.git/rebase-apply/patch:474: trailing whitespace.
    /var/lib/kubelet/credential-provider-config.yaml  
.git/rebase-apply/patch:529: trailing whitespace.
      
.git/rebase-apply/patch:555: trailing whitespace.
    /var/lib/kubelet/credential-provider-config.yaml  
.git/rebase-apply/patch:571: trailing whitespace.
        
.git/rebase-apply/patch:883: trailing whitespace.
      
warning: squelched 3 whitespace errors
warning: 8 lines add whitespace errors.
Using index info to reconstruct a base tree...
A	templates/test/ci/cluster-template-prow-ci-version-dra.yaml
M	templates/test/ci/cluster-template-prow-ci-version-dual-stack.yaml
M	templates/test/ci/cluster-template-prow-ci-version-ipv6.yaml
M	templates/test/ci/cluster-template-prow-ci-version.yaml
M	templates/test/ci/cluster-template-prow-machine-pool-ci-version.yaml
A	templates/test/dev/cluster-template-custom-builds-dra.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
CONFLICT (modify/delete): templates/test/dev/cluster-template-custom-builds-dra.yaml deleted in HEAD and modified in fall back to curl when az login --identity fails. Version fall back to curl when az login --identity fails of templates/test/dev/cluster-template-custom-builds-dra.yaml left in tree.
Auto-merging templates/test/ci/cluster-template-prow-machine-pool-ci-version.yaml
Auto-merging templates/test/ci/cluster-template-prow-ci-version.yaml
Auto-merging templates/test/ci/cluster-template-prow-ci-version-ipv6.yaml
Auto-merging templates/test/ci/cluster-template-prow-ci-version-dual-stack.yaml
CONFLICT (modify/delete): templates/test/ci/cluster-template-prow-ci-version-dra.yaml deleted in HEAD and modified in fall back to curl when az login --identity fails. Version fall back to curl when az login --identity fails of templates/test/ci/cluster-template-prow-ci-version-dra.yaml left in tree.
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 fall back to curl when az login --identity fails

In response to this:

/cherry-pick release-1.16

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-sigs/prow repository.

k8s-infra-cherrypick-robot · 2024-10-11T17:37:04Z

@nawazkh: new pull request created: #5173

In response to this:

/cherry-pick release-1.17

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-sigs/prow repository.

jackfrancis · 2024-10-11T18:24:13Z

@nawazkh I think you can skip cherry-picking to release-1.16

@jeremyrickard when this lands on release-1.17 branch you can use that branch to source a test run

k8s-ci-robot requested review from marosset and mboersma September 4, 2024 23:14

k8s-ci-robot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Sep 4, 2024

nawazkh mentioned this pull request Sep 5, 2024

swap curl for az storage blob download for credential provider #4961

Closed

4 tasks

nawazkh force-pushed the update_custom_builds branch from 006a243 to bafa6ab Compare September 5, 2024 17:09

nawazkh assigned nawazkh and unassigned nawazkh Sep 9, 2024

nawazkh force-pushed the update_custom_builds branch from 4dc7cf5 to 3fd1e00 Compare September 12, 2024 23:00

k8s-ci-robot added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Sep 12, 2024

nawazkh marked this pull request as ready for review September 13, 2024 19:50

k8s-ci-robot requested review from nojnhuh and willie-yao September 13, 2024 19:50

nawazkh changed the title ~~[WIP] Custom builds: fall back to curl with az login fails~~ Custom builds: fall back to curl with az login fails Sep 13, 2024

k8s-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Sep 13, 2024

jackfrancis reviewed Sep 16, 2024

View reviewed changes

templates/test/ci/prow-ci-version/patches/oot-credential-provider-kcp.yaml Outdated Show resolved Hide resolved

nawazkh force-pushed the update_custom_builds branch 2 times, most recently from d05b116 to cb2bbeb Compare September 19, 2024 17:00

nawazkh requested a review from jackfrancis September 19, 2024 17:24

nawazkh force-pushed the update_custom_builds branch from cb2bbeb to b4879bb Compare October 2, 2024 16:48

willie-yao reviewed Oct 4, 2024

View reviewed changes

templates/test/ci/prow-ci-version/patches/oot-credential-provider-win.yaml Show resolved Hide resolved

templates/test/dev/patches/control-plane-custom-builds.yaml Outdated Show resolved Hide resolved

fall back to curl when az login --identity fails

d95876f

nawazkh force-pushed the update_custom_builds branch from b4879bb to d95876f Compare October 4, 2024 20:07

jackfrancis approved these changes Oct 7, 2024

View reviewed changes

k8s-ci-robot assigned jackfrancis Oct 7, 2024

k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Oct 7, 2024

k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Oct 7, 2024

k8s-ci-robot merged commit 37e9e1f into kubernetes-sigs:main Oct 7, 2024
29 of 30 checks passed

k8s-ci-robot added this to the v1.18 milestone Oct 7, 2024

nawazkh deleted the update_custom_builds branch October 8, 2024 19:24

k8s-infra-cherrypick-robot mentioned this pull request Oct 11, 2024

[release-1.17] Custom builds: fall back to curl with az login fails #5173

Merged

jackfrancis mentioned this pull request Oct 31, 2024

add nawazkh to maintainers #5224

Merged

4 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Custom builds: fall back to curl with az login fails #5109

Custom builds: fall back to curl with az login fails #5109

nawazkh commented Sep 4, 2024 •

edited

Loading

k8s-ci-robot commented Sep 4, 2024

codecov bot commented Sep 4, 2024 •

edited

Loading

nawazkh commented Sep 13, 2024

nawazkh commented Sep 13, 2024

k8s-ci-robot commented Sep 13, 2024

nawazkh commented Sep 13, 2024

nawazkh commented Sep 13, 2024

nawazkh commented Sep 19, 2024

nawazkh commented Oct 2, 2024

nawazkh commented Oct 3, 2024

willie-yao left a comment

willie-yao commented Oct 4, 2024

k8s-ci-robot commented Oct 4, 2024

nawazkh commented Oct 4, 2024

jackfrancis left a comment

k8s-ci-robot commented Oct 7, 2024

k8s-ci-robot commented Oct 7, 2024

nawazkh commented Oct 11, 2024

nawazkh commented Oct 11, 2024

k8s-infra-cherrypick-robot commented Oct 11, 2024

k8s-infra-cherrypick-robot commented Oct 11, 2024

jackfrancis commented Oct 11, 2024

Custom builds: fall back to curl with az login fails #5109

Custom builds: fall back to curl with az login fails #5109

Conversation

nawazkh commented Sep 4, 2024 • edited Loading

k8s-ci-robot commented Sep 4, 2024

codecov bot commented Sep 4, 2024 • edited Loading

Codecov Report

nawazkh commented Sep 13, 2024

nawazkh commented Sep 13, 2024

k8s-ci-robot commented Sep 13, 2024

nawazkh commented Sep 13, 2024

nawazkh commented Sep 13, 2024

nawazkh commented Sep 19, 2024

nawazkh commented Oct 2, 2024

nawazkh commented Oct 3, 2024

willie-yao left a comment

Choose a reason for hiding this comment

willie-yao commented Oct 4, 2024

k8s-ci-robot commented Oct 4, 2024

nawazkh commented Oct 4, 2024

jackfrancis left a comment

Choose a reason for hiding this comment

k8s-ci-robot commented Oct 7, 2024

k8s-ci-robot commented Oct 7, 2024

nawazkh commented Oct 11, 2024

nawazkh commented Oct 11, 2024

k8s-infra-cherrypick-robot commented Oct 11, 2024

k8s-infra-cherrypick-robot commented Oct 11, 2024

jackfrancis commented Oct 11, 2024

nawazkh commented Sep 4, 2024 •

edited

Loading

codecov bot commented Sep 4, 2024 •

edited

Loading