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

remove special condition for workload id for conformance tests #5127

Merged
merged 1 commit into from
Sep 11, 2024

Conversation

nojnhuh
Copy link
Contributor

@nojnhuh nojnhuh commented Sep 10, 2024

What type of PR is this?
/kind cleanup

What this PR does / why we need it:

The new DRA periodic job sets CONFORMANCE_FLAVOR in order to use a DRA-enabled template and hits this error in the kind setup script:

./scripts/kind-with-registry.sh: line 206: SERVICE_ACCOUNT_SIGNING_PUB: unbound variable

The other conformance jobs do not hit the same error because they leave CONFORMACE_FLAVOR undefined and let the e2e framework select a default flavor.

IIRC this condition in the kind script to use a different workload ID setup is a vestige of the pre-community infra and/or pre-workload ID default days and no longer is needed now.

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:

I don't see any other references to CONFORMANCE_FLAVOR in test-infra or any other repo, so I don't think this change should include any collateral damage.
https://github.com/search?q=CONFORMANCE_FLAVOR+%28org%3Akubernetes+OR+org%3Akubernetes-sigs%29&type=code

  • cherry-pick candidate

TODOs:

  • squashed commits
  • includes documentation
  • adds unit tests

Release note:

NONE

@k8s-ci-robot k8s-ci-robot added release-note-none Denotes a PR that doesn't merit a release note. kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Sep 10, 2024
@k8s-ci-robot k8s-ci-robot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Sep 10, 2024
@@ -203,34 +203,22 @@ function upload_to_blob() {
# to be mounted on the kind cluster and hence extra mount flags are required.
function createKindForAZWI() {
echo "creating workload-identity-enabled kind configuration"
if [ -n "${CONFORMANCE_FLAVOR}" ] && [ -n "${SERVICE_ACCOUNT_SIGNING_PUB}" ] && [ -n "${SERVICE_ACCOUNT_SIGNING_KEY}" ]; then
Copy link
Contributor Author

Choose a reason for hiding this comment

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

IIRC this condition in the kind script to use a different workload ID setup is a vestige of the pre-community infra and/or pre-workload ID default days and no longer is needed now.

@jackfrancis Does that sound right?

Copy link
Contributor

Choose a reason for hiding this comment

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

That sounds plausible, conformance E2E test runs will tell us!

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Looks like the tests are all far enough along now that they've all created a cluster successfully, so I think we're in the clear.

Copy link

codecov bot commented Sep 10, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 51.25%. Comparing base (befe2f4) to head (0d48ce1).
Report is 2 commits behind head on main.

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #5127      +/-   ##
==========================================
- Coverage   51.25%   51.25%   -0.01%     
==========================================
  Files         273      273              
  Lines       24651    24651              
==========================================
- Hits        12636    12634       -2     
- Misses      11229    11231       +2     
  Partials      786      786              

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

Copy link
Contributor

@mboersma mboersma left a comment

Choose a reason for hiding this comment

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

/lgtm

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

LGTM label has been added.

Git tree hash: a914159eeebafd8c6ba5fa37d5e2e642efbe0295

@jackfrancis
Copy link
Contributor

/approve

@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 the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Sep 11, 2024
@k8s-ci-robot k8s-ci-robot merged commit a859bd0 into kubernetes-sigs:main Sep 11, 2024
27 checks passed
@k8s-ci-robot k8s-ci-robot added this to the v1.17 milestone Sep 11, 2024
@nojnhuh nojnhuh deleted the kind-conformance branch September 11, 2024 15:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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. kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. 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/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

4 participants