Skip to content

Commit 8dce78b

Browse files
authored
feat: enable watch based route reconciliation by default (#1112)
This will enable the watch based route reconciliation by default. We already mentioned this feature gate in [v1.27.0](https://github.com/hetznercloud/hcloud-cloud-controller-manager/releases/tag/v1.27.0)
1 parent a724c8e commit 8dce78b

File tree

8 files changed

+109
-267
lines changed

8 files changed

+109
-267
lines changed

chart/.snapshots/default.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ spec:
140140
args:
141141
- "--allow-untagged-cloud"
142142
- "--cloud-provider=hcloud"
143-
- "--feature-gates=CloudControllerManagerWatchBasedRoutesReconciliation=false"
143+
- "--feature-gates=CloudControllerManagerWatchBasedRoutesReconciliation=true"
144144
- "--route-reconciliation-period=30s"
145145
- "--webhook-secure-port=0"
146146
- "--leader-elect=false"

chart/.snapshots/full.daemonset.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ spec:
150150
- "/bin/hcloud-cloud-controller-manager"
151151
- "--allow-untagged-cloud"
152152
- "--cloud-provider=hcloud"
153-
- "--feature-gates=CloudControllerManagerWatchBasedRoutesReconciliation=false"
153+
- "--feature-gates=CloudControllerManagerWatchBasedRoutesReconciliation=true"
154154
- "--route-reconciliation-period=30s"
155155
- "--webhook-secure-port=0"
156156
env:

chart/values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ args:
2121
# - Node deleted
2222
# - Node PodCIDRs, or Addresses updated
2323
# This replaces the fixed route reconcile interval of 30s
24-
feature-gates: "CloudControllerManagerWatchBasedRoutesReconciliation=false"
24+
feature-gates: "CloudControllerManagerWatchBasedRoutesReconciliation=true"
2525

2626
# Change deployment kind from "Deployment" to "DaemonSet"
2727
kind: Deployment

deploy/ccm-networks.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ spec:
139139
args:
140140
- "--allow-untagged-cloud"
141141
- "--cloud-provider=hcloud"
142-
- "--feature-gates=CloudControllerManagerWatchBasedRoutesReconciliation=false"
142+
- "--feature-gates=CloudControllerManagerWatchBasedRoutesReconciliation=true"
143143
- "--route-reconciliation-period=30s"
144144
- "--webhook-secure-port=0"
145145
- "--allocate-node-cidrs=true"

deploy/ccm.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ spec:
138138
args:
139139
- "--allow-untagged-cloud"
140140
- "--cloud-provider=hcloud"
141-
- "--feature-gates=CloudControllerManagerWatchBasedRoutesReconciliation=false"
141+
- "--feature-gates=CloudControllerManagerWatchBasedRoutesReconciliation=true"
142142
- "--route-reconciliation-period=30s"
143143
- "--webhook-secure-port=0"
144144
- "--leader-elect=false"

go.mod

Lines changed: 27 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/hetznercloud/hcloud-cloud-controller-manager
22

3-
go 1.24.0
3+
go 1.25.0
44

55
toolchain go1.25.5
66

@@ -11,11 +11,11 @@ require (
1111
github.com/stretchr/testify v1.11.1
1212
github.com/syself/hrobot-go v0.2.7
1313
golang.org/x/time v0.14.0
14-
k8s.io/api v0.34.3
15-
k8s.io/apimachinery v0.34.3
16-
k8s.io/client-go v0.34.3
17-
k8s.io/cloud-provider v0.34.3
18-
k8s.io/component-base v0.34.3
14+
k8s.io/api v0.35.0
15+
k8s.io/apimachinery v0.35.0
16+
k8s.io/client-go v0.35.0
17+
k8s.io/cloud-provider v0.35.0
18+
k8s.io/component-base v0.35.0
1919
k8s.io/klog/v2 v2.130.1
2020
)
2121

@@ -35,7 +35,7 @@ require (
3535
github.com/felixge/httpsnoop v1.0.4 // indirect
3636
github.com/fsnotify/fsnotify v1.9.0 // indirect
3737
github.com/fxamacker/cbor/v2 v2.9.0 // indirect
38-
github.com/go-logr/logr v1.4.2 // indirect
38+
github.com/go-logr/logr v1.4.3 // indirect
3939
github.com/go-logr/stdr v1.2.2 // indirect
4040
github.com/go-openapi/jsonpointer v0.21.0 // indirect
4141
github.com/go-openapi/jsonreference v0.20.2 // indirect
@@ -58,31 +58,30 @@ require (
5858
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
5959
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
6060
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
61-
github.com/pkg/errors v0.9.1 // indirect
6261
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
6362
github.com/prometheus/client_model v0.6.2 // indirect
6463
github.com/prometheus/common v0.66.1 // indirect
6564
github.com/prometheus/procfs v0.16.1 // indirect
66-
github.com/spf13/cobra v1.9.1 // indirect
65+
github.com/spf13/cobra v1.10.0 // indirect
6766
github.com/stoewer/go-strcase v1.3.0 // indirect
6867
github.com/stretchr/objx v0.5.2 // indirect
6968
github.com/x448/float16 v0.8.4 // indirect
70-
go.etcd.io/etcd/api/v3 v3.6.4 // indirect
71-
go.etcd.io/etcd/client/pkg/v3 v3.6.4 // indirect
72-
go.etcd.io/etcd/client/v3 v3.6.4 // indirect
69+
go.etcd.io/etcd/api/v3 v3.6.5 // indirect
70+
go.etcd.io/etcd/client/pkg/v3 v3.6.5 // indirect
71+
go.etcd.io/etcd/client/v3 v3.6.5 // indirect
7372
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
7473
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.60.0 // indirect
75-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.58.0 // indirect
76-
go.opentelemetry.io/otel v1.35.0 // indirect
74+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.61.0 // indirect
75+
go.opentelemetry.io/otel v1.36.0 // indirect
7776
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.34.0 // indirect
7877
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.34.0 // indirect
79-
go.opentelemetry.io/otel/metric v1.35.0 // indirect
80-
go.opentelemetry.io/otel/sdk v1.34.0 // indirect
81-
go.opentelemetry.io/otel/trace v1.35.0 // indirect
78+
go.opentelemetry.io/otel/metric v1.36.0 // indirect
79+
go.opentelemetry.io/otel/sdk v1.36.0 // indirect
80+
go.opentelemetry.io/otel/trace v1.36.0 // indirect
8281
go.opentelemetry.io/proto/otlp v1.5.0 // indirect
8382
go.uber.org/multierr v1.11.0 // indirect
8483
go.uber.org/zap v1.27.0 // indirect
85-
go.yaml.in/yaml/v2 v2.4.2 // indirect
84+
go.yaml.in/yaml/v2 v2.4.3 // indirect
8685
go.yaml.in/yaml/v3 v3.0.4 // indirect
8786
golang.org/x/crypto v0.45.0 // indirect
8887
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
@@ -93,26 +92,22 @@ require (
9392
golang.org/x/term v0.37.0 // indirect
9493
golang.org/x/text v0.31.0 // indirect
9594
google.golang.org/genproto/googleapis/api v0.0.0-20250303144028-a0af3efb3deb // indirect
96-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250303144028-a0af3efb3deb // indirect
97-
google.golang.org/grpc v1.72.1 // indirect
95+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250528174236-200df99c418a // indirect
96+
google.golang.org/grpc v1.72.2 // indirect
9897
google.golang.org/protobuf v1.36.8 // indirect
99-
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
98+
gopkg.in/evanphx/json-patch.v4 v4.13.0 // indirect
10099
gopkg.in/inf.v0 v0.9.1 // indirect
101100
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
102101
gopkg.in/yaml.v3 v3.0.1 // indirect
103-
k8s.io/apiserver v0.34.1 // indirect
104-
k8s.io/component-helpers v0.34.1 // indirect
105-
k8s.io/controller-manager v0.34.1 // indirect
106-
k8s.io/kms v0.34.1 // indirect
107-
k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b // indirect
108-
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 // indirect
102+
k8s.io/apiserver v0.35.0 // indirect
103+
k8s.io/component-helpers v0.35.0 // indirect
104+
k8s.io/controller-manager v0.35.0 // indirect
105+
k8s.io/kms v0.35.0 // indirect
106+
k8s.io/kube-openapi v0.0.0-20250910181357-589584f1c912 // indirect
107+
k8s.io/utils v0.0.0-20251002143259-bc988d571ff4 // indirect
109108
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2 // indirect
110-
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
109+
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 // indirect
111110
sigs.k8s.io/randfill v1.0.0 // indirect
112111
sigs.k8s.io/structured-merge-diff/v6 v6.3.0 // indirect
113112
sigs.k8s.io/yaml v1.6.0 // indirect
114113
)
115-
116-
replace k8s.io/cloud-provider => github.com/lukasmetzner/cloud-provider v0.34.1-watch-based-route-reconciliation
117-
118-
replace k8s.io/controller-manager => github.com/lukasmetzner/controller-manager v0.34.1-watch-based-route-reconciliation

0 commit comments

Comments
 (0)