Skip to content

Commit

Permalink
Bump Gardener to v1.101.3 (#93)
Browse files Browse the repository at this point in the history
* bump Gardener to v1.101

* change deprecated configuration

* downgrade toolchain

* update client-go & provider-openstack

* remove replacement of client-go
  • Loading branch information
Duciwuci authored Nov 21, 2024
1 parent a687bb0 commit 58364c6
Show file tree
Hide file tree
Showing 6 changed files with 111 additions and 1,501 deletions.
5 changes: 2 additions & 3 deletions .golangci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@ run:
concurrency: 4
deadline: 10m

skip-files:
- "zz_generated\\..*\\.go$"

linters:
enable:
- revive
Expand Down Expand Up @@ -36,6 +33,8 @@ issues:
- linters:
- staticcheck
text: "SA1019:" # Excludes messages where deprecated variables are used
exclude-files:
- "zz_generated\\..*\\.go$"

linters-settings:
revive:
Expand Down
2 changes: 1 addition & 1 deletion cmd/gardener-extension-acl/app/app.go
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ func (o *Options) run(ctx context.Context) error {

o.controllerOptions.Completed().Apply(&controller.DefaultAddOptions.ControllerOptions)
o.healthOptions.Completed().Apply(&healthcheck.DefaultAddOptions.Controller)
o.reconcileOptions.Completed().Apply(&controller.DefaultAddOptions.IgnoreOperationAnnotation)
o.reconcileOptions.Completed().Apply(&controller.DefaultAddOptions.IgnoreOperationAnnotation, &controller.DefaultAddOptions.ExtensionClass)

if err := o.controllerSwitches.Completed().AddToManager(ctx, mgr); err != nil {
return fmt.Errorf("could not add controllers to manager: %s", err)
Expand Down
62 changes: 30 additions & 32 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,35 +1,33 @@
module github.com/stackitcloud/gardener-extension-acl

go 1.22.0
go 1.22.4

toolchain go1.22.5

replace k8s.io/client-go => k8s.io/client-go v0.29.6
toolchain go1.22.8

require (
github.com/ahmetb/gen-crd-api-reference-docs v0.3.0
github.com/gardener/gardener v1.99.4
github.com/gardener/gardener-extension-provider-openstack v1.30.1-0.20221215131400-b390fb780945
github.com/gardener/gardener v1.101.3
github.com/gardener/gardener-extension-provider-openstack v1.41.2
github.com/go-logr/logr v1.4.2
github.com/golang/mock v1.6.0
github.com/onsi/ginkgo/v2 v2.19.0
github.com/onsi/gomega v1.33.1
github.com/onsi/gomega v1.34.0
github.com/pkg/errors v0.9.1
github.com/spf13/cobra v1.8.1
github.com/spf13/pflag v1.0.5
github.com/tidwall/gjson v1.17.1
golang.org/x/tools v0.23.0
golang.org/x/tools v0.24.0
gomodules.xyz/jsonpatch/v2 v2.4.0
gopkg.in/yaml.v3 v3.0.1
istio.io/api v1.22.2
istio.io/api v1.22.3
istio.io/client-go v1.22.0
k8s.io/api v0.29.6
k8s.io/apiextensions-apiserver v0.29.6
k8s.io/apimachinery v0.29.6
k8s.io/client-go v11.0.1-0.20190409021438-1a26190bd76a+incompatible
k8s.io/code-generator v0.29.6
k8s.io/component-base v0.29.6
k8s.io/utils v0.0.0-20240502163921-fe8a2dddb1d0
k8s.io/api v0.29.7
k8s.io/apiextensions-apiserver v0.29.7
k8s.io/apimachinery v0.29.7
k8s.io/client-go v0.29.7
k8s.io/code-generator v0.29.7
k8s.io/component-base v0.29.7
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8
sigs.k8s.io/controller-runtime v0.17.5
sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20231015215740-bf15e44028f9
)
Expand All @@ -46,14 +44,14 @@ require (
github.com/cyphar/filepath-securejoin v0.2.4 // indirect
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
github.com/evanphx/json-patch/v5 v5.8.0 // indirect
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
github.com/fatih/color v1.16.0 // indirect
github.com/fluent/fluent-operator/v2 v2.9.0 // indirect
github.com/fsnotify/fsnotify v1.7.0 // indirect
github.com/gardener/cert-management v0.15.0 // indirect
github.com/gardener/etcd-druid v0.22.1 // indirect
github.com/gardener/etcd-druid v0.22.4 // indirect
github.com/gardener/hvpa-controller/api v0.15.0 // indirect
github.com/gardener/machine-controller-manager v0.53.0 // indirect
github.com/gardener/machine-controller-manager v0.53.1 // indirect
github.com/go-logr/zapr v1.3.0 // indirect
github.com/go-openapi/errors v0.20.4 // indirect
github.com/go-openapi/jsonpointer v0.20.0 // indirect
Expand Down Expand Up @@ -109,29 +107,29 @@ require (
go.uber.org/mock v0.4.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
go.uber.org/zap v1.27.0 // indirect
golang.org/x/crypto v0.25.0 // indirect
golang.org/x/exp v0.0.0-20240707233637-46b078467d37 // indirect
golang.org/x/mod v0.19.0 // indirect
golang.org/x/net v0.27.0 // indirect
golang.org/x/crypto v0.26.0 // indirect
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
golang.org/x/mod v0.20.0 // indirect
golang.org/x/net v0.28.0 // indirect
golang.org/x/oauth2 v0.20.0 // indirect
golang.org/x/sync v0.7.0 // indirect
golang.org/x/sys v0.22.0 // indirect
golang.org/x/term v0.22.0 // indirect
golang.org/x/text v0.16.0 // indirect
golang.org/x/time v0.5.0 // indirect
golang.org/x/sync v0.8.0 // indirect
golang.org/x/sys v0.23.0 // indirect
golang.org/x/term v0.23.0 // indirect
golang.org/x/text v0.17.0 // indirect
golang.org/x/time v0.6.0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240318140521-94a12d6c2237 // indirect
google.golang.org/protobuf v1.34.0 // indirect
google.golang.org/protobuf v1.34.1 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
helm.sh/helm/v3 v3.14.4 // indirect
k8s.io/autoscaler v0.0.0-20190805135949-100e91ba756e // indirect
k8s.io/gengo v0.0.0-20230829151522-9cce18d56c01 // indirect
k8s.io/klog v1.0.0 // indirect
k8s.io/klog/v2 v2.120.1 // indirect
k8s.io/kube-aggregator v0.29.6 // indirect
k8s.io/kube-aggregator v0.29.7 // indirect
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect
k8s.io/kubelet v0.29.6 // indirect
k8s.io/metrics v0.29.6 // indirect
k8s.io/kubelet v0.29.7 // indirect
k8s.io/metrics v0.29.7 // indirect
sigs.k8s.io/controller-tools v0.14.0 // indirect
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
Expand Down
Loading

0 comments on commit 58364c6

Please sign in to comment.