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

🐛 Fixing placmement group delimiter solves issue which leads to creating and deleting of placementgroups in a loop #46

Merged
merged 1 commit into from
Jan 14, 2022
Merged

🐛 Fixing placmement group delimiter solves issue which leads to creating and deleting of placementgroups in a loop #46

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 10 additions & 10 deletions pkg/services/hcloud/placementgroup/placementgroup.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,6 @@ type Service struct {
scope *scope.ClusterScope
}

const pgDelimiter = "-"

// NewService creates new service object.
func NewService(scope *scope.ClusterScope) *Service {
return &Service{
Expand All @@ -62,16 +60,17 @@ func (s *Service) Reconcile(ctx context.Context) (err error) {

// Delete placement groups which are not in status but in specs
var multierr []error
for _, pg := range placementGroups {
for i, pgSts := range s.scope.HetznerCluster.Status.HCloudPlacementGroup {
log.Info("pg Status", "i", i, "name", pgSts.Name)
var foundInSpecs bool
for _, pgSpec := range s.scope.HetznerCluster.Spec.HCloudPlacementGroupSpec {
if pg.Name == pgSpec.Name {
if pgSts.Name == pgSpec.Name {
foundInSpecs = true
break
}
}
if !foundInSpecs {
if _, err := s.scope.HCloudClient().DeletePlacementGroup(ctx, pg.ID); err != nil {
if _, err := s.scope.HCloudClient().DeletePlacementGroup(ctx, pgSts.ID); err != nil {
multierr = append(multierr, err)
}
}
Expand All @@ -83,16 +82,17 @@ func (s *Service) Reconcile(ctx context.Context) (err error) {

// Create placement groups which are in specs but not in status
multierr = []error{}
for _, pgSpec := range s.scope.HetznerCluster.Spec.HCloudPlacementGroupSpec {
for i, pgSpec := range s.scope.HetznerCluster.Spec.HCloudPlacementGroupSpec {
log.Info("pg Spec", "i", i, "name", pgSpec.Name)
var foundInStatus bool
for _, pg := range placementGroups {
if pg.Name == pgSpec.Name {
for _, pgSts := range s.scope.HetznerCluster.Status.HCloudPlacementGroup {
if pgSts.Name == pgSpec.Name {
foundInStatus = true
break
}
}
if !foundInStatus {
name := fmt.Sprintf("%s%s%s", s.scope.HetznerCluster.Name, pgDelimiter, pgSpec.Name)
name := fmt.Sprintf("%s-%s", s.scope.HetznerCluster.Name, pgSpec.Name)
clusterTagKey := infrav1.ClusterTagKey(s.scope.HetznerCluster.Name)
if _, _, err := s.scope.HCloudClient().CreatePlacementGroup(ctx, hcloud.PlacementGroupCreateOpts{
Name: name,
Expand Down Expand Up @@ -159,7 +159,7 @@ func (s *Service) apiToStatus(placementGroups []*hcloud.PlacementGroup) (status
status = append(status, infrav1.HCloudPlacementGroupStatus{
ID: pg.ID,
Server: pg.Servers,
Name: strings.Split(pg.Name, pgDelimiter)[1],
Name: strings.TrimPrefix(pg.Name, fmt.Sprintf("%s-", s.scope.HetznerCluster.Name)),
Type: string(pg.Type),
})
}
Expand Down