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

Modify capibmadm to not use GetAPIKeyDetails to fetch the account ID #1250

Merged
merged 1 commit into from
Jun 2, 2023
Merged

Conversation

Amulyam24
Copy link
Contributor

What this PR does / why we need it:
A user needs additional access for using capibmadm which internally uses GetAPIKeyDetails() for fetching the account ID. It is better to switch to the traditional approach for fetching 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 #1243

Special notes for your reviewer:

/area provider/ibmcloud

  1. Please confirm that if this PR changes any image versions, then that's the sole change this PR makes.

Release note:

modify capibmadm to not use GetAPIKeyDetails to fetch the account ID

@k8s-ci-robot k8s-ci-robot added the area/provider/ibmcloud Issues or PRs related to ibmcloud provider label Jun 2, 2023
@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Jun 2, 2023
@netlify
Copy link

netlify bot commented Jun 2, 2023

Deploy Preview for kubernetes-sigs-cluster-api-ibmcloud ready!

Name Link
🔨 Latest commit 9690fe0
🔍 Latest deploy log https://app.netlify.com/sites/kubernetes-sigs-cluster-api-ibmcloud/deploys/6479e8403547e00008959b5c
😎 Deploy Preview https://deploy-preview-1250--kubernetes-sigs-cluster-api-ibmcloud.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site settings.

@k8s-ci-robot k8s-ci-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Jun 2, 2023
@Amulyam24
Copy link
Contributor Author

Amulyam24 commented Jun 2, 2023

/cc @mkumatag

Copy link
Member

@mkumatag mkumatag left a comment

Choose a reason for hiding this comment

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

minor comment

cmd/capibmadm/cmd/powervs/image/import.go Outdated Show resolved Hide resolved
Copy link
Member

@mkumatag mkumatag left a comment

Choose a reason for hiding this comment

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

Still I see some instances of

	utils "sigs.k8s.io/cluster-api-provider-ibmcloud/pkg/cloud/services/utils"

here utils alias can be removed!

@Amulyam24
Copy link
Contributor Author

Still I see some instances of

	utils "sigs.k8s.io/cluster-api-provider-ibmcloud/pkg/cloud/services/utils"

here utils alias can be removed!

Missed it, changed it wherever required.

Copy link
Member

@mkumatag mkumatag 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 Jun 2, 2023
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: Amulyam24, mkumatag

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 Jun 2, 2023
@mkumatag
Copy link
Member

mkumatag commented Jun 2, 2023

/cherrypick release-0.5

@k8s-infra-cherrypick-robot

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

In response to this:

/cherrypick release-0.5

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 4279f6b into kubernetes-sigs:main Jun 2, 2023
@k8s-infra-cherrypick-robot

@mkumatag: #1250 failed to apply on top of branch "release-0.5":

Applying: Modify capibmadm to not use GetAPIKeyDetails to fetch the account ID
Using index info to reconstruct a base tree...
A	cmd/capibmadm/cmd/powervs/image/import.go
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): cmd/capibmadm/cmd/powervs/image/import.go deleted in HEAD and modified in Modify capibmadm to not use GetAPIKeyDetails to fetch the account ID. Version Modify capibmadm to not use GetAPIKeyDetails to fetch the account ID of cmd/capibmadm/cmd/powervs/image/import.go 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 Modify capibmadm to not use GetAPIKeyDetails to fetch the account ID
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:

/cherrypick release-0.5

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.

@Amulyam24 Amulyam24 deleted the capibmadm branch June 6, 2023 06:14
@Amulyam24
Copy link
Contributor Author

/cherrypick release-0.5

@k8s-infra-cherrypick-robot

@Amulyam24: #1250 failed to apply on top of branch "release-0.5":

Applying: Modify capibmadm to not use GetAPIKeyDetails to fetch the account ID
Using index info to reconstruct a base tree...
A	cmd/capibmadm/cmd/powervs/image/import.go
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): cmd/capibmadm/cmd/powervs/image/import.go deleted in HEAD and modified in Modify capibmadm to not use GetAPIKeyDetails to fetch the account ID. Version Modify capibmadm to not use GetAPIKeyDetails to fetch the account ID of cmd/capibmadm/cmd/powervs/image/import.go 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 Modify capibmadm to not use GetAPIKeyDetails to fetch the account ID
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:

/cherrypick release-0.5

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.

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. area/provider/ibmcloud Issues or PRs related to ibmcloud provider 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. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Move away from using GetAPIKeyDetails to fetch the Account ID
4 participants