Skip to content

🌱 Set v1.1.x to main branch, and release.#1781

Open
guettli wants to merge 5 commits intotg/support-provider-id-format-of-upstream-ccmfrom
tg/align-v1.1.x-to-current-main-then-reset-main
Open

🌱 Set v1.1.x to main branch, and release.#1781
guettli wants to merge 5 commits intotg/support-provider-id-format-of-upstream-ccmfrom
tg/align-v1.1.x-to-current-main-then-reset-main

Conversation

@guettli
Copy link
Copy Markdown
Collaborator

@guettli guettli commented Jan 22, 2026

Previous PR: hcloud-ccm #1703
Next PR: #1775 (first beta2 PR)

Note

This is the last PR without beta2.
We should merge that to main (or reset main), and the release that to our commmercial customers.
After that we can work on beta2.

At the end of 2025 the main was reset to reflect the last release.

After this PR is merged to v1.1.x we plan to reset main again, and release caph v1.1.x

Tasks

  • Update README.md and Pull-Request-Template to reflect the changes.
  • Fix e2e tests.
  • Maybe update CAPI to a newer version (which still supports beta1)
  • Reset main
  • Release
  • Deploy
  • Work on beta2

Commits behind main

These commits of main are not in v1.1.x branch.

Status explains whether the change is already covered in v1.1.x, superseded there, or tracked by a follow-up backport PR.

"done" in first column means check by Thomas.

Status Short explanation main v1.1.x Description
done covered in v1.1.x by the combined irrecoverable and unauthorized error backport d26a5d6e / #1887 #1889 · #1891 Stops retry loops for irrecoverable Hetzner API errors like invalid_input and resource_unavailable.
in-review still missing in v1.1.x; opened a focused backport PR 774ec79d / #1892 #1904 Updates the bundled InstallImage assets to v1.0.8 and adjusts Tilt support for the new tarball.
done v1.1.x already exits remediation when providerID is nil, so the main fix is covered differently there 7311bf8d / #1881 #1693 Treats a missing hcloud providerID like an absent server during remediation and adds regression tests.
done covered in v1.1.x by the combined irrecoverable and unauthorized error backport 773cfee5 / #1888 #1889 · #1891 Skips further reconciliation when credentials are invalid so the machine can be replaced instead of hammering the API.
done equivalent cleanup already landed there; .vscode/settings.json is no longer tracked 995e1037 / #1882 #1827 Stops tracking workspace-specific VS Code settings and updates .gitignore.
done .lycheecache is already ignored there 2bc46054 / #1866 #1729 Ignores the Lychee cache file so local link-checker runs do not create git noise.
done needed as the RBAC dependency for namespace annotation-based skipping d1307676 / #1867 #1902 Adds the missing namespace list/watch RBAC permissions needed by the controller-runtime cache.
done annotation-based namespace skip is still missing in v1.1.x 85b5a479 / #1865 #1902 Replaces the CLI flag with a namespace annotation-based skip mechanism across reconcilers, with docs and tests.
in-review findServer() rate-limit handling is still missing in v1.1.x 95bd72d9 / #1857 #1903 Fixes nil-handling around handleRateLimit() so rate-limited paths do not fail unexpectedly, and adds tests.
done the old --ignored-namespaces flag was replaced on main by #1865; the v1.1.x backport is in #1902 91557cd2 / #1859 · #1865 #1902 Adds the earlier --ignored-namespaces flag for skipping reconciliation in selected namespaces.
done later lint workflow and Lychee cache updates already cover this 24752ea1 / #1860 #1729 · #1875 Repairs the link-lint workflow/configuration and removes a duplicate verify run.
done docs only 4a858e2a / #1777 Updates README with version compatibility details.
done already in v1.1.x via equivalent tooling commits 5fd82990 / #1769 #1676 · #1810 Builder image 1.0.26 adds controller-gen.
in-review already included in this PR 18f39913 / #1765 #1781 Sets ServerCreateSucceededCondition to True on every reconcile.
done already in v1.1.x 056208c4 / #1762 #1772 Improves InstallImage documentation.
done already in v1.1.x f4cf9edd / #1758 #1772 Improves the error message when hcloud server creation fails.
done already in v1.1.x 92674977 / #1766 Updates mockery so make generate works again.
done already in v1.1.x bc2a9140 / #1768 #1810 Fixes the builder image so pipx can find yamlfixer.
done already in v1.1.x 2efc3f88 / #1767 #1771 · #1810 Updates the builder image and bumps Go to 1.25.
done later tooling updates there already provide controller-gen e1ac808a / #1763 #1676 #1810 Bumps controller-gen.
done v1.1.x no longer relies on PortAfterCloudInit in the affected path 95ba030f / #1752 #1670 Falls back to port 22 when no SSH port is specified.
done host-not-found remediation is already covered on v1.1.x 0da2770b / #1754 #1898 Sets an error when the HBMH is gone so the HBMM can be deleted.
done docs only 18673e61 / #1751 Elaborates on the difference between main and v1.1.x.
done docs only 02c70ab9 / #1744 Announces the v1.1.x branch and the PR handling workflow.
in-review docs fence cleanup is still missing in v1.1.x c9faedba / #1739 #1905 Fixes the console language.
done already in v1.1.x 1636fb3e / #1694 #1693 Allows all values for the HCloudMachine type field.

At the end of 2025 the main was reset to reflect the last release.

After this PR is merged to v1.1.x we plan to reset
main again, and release caph v1.1.x
…ue on every Reconcile

`18f39913` 🌱 Set ServerCreateSucceededCondition to True on every Reconcile. ([#1765](#1765))
…align-v1.1.x-to-current-main-then-reset-main
@github-actions github-actions bot added size/XS Denotes a PR that changes 0-20 lines, ignoring generated files. area/code Changes made in the code directory labels Mar 26, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area/code Changes made in the code directory size/XS Denotes a PR that changes 0-20 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant