Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Copy gardener informers #188

Merged
merged 4 commits into from May 18, 2023
Merged

Copy gardener informers #188

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
eab69aa
First Commit
vlvasilev Mar 31, 2023
fbc355c
Second commit
vlvasilev Mar 31, 2023
5d3cb87
Fix unit tests
vlvasilev Apr 1, 2023
d3be04e
Fix make verify
vlvasilev Apr 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
1 change: 1 addition & 0 deletions .golangci.yaml
View file
Open in desktop
Expand Up @@ -35,6 +35,7 @@ issues:
- "invalid operation: cannot compare .*"
- "client.StopWait undefined .*"
- "could not import github.com/gardener/gardener/pkg/apis/core/v1beta1/constants .*"
- "Error return value of `informer.AddEventHandler` is not checked"
exclude-rules:
- linters:
- staticcheck
Expand Down
15 changes: 8 additions & 7 deletions cmd/event-logger/app/options.go
View file
Open in desktop
Expand Up @@ -19,9 +19,6 @@ import (
"flag"

"github.com/gardener/gardener/pkg/logger"

"github.com/gardener/logging/pkg/events"

"github.com/spf13/cobra"
"github.com/spf13/pflag"
"k8s.io/apimachinery/pkg/runtime"
Expand All @@ -33,6 +30,8 @@ import (
"k8s.io/component-base/version"
"k8s.io/component-base/version/verflag"
"sigs.k8s.io/controller-runtime/pkg/manager/signals"

"github.com/gardener/logging/pkg/events"
)

// NewCommandStartGardenerEventLogger creates a *cobra.Command object with default parameters.
Expand All @@ -51,7 +50,7 @@ func NewCommandStartGardenerEventLogger() *cobra.Command {
}

stopCh := signals.SetupSignalHandler()
return opts.Run(stopCh)
return opts.Run(stopCh.Done())
},
SilenceUsage: true,
}
Expand Down Expand Up @@ -129,9 +128,11 @@ func (o *Options) config(seedKubeAPIServerConfig *rest.Config, seedKubeClient *k

// Run runs gardener-apiserver with the given Options.
func (o *Options) Run(stopCh <-chan struct{}) error {
logger := logger.NewLogger("")
logger.Info("Starting Gardener Event Logger...")
logger.Infof("Version: %+v", version.Get())
logger, err := logger.NewZapLogger(logger.InfoLevel, logger.FormatJSON)
if err != nil {
return err
}
logger.Info("Starting Gardener Event Logger...", "Version", version.Get())

// Create clientset for the native Kubernetes API group
// Use remote kubeconfig file (if set) or in-cluster config to create a new Kubernetes client for the native Kubernetes API groups
Expand Down
7 changes: 3 additions & 4 deletions cmd/fluent-bit-vali-plugin/out_vali.go
View file
Open in desktop
Expand Up @@ -23,9 +23,8 @@ import (
"github.com/gardener/logging/pkg/metrics"
"github.com/gardener/logging/pkg/valiplugin"

gardenerclientsetversioned "github.com/gardener/gardener/pkg/client/extensions/clientset/versioned"
versioned "github.com/gardener/gardener/pkg/client/extensions/clientset/versioned"
gardeninternalcoreinformers "github.com/gardener/gardener/pkg/client/extensions/informers/externalversions"
gardenerclientsetversioned "github.com/gardener/logging/pkg/cluster/clientset/versioned"
gardeninternalcoreinformers "github.com/gardener/logging/pkg/cluster/informers/externalversions"

"github.com/fluent/fluent-bit-go/output"
"github.com/go-kit/kit/log"
Expand Down Expand Up @@ -258,7 +257,7 @@ func newLogger(logLevel logging.Level) log.Logger {
return logger
}

func getInclusterKubernetsClient() (versioned.Interface, error) {
func getInclusterKubernetsClient() (gardenerclientsetversioned.Interface, error) {
config, err := rest.InClusterConfig()
if err != nil {
return nil, err
Expand Down
4 changes: 1 addition & 3 deletions cmd/vali-curator/main.go
View file
Open in desktop
Expand Up @@ -16,17 +16,15 @@ package main

import (
"net/http"
_ "net/http/pprof"
"os"
"os/signal"
"runtime"

"github.com/gardener/logging/cmd/vali-curator/app"
"github.com/gardener/logging/pkg/vali/curator"
"github.com/go-kit/kit/log/level"

"github.com/prometheus/client_golang/prometheus/promhttp"

_ "net/http/pprof"
)

func main() {
Expand Down
181 changes: 86 additions & 95 deletions go.mod
View file
Open in desktop
Expand Up @@ -3,68 +3,66 @@ module github.com/gardener/logging
go 1.20

require (
github.com/ahmetb/gen-crd-api-reference-docs v0.2.0
github.com/ahmetb/gen-crd-api-reference-docs v0.3.0
github.com/cortexproject/cortex v1.10.0
github.com/credativ/vali v0.0.0-20230322125549-22fdbf30c62a
github.com/fluent/fluent-bit-go v0.0.0-20190925192703-ea13c021720c
github.com/gardener/gardener v1.5.0
github.com/gardener/gardener v1.67.0
github.com/go-kit/kit v0.12.0
github.com/go-kit/log v0.2.0
github.com/go-logfmt/logfmt v0.5.1
github.com/gobuffalo/packr/v2 v2.8.0
github.com/golang/mock v1.6.0
github.com/joncrlsn/dque v2.2.1-0.20200515025108-956d14155fa2+incompatible
github.com/json-iterator/go v1.1.12
github.com/onsi/ginkgo v1.16.2
github.com/onsi/gomega v1.13.0
github.com/onsi/ginkgo v1.16.5
github.com/onsi/gomega v1.27.1
github.com/pkg/errors v0.9.1
github.com/prometheus/client_golang v1.11.1
github.com/prometheus/common v0.30.0
github.com/spf13/cobra v1.1.3
github.com/prometheus/client_golang v1.14.0
github.com/prometheus/common v0.37.0
github.com/spf13/cobra v1.6.1
github.com/spf13/pflag v1.0.5
github.com/weaveworks/common v0.0.0-20210901124008-1fa3f9fa874c
gopkg.in/yaml.v2 v2.4.0
k8s.io/api v0.21.0
k8s.io/apimachinery v0.22.1
k8s.io/api v0.26.2
k8s.io/apimachinery v0.26.2
k8s.io/client-go v12.0.0+incompatible
k8s.io/code-generator v0.18.3
k8s.io/component-base v0.19.2
k8s.io/utils v0.0.0-20201110183641-67b214c5f920
sigs.k8s.io/controller-runtime v0.7.0
k8s.io/code-generator v0.26.2
k8s.io/component-base v0.26.2
k8s.io/utils v0.0.0-20221128185143-99ec85e7a448
sigs.k8s.io/controller-runtime v0.14.5
)

require (
github.com/BurntSushi/toml v0.3.1 // indirect
github.com/BurntSushi/toml v1.0.0 // indirect
github.com/Masterminds/goutils v1.1.1 // indirect
github.com/Masterminds/semver v1.5.0 // indirect
github.com/Masterminds/sprig v2.22.0+incompatible // indirect
github.com/PuerkitoBio/purell v1.1.1 // indirect
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/bronze1man/yaml2json v0.0.0-20211227013850-8972abeaea25 // indirect
github.com/c2h5oh/datasize v0.0.0-20200112174442-28bbd4740fee // indirect
github.com/cespare/xxhash/v2 v2.1.2 // indirect
github.com/cyphar/filepath-securejoin v0.2.2 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96 // indirect
github.com/dustin/go-humanize v1.0.0 // indirect
github.com/edsrzf/mmap-go v1.0.0 // indirect
github.com/emicklei/go-restful v2.16.0+incompatible // indirect
github.com/evanphx/json-patch v4.9.0+incompatible // indirect
github.com/fatih/color v1.12.0 // indirect
github.com/felixge/httpsnoop v1.0.1 // indirect
github.com/fsnotify/fsnotify v1.4.9 // indirect
github.com/gardener/controller-manager-library v0.1.1-0.20200204110458-c263b9bb97ad // indirect
github.com/gardener/etcd-druid v0.3.0 // indirect
github.com/gardener/external-dns-management v0.7.7 // indirect
github.com/gardener/gardener-resource-manager v0.10.0 // indirect
github.com/gardener/hvpa-controller v0.0.0-20191014062307-fad3bdf06a25 // indirect
github.com/emicklei/go-restful/v3 v3.9.0 // indirect
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
github.com/fatih/color v1.13.0 // indirect
github.com/felixge/httpsnoop v1.0.3 // indirect
github.com/fsnotify/fsnotify v1.6.0 // indirect
github.com/gardener/etcd-druid v0.15.3 // indirect
github.com/gardener/hvpa-controller v0.3.1 // indirect
github.com/gardener/machine-controller-manager v0.48.1 // indirect
github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32 // indirect
github.com/go-logr/logr v0.4.0 // indirect
github.com/go-logr/logr v1.2.3 // indirect
github.com/go-logr/zapr v1.2.3 // indirect
github.com/go-openapi/jsonpointer v0.19.5 // indirect
github.com/go-openapi/jsonreference v0.19.5 // indirect
github.com/go-openapi/spec v0.20.3 // indirect
github.com/go-openapi/jsonreference v0.20.0 // indirect
github.com/go-openapi/swag v0.19.15 // indirect
github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 // indirect
github.com/gobuffalo/flect v0.3.0 // indirect
github.com/gobuffalo/logger v1.0.3 // indirect
github.com/gobuffalo/packd v1.0.0 // indirect
github.com/gobwas/glob v0.2.3 // indirect
Expand All @@ -74,115 +72,108 @@ require (
github.com/gogo/status v1.0.3 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/protobuf v1.5.2 // indirect
github.com/golang/snappy v0.0.3 // indirect
github.com/google/go-cmp v0.5.5 // indirect
github.com/google/gofuzz v1.0.0 // indirect
github.com/golang/snappy v0.0.4 // indirect
github.com/google/gnostic v0.5.7-v3refs // indirect
github.com/google/go-cmp v0.5.9 // indirect
github.com/google/gofuzz v1.1.0 // indirect
github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 // indirect
github.com/google/uuid v1.1.2 // indirect
github.com/googleapis/gnostic v0.5.1 // indirect
github.com/gorilla/mux v1.7.3 // indirect
github.com/grpc-ecosystem/go-grpc-middleware v1.2.2 // indirect
github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 // indirect
github.com/hashicorp/errwrap v1.0.0 // indirect
github.com/hashicorp/go-multierror v1.1.0 // indirect
github.com/hashicorp/golang-lru v0.5.4 // indirect
github.com/huandu/xstrings v1.3.1 // indirect
github.com/imdario/mergo v0.3.10 // indirect
github.com/inconshreveable/mousetrap v1.0.0 // indirect
github.com/hashicorp/go-multierror v1.1.1 // indirect
github.com/huandu/xstrings v1.3.2 // indirect
github.com/imdario/mergo v0.3.12 // indirect
github.com/inconshreveable/mousetrap v1.0.1 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/jpillora/backoff v1.0.0 // indirect
github.com/karrick/godirwalk v1.16.1 // indirect
github.com/kubernetes-csi/external-snapshotter/v2 v2.1.4 // indirect
github.com/mailru/easyjson v0.7.6 // indirect
github.com/markbates/errx v1.1.0 // indirect
github.com/markbates/oncer v1.0.0 // indirect
github.com/markbates/safe v1.0.1 // indirect
github.com/mattn/go-colorable v0.1.8 // indirect
github.com/mattn/go-colorable v0.1.12 // indirect
github.com/mattn/go-isatty v0.0.14 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
github.com/mitchellh/copystructure v1.0.0 // indirect
github.com/mitchellh/mapstructure v1.4.2 // indirect
github.com/mitchellh/reflectwalk v1.0.1 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.2 // indirect
github.com/mitchellh/copystructure v1.2.0 // indirect
github.com/mitchellh/mapstructure v1.4.3 // indirect
github.com/mitchellh/reflectwalk v1.0.2 // indirect
github.com/moby/spdystream v0.2.0 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f // indirect
github.com/nxadm/tail v1.4.8 // indirect
github.com/oklog/ulid v1.3.1 // indirect
github.com/onsi/ginkgo/v2 v2.8.3 // indirect
github.com/opentracing-contrib/go-grpc v0.0.0-20210225150812-73cb765af46e // indirect
github.com/opentracing-contrib/go-stdlib v1.0.0 // indirect
github.com/opentracing/opentracing-go v1.2.0 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/prometheus/client_model v0.2.0 // indirect
github.com/prometheus/client_model v0.3.0 // indirect
github.com/prometheus/node_exporter v1.0.0-rc.0.0.20200428091818-01054558c289 // indirect
github.com/prometheus/procfs v0.7.3 // indirect
github.com/prometheus/procfs v0.8.0 // indirect
github.com/prometheus/prometheus v1.8.2-0.20210510213326-e313ffa8abf6 // indirect
github.com/rogpeppe/go-internal v1.5.2 // indirect
github.com/russross/blackfriday/v2 v2.1.0 // indirect
github.com/sercand/kuberesolver v2.4.0+incompatible // indirect
github.com/sirupsen/logrus v1.8.1 // indirect
github.com/stretchr/objx v0.2.0 // indirect
github.com/stretchr/testify v1.7.0 // indirect
github.com/spf13/afero v1.8.2 // indirect
github.com/stretchr/objx v0.4.0 // indirect
github.com/stretchr/testify v1.8.0 // indirect
github.com/uber/jaeger-client-go v2.28.0+incompatible // indirect
github.com/uber/jaeger-lib v2.4.1+incompatible // indirect
github.com/ugorji/go/codec v1.1.7 // indirect
github.com/weaveworks/promrus v1.2.0 // indirect
go.uber.org/atomic v1.9.0 // indirect
go.uber.org/goleak v1.1.10 // indirect
golang.org/x/crypto v0.1.0 // indirect
golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 // indirect
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect
go.uber.org/goleak v1.2.0 // indirect
go.uber.org/multierr v1.7.0 // indirect
go.uber.org/zap v1.24.0 // indirect
golang.org/x/crypto v0.6.0 // indirect
golang.org/x/mod v0.8.0 // indirect
golang.org/x/net v0.7.0 // indirect
golang.org/x/oauth2 v0.0.0-20210427180440-81ed05c6b58c // indirect
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4 // indirect
golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5 // indirect
golang.org/x/sync v0.1.0 // indirect
golang.org/x/sys v0.5.0 // indirect
golang.org/x/term v0.5.0 // indirect
golang.org/x/text v0.7.0 // indirect
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
golang.org/x/tools v0.1.12 // indirect
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
gomodules.xyz/jsonpatch/v2 v2.1.0 // indirect
gonum.org/v1/gonum v0.6.2 // indirect
golang.org/x/time v0.3.0 // indirect
golang.org/x/tools v0.6.0 // indirect
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto v0.0.0-20210917145530-b395a37504d4 // indirect
google.golang.org/grpc v1.40.0 // indirect
google.golang.org/protobuf v1.28.0 // indirect
gopkg.in/fsnotify.v1 v1.4.7 // indirect
google.golang.org/genproto v0.0.0-20221018160656-63c7b68cfc55 // indirect
google.golang.org/grpc v1.50.1 // indirect
google.golang.org/protobuf v1.28.1 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
k8s.io/apiextensions-apiserver v0.19.2 // indirect
k8s.io/apiserver v0.17.9 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
istio.io/api v0.0.0-20230217221049-9d422bf48675 // indirect
istio.io/client-go v1.17.1 // indirect
k8s.io/apiextensions-apiserver v0.26.2 // indirect
k8s.io/autoscaler v0.0.0-20190805135949-100e91ba756e // indirect
k8s.io/cluster-bootstrap v0.16.8 // indirect
k8s.io/gengo v0.0.0-20190826232639-a874a240740c // indirect
k8s.io/gengo v0.0.0-20220902162205-c0856e24416d // indirect
k8s.io/helm v2.16.1+incompatible // indirect
k8s.io/klog v1.0.0 // indirect
k8s.io/klog/v2 v2.8.0 // indirect
k8s.io/kube-aggregator v0.16.8 // indirect
k8s.io/kube-openapi v0.0.0-20200410145947-bcb3869e6f29 // indirect
sigs.k8s.io/yaml v1.2.0 // indirect
k8s.io/klog/v2 v2.80.1 // indirect
k8s.io/kube-aggregator v0.26.2 // indirect
k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 // indirect
k8s.io/kubelet v0.26.2 // indirect
k8s.io/metrics v0.26.2 // indirect
sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20221212190805-d4f1e822ca11 // indirect
sigs.k8s.io/controller-tools v0.11.3 // indirect
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
sigs.k8s.io/yaml v1.3.0 // indirect
)

replace (
github.com/Azure/azure-sdk-for-go => github.com/Azure/azure-sdk-for-go v36.2.0+incompatible

github.com/Azure/go-autorest => github.com/Azure/go-autorest v13.3.0+incompatible

github.com/googleapis/gnostic => github.com/googleapis/gnostic v0.4.0
github.com/hpcloud/tail => github.com/grafana/tail v0.0.0-20191024143944-0b54ddf21fe7
github.com/prometheus/common => github.com/prometheus/common v0.15.0
// Vali requere this
github.com/prometheus/common => github.com/prometheus/common v0.20.0
//These two comes together
github.com/weaveworks/common => github.com/weaveworks/common v0.0.0-20210419092856-009d1eebd624

golang.org/x/net v0.0.0-20190813000000-74dc4d7220e7 => golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7
k8s.io/api => k8s.io/api v0.17.9
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.17.9
k8s.io/apimachinery => k8s.io/apimachinery v0.17.9
k8s.io/apiserver => k8s.io/apiserver v0.17.9
k8s.io/client-go => k8s.io/client-go v0.17.9
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.17.9
k8s.io/code-generator => k8s.io/code-generator v0.17.9
k8s.io/component-base => k8s.io/component-base v0.17.9
k8s.io/helm => k8s.io/helm v2.13.1+incompatible
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.17.9
sigs.k8s.io/controller-runtime => sigs.k8s.io/controller-runtime v0.4.0
sigs.k8s.io/controller-runtime/pkg/manager/signals => sigs.k8s.io/controller-runtime/pkg/manager/signals v0.7.0
// Override reference that causes an error from Go proxy - see https://github.com/golang/go/issues/33558
//k8s.io/client-go => k8s.io/client-go v0.0.0-20190620085101-78d2af792bab
google.golang.org/grpc => google.golang.org/grpc v1.40.0
// From Gardener
k8s.io/client-go => k8s.io/client-go v0.26.2
)