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

AWS: Option to disable IAM reconciliation #11272

Merged
merged 1 commit into from Nov 2, 2022
Merged

AWS: Option to disable IAM reconciliation #11272

merged 1 commit into from Nov 2, 2022

Conversation

ahmedwaleedmalik
Copy link
Member

@ahmedwaleedmalik ahmedwaleedmalik commented Nov 2, 2022

Signed-off-by: Waleed Malik ahmedwaleedmalik@gmail.com

What this PR does / why we need it:
introduced a new field disableIAMReconciling in AWS cloud spec to disable IAM reconciliation.

Which issue(s) this PR fixes:

Fixes #11126

What type of PR is this?

/kind feature

Special notes for your reviewer:

Does this PR introduce a user-facing change? Then add your Release Note here:

Introduce a new field `disableIAMReconciling` in AWS cloud spec to disable IAM reconciliation.

Documentation:

https://docs.kubermatic.com/kubermatic/main/references/crds/#awscloudspec

@ahmedwaleedmalik ahmedwaleedmalik self-assigned this Nov 2, 2022
@kubermatic-bot kubermatic-bot added docs/tbd Denotes a PR that needs documentation (change) that will be done later. release-note Denotes a PR that will be considered when it comes time to generate release notes. dco-signoff: yes Denotes that all commits in the pull request have the valid DCO signoff message. kind/feature Categorizes issue or PR as related to a new feature. sig/cluster-management Denotes a PR or issue as being assigned to SIG Cluster Management. approved Indicates a PR has been approved by an approver from all required OWNERS files. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Nov 2, 2022
pkg/apis/kubermatic/v1/cluster.go Outdated Show resolved Hide resolved
Signed-off-by: Waleed Malik <ahmedwaleedmalik@gmail.com>
Copy link
Contributor

@xrstf xrstf left a comment

Choose a reason for hiding this comment

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

/approve

@kubermatic-bot kubermatic-bot added the lgtm Indicates that a PR is ready to be merged. label Nov 2, 2022
@kubermatic-bot
Copy link
Contributor

LGTM label has been added.

Git tree hash: ff282806d8e8b96df96ec7a0a903bf75faa5a604

@kubermatic-bot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ahmedwaleedmalik, xrstf

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

@xrstf
Copy link
Contributor

xrstf commented Nov 2, 2022

/hold temporarily

@kubermatic-bot kubermatic-bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Nov 2, 2022
@ahmedwaleedmalik
Copy link
Member Author

/retest

@xrstf
Copy link
Contributor

xrstf commented Nov 2, 2022

/unhold

@kubermatic-bot kubermatic-bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Nov 2, 2022
@ahmedwaleedmalik
Copy link
Member Author

/retest

@kubermatic-bot kubermatic-bot merged commit a0730fc into kubermatic:main Nov 2, 2022
@ahmedwaleedmalik ahmedwaleedmalik deleted the iam-reconciling branch November 2, 2022 13:42
@ahmedwaleedmalik
Copy link
Member Author

/cherry-pick release/v2.21

@ahmedwaleedmalik ahmedwaleedmalik added the backport-needed Denotes a PR or issue that has not been fully backported. label Nov 2, 2022
@kubermatic-bot
Copy link
Contributor

@ahmedwaleedmalik: #11272 failed to apply on top of branch "release/v2.21":

Applying: AWS: Option to disable IAM reconciliation
Using index info to reconstruct a base tree...
M	hack/run-ccm-migration-e2e-test-in-kind.sh
M	pkg/apis/kubermatic/v1/cluster.go
M	pkg/crd/k8c.io/kubermatic.k8c.io_clusters.yaml
M	pkg/crd/k8c.io/kubermatic.k8c.io_clustertemplates.yaml
M	pkg/provider/cloud/aws/provider.go
M	pkg/validation/cluster.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/validation/cluster.go
Auto-merging pkg/provider/cloud/aws/provider.go
Auto-merging pkg/crd/k8c.io/kubermatic.k8c.io_clustertemplates.yaml
CONFLICT (content): Merge conflict in pkg/crd/k8c.io/kubermatic.k8c.io_clustertemplates.yaml
Auto-merging pkg/crd/k8c.io/kubermatic.k8c.io_clusters.yaml
CONFLICT (content): Merge conflict in pkg/crd/k8c.io/kubermatic.k8c.io_clusters.yaml
Auto-merging pkg/apis/kubermatic/v1/cluster.go
Auto-merging hack/run-ccm-migration-e2e-test-in-kind.sh
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 AWS: Option to disable IAM reconciliation
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/v2.21

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.

@ahmedwaleedmalik ahmedwaleedmalik removed the backport-needed Denotes a PR or issue that has not been fully backported. label Nov 3, 2022
@ahmedwaleedmalik ahmedwaleedmalik added the backport-complete Denotes a PR or issue which has been fully backported to all required release branches. label Nov 3, 2022
@kubermatic-bot kubermatic-bot added docs/provided Denotes a PR that has a valid documentation reference. and removed docs/tbd Denotes a PR that needs documentation (change) that will be done later. labels Feb 2, 2023
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. backport-complete Denotes a PR or issue which has been fully backported to all required release branches. dco-signoff: yes Denotes that all commits in the pull request have the valid DCO signoff message. docs/provided Denotes a PR that has a valid documentation reference. kind/feature Categorizes issue or PR as related to a new feature. lgtm Indicates that a PR is ready to be merged. release-note Denotes a PR that will be considered when it comes time to generate release notes. sig/cluster-management Denotes a PR or issue as being assigned to SIG Cluster Management. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Don't enforce roleARN and instanceProfile validation when AWS IAM not accessible
4 participants