Skip to content

Fix: Update handling of version strings in Helm template and helpers.tpl - #845

Merged
archlitchi merged 5 commits into
Project-HAMi:masterfrom
HJJ256:patch-1
Feb 13, 2025
Merged

Fix: Update handling of version strings in Helm template and helpers.tpl#845
archlitchi merged 5 commits into
Project-HAMi:masterfrom
HJJ256:patch-1

Conversation

@HJJ256

@HJJ256 HJJ256 commented Jan 28, 2025

Copy link
Copy Markdown
Contributor

What type of PR is this?
/kind bug

What this PR does / why we need it:
The current master branch was not able to handle version strings like v1.30.8-eks-2d5f260 which is prevalent for AWS EKS. This causes HAMi charts installation failure as the minor version checking condition defaults to false and old parameters are used.
Also currently, scheduler imageTag needs to be set every time we have versions like v1.30.8-eks-2d5f260. However changing the definition of strippedKubeVersion in _helpers.tpl to a more general regexReplaceAll command solves this while being backwards compatible.

Which issue(s) this PR fixes:
Fixes #
#744
#791
Special notes for your reviewer: This PR will help Project HAMi to get deployed on various cloud-based Kubernetes clusters.

Does this PR introduce a user-facing change?: No

@HJJ256
HJJ256 changed the base branch from master to dev January 28, 2025 22:36
@HJJ256
HJJ256 changed the base branch from dev to master January 28, 2025 22:36
…bers from minor versions

Signed-off-by: HJJ256 <harshjalan27@yahoo.com>
Signed-off-by: HJJ256 <harshjalan27@yahoo.com>
… numbering systems

Signed-off-by: HJJ256 <harshjalan27@yahoo.com>
Signed-off-by: HJJ256 <harshjalan27@yahoo.com>
Signed-off-by: HJJ256 <harshjalan27@yahoo.com>
@HJJ256 HJJ256 changed the title Update handling of version strings in Helm template and helpers.tpl Fix: Update handling of version strings in Helm template and helpers.tpl Jan 28, 2025
@HJJ256

HJJ256 commented Feb 13, 2025

Copy link
Copy Markdown
Contributor Author

@archlitchi @wawa0210 any timeline on review and merging of this PR?

@archlitchi

Copy link
Copy Markdown
Member

thanks, a nice fix, i assume you have tested on your AWS cluster?

@HJJ256

HJJ256 commented Feb 13, 2025

Copy link
Copy Markdown
Contributor Author

thanks, a nice fix, i assume you have tested on your AWS cluster?

Thanks. Yes, that's correct

@archlitchi

Copy link
Copy Markdown
Member

/lgtm

@archlitchi
archlitchi merged commit 4b14ec7 into Project-HAMi:master Feb 13, 2025
@HJJ256 HJJ256 mentioned this pull request Mar 29, 2025
33 tasks
@ouyangluwei163 ouyangluwei163 mentioned this pull request Apr 8, 2025
45 tasks
@archlitchi archlitchi mentioned this pull request May 6, 2025
11 tasks
archlitchi added a commit that referenced this pull request May 6, 2025
* Fix: Update handling of version strings in Helm template and helpers.tpl (#845)

* Update condition to include regexReplaceAll for outputting proper numbers from minor versions

Signed-off-by: HJJ256 <harshjalan27@yahoo.com>

* Update condition

Signed-off-by: HJJ256 <harshjalan27@yahoo.com>

* Update definition of strippedKubeVersion to handle variety of version numbering systems

Signed-off-by: HJJ256 <harshjalan27@yahoo.com>

* Update job-createSecret.yaml

Signed-off-by: HJJ256 <harshjalan27@yahoo.com>

* Update job-patchWebhook.yaml

Signed-off-by: HJJ256 <harshjalan27@yahoo.com>

---------

Signed-off-by: HJJ256 <harshjalan27@yahoo.com>

* Update libvgpu.so (#876)

* update libvgpu

Signed-off-by: limengxuan <391013634@qq.com>

* fix: disable passDeviceSpecsEnabled by default (#872)

Due to potential pod startup issues in certain environments,
set passDeviceSpecsEnabled to false by default.
This configuration can still be enabled via helm values
for environments that need it to handle runtime GPU access issues.

Signed-off-by: Nimbus318 <136771156+Nimbus318@users.noreply.github.com>

* fix: Remove the pkg/k8sutil/client.go and replace it with HAMi/pkg/util/client in pkg/scheduler/scheduler.go (#681)

Signed-off-by: Shouren Yang <yangshouren@gmail.com>

* fix: correct device filter initialization order (#857)

Ensure DevicePluginFilterDevice is initialized before FilterDeviceToRegister.
This fixes the initialization sequence to make device filtering work.

Signed-off-by: Nimbus318 <136771156+Nimbus318@users.noreply.github.com>

* fix parseNvidiaNumaInfo index out of range (#889)

Signed-off-by: bin <bin.pan@daocloud.io>

* fix conflict

Signed-off-by: limengxuan <mengxuan.li@dynamia.ai>

* fix conflict

Signed-off-by: limengxuan <mengxuan.li@dynamia.ai>

* fix ubuntu base image (#944)

Signed-off-by: bin <bin.pan@daocloud.io>

* fix: Add error handling for nvml.Init in NvidiaDevicePlugin (#982)

Signed-off-by: yxxhero <aiopsclub@163.com>

* Bump golang.org/x/net from 0.26.0 to 0.33.0

Bumps [golang.org/x/net](https://github.com/golang/net) from 0.26.0 to 0.33.0.
- [Commits](golang/net@v0.26.0...v0.33.0)

---
updated-dependencies:
- dependency-name: golang.org/x/net
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

* Fix Dockerfile to make CI pass (#846)

* update dockerfile

Signed-off-by: limengxuan <391013634@qq.com>

---------

Signed-off-by: HJJ256 <harshjalan27@yahoo.com>
Signed-off-by: limengxuan <391013634@qq.com>
Signed-off-by: Nimbus318 <136771156+Nimbus318@users.noreply.github.com>
Signed-off-by: Shouren Yang <yangshouren@gmail.com>
Signed-off-by: bin <bin.pan@daocloud.io>
Signed-off-by: limengxuan <mengxuan.li@dynamia.ai>
Signed-off-by: yxxhero <aiopsclub@163.com>
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Harsh Jaykumar Jalan <harshjalan27@yahoo.com>
Co-authored-by: 霓漠Nimbus <136771156+Nimbus318@users.noreply.github.com>
Co-authored-by: Shouren Yang <yangshouren@gmail.com>
Co-authored-by: bin.pan <bin.pan@daocloud.io>
Co-authored-by: yxxhero <11087727+yxxhero@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
archlitchi added a commit that referenced this pull request May 6, 2025
* Fix: Update handling of version strings in Helm template and helpers.tpl (#845)

* Update condition to include regexReplaceAll for outputting proper numbers from minor versions

Signed-off-by: HJJ256 <harshjalan27@yahoo.com>

* Update condition

Signed-off-by: HJJ256 <harshjalan27@yahoo.com>

* Update definition of strippedKubeVersion to handle variety of version numbering systems

Signed-off-by: HJJ256 <harshjalan27@yahoo.com>

* Update job-createSecret.yaml

Signed-off-by: HJJ256 <harshjalan27@yahoo.com>

* Update job-patchWebhook.yaml

Signed-off-by: HJJ256 <harshjalan27@yahoo.com>

---------

Signed-off-by: HJJ256 <harshjalan27@yahoo.com>

* Update libvgpu.so (#876)

* update libvgpu

Signed-off-by: limengxuan <391013634@qq.com>

* fix: disable passDeviceSpecsEnabled by default (#872)

Due to potential pod startup issues in certain environments,
set passDeviceSpecsEnabled to false by default.
This configuration can still be enabled via helm values
for environments that need it to handle runtime GPU access issues.

Signed-off-by: Nimbus318 <136771156+Nimbus318@users.noreply.github.com>

* fix: Remove the pkg/k8sutil/client.go and replace it with HAMi/pkg/util/client in pkg/scheduler/scheduler.go (#681)

Signed-off-by: Shouren Yang <yangshouren@gmail.com>

* fix: correct device filter initialization order (#857)

Ensure DevicePluginFilterDevice is initialized before FilterDeviceToRegister.
This fixes the initialization sequence to make device filtering work.

Signed-off-by: Nimbus318 <136771156+Nimbus318@users.noreply.github.com>

* fix parseNvidiaNumaInfo index out of range (#889)

Signed-off-by: bin <bin.pan@daocloud.io>

* fix conflict

Signed-off-by: limengxuan <mengxuan.li@dynamia.ai>

* fix conflict

Signed-off-by: limengxuan <mengxuan.li@dynamia.ai>

* fix ubuntu base image (#944)

Signed-off-by: bin <bin.pan@daocloud.io>

* fix: Add error handling for nvml.Init in NvidiaDevicePlugin (#982)

Signed-off-by: yxxhero <aiopsclub@163.com>

* Bump golang.org/x/net from 0.26.0 to 0.33.0

Bumps [golang.org/x/net](https://github.com/golang/net) from 0.26.0 to 0.33.0.
- [Commits](golang/net@v0.26.0...v0.33.0)

---
updated-dependencies:
- dependency-name: golang.org/x/net
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

* Fix Dockerfile to make CI pass (#846)

* update dockerfile

Signed-off-by: limengxuan <391013634@qq.com>

* update version

Signed-off-by: limengxuan <mengxuan.li@dynamia.ai>

---------

Signed-off-by: HJJ256 <harshjalan27@yahoo.com>
Signed-off-by: limengxuan <391013634@qq.com>
Signed-off-by: Nimbus318 <136771156+Nimbus318@users.noreply.github.com>
Signed-off-by: Shouren Yang <yangshouren@gmail.com>
Signed-off-by: bin <bin.pan@daocloud.io>
Signed-off-by: limengxuan <mengxuan.li@dynamia.ai>
Signed-off-by: yxxhero <aiopsclub@163.com>
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Harsh Jaykumar Jalan <harshjalan27@yahoo.com>
Co-authored-by: 霓漠Nimbus <136771156+Nimbus318@users.noreply.github.com>
Co-authored-by: Shouren Yang <yangshouren@gmail.com>
Co-authored-by: bin.pan <bin.pan@daocloud.io>
Co-authored-by: yxxhero <11087727+yxxhero@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
archlitchi added a commit that referenced this pull request May 6, 2025
* Fix: Update handling of version strings in Helm template and helpers.tpl (#845)

* Update condition to include regexReplaceAll for outputting proper numbers from minor versions

Signed-off-by: HJJ256 <harshjalan27@yahoo.com>

* Update condition

Signed-off-by: HJJ256 <harshjalan27@yahoo.com>

* Update definition of strippedKubeVersion to handle variety of version numbering systems

Signed-off-by: HJJ256 <harshjalan27@yahoo.com>

* Update job-createSecret.yaml

Signed-off-by: HJJ256 <harshjalan27@yahoo.com>

* Update job-patchWebhook.yaml

Signed-off-by: HJJ256 <harshjalan27@yahoo.com>

---------

Signed-off-by: HJJ256 <harshjalan27@yahoo.com>

* Update libvgpu.so (#876)

* update libvgpu

Signed-off-by: limengxuan <391013634@qq.com>

* fix: disable passDeviceSpecsEnabled by default (#872)

Due to potential pod startup issues in certain environments,
set passDeviceSpecsEnabled to false by default.
This configuration can still be enabled via helm values
for environments that need it to handle runtime GPU access issues.

Signed-off-by: Nimbus318 <136771156+Nimbus318@users.noreply.github.com>

* fix: Remove the pkg/k8sutil/client.go and replace it with HAMi/pkg/util/client in pkg/scheduler/scheduler.go (#681)

Signed-off-by: Shouren Yang <yangshouren@gmail.com>

* fix: correct device filter initialization order (#857)

Ensure DevicePluginFilterDevice is initialized before FilterDeviceToRegister.
This fixes the initialization sequence to make device filtering work.

Signed-off-by: Nimbus318 <136771156+Nimbus318@users.noreply.github.com>

* fix parseNvidiaNumaInfo index out of range (#889)

Signed-off-by: bin <bin.pan@daocloud.io>

* fix conflict

Signed-off-by: limengxuan <mengxuan.li@dynamia.ai>

* fix conflict

Signed-off-by: limengxuan <mengxuan.li@dynamia.ai>

* fix ubuntu base image (#944)

Signed-off-by: bin <bin.pan@daocloud.io>

* fix: Add error handling for nvml.Init in NvidiaDevicePlugin (#982)

Signed-off-by: yxxhero <aiopsclub@163.com>

* Bump golang.org/x/net from 0.26.0 to 0.33.0

Bumps [golang.org/x/net](https://github.com/golang/net) from 0.26.0 to 0.33.0.
- [Commits](golang/net@v0.26.0...v0.33.0)

---
updated-dependencies:
- dependency-name: golang.org/x/net
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

* Fix Dockerfile to make CI pass (#846)

* update dockerfile

Signed-off-by: limengxuan <391013634@qq.com>

* update version

Signed-off-by: limengxuan <mengxuan.li@dynamia.ai>

* Optimize E2E with pod status check (#847)

Signed-off-by: wen.rui <wen.rui@daocloud.io>

---------

Signed-off-by: HJJ256 <harshjalan27@yahoo.com>
Signed-off-by: limengxuan <391013634@qq.com>
Signed-off-by: Nimbus318 <136771156+Nimbus318@users.noreply.github.com>
Signed-off-by: Shouren Yang <yangshouren@gmail.com>
Signed-off-by: bin <bin.pan@daocloud.io>
Signed-off-by: limengxuan <mengxuan.li@dynamia.ai>
Signed-off-by: yxxhero <aiopsclub@163.com>
Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: wen.rui <wen.rui@daocloud.io>
Co-authored-by: Harsh Jaykumar Jalan <harshjalan27@yahoo.com>
Co-authored-by: 霓漠Nimbus <136771156+Nimbus318@users.noreply.github.com>
Co-authored-by: Shouren Yang <yangshouren@gmail.com>
Co-authored-by: bin.pan <bin.pan@daocloud.io>
Co-authored-by: yxxhero <11087727+yxxhero@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Rei1010 <56469400+Rei1010@users.noreply.github.com>
imgbot Bot pushed a commit to haitwang-cloud/HAMi that referenced this pull request Jun 3, 2026
…tpl (Project-HAMi#845)

* Update condition to include regexReplaceAll for outputting proper numbers from minor versions

Signed-off-by: HJJ256 <harshjalan27@yahoo.com>

* Update condition

Signed-off-by: HJJ256 <harshjalan27@yahoo.com>

* Update definition of strippedKubeVersion to handle variety of version numbering systems

Signed-off-by: HJJ256 <harshjalan27@yahoo.com>

* Update job-createSecret.yaml

Signed-off-by: HJJ256 <harshjalan27@yahoo.com>

* Update job-patchWebhook.yaml

Signed-off-by: HJJ256 <harshjalan27@yahoo.com>

---------

Signed-off-by: HJJ256 <harshjalan27@yahoo.com>
@fishman fishman mentioned this pull request Jul 1, 2026
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