Skip to content

🐛 EKS - when aws-cni is disabled deleted all resources including helm managed resources #582

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

Merged
merged 2 commits into from
Jan 18, 2024

Conversation

calvix
Copy link

@calvix calvix commented Jan 17, 2024

towards giantswarm/roadmap#3105

for now always just delete the aws-node

I want to merge this fix to allow another team to easily try debug the cillium issue.

@calvix calvix self-assigned this Jan 18, 2024
@calvix calvix changed the title EKS - when aws-cni is disabled deleted all resources including helm managed resources 🐛 EKS - when aws-cni is disabled deleted all resources including helm managed resources Jan 18, 2024
@calvix calvix marked this pull request as ready for review January 18, 2024 09:35
@calvix calvix requested a review from a team January 18, 2024 09:36
@@ -273,20 +272,16 @@ func (s *Service) deleteResource(ctx context.Context, remoteClient client.Client
}
s.scope.Debug(fmt.Sprintf("resource %s was not found, no action", key))
} else {
// resource found, delete if no label or not managed by helm
if val, ok := obj.GetLabels()[konfig.ManagedbyLabelKey]; !ok || val != "Helm" {
Copy link
Author

Choose a reason for hiding this comment

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

diff is complex but its just removing this line

@calvix calvix merged commit ba007f8 into release-2.3 Jan 18, 2024
@calvix calvix deleted the aws-cni-deleted-helm-managed-resources branch January 18, 2024 12:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants