Skip to content

Commit 3a34845

Browse files
lukasmetznerlukasmetzner
committed
refactor: enabled suffix
1 parent aed8a4e commit 3a34845

6 files changed

Lines changed: 99 additions & 99 deletions

File tree

‎hcloud/cloud.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ func NewCloud(cidr string) (cloudprovider.Interface, error) {
108108
}
109109
networkID = n.ID
110110

111-
if cfg.Network.UseAttachedCheck {
111+
if cfg.Network.AttachedCheckEnabled {
112112
attached, err := serverIsAttachedToNetwork(metadataClient, networkID)
113113
if err != nil {
114114
return nil, fmt.Errorf("%s: checking if server is in Network not possible: %w", op, err)
@@ -181,7 +181,7 @@ func (c *cloud) LoadBalancer() (cloudprovider.LoadBalancer, bool) {
181181
Recorder: c.recorder,
182182
}
183183

184-
return newLoadBalancers(lbOps, c.cfg.LoadBalancer.UsePrivateIngress, c.cfg.LoadBalancer.UseIPv6), true
184+
return newLoadBalancers(lbOps, c.cfg.LoadBalancer.PrivateIngressEnabled, c.cfg.LoadBalancer.IPv6Enabled), true
185185
}
186186

187187
func (c *cloud) Clusters() (cloudprovider.Clusters, bool) {

‎hcloud/load_balancers.go‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -30,17 +30,17 @@ type LoadBalancerOps interface {
3030
}
3131

3232
type loadBalancers struct {
33-
lbOps LoadBalancerOps
34-
usePrivateIngressDefault bool
35-
useIPv6Default bool
36-
useProxyProtocolDefault bool
33+
lbOps LoadBalancerOps
34+
ipv6EnabledDefault bool
35+
proxyProtocolEnabledDefault bool
36+
privateIngressEnabledDefault bool
3737
}
3838

39-
func newLoadBalancers(lbOps LoadBalancerOps, usePrivateIngressDefault bool, useIPv6Default bool) *loadBalancers {
39+
func newLoadBalancers(lbOps LoadBalancerOps, privateIngressEnabledDefault bool, ipv6EnabledDefault bool) *loadBalancers {
4040
return &loadBalancers{
41-
lbOps: lbOps,
42-
usePrivateIngressDefault: usePrivateIngressDefault,
43-
useIPv6Default: useIPv6Default,
41+
lbOps: lbOps,
42+
ipv6EnabledDefault: ipv6EnabledDefault,
43+
privateIngressEnabledDefault: privateIngressEnabledDefault,
4444
}
4545
}
4646

@@ -219,12 +219,12 @@ func (l *loadBalancers) buildLoadBalancerStatusIngress(lb *hcloud.LoadBalancer,
219219
var ingress []corev1.LoadBalancerIngress
220220
ipMode := corev1.LoadBalancerIPModeVIP
221221

222-
useProxyProtocol, err := l.getUseProxyProtocol(svc)
222+
proxyProtocolEnabled, err := l.getProxyProtocolEnabled(svc)
223223
if err != nil {
224224
return nil, fmt.Errorf("%s: %w", op, err)
225225
}
226226

227-
if useProxyProtocol {
227+
if proxyProtocolEnabled {
228228
ipMode = corev1.LoadBalancerIPModeProxy
229229
}
230230

@@ -234,24 +234,24 @@ func (l *loadBalancers) buildLoadBalancerStatusIngress(lb *hcloud.LoadBalancer,
234234
IPMode: &ipMode,
235235
})
236236

237-
useIPv6, err := l.getUseIPv6(svc)
237+
ipv6Enabled, err := l.getIPv6Enabled(svc)
238238
if err != nil {
239239
return nil, fmt.Errorf("%s: %w", op, err)
240240
}
241-
if useIPv6 {
241+
if ipv6Enabled {
242242
ingress = append(ingress, corev1.LoadBalancerIngress{
243243
IP: lb.PublicNet.IPv6.IP.String(),
244244
IPMode: &ipMode,
245245
})
246246
}
247247
}
248248

249-
usePrivIngress, err := l.getUsePrivateIngress(svc)
249+
privateIngressEnabled, err := l.getPrivateIngressEnabled(svc)
250250
if err != nil {
251251
return nil, fmt.Errorf("%s: %w", op, err)
252252
}
253253

254-
if usePrivIngress {
254+
if privateIngressEnabled {
255255
for _, privateNet := range lb.PrivateNet {
256256
ingress = append(ingress, corev1.LoadBalancerIngress{
257257
IP: privateNet.IP.String(),
@@ -263,35 +263,35 @@ func (l *loadBalancers) buildLoadBalancerStatusIngress(lb *hcloud.LoadBalancer,
263263
return ingress, nil
264264
}
265265

266-
func (l *loadBalancers) getUsePrivateIngress(svc *corev1.Service) (bool, error) {
266+
func (l *loadBalancers) getPrivateIngressEnabled(svc *corev1.Service) (bool, error) {
267267
disable, err := annotation.LBDisablePrivateIngress.BoolFromService(svc)
268268
if err == nil {
269269
return !disable, nil
270270
}
271271
if errors.Is(err, annotation.ErrNotSet) {
272-
return l.usePrivateIngressDefault, nil
272+
return l.privateIngressEnabledDefault, nil
273273
}
274274
return true, err
275275
}
276276

277-
func (l *loadBalancers) getUseProxyProtocol(svc *corev1.Service) (bool, error) {
277+
func (l *loadBalancers) getProxyProtocolEnabled(svc *corev1.Service) (bool, error) {
278278
enable, err := annotation.LBSvcProxyProtocol.BoolFromService(svc)
279279
if err == nil {
280280
return enable, nil
281281
}
282282
if errors.Is(err, annotation.ErrNotSet) {
283-
return l.useProxyProtocolDefault, nil
283+
return l.proxyProtocolEnabledDefault, nil
284284
}
285285
return false, err
286286
}
287287

288-
func (l *loadBalancers) getUseIPv6(svc *corev1.Service) (bool, error) {
288+
func (l *loadBalancers) getIPv6Enabled(svc *corev1.Service) (bool, error) {
289289
disable, err := annotation.LBIPv6Disabled.BoolFromService(svc)
290290
if err == nil {
291291
return !disable, nil
292292
}
293293
if errors.Is(err, annotation.ErrNotSet) {
294-
return l.useIPv6Default, nil
294+
return l.ipv6EnabledDefault, nil
295295
}
296296
return true, err
297297
}

‎internal/config/config.go‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -76,17 +76,17 @@ type InstanceConfiguration struct {
7676
}
7777

7878
type LoadBalancerConfiguration struct {
79-
Enabled bool
80-
Location string
81-
NetworkZone string
82-
UsePrivateIngress bool
83-
UsePrivateIP bool
84-
UseIPv6 bool
79+
Enabled bool
80+
Location string
81+
NetworkZone string
82+
PrivateIngressEnabled bool
83+
PrivateIPEnabled bool
84+
IPv6Enabled bool
8585
}
8686

8787
type NetworkConfiguration struct {
88-
NameOrID string
89-
UseAttachedCheck bool
88+
NameOrID string
89+
AttachedCheckEnabled bool
9090
}
9191

9292
type RouteConfiguration struct {
@@ -172,29 +172,29 @@ func Read() (HCCMConfiguration, error) {
172172
cfg.LoadBalancer.Location = os.Getenv(hcloudLoadBalancersLocation)
173173
cfg.LoadBalancer.NetworkZone = os.Getenv(hcloudLoadBalancersNetworkZone)
174174

175-
cfg.LoadBalancer.UsePrivateIngress, err = getEnvBool(hcloudLoadBalancersDisablePrivateIngress, false)
175+
disablePrivateIngress, err := getEnvBool(hcloudLoadBalancersDisablePrivateIngress, false)
176176
if err != nil {
177177
errs = append(errs, err)
178178
}
179-
cfg.LoadBalancer.UsePrivateIngress = !cfg.LoadBalancer.UsePrivateIngress // Invert the logic, as the env var is prefixed with DISABLE_.
179+
cfg.LoadBalancer.PrivateIngressEnabled = !disablePrivateIngress // Invert the logic, as the env var is prefixed with DISABLE_.
180180

181-
cfg.LoadBalancer.UsePrivateIP, err = getEnvBool(hcloudLoadBalancersUsePrivateIP, false)
181+
cfg.LoadBalancer.PrivateIPEnabled, err = getEnvBool(hcloudLoadBalancersUsePrivateIP, false)
182182
if err != nil {
183183
errs = append(errs, err)
184184
}
185185

186-
cfg.LoadBalancer.UseIPv6, err = getEnvBool(hcloudLoadBalancersDisableIPv6, false)
186+
disableIPv6, err := getEnvBool(hcloudLoadBalancersDisableIPv6, false)
187187
if err != nil {
188188
errs = append(errs, err)
189189
}
190-
cfg.LoadBalancer.UseIPv6 = !cfg.LoadBalancer.UseIPv6 // Invert the logic, as the env var is prefixed with DISABLE_.
190+
cfg.LoadBalancer.IPv6Enabled = !disableIPv6 // Invert the logic, as the env var is prefixed with DISABLE_.
191191

192192
cfg.Network.NameOrID = os.Getenv(hcloudNetwork)
193-
cfg.Network.UseAttachedCheck, err = getEnvBool(hcloudNetworkDisableAttachedCheck, false)
193+
disableAttachedCheck, err := getEnvBool(hcloudNetworkDisableAttachedCheck, false)
194194
if err != nil {
195195
errs = append(errs, err)
196196
}
197-
cfg.Network.UseAttachedCheck = !cfg.Network.UseAttachedCheck // Invert the logic, as the env var is prefixed with DISABLE_.
197+
cfg.Network.AttachedCheckEnabled = !disableAttachedCheck // Invert the logic, as the env var is prefixed with DISABLE_.
198198

199199
// Enabling Routes only makes sense when a Network is configured, otherwise there is no network to add the routes to.
200200
if cfg.Network.NameOrID != "" {

‎internal/config/config_test.go‎

Lines changed: 46 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,12 @@ func TestRead(t *testing.T) {
2626
Metrics: MetricsConfiguration{Enabled: true, Address: ":8233"},
2727
Instance: InstanceConfiguration{AddressFamily: AddressFamilyIPv4},
2828
Network: NetworkConfiguration{
29-
UseAttachedCheck: true,
29+
AttachedCheckEnabled: true,
3030
},
3131
LoadBalancer: LoadBalancerConfiguration{
32-
Enabled: true,
33-
UsePrivateIngress: true,
34-
UseIPv6: true,
32+
Enabled: true,
33+
PrivateIngressEnabled: true,
34+
IPv6Enabled: true,
3535
},
3636
},
3737
wantErr: nil,
@@ -49,13 +49,13 @@ func TestRead(t *testing.T) {
4949
Metrics: MetricsConfiguration{Enabled: true, Address: ":8233"},
5050
Instance: InstanceConfiguration{AddressFamily: AddressFamilyIPv4},
5151
Network: NetworkConfiguration{
52-
NameOrID: "foobar",
53-
UseAttachedCheck: true,
52+
NameOrID: "foobar",
53+
AttachedCheckEnabled: true,
5454
},
5555
LoadBalancer: LoadBalancerConfiguration{
56-
Enabled: true,
57-
UsePrivateIngress: true,
58-
UseIPv6: true,
56+
Enabled: true,
57+
PrivateIngressEnabled: true,
58+
IPv6Enabled: true,
5959
},
6060
Route: RouteConfiguration{Enabled: true},
6161
},
@@ -86,12 +86,12 @@ func TestRead(t *testing.T) {
8686
Metrics: MetricsConfiguration{Enabled: true, Address: ":8233"},
8787
Instance: InstanceConfiguration{AddressFamily: AddressFamilyIPv4},
8888
Network: NetworkConfiguration{
89-
UseAttachedCheck: true,
89+
AttachedCheckEnabled: true,
9090
},
9191
LoadBalancer: LoadBalancerConfiguration{
92-
Enabled: true,
93-
UsePrivateIngress: true,
94-
UseIPv6: true,
92+
Enabled: true,
93+
PrivateIngressEnabled: true,
94+
IPv6Enabled: true,
9595
},
9696
Route: RouteConfiguration{Enabled: false},
9797
},
@@ -134,12 +134,12 @@ failed to read ROBOT_PASSWORD_FILE: open /tmp/hetzner-password: no such file or
134134
Metrics: MetricsConfiguration{Enabled: true, Address: ":8233"},
135135
Instance: InstanceConfiguration{AddressFamily: AddressFamilyIPv4},
136136
Network: NetworkConfiguration{
137-
UseAttachedCheck: true,
137+
AttachedCheckEnabled: true,
138138
},
139139
LoadBalancer: LoadBalancerConfiguration{
140-
Enabled: true,
141-
UsePrivateIngress: true,
142-
UseIPv6: true,
140+
Enabled: true,
141+
PrivateIngressEnabled: true,
142+
IPv6Enabled: true,
143143
},
144144
},
145145
wantErr: nil,
@@ -165,12 +165,12 @@ failed to read ROBOT_PASSWORD_FILE: open /tmp/hetzner-password: no such file or
165165
Metrics: MetricsConfiguration{Enabled: true, Address: ":8233"},
166166
Instance: InstanceConfiguration{AddressFamily: AddressFamilyIPv4},
167167
Network: NetworkConfiguration{
168-
UseAttachedCheck: true,
168+
AttachedCheckEnabled: true,
169169
},
170170
LoadBalancer: LoadBalancerConfiguration{
171-
Enabled: true,
172-
UsePrivateIngress: true,
173-
UseIPv6: true,
171+
Enabled: true,
172+
PrivateIngressEnabled: true,
173+
IPv6Enabled: true,
174174
},
175175
},
176176
wantErr: nil,
@@ -197,12 +197,12 @@ failed to read ROBOT_PASSWORD_FILE: open /tmp/hetzner-password: no such file or
197197
Metrics: MetricsConfiguration{Enabled: true, Address: ":8233"},
198198
Instance: InstanceConfiguration{AddressFamily: AddressFamilyIPv4},
199199
Network: NetworkConfiguration{
200-
UseAttachedCheck: true,
200+
AttachedCheckEnabled: true,
201201
},
202202
LoadBalancer: LoadBalancerConfiguration{
203-
Enabled: true,
204-
UsePrivateIngress: true,
205-
UseIPv6: true,
203+
Enabled: true,
204+
PrivateIngressEnabled: true,
205+
IPv6Enabled: true,
206206
},
207207
},
208208
wantErr: nil,
@@ -217,12 +217,12 @@ failed to read ROBOT_PASSWORD_FILE: open /tmp/hetzner-password: no such file or
217217
Metrics: MetricsConfiguration{Enabled: true, Address: ":8233"},
218218
Instance: InstanceConfiguration{AddressFamily: AddressFamilyIPv6},
219219
Network: NetworkConfiguration{
220-
UseAttachedCheck: true,
220+
AttachedCheckEnabled: true,
221221
},
222222
LoadBalancer: LoadBalancerConfiguration{
223-
Enabled: true,
224-
UsePrivateIngress: true,
225-
UseIPv6: true,
223+
Enabled: true,
224+
PrivateIngressEnabled: true,
225+
IPv6Enabled: true,
226226
},
227227
},
228228
wantErr: nil,
@@ -238,13 +238,13 @@ failed to read ROBOT_PASSWORD_FILE: open /tmp/hetzner-password: no such file or
238238
Metrics: MetricsConfiguration{Enabled: true, Address: ":8233"},
239239
Instance: InstanceConfiguration{AddressFamily: AddressFamilyIPv4},
240240
LoadBalancer: LoadBalancerConfiguration{
241-
Enabled: true,
242-
UsePrivateIngress: true,
243-
UseIPv6: true,
241+
Enabled: true,
242+
PrivateIngressEnabled: true,
243+
IPv6Enabled: true,
244244
},
245245
Network: NetworkConfiguration{
246-
NameOrID: "foobar",
247-
UseAttachedCheck: false,
246+
NameOrID: "foobar",
247+
AttachedCheckEnabled: false,
248248
},
249249
Route: RouteConfiguration{Enabled: true},
250250
},
@@ -261,13 +261,13 @@ failed to read ROBOT_PASSWORD_FILE: open /tmp/hetzner-password: no such file or
261261
Metrics: MetricsConfiguration{Enabled: true, Address: ":8233"},
262262
Instance: InstanceConfiguration{AddressFamily: AddressFamilyIPv4},
263263
LoadBalancer: LoadBalancerConfiguration{
264-
Enabled: true,
265-
UsePrivateIngress: true,
266-
UseIPv6: true,
264+
Enabled: true,
265+
PrivateIngressEnabled: true,
266+
IPv6Enabled: true,
267267
},
268268
Network: NetworkConfiguration{
269-
NameOrID: "foobar",
270-
UseAttachedCheck: true,
269+
NameOrID: "foobar",
270+
AttachedCheckEnabled: true,
271271
},
272272
Route: RouteConfiguration{Enabled: false},
273273
},
@@ -288,15 +288,15 @@ failed to read ROBOT_PASSWORD_FILE: open /tmp/hetzner-password: no such file or
288288
Metrics: MetricsConfiguration{Enabled: true, Address: ":8233"},
289289
Instance: InstanceConfiguration{AddressFamily: AddressFamilyIPv4},
290290
Network: NetworkConfiguration{
291-
UseAttachedCheck: true,
291+
AttachedCheckEnabled: true,
292292
},
293293
LoadBalancer: LoadBalancerConfiguration{
294-
Enabled: false,
295-
Location: "nbg1",
296-
NetworkZone: "eu-central",
297-
UsePrivateIngress: false,
298-
UsePrivateIP: true,
299-
UseIPv6: false,
294+
Enabled: false,
295+
Location: "nbg1",
296+
NetworkZone: "eu-central",
297+
PrivateIngressEnabled: false,
298+
PrivateIPEnabled: true,
299+
IPv6Enabled: false,
300300
},
301301
},
302302
wantErr: nil,

0 commit comments

Comments
 (0)