Skip to content

fix: ensure compatibility of kubeversion.version with what helm reeturns#26469

Open
ppapapetrou76 wants to merge 6 commits intoargoproj:masterfrom
ppapapetrou76:issue-26330-consistency-of-kubeversion-with-helm-version
Open

fix: ensure compatibility of kubeversion.version with what helm reeturns#26469
ppapapetrou76 wants to merge 6 commits intoargoproj:masterfrom
ppapapetrou76:issue-26330-consistency-of-kubeversion-with-helm-version

Conversation

@ppapapetrou76
Copy link
Contributor

closes #26330

I used the example chart and app in the original issue to reproduce the problem.
Before the fix the manifest was rendered like this

apiVersion: v1
data:
  direct: v1.31
kind: ConfigMap
metadata:
  annotations:
    argocd.argoproj.io/tracking-id: debug-app:/ConfigMap:argocd/debug-cm
  name: debug-cm
  namespace: argocd

after the fix it renders as follows.

apiVersion: v1
data:
  direct: v1.31.5
kind: ConfigMap
metadata:
  annotations:
    argocd.argoproj.io/tracking-id: debug-app:/ConfigMap:argocd/debug-cm
  name: debug-cm
  namespace: argocd

I think we need to backport this in the supported versions ( 3.3 and 3.2 )

Checklist:

  • Either (a) I've created an enhancement proposal and discussed it with the community, (b) this is a bug fix, or (c) this does not need to be in the release notes.
  • The title of the PR states what changed and the related issues number (used for the release note).
  • The title of the PR conforms to the Title of the PR
  • I've included "Closes [ISSUE #]" or "Fixes [ISSUE #]" in the description to automatically close the associated issue.
  • I've updated both the CLI and UI to expose my feature, or I plan to submit a second PR with them.
  • Does this PR require documentation updates?
  • I've updated documentation as required by this PR.
  • I have signed off all my commits as required by DCO
  • I have written unit and/or e2e tests for my change. PRs without these are unlikely to be merged.
  • My build is green (troubleshooting builds).
  • My new feature complies with the feature status guidelines.
  • I have added a brief description of why this PR is necessary and/or what this PR solves.
  • Optional. My organization is added to USERS.md.
  • Optional. For bug fixes, I've indicated what older releases this fix should be cherry-picked into (this may or may not happen depending on risk/complexity).

Signed-off-by: Patroklos Papapetrou <ppapapetrou76@gmail.com>
@ppapapetrou76 ppapapetrou76 requested review from a team as code owners February 16, 2026 17:14
@bunnyshell
Copy link

bunnyshell bot commented Feb 16, 2026

🔴 Preview Environment stopped on Bunnyshell

See: Environment Details | Pipeline Logs

Available commands (reply to this comment):

  • 🔵 /bns:start to start the environment
  • 🚀 /bns:deploy to redeploy the environment
  • /bns:delete to remove the environment

@ppapapetrou76 ppapapetrou76 marked this pull request as draft February 16, 2026 17:17
@ppapapetrou76 ppapapetrou76 changed the title fix: ensure compatibility of kubeversion.version with what helm retusnd fix: ensure compatibility of kubeversion.version with what helm reeturns Feb 16, 2026
ppapapetrou76 and others added 3 commits February 16, 2026 19:34
Signed-off-by: Patroklos Papapetrou <ppapapetrou76@gmail.com>
Signed-off-by: Patroklos Papapetrou <ppapapetrou76@gmail.com>
@ppapapetrou76 ppapapetrou76 marked this pull request as ready for review February 17, 2026 08:26
@codecov
Copy link

codecov bot commented Feb 17, 2026

Codecov Report

❌ Patch coverage is 60.00000% with 2 lines in your changes missing coverage. Please review.
✅ Project coverage is 62.72%. Comparing base (47eb7ee) to head (bcd214d).
⚠️ Report is 1 commits behind head on master.

Files with missing lines Patch % Lines
gitops-engine/pkg/utils/kube/ctl.go 50.00% 1 Missing and 1 partial ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##           master   #26469      +/-   ##
==========================================
+ Coverage   62.68%   62.72%   +0.03%     
==========================================
  Files         412      412              
  Lines       55566    55569       +3     
==========================================
+ Hits        34831    34854      +23     
+ Misses      17417    17395      -22     
- Partials     3318     3320       +2     

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


assert.Equal(t, "v1.30.0", serverVersion)
assert.NotContains(t, serverVersion, "+", "Should not contain the '+' from Minor field")
})
Copy link
Member

Choose a reason for hiding this comment

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

All the tests looks good. However, let's add a test for removal of vendor-specific suffixes since this is one of the case normalization targets.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@nitishfy I believe you are talking about this one - it is already part of the PR

Copy link
Member

@nitishfy nitishfy left a comment

Choose a reason for hiding this comment

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

Left a couple of comments, PTAL.

ppapapetrou76 and others added 2 commits February 18, 2026 12:16
Signed-off-by: Patroklos Papapetrou <ppapapetrou76@gmail.com>
@ppapapetrou76
Copy link
Contributor Author

Thanks for review @nitishfy - I added a comment explaining how ParseGeneric works and what we want to return back
Also the test you asked for already exists in the PR

Feel free to review again when you have some time

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.

[Helm] ArgoCD-provided .Capabilities.KubeVersion.Version is inconsistent with Helm

2 participants

Comments