Add tenant secret auto-detection + refactor into pkgs

README.md

@@ -23,3 +23,8 @@ Usage of obsctl-reloader:
 ```
 
 > Note: this project is still experimental.
+
+The tenant K8s secret must have a `tenant` metadata label and the following data fields, for it to be auto-detected by obsctl-reloader.
+
+- `client-id` or `client_id` 
+- `client-secret` or `client_secret`

go.mod

@@ -1,33 +1,30 @@
 module github.com/rhobs/obsctl-reloader
 
-go 1.17
+go 1.19
 
 replace github.com/prometheus/prometheus => github.com/prometheus/prometheus v1.8.2-0.20210621150501-ff58416a0b02
 
-require (
-	github.com/efficientgo/tools/core v0.0.0-20220225185207-fe763185946b
-	github.com/go-kit/log v0.2.1
-	github.com/observatorium/obsctl v0.1.0-rc.0.0.20230616134804-751b92bac586
-	github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.57.0
-	github.com/prometheus/prometheus v1.8.2-0.20220303173753-edfe657b5405
-	gopkg.in/yaml.v3 v3.0.1
-	k8s.io/apimachinery v0.26.3
-	sigs.k8s.io/controller-runtime v0.14.5
-)
-
 require (
 	github.com/efficientgo/core v1.0.0-rc.2
+	github.com/go-kit/log v0.2.1
 	github.com/grafana/loki/operator/apis/loki v0.0.0-20230323133219-93a1c21da5c9
 	github.com/metalmatze/signal v0.0.0-20210307161603-1c9aa721a97a
 	github.com/observatorium/api v0.1.3-0.20221005180515-c3230526775b
+	github.com/observatorium/obsctl v0.1.0-rc.0.0.20230616134804-751b92bac586
 	github.com/oklog/run v1.1.0
+	github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.57.0
 	github.com/prometheus/client_golang v1.14.0
+	github.com/prometheus/prometheus v1.8.2-0.20220303173753-edfe657b5405
+	golang.org/x/exp v0.0.0-20230626212559-97b1e661b5df
+	gopkg.in/yaml.v3 v3.0.1
+	k8s.io/api v0.26.3
+	k8s.io/apimachinery v0.26.3
 	k8s.io/client-go v0.26.1
+	sigs.k8s.io/controller-runtime v0.14.5
 )
 
 require (
 	github.com/beorn7/perks v1.0.1 // indirect
-	github.com/bwplotka/mdox v0.9.0 // indirect
 	github.com/cespare/xxhash/v2 v2.1.2 // indirect
 	github.com/coreos/go-oidc/v3 v3.2.0 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
@@ -36,23 +33,19 @@ require (
 	github.com/emicklei/go-restful/v3 v3.9.0 // indirect
 	github.com/evanphx/json-patch/v5 v5.6.0 // indirect
 	github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32 // indirect
-	github.com/go-kit/kit v0.12.0 // indirect
 	github.com/go-logfmt/logfmt v0.5.1 // indirect
 	github.com/go-logr/logr v1.2.3 // indirect
 	github.com/go-openapi/jsonpointer v0.19.5 // indirect
 	github.com/go-openapi/jsonreference v0.20.0 // indirect
 	github.com/go-openapi/swag v0.21.1 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
-	github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 // indirect
 	github.com/golang/protobuf v1.5.2 // 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.2.0 // indirect
 	github.com/google/uuid v1.3.0 // indirect
-	github.com/guptarohit/asciigraph v0.5.5 // indirect
 	github.com/imdario/mergo v0.3.12 // indirect
-	github.com/inconshreveable/mousetrap v1.0.0 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
 	github.com/mailru/easyjson v0.7.7 // indirect
@@ -67,30 +60,25 @@ require (
 	github.com/prometheus/client_model v0.3.0 // indirect
 	github.com/prometheus/common v0.37.0 // indirect
 	github.com/prometheus/procfs v0.8.0 // indirect
-	github.com/spf13/cobra v1.5.0 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
 	github.com/stretchr/testify v1.8.2 // indirect
 	github.com/uber/jaeger-client-go v2.30.0+incompatible // indirect
 	github.com/uber/jaeger-lib v2.4.1+incompatible // indirect
-	github.com/wcharczuk/go-chart/v2 v2.1.0 // indirect
 	go.uber.org/atomic v1.9.0 // indirect
 	go.uber.org/goleak v1.2.0 // indirect
 	golang.org/x/crypto v0.1.0 // indirect
-	golang.org/x/image v0.0.0-20200927104501-e162460cd6b5 // indirect
 	golang.org/x/net v0.7.0 // indirect
 	golang.org/x/oauth2 v0.0.0-20220718184931-c8730f7fcb92 // indirect
 	golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4 // 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.3.0 // indirect
-	golang.org/x/tools v0.2.0 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 	google.golang.org/protobuf v1.28.1 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/square/go-jose.v2 v2.6.0 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
-	k8s.io/api v0.26.3 // indirect
 	k8s.io/klog/v2 v2.80.1 // indirect
 	k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 // indirect
 	k8s.io/utils v0.0.0-20230313181309-38a27ef9d749 // indirect