Skip to content

fix: Add provider images in values.yaml#2019

Merged
alexander-demicev merged 1 commit into
rancher:mainfrom
yiannistri:add-images-in-values
Jan 23, 2026
Merged

fix: Add provider images in values.yaml#2019
alexander-demicev merged 1 commit into
rancher:mainfrom
yiannistri:add-images-in-values

Conversation

@yiannistri
Copy link
Copy Markdown
Contributor

@yiannistri yiannistri commented Jan 23, 2026

What this PR does / why we need it:

Adding provider images in values.yaml for the purpose of including them in rancher-images.txt during a Rancher release.

Which issue(s) this PR fixes:
Fixes #2017

Special notes for your reviewer:

This PR once merged, needs to be backported to release/v0.25.

Checklist:

  • squashed commits into logical changes
  • includes documentation
  • adds unit tests
  • adds or updates e2e tests

@yiannistri
Copy link
Copy Markdown
Contributor Author

yiannistri commented Jan 23, 2026

To be able to test this end-to-end:

  • Ensure you have community charts repo and prime charts repo checked out in your local filesystem. You need these to be able to pass their path to the release tooling.
  • Ensure you have checked out the branch from this PR or release/v2.13 if that PR has been merged. You need to use the release tooling from this branch as it includes the updated origins for the new images.
  • Checkout this branch and run make build-providers-chart. This should package the providers Helm chart in ./out/package/rancher-turtles-providers-<TAG>.tgz
  • Copy the package into <PRIME_CHARTS_CHECKOUT_DIR>/assets/rancher-turtles-providers/ directory
  • Update the <PRIME_CHARTS_CHECKOUT_DIR>/index.yaml file to add a new array item under the rancher-turtles-providers entry with the following content:
    - annotations:
        catalog.cattle.io/certified: rancher
        catalog.cattle.io/display-name: Rancher Turtles Certified Providers
        catalog.cattle.io/kube-version: '>= 1.32.0-0 < 1.35.0-0'
        catalog.cattle.io/namespace: cattle-turtles-system
        catalog.cattle.io/os: linux
        catalog.cattle.io/permits-os: linux
        catalog.cattle.io/rancher-version: '>= 2.13.0-0 < 2.14.0-0'
        catalog.cattle.io/release-name: rancher-turtles-providers
        catalog.cattle.io/scope: management
        catalog.cattle.io/type: cluster-tool
      apiVersion: v2
      appVersion: 0.25.2
      created: "2025-10-16T17:20:51.318147992Z"
      description: This chart installs the Rancher Turtles certified providers.
      digest: 77b7e71ee20687296848eac9dec114d09d228f7f53b1360a3aa1900708276375
      home: https://turtles.docs.rancher.com/turtles/stable/en/overview/certified.html
      icon: https://raw.githubusercontent.com/rancher/turtles/main/logos/capi.svg
      keywords:
      - rancher
      - cluster-api
      - capi
      - provisioning
      - provider
      name: rancher-turtles-providers
      urls:
      - assets/rancher-turtles-providers/rancher-turtles-providers-<TAG>.tgz
      version: 108.0.2+up0.25.2
    
    Note that the url must be updated to point to file you copied in the previous step.
  • Run the following command from the r/r branch that was checked out earlier, substituting values where necessary:
    TAG=v2.13.2-alpha5 OCI_CHART_DIRS="<PRIME_CHARTS_CHECKOUT_DIR>" OCI_CHART_REPOSITORY="rancher/charts" go run ./pkg/image/export/main.go "<COMMUNITY_CHARTS_CHECKOUT_DIR>","<PRIME_CHARTS_CHECKOUT_DIR>" rancher/wins:v0.0.0
    
    The last argument (rancher/wins:v0.0.0) is irrelevant for the purpose of testing this fix but the tooling expects this to be passed in order to proceed with execution.
    Output:
    INFO[0000] generating k3s image list...
    INFO[0000] skipping image generation since no compatible releases were found for version: v2.13.2-alpha5
    INFO[0000] generating rke2 image list...
    INFO[0000] skipping image generation since no compatible releases were found for version: v2.13.2-alpha5
    2026/01/23 08:09:37 building rancher-images-origins.txt
    2026/01/23 08:09:37 Creating rancher-images.txt
    2026/01/23 08:09:37 Creating rancher-images-sources.txt
    2026/01/23 08:09:37 Creating rancher-mirror-to-rancher-org.sh
    2026/01/23 08:09:37 Creating rancher-save-images.sh
    2026/01/23 08:09:37 Creating rancher-load-images.sh
    2026/01/23 08:09:37 Creating rancher-windows-images.txt
    2026/01/23 08:09:37 Creating rancher-windows-images-sources.txt
    2026/01/23 08:09:37 Creating rancher-mirror-to-rancher-org.ps1
    2026/01/23 08:09:37 Creating rancher-save-images.ps1
    2026/01/23 08:09:37 Creating rancher-load-images.ps1
    

UPDATE from thehejik: To make it work, one have to put data.json from kdm to $HOME/bin/

@yiannistri yiannistri marked this pull request as ready for review January 23, 2026 08:17
@yiannistri yiannistri requested a review from a team as a code owner January 23, 2026 08:17
Copy link
Copy Markdown
Contributor

@salasberryfin salasberryfin left a comment

Choose a reason for hiding this comment

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

Thanks @yiannistri.

We should probably have a follow up to haveupdatecli syncing provider versions in values.yaml with what we have in config-prime.yaml. One less configuration to take care of.

@anmazzotti
Copy link
Copy Markdown
Contributor

@salasberryfin shouldn't this instead replace config-prime.yaml entirely? also considering this chart is following the same release lifecycle of Turtles

@salasberryfin
Copy link
Copy Markdown
Contributor

In that case I think we'd have to build the Turtles image with the values taken from the chart's values.yaml, wouldn't we?

@anmazzotti
Copy link
Copy Markdown
Contributor

No, just use CAPIProvider.spec.version. There is no reason to hardcode the versions if we have to also put them here. This also implies Turtles does not need separate builds anymore.

Copy link
Copy Markdown
Contributor

@anmazzotti anmazzotti left a comment

Choose a reason for hiding this comment

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

Thank you @yiannistri

@alexander-demicev alexander-demicev merged commit ad2b2e1 into rancher:main Jan 23, 2026
11 of 20 checks passed
@yiannistri yiannistri deleted the add-images-in-values branch January 23, 2026 10:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area/airgapped kind/bug Something isn't working

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Turtles Providers images are missing in rancher-images.txt for airgap provisioning of 2.13.2-alpha4

4 participants