Skip to content

Commit e4fe6dc

Browse files
authored
Merge pull request #319 from kube-tarian/add-crossplane-job-handlers
add crossplane resource synch job handlers
2 parents 32bf560 + 7fa5d2a commit e4fe6dc

File tree

3 files changed

+24
-18
lines changed

3 files changed

+24
-18
lines changed

capten/agent/pkg/crossplane/crossplane_cluster_claims.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ type ClusterClaimSyncHandler struct {
3535
clusters map[string]*captenpluginspb.ManagedCluster
3636
}
3737

38-
func NewClusterClaimSyncHandler(log logging.Logger, dbStore *captenstore.Store) (*ClusterClaimSyncHandler, error) {
39-
return &ClusterClaimSyncHandler{log: log, dbStore: dbStore, clusters: map[string]*captenpluginspb.ManagedCluster{}}, nil
38+
func NewClusterClaimSyncHandler(log logging.Logger, dbStore *captenstore.Store) *ClusterClaimSyncHandler {
39+
return &ClusterClaimSyncHandler{log: log, dbStore: dbStore, clusters: map[string]*captenpluginspb.ManagedCluster{}}
4040
}
4141

4242
func (h *ClusterClaimSyncHandler) Sync() error {

capten/agent/pkg/crossplane/crossplane_providers.go

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import (
55
"encoding/json"
66
"fmt"
77

8-
"github.com/intelops/go-common/credentials"
98
"github.com/intelops/go-common/logging"
109
captenstore "github.com/kube-tarian/kad/capten/agent/pkg/capten-store"
1110

@@ -21,13 +20,11 @@ const (
2120

2221
type ProvidersSyncHandler struct {
2322
log logging.Logger
24-
client *k8s.K8SClient
2523
dbStore *captenstore.Store
26-
creds credentials.CredentialAdmin
2724
}
2825

29-
func NewProvidersSyncHandler(log logging.Logger, dbStore *captenstore.Store) (*ProvidersSyncHandler, error) {
30-
return &ProvidersSyncHandler{log: log, dbStore: dbStore}, nil
26+
func NewProvidersSyncHandler(log logging.Logger, dbStore *captenstore.Store) *ProvidersSyncHandler {
27+
return &ProvidersSyncHandler{log: log, dbStore: dbStore}
3128
}
3229

3330
func (h *ProvidersSyncHandler) Sync() error {

capten/agent/pkg/job/crossplane_resources_sync.go

Lines changed: 20 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,28 +3,37 @@ package job
33
import (
44
"github.com/intelops/go-common/logging"
55
captenstore "github.com/kube-tarian/kad/capten/agent/pkg/capten-store"
6+
"github.com/kube-tarian/kad/capten/agent/pkg/crossplane"
67
)
78

89
type CrossplaneResourcesSync struct {
9-
dbStore *captenstore.Store
10-
log logging.Logger
11-
frequency string
10+
log logging.Logger
11+
frequency string
12+
clusterHandler *crossplane.ClusterClaimSyncHandler
13+
providerHandler *crossplane.ProvidersSyncHandler
1214
}
1315

1416
func NewCrossplaneResourcesSync(log logging.Logger, frequency string, dbStore *captenstore.Store) (*CrossplaneResourcesSync, error) {
1517
return &CrossplaneResourcesSync{
16-
log: log,
17-
frequency: frequency,
18-
dbStore: dbStore,
18+
log: log,
19+
frequency: frequency,
20+
clusterHandler: crossplane.NewClusterClaimSyncHandler(log, dbStore),
21+
providerHandler: crossplane.NewProvidersSyncHandler(log, dbStore),
1922
}, nil
2023
}
2124

22-
func (v *CrossplaneResourcesSync) CronSpec() string {
23-
return v.frequency
25+
func (s *CrossplaneResourcesSync) CronSpec() string {
26+
return s.frequency
2427
}
2528

26-
func (v *CrossplaneResourcesSync) Run() {
27-
v.log.Debug("started crossplane resource sync job")
29+
func (s *CrossplaneResourcesSync) Run() {
30+
s.log.Debug("started crossplane resource sync job")
31+
if err := s.providerHandler.Sync(); err != nil {
32+
s.log.Errorf("failed to synch providers, %v", err)
33+
}
2834

29-
v.log.Debug("crossplane resource sync job completed")
35+
if err := s.clusterHandler.Sync(); err != nil {
36+
s.log.Errorf("failed to synch managed clusters, %v", err)
37+
}
38+
s.log.Debug("crossplane resource sync job completed")
3039
}

0 commit comments

Comments
 (0)