Skip to content

Commit e08417d

Browse files
authored
feat: implement ipMode (#185)
1 parent 23fe217 commit e08417d

File tree

8 files changed

+392
-177
lines changed

8 files changed

+392
-177
lines changed

.github/workflows/pull-request.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
unit-test:
88
strategy:
99
matrix:
10-
go-version: [1.23.x]
10+
go-version: [1.24.x]
1111
platform: [ubuntu-latest]
1212
runs-on: ${{ matrix.platform }}
1313
steps:
@@ -25,7 +25,7 @@ jobs:
2525
build-test:
2626
strategy:
2727
matrix:
28-
go-version: [1.23.x]
28+
go-version: [1.24.x]
2929
platform: [ubuntu-latest]
3030
arch: [386, amd64, arm, arm64]
3131
runs-on: ${{ matrix.platform }}

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.23-alpine as builder
1+
FROM golang:1.24-alpine AS builder
22

33
RUN apk update && apk add --no-cache git ca-certificates && update-ca-certificates
44

docs/loadbalancer-annotations.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -196,3 +196,11 @@ Changing the IPs will result in the re-creation of the LB.
196196
The possible formats are:
197197
- `<ip-id>`: will attach a single IP to the LB.
198198
- `<ip-id>,<ip-id>`: will attach the two IPs to the LB.
199+
200+
### `service.beta.kubernetes.io/scw-loadbalancer-ip-mode`
201+
202+
This is the annotation to manually set the `.status.loadBalancer.ingress.ipMode` field of the service.
203+
The accepted values are "Proxy" and "VIP". Please refer to this article for more information about IPMode:
204+
<https://kubernetes.io/blog/2023/12/18/kubernetes-1-29-feature-loadbalancer-ip-mode-alpha/>.
205+
When proxy-protocol is enabled on ALL the ports of the service, the ipMode
206+
is automatically set to "Proxy". You can use this annotation to override this.

go.mod

Lines changed: 51 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,25 @@
11
module github.com/scaleway/scaleway-cloud-controller-manager
22

3-
go 1.23.0
4-
5-
toolchain go1.23.6
3+
go 1.24.5
64

75
require (
8-
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.32
9-
golang.org/x/exp v0.0.0-20250207012021-f9890c6ad9f3
10-
google.golang.org/protobuf v1.36.5
11-
k8s.io/api v0.32.1
12-
k8s.io/apimachinery v0.32.1
13-
k8s.io/client-go v0.32.1
14-
k8s.io/cloud-provider v0.32.1
15-
k8s.io/component-base v0.32.1
6+
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.33
7+
golang.org/x/exp v0.0.0-20250620022241-b7579e27df2b
8+
google.golang.org/protobuf v1.36.6
9+
k8s.io/api v0.33.2
10+
k8s.io/apimachinery v0.33.2
11+
k8s.io/client-go v0.33.2
12+
k8s.io/cloud-provider v0.33.2
13+
k8s.io/component-base v0.33.2
1614
k8s.io/klog/v2 v2.130.1
15+
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738
1716
)
1817

1918
require (
20-
cel.dev/expr v0.18.0 // indirect
19+
cel.dev/expr v0.19.1 // indirect
2120
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
2221
github.com/NYTimes/gziphandler v1.1.1 // indirect
2322
github.com/antlr4-go/antlr/v4 v4.13.0 // indirect
24-
github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a // indirect
2523
github.com/beorn7/perks v1.0.1 // indirect
2624
github.com/blang/semver/v4 v4.0.0 // indirect
2725
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
@@ -40,69 +38,70 @@ require (
4038
github.com/go-openapi/swag v0.23.0 // indirect
4139
github.com/gogo/protobuf v1.3.2 // indirect
4240
github.com/golang/protobuf v1.5.4 // indirect
43-
github.com/google/btree v1.0.1 // indirect
44-
github.com/google/cel-go v0.22.0 // indirect
45-
github.com/google/gnostic-models v0.6.8 // indirect
46-
github.com/google/go-cmp v0.6.0 // indirect
47-
github.com/google/gofuzz v1.2.0 // indirect
41+
github.com/google/btree v1.1.3 // indirect
42+
github.com/google/cel-go v0.23.2 // indirect
43+
github.com/google/gnostic-models v0.6.9 // indirect
44+
github.com/google/go-cmp v0.7.0 // indirect
4845
github.com/google/uuid v1.6.0 // indirect
4946
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
50-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 // indirect
47+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.24.0 // indirect
5148
github.com/inconshreveable/mousetrap v1.1.0 // indirect
5249
github.com/josharian/intern v1.0.0 // indirect
5350
github.com/json-iterator/go v1.1.12 // indirect
51+
github.com/kylelemons/godebug v1.1.0 // indirect
5452
github.com/mailru/easyjson v0.7.7 // indirect
5553
github.com/moby/term v0.5.0 // indirect
5654
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
5755
github.com/modern-go/reflect2 v1.0.2 // indirect
5856
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
5957
github.com/pkg/errors v0.9.1 // indirect
60-
github.com/prometheus/client_golang v1.19.1 // indirect
58+
github.com/prometheus/client_golang v1.22.0 // indirect
6159
github.com/prometheus/client_model v0.6.1 // indirect
62-
github.com/prometheus/common v0.55.0 // indirect
60+
github.com/prometheus/common v0.62.0 // indirect
6361
github.com/prometheus/procfs v0.15.1 // indirect
6462
github.com/spf13/cobra v1.8.1 // indirect
6563
github.com/spf13/pflag v1.0.5 // indirect
6664
github.com/stoewer/go-strcase v1.3.0 // indirect
6765
github.com/x448/float16 v0.8.4 // indirect
68-
go.etcd.io/etcd/api/v3 v3.5.16 // indirect
69-
go.etcd.io/etcd/client/pkg/v3 v3.5.16 // indirect
70-
go.etcd.io/etcd/client/v3 v3.5.16 // indirect
71-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.53.0 // indirect
72-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect
73-
go.opentelemetry.io/otel v1.28.0 // indirect
74-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0 // indirect
75-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.27.0 // indirect
76-
go.opentelemetry.io/otel/metric v1.28.0 // indirect
77-
go.opentelemetry.io/otel/sdk v1.28.0 // indirect
78-
go.opentelemetry.io/otel/trace v1.28.0 // indirect
79-
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
66+
go.etcd.io/etcd/api/v3 v3.5.21 // indirect
67+
go.etcd.io/etcd/client/pkg/v3 v3.5.21 // indirect
68+
go.etcd.io/etcd/client/v3 v3.5.21 // indirect
69+
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
70+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.58.0 // indirect
71+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.58.0 // indirect
72+
go.opentelemetry.io/otel v1.33.0 // indirect
73+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.33.0 // indirect
74+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.33.0 // indirect
75+
go.opentelemetry.io/otel/metric v1.33.0 // indirect
76+
go.opentelemetry.io/otel/sdk v1.33.0 // indirect
77+
go.opentelemetry.io/otel/trace v1.33.0 // indirect
78+
go.opentelemetry.io/proto/otlp v1.4.0 // indirect
8079
go.uber.org/multierr v1.11.0 // indirect
8180
go.uber.org/zap v1.27.0 // indirect
82-
golang.org/x/crypto v0.31.0 // indirect
83-
golang.org/x/net v0.33.0 // indirect
84-
golang.org/x/oauth2 v0.23.0 // indirect
85-
golang.org/x/sync v0.10.0 // indirect
86-
golang.org/x/sys v0.28.0 // indirect
87-
golang.org/x/term v0.27.0 // indirect
88-
golang.org/x/text v0.21.0 // indirect
89-
golang.org/x/time v0.7.0 // indirect
90-
google.golang.org/genproto/googleapis/api v0.0.0-20240826202546-f6391c0de4c7 // indirect
91-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240826202546-f6391c0de4c7 // indirect
92-
google.golang.org/grpc v1.65.0 // indirect
81+
golang.org/x/crypto v0.36.0 // indirect
82+
golang.org/x/net v0.38.0 // indirect
83+
golang.org/x/oauth2 v0.27.0 // indirect
84+
golang.org/x/sync v0.15.0 // indirect
85+
golang.org/x/sys v0.31.0 // indirect
86+
golang.org/x/term v0.30.0 // indirect
87+
golang.org/x/text v0.23.0 // indirect
88+
golang.org/x/time v0.9.0 // indirect
89+
google.golang.org/genproto/googleapis/api v0.0.0-20241209162323-e6fa225c2576 // indirect
90+
google.golang.org/genproto/googleapis/rpc v0.0.0-20241209162323-e6fa225c2576 // indirect
91+
google.golang.org/grpc v1.68.1 // indirect
9392
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
9493
gopkg.in/inf.v0 v0.9.1 // indirect
9594
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
9695
gopkg.in/yaml.v2 v2.4.0 // indirect
9796
gopkg.in/yaml.v3 v3.0.1 // indirect
98-
k8s.io/apiserver v0.32.1 // indirect
99-
k8s.io/component-helpers v0.32.1 // indirect
100-
k8s.io/controller-manager v0.32.1 // indirect
101-
k8s.io/kms v0.32.1 // indirect
102-
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect
103-
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 // indirect
104-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.0 // indirect
97+
k8s.io/apiserver v0.33.2 // indirect
98+
k8s.io/component-helpers v0.33.2 // indirect
99+
k8s.io/controller-manager v0.33.2 // indirect
100+
k8s.io/kms v0.33.2 // indirect
101+
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff // indirect
102+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2 // indirect
105103
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
106-
sigs.k8s.io/structured-merge-diff/v4 v4.4.2 // indirect
104+
sigs.k8s.io/randfill v1.0.0 // indirect
105+
sigs.k8s.io/structured-merge-diff/v4 v4.6.0 // indirect
107106
sigs.k8s.io/yaml v1.4.0 // indirect
108107
)

0 commit comments

Comments
 (0)