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

Fix k3s cluster detection #956

Merged
merged 3 commits into from
Jun 6, 2024
Merged

Conversation

SergeyMelnikov
Copy link
Contributor

@SergeyMelnikov SergeyMelnikov commented Jun 6, 2024

When upgrading k3d cluster to 1.26 in #928 k3d cluster nodes are getting renamed into K3s v1.26.15+k3s1 instead of K3s dev.
We rely on this to find containerd socket in e2e tests, so they breaks.
Let's detect if we are running inside k3d cluster using K3s prefix.

@SergeyMelnikov SergeyMelnikov requested a review from sharnoff June 6, 2024 15:11
Copy link
Member

@sharnoff sharnoff left a comment

Choose a reason for hiding this comment

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

Nice- thanks! approval, pending one comment

neonvm/main.go Outdated Show resolved Hide resolved
@SergeyMelnikov SergeyMelnikov enabled auto-merge (squash) June 6, 2024 16:10
@SergeyMelnikov SergeyMelnikov merged commit c78e4bc into main Jun 6, 2024
15 checks passed
@SergeyMelnikov SergeyMelnikov deleted the sergey/better-k3d-detection branch June 6, 2024 16:20
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