Skip to content

Commit c6f6497

Browse files
Lemaitre JacquesLemaitre Jacques
authored andcommitted
upgrade version operator sdk 1.32.0
1 parent a0ec52a commit c6f6497

File tree

3 files changed

+99
-152
lines changed

3 files changed

+99
-152
lines changed

cmd/main.go

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,17 +25,17 @@ import (
2525
// to ensure that exec-entrypoint and run can make use of them.
2626
_ "k8s.io/client-go/plugin/pkg/client/auth"
2727

28+
s3v1alpha1 "github.com/inseefrlab/s3-operator/api/v1alpha1"
29+
controllers "github.com/inseefrlab/s3-operator/internal/controller"
30+
"github.com/inseefrlab/s3-operator/internal/controller/s3/factory"
2831
"go.uber.org/zap/zapcore"
2932
"k8s.io/apimachinery/pkg/runtime"
3033
utilruntime "k8s.io/apimachinery/pkg/util/runtime"
3134
clientgoscheme "k8s.io/client-go/kubernetes/scheme"
3235
ctrl "sigs.k8s.io/controller-runtime"
3336
"sigs.k8s.io/controller-runtime/pkg/healthz"
3437
"sigs.k8s.io/controller-runtime/pkg/log/zap"
35-
36-
s3v1alpha1 "github.com/inseefrlab/s3-operator/api/v1alpha1"
37-
"github.com/inseefrlab/s3-operator/internal/controller"
38-
"github.com/inseefrlab/s3-operator/internal/controller/s3/factory"
38+
"sigs.k8s.io/controller-runtime/pkg/metrics/server"
3939
//+kubebuilder:scaffold:imports
4040
)
4141

@@ -104,10 +104,15 @@ func main() {
104104

105105
ctrl.SetLogger(zap.New(zap.UseFlagOptions(&opts)))
106106

107+
// change due to upgrade version to 0.16.2 of sigs.k8s.io/controller-runtime
108+
var serverOption = server.Options{
109+
BindAddress: metricsAddr,
110+
}
107111
mgr, err := ctrl.NewManager(ctrl.GetConfigOrDie(), ctrl.Options{
108-
Scheme: scheme,
109-
MetricsBindAddress: metricsAddr,
110-
Port: 9443,
112+
Scheme: scheme,
113+
Metrics: serverOption,
114+
// commented because option format change in ctrl.Options
115+
//Port: 9443,
111116
HealthProbeBindAddress: probeAddr,
112117
LeaderElection: enableLeaderElection,
113118
LeaderElectionID: "1402b7b1.onyxia.sh",

go.mod

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ go 1.20
55
require (
66
github.com/minio/madmin-go/v2 v2.2.1
77
github.com/minio/minio-go/v7 v7.0.55
8-
github.com/onsi/ginkgo/v2 v2.9.5
9-
github.com/onsi/gomega v1.27.7
10-
go.uber.org/zap v1.24.0
11-
k8s.io/apimachinery v0.27.2
12-
k8s.io/client-go v0.27.2
13-
sigs.k8s.io/controller-runtime v0.15.0
8+
github.com/onsi/ginkgo/v2 v2.11.0
9+
github.com/onsi/gomega v1.27.10
10+
go.uber.org/zap v1.25.0
11+
k8s.io/apimachinery v0.28.2
12+
k8s.io/client-go v0.28.2
13+
sigs.k8s.io/controller-runtime v0.16.2
1414
)
1515

1616
require (
@@ -25,15 +25,15 @@ require (
2525
github.com/go-logr/zapr v1.2.4 // indirect
2626
github.com/go-ole/go-ole v1.2.6 // indirect
2727
github.com/go-openapi/jsonpointer v0.19.6 // indirect
28-
github.com/go-openapi/jsonreference v0.20.1 // indirect
28+
github.com/go-openapi/jsonreference v0.20.2 // indirect
2929
github.com/go-openapi/swag v0.22.3 // indirect
3030
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
3131
github.com/gogo/protobuf v1.3.2 // indirect
3232
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
3333
github.com/golang/protobuf v1.5.3 // indirect
34-
github.com/google/gnostic v0.5.7-v3refs // indirect
34+
github.com/google/gnostic-models v0.6.8 // indirect
3535
github.com/google/go-cmp v0.5.9 // indirect
36-
github.com/google/gofuzz v1.1.0 // indirect
36+
github.com/google/gofuzz v1.2.0 // indirect
3737
github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 // indirect
3838
github.com/google/uuid v1.3.0 // indirect
3939
github.com/imdario/mergo v0.3.12 // indirect
@@ -52,10 +52,10 @@ require (
5252
github.com/philhofer/fwd v1.1.2 // indirect
5353
github.com/pkg/errors v0.9.1 // indirect
5454
github.com/power-devops/perfstat v0.0.0-20221212215047-62379fc7944b // indirect
55-
github.com/prometheus/client_golang v1.15.1 // indirect
55+
github.com/prometheus/client_golang v1.16.0 // indirect
5656
github.com/prometheus/client_model v0.4.0 // indirect
57-
github.com/prometheus/common v0.42.0 // indirect
58-
github.com/prometheus/procfs v0.9.0 // indirect
57+
github.com/prometheus/common v0.44.0 // indirect
58+
github.com/prometheus/procfs v0.10.1 // indirect
5959
github.com/rs/xid v1.5.0 // indirect
6060
github.com/secure-io/sio-go v0.3.1 // indirect
6161
github.com/shirou/gopsutil/v3 v3.23.1 // indirect
@@ -65,30 +65,30 @@ require (
6565
github.com/tklauser/go-sysconf v0.3.11 // indirect
6666
github.com/tklauser/numcpus v0.6.0 // indirect
6767
github.com/yusufpapurcu/wmi v1.2.2 // indirect
68-
go.uber.org/atomic v1.7.0 // indirect
69-
go.uber.org/multierr v1.6.0 // indirect
70-
golang.org/x/crypto v0.9.0 // indirect
71-
golang.org/x/net v0.10.0 // indirect
72-
golang.org/x/oauth2 v0.5.0 // indirect
68+
go.uber.org/multierr v1.11.0 // indirect
69+
golang.org/x/crypto v0.11.0 // indirect
70+
golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect
71+
golang.org/x/net v0.13.0 // indirect
72+
golang.org/x/oauth2 v0.8.0 // indirect
7373
golang.org/x/sync v0.2.0 // indirect
74-
golang.org/x/sys v0.8.0 // indirect
75-
golang.org/x/term v0.8.0 // indirect
76-
golang.org/x/text v0.9.0 // indirect
74+
golang.org/x/sys v0.11.0 // indirect
75+
golang.org/x/term v0.10.0 // indirect
76+
golang.org/x/text v0.11.0 // indirect
7777
golang.org/x/time v0.3.0 // indirect
78-
golang.org/x/tools v0.9.1 // indirect
79-
gomodules.xyz/jsonpatch/v2 v2.3.0 // indirect
78+
golang.org/x/tools v0.9.3 // indirect
79+
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
8080
google.golang.org/appengine v1.6.7 // indirect
8181
google.golang.org/protobuf v1.30.0 // indirect
8282
gopkg.in/inf.v0 v0.9.1 // indirect
8383
gopkg.in/ini.v1 v1.67.0 // indirect
8484
gopkg.in/yaml.v2 v2.4.0 // indirect
8585
gopkg.in/yaml.v3 v3.0.1 // indirect
86-
k8s.io/api v0.27.2 // indirect
87-
k8s.io/apiextensions-apiserver v0.27.2 // indirect
88-
k8s.io/component-base v0.27.2 // indirect
89-
k8s.io/klog/v2 v2.90.1 // indirect
90-
k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f // indirect
91-
k8s.io/utils v0.0.0-20230209194617-a36077c30491 // indirect
86+
k8s.io/api v0.28.2 // indirect
87+
k8s.io/apiextensions-apiserver v0.28.0 // indirect
88+
k8s.io/component-base v0.28.1 // indirect
89+
k8s.io/klog/v2 v2.100.1 // indirect
90+
k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect
91+
k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 // indirect
9292
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
9393
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
9494
sigs.k8s.io/yaml v1.3.0 // indirect

0 commit comments

Comments
 (0)