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.

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

Update crossplane changes #343

Closed
wants to merge 15 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion capten/agent/internal/config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ type SericeConfig struct {
Mode string `envconfig:"MODE" default:"production"`
AuthEnabled bool `envconfig:"AUTH_ENABLED" default:"false"`
CrossplaneSyncJobEnabled bool `envconfig:"CROSSPLANE_SYNC_JOB_ENABLED" default:"true"`
CrossplaneSyncJobInterval string `envconfig:"CROSSPLANE_SYNC_JOB_INTERVAL" default:"@every 1h"`
CrossplaneSyncJobInterval string `envconfig:"CROSSPLANE_SYNC_JOB_INTERVAL" default:"@every 5m"`
}

func GetServiceConfig() (*SericeConfig, error) {
Expand Down
39 changes: 30 additions & 9 deletions capten/agent/internal/crossplane/package_providers.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,13 @@ var (
pgvk = schema.GroupVersionResource{Group: "pkg.crossplane.io", Version: "v1", Resource: "providers"}
)

const (
updateCrossplaneProviderAddAction = "OnAdd"
updateCrossplaneProviderUpdateAction = "OnUpdate"
updateCrossplaneProviderDeleteAction = "OnDelete"
updateCrossplaneProviderSyncAction = "Sync"
)

type ProvidersSyncHandler struct {
log logging.Logger
dbStore *captenstore.Store
Expand Down Expand Up @@ -56,7 +63,7 @@ func (h *ProvidersSyncHandler) OnAdd(obj interface{}) {
return
}

if err := h.updateCrossplaneProvider([]model.Provider{*newCcObj}); err != nil {
if err := h.updateCrossplaneProvider([]model.Provider{*newCcObj}, updateCrossplaneProviderAddAction); err != nil {
h.log.Errorf("failed to update Provider object, %v", err)
return
}
Expand All @@ -76,14 +83,25 @@ func (h *ProvidersSyncHandler) OnUpdate(oldObj, newObj interface{}) {
return
}

if err := h.updateCrossplaneProvider([]model.Provider{*newCcObj}); err != nil {
if err := h.updateCrossplaneProvider([]model.Provider{*newCcObj}, updateCrossplaneProviderUpdateAction); err != nil {
h.log.Errorf("failed to update Provider object, %v", err)
return
}
}

func (h *ProvidersSyncHandler) OnDelete(obj interface{}) {
h.log.Info("Crossplane Provider Delete Callback")
// need to update the state as not in sync.
provider, err := getProviderObj(obj)
if provider == nil {
h.log.Errorf("failed to read Provider object %v", err)
return
}

if err := h.updateCrossplaneProvider([]model.Provider{*provider}, updateCrossplaneProviderDeleteAction); err != nil {
h.log.Errorf("failed to update Provider object %v", err)
return
}
}

func (h *ProvidersSyncHandler) Sync() error {
Expand All @@ -110,14 +128,14 @@ func (h *ProvidersSyncHandler) Sync() error {
return fmt.Errorf("failed to un-marshall the data, %s", err)
}

if err = h.updateCrossplaneProvider(providerObj.Items); err != nil {
if err = h.updateCrossplaneProvider(providerObj.Items, updateCrossplaneProviderSyncAction); err != nil {
return fmt.Errorf("failed to update providers in DB, %v", err)
}
h.log.Debug("Crossplane Provider resources synched")
return nil
}

func (h *ProvidersSyncHandler) updateCrossplaneProvider(k8sProviders []model.Provider) error {
func (h *ProvidersSyncHandler) updateCrossplaneProvider(k8sProviders []model.Provider, action string) error {
dbProviders, err := h.dbStore.GetCrossplaneProviders()
if err != nil {
return fmt.Errorf("failed to get Crossplane Providers, %v", err)
Expand All @@ -131,20 +149,26 @@ func (h *ProvidersSyncHandler) updateCrossplaneProvider(k8sProviders []model.Pro
for _, k8sProvider := range k8sProviders {
h.log.Infof("processing Crossplane Provider %s", k8sProvider.Name)
for _, providerStatus := range k8sProvider.Status.Conditions {
status := model.CrossPlaneProviderNotReady

if providerStatus.Type != model.TypeHealthy {
continue
}

dbProvider, ok := dbProviderMap[k8sProvider.Name]
if !ok {
h.log.Infof("Provider name %s is not found in the db, skipping the update", k8sProvider.Name)
h.log.Infof("Provider name %s is not found in the db, skipped the provider update", k8sProvider.Name)
continue
}

status := model.CrossPlaneProviderNotReady
if strings.EqualFold(string(providerStatus.Status), "true") {
status = model.CrossPlaneProviderReady
}

if action == updateCrossplaneProviderDeleteAction {
status = model.CrossPlaneProviderOutofSynch
}

provider := model.CrossplaneProvider{
Id: dbProvider.Id,
Status: string(status),
Expand All @@ -153,9 +177,6 @@ func (h *ProvidersSyncHandler) updateCrossplaneProvider(k8sProviders []model.Pro
ProviderName: dbProvider.ProviderName,
}

v, _ := json.Marshal(provider)
fmt.Println("Provider ===>" + string(v))

if err := h.dbStore.UpdateCrossplaneProvider(&provider); err != nil {
h.log.Errorf("failed to update provider %s details in db, %v", k8sProvider.Name, err)
continue
Expand Down
Loading