Skip to content

Commit aa5cc21

Browse files
thokra-navthokra-nav
committed
Looks to be ok with k8s resources
1 parent adb9ed3 commit aa5cc21

File tree

16 files changed

+472
-55
lines changed

16 files changed

+472
-55
lines changed

‎internal/cmd/api/http.go

+11
Original file line numberDiff line numberDiff line change
@@ -199,6 +199,17 @@ func ConfigureGraph(
199199
namespaceWatcher := team.NewNamespaceWatcher(ctx, watcherMgr)
200200
unleashWatcher := unleash.NewWatcher(ctx, mgmtWatcherMgr)
201201

202+
// K8s searchers
203+
application.AddSearch(appWatcher)
204+
job.AddSearch(jobWatcher)
205+
bigquery.AddSearch(bqWatcher)
206+
bucket.AddSearch(bucketWatcher)
207+
kafkatopic.AddSearch(kafkaTopicWatcher)
208+
opensearch.AddSearch(openSearchWatcher)
209+
redis.AddSearch(redisWatcher)
210+
sqlinstance.AddSearch(sqlInstanceWatcher)
211+
valkey.AddSearch(valkeyWatcher)
212+
202213
sqlAdminService, err := sqlinstance.NewClient(ctx, log, sqlinstance.WithFakeClients(fakeClients), sqlinstance.WithInstanceWatcher(sqlInstanceWatcher))
203214
if err != nil {
204215
return nil, fmt.Errorf("create SQL Admin service: %w", err)

‎internal/kubernetes/watcher/watcher.go

+19
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,15 @@ type watcherSettings struct {
5050
filterLabelSelector string
5151
}
5252

53+
type WatcherHook[T Object] func(cluster string, obj T)
54+
5355
type Watcher[T Object] struct {
5456
watchers []*clusterWatcher[T]
5557
log logrus.FieldLogger
5658
resourceCounter metric.Int64UpDownCounter
5759
watchedType string
60+
onUpdate WatcherHook[T]
61+
onRemove WatcherHook[T]
5862
}
5963

6064
func newWatcher[T Object](mgr *Manager, obj T, settings *watcherSettings, log logrus.FieldLogger) *Watcher[T] {
@@ -104,6 +108,10 @@ func (w *Watcher[T]) add(cluster string, obj T) {
104108
}
105109

106110
func (w *Watcher[T]) remove(cluster string, obj T) {
111+
if w.onRemove != nil {
112+
w.onRemove(cluster, obj)
113+
}
114+
107115
w.resourceCounter.Add(context.TODO(), 1, metric.WithAttributes(attribute.String("type", w.watchedType), attribute.String("action", "remove")))
108116
w.log.WithFields(logrus.Fields{
109117
"cluster": cluster,
@@ -113,6 +121,9 @@ func (w *Watcher[T]) remove(cluster string, obj T) {
113121
}
114122

115123
func (w *Watcher[T]) update(cluster string, obj T) {
124+
if w.onUpdate != nil {
125+
w.onUpdate(cluster, obj)
126+
}
116127
w.resourceCounter.Add(context.TODO(), 1, metric.WithAttributes(attribute.String("type", w.watchedType), attribute.String("action", "update")))
117128
w.log.WithFields(logrus.Fields{
118129
"cluster": cluster,
@@ -285,6 +296,14 @@ func (w *Watcher[T]) SystemAuthenticatedClient(ctx context.Context, cluster stri
285296
return nil, fmt.Errorf("no watcher for cluster %s", cluster)
286297
}
287298

299+
func (w *Watcher[T]) OnRemove(fn WatcherHook[T]) {
300+
w.onRemove = fn
301+
}
302+
303+
func (w *Watcher[T]) OnUpdate(fn WatcherHook[T]) {
304+
w.onUpdate = fn
305+
}
306+
288307
func Objects[T Object](list []*EnvironmentWrapper[T]) []T {
289308
ret := make([]T, len(list))
290309
for i, obj := range list {

‎internal/persistence/bigquery/queries.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ func GetByIdent(ctx context.Context, id ident.Ident) (*BigQueryDataset, error) {
1818
return nil, err
1919
}
2020

21-
return Get(ctx, teamSlug, environment, name)
21+
return fromContext(ctx).watcher.Get(environment, teamSlug.String(), name)
2222
}
2323

2424
func Get(ctx context.Context, teamSlug slug.Slug, environment, name string) (*BigQueryDataset, error) {

‎internal/persistence/bigquery/search.go

+14
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ package bigquery
33
import (
44
"context"
55

6+
"github.com/nais/api/internal/graph/ident"
7+
"github.com/nais/api/internal/kubernetes/watcher"
68
"github.com/nais/api/internal/search"
79
)
810

@@ -15,3 +17,15 @@ func init() {
1517
return ret
1618
})
1719
}
20+
21+
func AddSearch(watcher *watcher.Watcher[*BigQueryDataset]) {
22+
createIdent := func(env string, obj *BigQueryDataset) ident.Ident {
23+
return obj.ID()
24+
}
25+
26+
gbi := func(ctx context.Context, id ident.Ident) (search.SearchNode, error) {
27+
return GetByIdent(ctx, id)
28+
}
29+
30+
search.RegisterBleve("BIGQUERY_DATASET", search.NewK8sSearch(watcher, gbi, createIdent))
31+
}

‎internal/persistence/bucket/search.go

+15
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,10 @@ package bucket
33
import (
44
"context"
55

6+
"github.com/nais/api/internal/graph/ident"
7+
"github.com/nais/api/internal/kubernetes/watcher"
68
"github.com/nais/api/internal/search"
9+
"github.com/nais/api/internal/slug"
710
)
811

912
func init() {
@@ -15,3 +18,15 @@ func init() {
1518
return ret
1619
})
1720
}
21+
22+
func AddSearch(watcher *watcher.Watcher[*Bucket]) {
23+
createIdent := func(env string, obj *Bucket) ident.Ident {
24+
return newIdent(slug.Slug(obj.GetNamespace()), env, obj.GetName())
25+
}
26+
27+
gbi := func(ctx context.Context, id ident.Ident) (search.SearchNode, error) {
28+
return GetByIdent(ctx, id)
29+
}
30+
31+
search.RegisterBleve("BUCKET", search.NewK8sSearch(watcher, gbi, createIdent))
32+
}

‎internal/persistence/kafkatopic/search.go

+15
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,10 @@ package kafkatopic
33
import (
44
"context"
55

6+
"github.com/nais/api/internal/graph/ident"
7+
"github.com/nais/api/internal/kubernetes/watcher"
68
"github.com/nais/api/internal/search"
9+
"github.com/nais/api/internal/slug"
710
)
811

912
func init() {
@@ -15,3 +18,15 @@ func init() {
1518
return ret
1619
})
1720
}
21+
22+
func AddSearch(watcher *watcher.Watcher[*KafkaTopic]) {
23+
createIdent := func(env string, obj *KafkaTopic) ident.Ident {
24+
return newIdent(slug.Slug(obj.GetNamespace()), env, obj.GetName())
25+
}
26+
27+
gbi := func(ctx context.Context, id ident.Ident) (search.SearchNode, error) {
28+
return GetByIdent(ctx, id)
29+
}
30+
31+
search.RegisterBleve("KAFKA_TOPIC", search.NewK8sSearch(watcher, gbi, createIdent))
32+
}

‎internal/persistence/opensearch/search.go

+15
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,10 @@ package opensearch
33
import (
44
"context"
55

6+
"github.com/nais/api/internal/graph/ident"
7+
"github.com/nais/api/internal/kubernetes/watcher"
68
"github.com/nais/api/internal/search"
9+
"github.com/nais/api/internal/slug"
710
)
811

912
func init() {
@@ -15,3 +18,15 @@ func init() {
1518
return ret
1619
})
1720
}
21+
22+
func AddSearch(watcher *watcher.Watcher[*OpenSearch]) {
23+
createIdent := func(env string, obj *OpenSearch) ident.Ident {
24+
return newIdent(slug.Slug(obj.GetNamespace()), env, obj.GetName())
25+
}
26+
27+
gbi := func(ctx context.Context, id ident.Ident) (search.SearchNode, error) {
28+
return GetByIdent(ctx, id)
29+
}
30+
31+
search.RegisterBleve("OPENSEARCH", search.NewK8sSearch(watcher, gbi, createIdent))
32+
}

‎internal/persistence/redis/search.go

+15
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,10 @@ package redis
33
import (
44
"context"
55

6+
"github.com/nais/api/internal/graph/ident"
7+
"github.com/nais/api/internal/kubernetes/watcher"
68
"github.com/nais/api/internal/search"
9+
"github.com/nais/api/internal/slug"
710
)
811

912
func init() {
@@ -15,3 +18,15 @@ func init() {
1518
return ret
1619
})
1720
}
21+
22+
func AddSearch(watcher *watcher.Watcher[*RedisInstance]) {
23+
createIdent := func(env string, app *RedisInstance) ident.Ident {
24+
return newIdent(slug.Slug(app.GetNamespace()), env, app.GetName())
25+
}
26+
27+
gbi := func(ctx context.Context, id ident.Ident) (search.SearchNode, error) {
28+
return GetByIdent(ctx, id)
29+
}
30+
31+
search.RegisterBleve("REDIS_INSTANCE", search.NewK8sSearch(watcher, gbi, createIdent))
32+
}

‎internal/persistence/sqlinstance/search.go

+15
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,10 @@ package sqlinstance
33
import (
44
"context"
55

6+
"github.com/nais/api/internal/graph/ident"
7+
"github.com/nais/api/internal/kubernetes/watcher"
68
"github.com/nais/api/internal/search"
9+
"github.com/nais/api/internal/slug"
710
)
811

912
func init() {
@@ -15,3 +18,15 @@ func init() {
1518
return ret
1619
})
1720
}
21+
22+
func AddSearch(watcher *watcher.Watcher[*SQLInstance]) {
23+
createIdent := func(env string, obj *SQLInstance) ident.Ident {
24+
return newIdent(slug.Slug(obj.GetNamespace()), env, obj.GetName())
25+
}
26+
27+
gbi := func(ctx context.Context, id ident.Ident) (search.SearchNode, error) {
28+
return GetByIdent(ctx, id)
29+
}
30+
31+
search.RegisterBleve("SQL_INSTANCE", search.NewK8sSearch(watcher, gbi, createIdent))
32+
}

‎internal/persistence/valkey/search.go

+15
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,10 @@ package valkey
33
import (
44
"context"
55

6+
"github.com/nais/api/internal/graph/ident"
7+
"github.com/nais/api/internal/kubernetes/watcher"
68
"github.com/nais/api/internal/search"
9+
"github.com/nais/api/internal/slug"
710
)
811

912
func init() {
@@ -15,3 +18,15 @@ func init() {
1518
return ret
1619
})
1720
}
21+
22+
func AddSearch(watcher *watcher.Watcher[*ValkeyInstance]) {
23+
createIdent := func(env string, obj *ValkeyInstance) ident.Ident {
24+
return newIdent(slug.Slug(obj.GetNamespace()), env, obj.GetName())
25+
}
26+
27+
gbi := func(ctx context.Context, id ident.Ident) (search.SearchNode, error) {
28+
return GetByIdent(ctx, id)
29+
}
30+
31+
search.RegisterBleve("VALKEY_INSTANCE", search.NewK8sSearch(watcher, gbi, createIdent))
32+
}

0 commit comments

Comments
 (0)