Skip to content
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
a958fc0
:sparkles: Support upstream hcloud-ccm. ProviderID changes to `hrobot…
guettli Nov 3, 2025
9e0dd80
... make generate.
guettli Nov 3, 2025
42e9483
fix grammar.
guettli Nov 3, 2025
619dc53
ProviderID of infra machines should not change: Validate that.
guettli Nov 4, 2025
88de8f0
make generate.
guettli Nov 4, 2025
2185a46
added docs, rename vars for better mgt-cluster vs wl-cluster understa…
guettli Nov 4, 2025
1f6ea11
create both keys in the secret: hcloud and token.
guettli Nov 4, 2025
09a030a
add note about source of secret.
guettli Nov 4, 2025
990a5b5
create both secrets for compatibilty.
guettli Nov 4, 2025
0e3c069
added a comment to hcloud change.
guettli Nov 4, 2025
dec7bfe
wording.
guettli Nov 4, 2025
b375950
inlined creation of ProviderID, to reduce complexity.
guettli Nov 5, 2025
5f62c63
Merge remote-tracking branch 'origin/main' into tg/support-provider-i…
guettli Nov 5, 2025
40d4fe9
fix typos.
guettli Nov 5, 2025
1fd26b9
make geneate.
guettli Nov 5, 2025
cdca0c3
updated comment about "token"
guettli Nov 5, 2025
4aea658
be explicit: recommend the defaults of upstream hcloud-ccm.
guettli Nov 5, 2025
a6979e0
make makefile target `install-ccm-in-wl-cluster` work again.
guettli Nov 5, 2025
3268799
Merge branch 'main' into tg/support-provider-id-format-of-upstream-ccm
guettli Nov 11, 2025
343c68d
Merge remote-tracking branch 'origin/main' into tg/support-provider-i…
guettli Nov 13, 2025
623f05a
added comment: we create up to three times the HLCOUD_KEY in the secret.
guettli Nov 14, 2025
c28ffdf
generate-manifests.
guettli Nov 14, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions api/v1beta1/types.go
Original file line number Diff line number Diff line change
Expand Up @@ -122,8 +122,11 @@ type HetznerSecretRef struct {
// HetznerSecretKeyRef defines the key name of the HetznerSecret.
// Need to specify either HCloudToken or both HetznerRobotUser and HetznerRobotPassword.
type HetznerSecretKeyRef struct {
// HCloudToken defines the name of the key where the token for the Hetzner Cloud API is stored.
// We recommend to use "token", because this is the default of upstream hcloud-ccm.
// hcloudToken defines the name of the key where the token for the Hetzner Cloud API is stored.
Copy link
Contributor

Choose a reason for hiding this comment

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

capital "HCloudToken"

// We recommend to use "token", because this is the default of upstream hcloud-ccm, while the
// legacy Syself ccm uses "hcloud". For maximal compatibility up to three keys get created in the
Copy link
Contributor

Choose a reason for hiding this comment

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

let's write "Syself fork" instead of "Syself ccm"

// secret for HCLOUD_TOKEN: "hcloud", "token" and the value of hcloudToken. This way we ensure
// that the ccm in the wl-cluster finds the secret.
//
// +optional
// +kubebuilder:default=token
Expand Down
4 changes: 4 additions & 0 deletions controllers/hetznercluster_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -533,6 +533,10 @@ func reconcileWorkloadClusterSecrets(ctx context.Context, clusterScope *scope.Cl
return reconcile.Result{}, nil
}

// reconcileOneWorkloadClusterSecret creates/updates the secret in the wl-cluster. For maximal
// compatibility up to three keys get created in the secret for HCLOUD_TOKEN: "hcloud", "token" and
// the value of HetznerCluster.Spec.HetznerSecret.Key.HCloudToken. See docstring of
// HetznerCluster.Spec.HetznerSecret.Key.HCloudToken.
func reconcileOneWorkloadClusterSecret(ctx context.Context, clusterScope *scope.ClusterScope, wlClient client.Client, name string) error {
wlSecret := &corev1.Secret{
ObjectMeta: metav1.ObjectMeta{
Expand Down
Loading