Skip to content

Commit ff9bbf9

Browse files
Gerrit91Gerrit91
authored
Revendor g/g 1.92. (#27)
1 parent 1147384 commit ff9bbf9

File tree

11 files changed

+1480
-427
lines changed

11 files changed

+1480
-427
lines changed

‎Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ COPY . .
55
RUN make install \
66
&& strip /go/bin/gardener-extension-audit
77

8-
FROM alpine:3.19
8+
FROM alpine:3.20
99
WORKDIR /
1010
COPY charts /charts
1111
COPY --from=builder /go/bin/gardener-extension-audit /gardener-extension-audit

‎Dockerfile.dev

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
FROM alpine:3.18
1+
FROM alpine:3.20
22
COPY bin/gardener-extension-audit /gardener-extension-audit
33
CMD ["/gardener-extension-audit"]

‎Makefile

+1-2
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,7 @@ generate: $(HELM)
7575

7676
.PHONY: generate-in-docker
7777
generate-in-docker: revendor $(HELM) $(YQ)
78-
# comment back in after first release:
79-
# echo $(shell git describe --abbrev=0 --tags) > VERSION
78+
echo $(shell git describe --abbrev=0 --tags) > VERSION
8079
docker run --rm -i$(DOCKER_TTY_ARG) -v $(PWD):/go/src/github.com/metal-stack/gardener-extension-audit golang:$(GO_VERSION) \
8180
sh -c "cd /go/src/github.com/metal-stack/gardener-extension-audit \
8281
&& make generate \

‎cmd/gardener-extension-audit/app/app.go

+18-9
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,22 @@ import (
1111
heartbeatcontroller "github.com/gardener/gardener/extensions/pkg/controller/heartbeat"
1212
"github.com/gardener/gardener/extensions/pkg/util"
1313
gardenerhealthz "github.com/gardener/gardener/pkg/healthz"
14-
"github.com/spf13/cobra"
14+
1515
corev1 "k8s.io/api/core/v1"
16-
componentbaseconfig "k8s.io/component-base/config"
16+
17+
"github.com/spf13/cobra"
1718
"sigs.k8s.io/controller-runtime/pkg/client"
1819
"sigs.k8s.io/controller-runtime/pkg/healthz"
20+
logf "sigs.k8s.io/controller-runtime/pkg/log"
1921
"sigs.k8s.io/controller-runtime/pkg/manager"
22+
23+
componentbaseconfig "k8s.io/component-base/config"
2024
)
2125

26+
var log = logf.Log.WithName("gardener-extension-audit")
27+
2228
// NewControllerManagerCommand creates a new command that is used to start the controller.
23-
func NewControllerManagerCommand() *cobra.Command {
29+
func NewControllerManagerCommand(ctx context.Context) *cobra.Command {
2430
options := NewOptions()
2531

2632
cmd := &cobra.Command{
@@ -37,7 +43,7 @@ func NewControllerManagerCommand() *cobra.Command {
3743
}
3844

3945
cmd.SilenceUsage = true
40-
return options.run(cmd.Context())
46+
return options.run(ctx)
4147
},
4248
}
4349

@@ -47,17 +53,20 @@ func NewControllerManagerCommand() *cobra.Command {
4753
}
4854

4955
func (o *Options) run(ctx context.Context) error {
50-
// TODO: Make these flags configurable via command line parameters or component config file.
5156
util.ApplyClientConnectionConfigurationToRESTConfig(&componentbaseconfig.ClientConnectionConfiguration{
5257
QPS: 100.0,
5358
Burst: 130,
5459
}, o.restOptions.Completed().Config)
5560

5661
mgrOpts := o.managerOptions.Completed().Options()
5762

58-
mgrOpts.ClientDisableCacheFor = []client.Object{
59-
&corev1.Secret{}, // applied for ManagedResources
60-
&corev1.ConfigMap{}, // applied for monitoring config
63+
mgrOpts.Client = client.Options{
64+
Cache: &client.CacheOptions{
65+
DisableFor: []client.Object{
66+
&corev1.Secret{}, // applied for ManagedResources
67+
&corev1.ConfigMap{}, // applied for monitoring config
68+
},
69+
},
6170
}
6271

6372
mgr, err := manager.New(o.restOptions.Completed().Config, mgrOpts)
@@ -83,7 +92,7 @@ func (o *Options) run(ctx context.Context) error {
8392
return fmt.Errorf("could not add controllers to manager: %w", err)
8493
}
8594

86-
if _, err := o.webhookOptions.Completed().AddToManager(ctx, mgr); err != nil {
95+
if _, err := o.webhookOptions.Completed().AddToManager(ctx, mgr, nil); err != nil {
8796
return fmt.Errorf("could not add the mutating webhook to manager: %w", err)
8897
}
8998

‎cmd/gardener-extension-audit/app/options.go

+5-7
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import (
77
heartbeatcmd "github.com/gardener/gardener/extensions/pkg/controller/heartbeat/cmd"
88
webhookcmd "github.com/gardener/gardener/extensions/pkg/webhook/cmd"
99
auditcmd "github.com/metal-stack/gardener-extension-audit/pkg/cmd"
10-
"k8s.io/client-go/tools/leaderelection/resourcelock"
1110
)
1211

1312
// ExtensionName is the name of the extension.
@@ -50,12 +49,11 @@ func NewOptions() *Options {
5049
restOptions: &controllercmd.RESTOptions{},
5150
managerOptions: &controllercmd.ManagerOptions{
5251
// These are default values.
53-
LeaderElection: true,
54-
LeaderElectionID: controllercmd.LeaderElectionNameID(ExtensionName),
55-
LeaderElectionResourceLock: resourcelock.LeasesResourceLock,
56-
LeaderElectionNamespace: os.Getenv("LEADER_ELECTION_NAMESPACE"),
57-
MetricsBindAddress: ":8080",
58-
HealthBindAddress: ":8081",
52+
LeaderElection: true,
53+
LeaderElectionID: controllercmd.LeaderElectionNameID(ExtensionName),
54+
LeaderElectionNamespace: os.Getenv("LEADER_ELECTION_NAMESPACE"),
55+
MetricsBindAddress: ":8080",
56+
HealthBindAddress: ":8081",
5957
},
6058
controllerOptions: &controllercmd.ControllerOptions{
6159
// This is a default value.

‎cmd/gardener-extension-audit/main.go

+3-2
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,16 @@ package main
33
import (
44
"os"
55

6-
"github.com/gardener/gardener/pkg/logger"
76
"github.com/metal-stack/gardener-extension-audit/cmd/gardener-extension-audit/app"
87

8+
logger "github.com/gardener/gardener/pkg/logger"
99
runtimelog "sigs.k8s.io/controller-runtime/pkg/log"
10+
"sigs.k8s.io/controller-runtime/pkg/manager/signals"
1011
)
1112

1213
func main() {
1314
runtimelog.SetLogger(logger.MustNewZapLogger(logger.InfoLevel, logger.FormatJSON))
14-
cmd := app.NewControllerManagerCommand()
15+
cmd := app.NewControllerManagerCommand(signals.SetupSignalHandler())
1516

1617
if err := cmd.Execute(); err != nil {
1718
runtimelog.Log.Error(err, "error executing the main controller command")

‎go.mod

+90-79
Original file line numberDiff line numberDiff line change
@@ -1,137 +1,148 @@
11
module github.com/metal-stack/gardener-extension-audit
22

3-
go 1.22
3+
go 1.22.0
4+
5+
toolchain go1.22.8
46

57
require (
68
github.com/ahmetb/gen-crd-api-reference-docs v0.3.0
7-
github.com/gardener/gardener v1.77.6
8-
github.com/go-logr/logr v1.4.1
9+
github.com/gardener/gardener v1.92.3
10+
github.com/go-logr/logr v1.4.2
911
github.com/golang/mock v1.6.0
1012
github.com/google/go-cmp v0.6.0
11-
github.com/metal-stack/metal-lib v0.15.0
13+
github.com/metal-stack/metal-lib v0.18.0
1214
github.com/onsi/ginkgo v1.16.5
13-
github.com/spf13/cobra v1.8.0
15+
github.com/spf13/cobra v1.8.1
1416
github.com/spf13/pflag v1.0.5
15-
github.com/stretchr/testify v1.8.4
16-
k8s.io/api v0.26.10
17-
k8s.io/apimachinery v0.28.2
17+
github.com/stretchr/testify v1.9.0
18+
k8s.io/api v0.29.3
19+
k8s.io/apimachinery v0.31.0
1820
k8s.io/client-go v11.0.1-0.20190409021438-1a26190bd76a+incompatible
19-
k8s.io/code-generator v0.26.10
20-
k8s.io/component-base v0.26.10
21-
k8s.io/utils v0.0.0-20230406110748-d93618cff8a2
22-
sigs.k8s.io/controller-runtime v0.14.6
21+
k8s.io/code-generator v0.29.3
22+
k8s.io/component-base v0.29.3
23+
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8
24+
sigs.k8s.io/controller-runtime v0.17.3
25+
)
26+
27+
replace (
28+
k8s.io/api => k8s.io/api v0.29.3
29+
k8s.io/apimachinery => k8s.io/apimachinery v0.29.3
30+
k8s.io/client-go => k8s.io/client-go v0.29.3
31+
k8s.io/code-generator => k8s.io/code-generator v0.29.3
2332
)
2433

2534
require (
26-
github.com/BurntSushi/toml v1.0.0 // indirect
35+
github.com/BurntSushi/toml v1.3.2 // indirect
2736
github.com/Masterminds/goutils v1.1.1 // indirect
28-
github.com/Masterminds/semver v1.5.0 // indirect
29-
github.com/Masterminds/sprig v2.22.0+incompatible // indirect
37+
github.com/Masterminds/semver/v3 v3.3.0 // indirect
38+
github.com/Masterminds/sprig/v3 v3.2.3 // indirect
3039
github.com/beorn7/perks v1.0.1 // indirect
3140
github.com/blang/semver/v4 v4.0.0 // indirect
32-
github.com/bronze1man/yaml2json v0.0.0-20211227013850-8972abeaea25 // indirect
3341
github.com/cespare/xxhash/v2 v2.2.0 // indirect
3442
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
35-
github.com/cyphar/filepath-securejoin v0.2.2 // indirect
43+
github.com/cyphar/filepath-securejoin v0.2.4 // indirect
3644
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
37-
github.com/emicklei/go-restful/v3 v3.11.2 // indirect
38-
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
39-
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
40-
github.com/fatih/color v1.16.0 // indirect
41-
github.com/fluent/fluent-operator/v2 v2.2.0 // indirect
45+
github.com/emicklei/go-restful/v3 v3.12.1 // indirect
46+
github.com/evanphx/json-patch v5.7.0+incompatible // indirect
47+
github.com/evanphx/json-patch/v5 v5.8.0 // indirect
48+
github.com/fatih/color v1.17.0 // indirect
49+
github.com/fluent/fluent-operator/v2 v2.7.0 // indirect
4250
github.com/fsnotify/fsnotify v1.7.0 // indirect
43-
github.com/gardener/etcd-druid v0.19.1 // indirect
44-
github.com/gardener/hvpa-controller v0.3.1 // indirect
45-
github.com/gardener/machine-controller-manager v0.48.1 // indirect
46-
github.com/ghodss/yaml v1.0.0 // indirect
47-
github.com/go-logr/zapr v1.2.3 // indirect
48-
github.com/go-openapi/errors v0.21.0 // indirect
49-
github.com/go-openapi/jsonpointer v0.20.2 // indirect
50-
github.com/go-openapi/jsonreference v0.20.4 // indirect
51-
github.com/go-openapi/swag v0.22.9 // indirect
51+
github.com/gardener/cert-management v0.13.0 // indirect
52+
github.com/gardener/etcd-druid v0.22.0 // indirect
53+
github.com/gardener/hvpa-controller/api v0.15.0 // indirect
54+
github.com/gardener/machine-controller-manager v0.52.0 // indirect
55+
github.com/go-logr/zapr v1.3.0 // indirect
56+
github.com/go-openapi/errors v0.22.0 // indirect
57+
github.com/go-openapi/jsonpointer v0.21.0 // indirect
58+
github.com/go-openapi/jsonreference v0.21.0 // indirect
59+
github.com/go-openapi/swag v0.23.0 // indirect
5260
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
53-
github.com/gobuffalo/flect v0.3.0 // indirect
61+
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
62+
github.com/gobuffalo/flect v1.0.2 // indirect
5463
github.com/gobwas/glob v0.2.3 // indirect
5564
github.com/gogo/protobuf v1.3.2 // indirect
5665
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
57-
github.com/golang/protobuf v1.5.3 // indirect
58-
github.com/google/gnostic v0.5.7-v3refs // indirect
66+
github.com/golang/protobuf v1.5.4 // indirect
67+
github.com/google/gnostic-models v0.6.9-0.20230804172637-c7be7c783f49 // indirect
5968
github.com/google/gofuzz v1.2.0 // indirect
60-
github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 // indirect
69+
github.com/google/pprof v0.0.0-20240525223248-4bfdf5a9a2af // indirect
6170
github.com/google/uuid v1.6.0 // indirect
71+
github.com/gorilla/websocket v1.5.0 // indirect
6272
github.com/hashicorp/errwrap v1.1.0 // indirect
6373
github.com/hashicorp/go-multierror v1.1.1 // indirect
6474
github.com/huandu/xstrings v1.4.0 // indirect
6575
github.com/imdario/mergo v0.3.16 // indirect
6676
github.com/inconshreveable/mousetrap v1.1.0 // indirect
77+
github.com/ironcore-dev/vgopath v0.1.4 // indirect
6778
github.com/josharian/intern v1.0.0 // indirect
6879
github.com/json-iterator/go v1.1.12 // indirect
6980
github.com/kubernetes-csi/external-snapshotter/client/v4 v4.2.0 // indirect
7081
github.com/mailru/easyjson v0.7.7 // indirect
7182
github.com/mattn/go-colorable v0.1.13 // indirect
7283
github.com/mattn/go-isatty v0.0.20 // indirect
73-
github.com/matttproud/golang_protobuf_extensions v1.0.2 // indirect
84+
github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
7485
github.com/mitchellh/copystructure v1.2.0 // indirect
7586
github.com/mitchellh/hashstructure/v2 v2.0.2 // indirect
7687
github.com/mitchellh/reflectwalk v1.0.2 // indirect
77-
github.com/moby/spdystream v0.2.0 // indirect
88+
github.com/moby/spdystream v0.4.0 // indirect
7889
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
7990
github.com/modern-go/reflect2 v1.0.2 // indirect
8091
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
92+
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
8193
github.com/nxadm/tail v1.4.8 // indirect
82-
github.com/onsi/ginkgo/v2 v2.9.4 // indirect
94+
github.com/onsi/ginkgo/v2 v2.19.0 // indirect
8395
github.com/pkg/errors v0.9.1 // indirect
8496
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
85-
github.com/prometheus/client_golang v1.14.0 // indirect
86-
github.com/prometheus/client_model v0.3.0 // indirect
87-
github.com/prometheus/common v0.37.0 // indirect
88-
github.com/prometheus/procfs v0.8.0 // indirect
97+
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.72.0 // indirect
98+
github.com/prometheus/client_golang v1.18.0 // indirect
99+
github.com/prometheus/client_model v0.5.0 // indirect
100+
github.com/prometheus/common v0.45.0 // indirect
101+
github.com/prometheus/procfs v0.12.0 // indirect
89102
github.com/russross/blackfriday/v2 v2.1.0 // indirect
103+
github.com/shopspring/decimal v1.3.1 // indirect
90104
github.com/spf13/afero v1.11.0 // indirect
91-
go.uber.org/mock v0.2.0 // indirect
105+
github.com/spf13/cast v1.6.0 // indirect
106+
github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
107+
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
108+
github.com/xeipuuv/gojsonschema v1.2.0 // indirect
109+
go.uber.org/mock v0.4.0 // indirect
92110
go.uber.org/multierr v1.11.0 // indirect
93-
go.uber.org/zap v1.25.0 // indirect
94-
golang.org/x/crypto v0.19.0 // indirect
95-
golang.org/x/mod v0.15.0 // indirect
96-
golang.org/x/net v0.21.0 // indirect
97-
golang.org/x/oauth2 v0.17.0 // indirect
98-
golang.org/x/sys v0.17.0 // indirect
99-
golang.org/x/term v0.17.0 // indirect
100-
golang.org/x/text v0.14.0 // indirect
101-
golang.org/x/time v0.5.0 // indirect
102-
golang.org/x/tools v0.18.0 // indirect
103-
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
104-
google.golang.org/appengine v1.6.8 // indirect
111+
go.uber.org/zap v1.27.0 // indirect
112+
golang.org/x/crypto v0.26.0 // indirect
113+
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
114+
golang.org/x/mod v0.20.0 // indirect
115+
golang.org/x/net v0.28.0 // indirect
116+
golang.org/x/oauth2 v0.23.0 // indirect
117+
golang.org/x/sync v0.8.0 // indirect
118+
golang.org/x/sys v0.23.0 // indirect
119+
golang.org/x/term v0.23.0 // indirect
120+
golang.org/x/text v0.17.0 // indirect
121+
golang.org/x/time v0.6.0 // indirect
122+
golang.org/x/tools v0.24.0 // indirect
123+
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
105124
google.golang.org/genproto v0.0.0-20231106174013-bbf56f31fb17 // indirect
106125
google.golang.org/genproto/googleapis/api v0.0.0-20231106174013-bbf56f31fb17 // indirect
107-
google.golang.org/protobuf v1.32.0 // indirect
126+
google.golang.org/protobuf v1.34.2 // indirect
108127
gopkg.in/inf.v0 v0.9.1 // indirect
109128
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
110129
gopkg.in/yaml.v2 v2.4.0 // indirect
111130
gopkg.in/yaml.v3 v3.0.1 // indirect
112-
istio.io/api v0.0.0-20230217221049-9d422bf48675 // indirect
113-
istio.io/client-go v1.17.1 // indirect
114-
k8s.io/apiextensions-apiserver v0.26.4 // indirect
115-
k8s.io/apiserver v0.26.4 // indirect
116-
k8s.io/autoscaler/vertical-pod-autoscaler v0.14.0 // indirect
117-
k8s.io/gengo v0.0.0-20220902162205-c0856e24416d // indirect
118-
k8s.io/helm v2.16.1+incompatible // indirect
131+
helm.sh/helm/v3 v3.14.3 // indirect
132+
istio.io/api v1.19.8 // indirect
133+
istio.io/client-go v1.19.8 // indirect
134+
k8s.io/apiextensions-apiserver v0.29.3 // indirect
135+
k8s.io/autoscaler/vertical-pod-autoscaler v1.0.0 // indirect
136+
k8s.io/gengo v0.0.0-20230829151522-9cce18d56c01 // indirect
119137
k8s.io/klog v1.0.0 // indirect
120-
k8s.io/klog/v2 v2.100.1 // indirect
121-
k8s.io/kube-aggregator v0.26.4 // indirect
122-
k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect
123-
k8s.io/kubelet v0.26.4 // indirect
124-
k8s.io/metrics v0.26.4 // indirect
125-
sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20221212190805-d4f1e822ca11 // indirect
126-
sigs.k8s.io/controller-tools v0.11.3 // indirect
138+
k8s.io/klog/v2 v2.130.1 // indirect
139+
k8s.io/kube-aggregator v0.29.3 // indirect
140+
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect
141+
k8s.io/kubelet v0.29.3 // indirect
142+
k8s.io/metrics v0.29.3 // indirect
143+
sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20231015215740-bf15e44028f9 // indirect
144+
sigs.k8s.io/controller-tools v0.14.0 // indirect
127145
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
128-
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
129-
sigs.k8s.io/yaml v1.3.0 // indirect
130-
)
131-
132-
replace (
133-
k8s.io/client-go => k8s.io/client-go v0.26.3
134-
// for some reason, newer gengo versions will fail with "hit an unsupported type"
135-
k8s.io/gengo => k8s.io/gengo v0.0.0-20210813121822-485abfe95c7c // indirect
136-
k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f
146+
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
147+
sigs.k8s.io/yaml v1.4.0 // indirect
137148
)

0 commit comments

Comments
 (0)