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

Enable OOT credential provider for all CI templates #4169

Merged
merged 1 commit into from
Nov 3, 2023
Merged

Enable OOT credential provider for all CI templates #4169

merged 1 commit into from
Nov 3, 2023

Conversation

CecileRobertMichon
Copy link
Contributor

@CecileRobertMichon CecileRobertMichon commented Oct 24, 2023 •
edited
Loading

What type of PR is this?

What this PR does / why we need it:

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 #4110

Special notes for your reviewer:

  • cherry-pick candidate

TODOs:

  • squashed commits
  • includes documentation
  • adds unit tests

Release note:

NONE

@k8s-ci-robot k8s-ci-robot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. 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 Oct 24, 2023
@k8s-ci-robot k8s-ci-robot added the size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. label Oct 24, 2023
CecileRobertMichon
CecileRobertMichon commented Oct 24, 2023
View reviewed changes
templates/test/ci/prow-ci-version/patches/oot-credential-provider.yaml Outdated
chmod 755 /var/lib/kubelet/credential-provider/acr-credential-provider

# Update the link below
curl --retry 10 --retry-delay 5 -Lo /var/lib/kubelet/credential-provider-config.yaml https://raw.githubusercontent.com/kubernetes-sigs/cloud-provider-azure/master/examples/out-of-tree/credential-provider-config.yaml
Copy link
Contributor Author

Choose a reason for hiding this comment

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

TODO: use release branch to avoid pulling from master

@CecileRobertMichon
Copy link
Contributor Author

/retest

@codecov
Copy link

codecov bot commented Oct 24, 2023 •
edited
Loading

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (4c3a068) 58.32% compared to head (b972f37) 58.31%.

Additional details and impacted files 
@@            Coverage Diff             @@
##             main    #4169      +/-   ##
==========================================
- Coverage   58.32%   58.31%   -0.02%     
==========================================
  Files         187      187              
  Lines       19242    19242              
==========================================
- Hits        11223    11221       -2     
- Misses       7389     7391       +2     
  Partials      630      630

see 1 file with indirect coverage changes

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

@k8s-ci-robot k8s-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. and removed size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Oct 25, 2023
@CecileRobertMichon
Copy link
Contributor Author

/retest pull-cluster-api-provider-azure-windows-custom-builds
/retest pull-cluster-api-provider-azure-windows-with-ci-artifacts

@k8s-ci-robot
Copy link
Contributor

@CecileRobertMichon: The /retest command does not accept any targets.
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-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-apiversion-upgrade
  • /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-containerd-upstream-with-ci-artifacts-serial-slow
  • /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-capi-e2e
  • 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:

/retest pull-cluster-api-provider-azure-windows-custom-builds
/retest pull-cluster-api-provider-azure-windows-with-ci-artifacts

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-custom-builds
/test pull-cluster-api-provider-azure-windows-with-ci-artifacts

@CecileRobertMichon CecileRobertMichon changed the title [WIP] Enable OOT credential provider for all CI templates Enable OOT credential provider for all CI templates Oct 27, 2023
@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/work-in-progress Indicates that a PR should not merge because it is a work in progress. 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 Oct 27, 2023
@CecileRobertMichon CecileRobertMichon changed the title Enable OOT credential provider for all CI templates [WIP] Enable OOT credential provider for all CI templates Oct 27, 2023
@k8s-ci-robot k8s-ci-robot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Oct 27, 2023
@CecileRobertMichon
Copy link
Contributor Author

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

@CecileRobertMichon
Copy link
Contributor Author

/retest

@CecileRobertMichon CecileRobertMichon mentioned this pull request Oct 31, 2023
Merged
@CecileRobertMichon CecileRobertMichon changed the title [WIP] Enable OOT credential provider for all CI templates Enable OOT credential provider for all CI templates Oct 31, 2023
CecileRobertMichon
CecileRobertMichon commented Oct 31, 2023
View reviewed changes
Copy link
Contributor Author

@CecileRobertMichon CecileRobertMichon left a comment

Choose a reason for hiding this comment

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

/cc @lzhecheng @mainred

@k8s-ci-robot
Copy link
Contributor

@CecileRobertMichon: GitHub didn't allow me to request PR reviews from the following users: mainred.

Note that only kubernetes-sigs members and repo collaborators can review this PR, and authors cannot review their own PRs.

In response to this:

/cc @lzhecheng @mainred

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.

lzhecheng
lzhecheng reviewed Nov 1, 2023
View reviewed changes
Copy link
Contributor

@lzhecheng lzhecheng left a comment

Choose a reason for hiding this comment

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

Overall LGTM

templates/test/ci/cluster-template-prow-ci-version-dual-stack.yaml Outdated Show resolved Hide resolved
CecileRobertMichon
CecileRobertMichon commented Nov 1, 2023
View reviewed changes
Copy link
Contributor Author

@CecileRobertMichon CecileRobertMichon left a comment

Choose a reason for hiding this comment

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

/hold for squash

@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 Nov 1, 2023
@CecileRobertMichon
Copy link
Contributor Author

Error response from daemon: unauthorized: authentication required

another docker transient issue

/retest

CecileRobertMichon
CecileRobertMichon commented Nov 3, 2023
View reviewed changes
Copy link
Contributor Author

@CecileRobertMichon CecileRobertMichon left a comment

Choose a reason for hiding this comment

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

/hold cancel

this is ready

/assign @mboersma

@k8s-ci-robot k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Nov 3, 2023
@CecileRobertMichon
Copy link
Contributor Author

/cherry-pick release-1.11

@k8s-infra-cherrypick-robot
Copy link

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

In response to this:

/cherry-pick release-1.11

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

k8s-ci-robot commented Nov 3, 2023 •
edited
Loading

@CecileRobertMichon: The following tests 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-windows-containerd-upstream-custom-builds c79ddc9 link false /test pull-cluster-api-provider-azure-windows-containerd-upstream-custom-builds
pull-cluster-api-provider-azure-windows-containerd-upstream-with-ci-artifacts c79ddc9 link false /test pull-cluster-api-provider-azure-windows-containerd-upstream-with-ci-artifacts

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.

@CecileRobertMichon
Copy link
Contributor Author

/retest

willie-yao
willie-yao approved these changes Nov 3, 2023
View reviewed changes
Copy link
Contributor

@willie-yao willie-yao left a comment

Choose a reason for hiding this comment

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

/lgtm

Just for my own understanding, which CI jobs would these apply to? It doesn't seem to touch all CAPZ prow templates. I guess I'm a bit confused about what the ci-version templates are used for

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Nov 3, 2023
@k8s-ci-robot
Copy link
Contributor

LGTM label has been added.

Git tree hash: 8b63de963e862df441a7444adfac5b1dd7166af3

@CecileRobertMichon
Copy link
Contributor Author

@willie-yao this would be all the CAPZ PR jobs with suffix with-ci-artifacts + all the periodic jobs testing the various release branches of k8s https://testgrid.k8s.io/provider-azure-master-signal, essentially anything that's testing kubernetes branches instead of stable k8s releases

CecileRobertMichon
CecileRobertMichon commented Nov 3, 2023
View reviewed changes
Copy link
Contributor Author

@CecileRobertMichon CecileRobertMichon left a comment

Choose a reason for hiding this comment

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

/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: CecileRobertMichon

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 the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Nov 3, 2023
@k8s-ci-robot k8s-ci-robot merged commit 822ea7d into kubernetes-sigs:main Nov 3, 2023
10 checks passed
@k8s-ci-robot k8s-ci-robot added this to the v1.12 milestone Nov 3, 2023
@k8s-infra-cherrypick-robot
Copy link

@CecileRobertMichon: #4169 failed to apply on top of branch "release-1.11":

Applying: Add support for OOT cred provider in ci templates
.git/rebase-apply/patch:601: trailing whitespace.
    /var/lib/kubelet/credential-provider-config.yaml  
.git/rebase-apply/patch:632: trailing whitespace.
    /var/lib/kubelet/credential-provider-config.yaml  
.git/rebase-apply/patch:670: trailing whitespace.
    /var/lib/kubelet/credential-provider-config.yaml  
.git/rebase-apply/patch:724: trailing whitespace.
    /var/lib/kubelet/credential-provider-config.yaml  
.git/rebase-apply/patch:1099: trailing whitespace.
    /var/lib/kubelet/credential-provider-config.yaml  
warning: 5 lines add whitespace errors.
Using index info to reconstruct a base tree...
A	templates/test/ci/cluster-template-prow-ci-version-dual-stack.yaml
A	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
M	templates/test/ci/prow-machine-pool-ci-version/patches/kubeadm-bootstrap-windows-k8s-ci-binaries.yaml
M	templates/test/ci/prow-machine-pool-ci-version/patches/machine-pool-ci-version.yaml
M	templates/test/dev/cluster-template-custom-builds-machine-pool.yaml
M	templates/test/dev/cluster-template-custom-builds.yaml
M	templates/test/dev/custom-builds-machine-pool/patches/custom-builds.yaml
M	templates/test/dev/custom-builds-machine-pool/patches/kubeadm-bootstrap-machine-pool-windows-k8s-pr-binaries.yaml
Falling back to patching base and 3-way merge...
Auto-merging templates/test/dev/custom-builds-machine-pool/patches/kubeadm-bootstrap-machine-pool-windows-k8s-pr-binaries.yaml
Auto-merging templates/test/dev/custom-builds-machine-pool/patches/custom-builds.yaml
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/prow-machine-pool-ci-version/patches/machine-pool-ci-version.yaml
Auto-merging templates/test/ci/prow-machine-pool-ci-version/patches/kubeadm-bootstrap-windows-k8s-ci-binaries.yaml
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-windows-containerd-2022.yaml
CONFLICT (modify/delete): templates/test/ci/cluster-template-prow-ci-version-ipv6.yaml deleted in HEAD and modified in Add support for OOT cred provider in ci templates. Version Add support for OOT cred provider in ci templates of templates/test/ci/cluster-template-prow-ci-version-ipv6.yaml left in tree.
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Add support for OOT cred provider in ci templates
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.11

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 CecileRobertMichon mentioned this pull request Nov 3, 2023
Closed
This was referenced Jan 10, 2024
Closed
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lzhecheng lzhecheng lzhecheng left review comments

@willie-yao willie-yao willie-yao approved these changes

@jackfrancis jackfrancis Awaiting requested review from jackfrancis

@jsturtevant jsturtevant Awaiting requested review from jsturtevant

Assignees

@mboersma mboersma

@willie-yao willie-yao

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/XL Denotes a PR that changes 500-999 lines, ignoring generated files.
Projects
CAPZ Planning
Archived in project
Milestone
v1.12
Development

Successfully merging this pull request may close these issues.

Support OOT credential provider for all templates
6 participants
@CecileRobertMichon @k8s-ci-robot @k8s-infra-cherrypick-robot @lzhecheng @willie-yao @mboersma