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

when kubernetes_use_configmaps -> skip further endpoints actions even delete #921

Merged
merged 4 commits into from Apr 16, 2020
Merged

when kubernetes_use_configmaps -> skip further endpoints actions even delete #921

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1d5d2c4
further compatibility with k8sUseConfigMaps - skip further endpoints …
ReSearchITEng Apr 15, 2020
e6bc13e
Update pkg/cluster/cluster.go
ReSearchITEng Apr 16, 2020
4c55208
Update pkg/cluster/cluster.go
ReSearchITEng Apr 16, 2020
b0492aa
Update pkg/cluster/cluster.go
FxKu Apr 16, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
18 changes: 14 additions & 4 deletions pkg/cluster/cluster.go
View file
Open in desktop
Expand Up @@ -783,8 +783,10 @@ func (c *Cluster) Delete() {

for _, role := range []PostgresRole{Master, Replica} {

if err := c.deleteEndpoint(role); err != nil {
c.logger.Warningf("could not delete %s endpoint: %v", role, err)
if !c.patroniKubernetesUseConfigMaps() {
if err := c.deleteEndpoint(role); err != nil {
c.logger.Warningf("could not delete %s endpoint: %v", role, err)
}
}

if err := c.deleteService(role); err != nil {
Expand Down Expand Up @@ -1160,11 +1162,19 @@ type clusterObjectDelete func(name string) error

func (c *Cluster) deletePatroniClusterObjects() error {
// TODO: figure out how to remove leftover patroni objects in other cases
var actionsList []simpleActionWithResult

if !c.patroniUsesKubernetes() {
c.logger.Infof("not cleaning up Etcd Patroni objects on cluster delete")
}
c.logger.Debugf("removing leftover Patroni objects (endpoints, services and configmaps)")
for _, deleter := range []simpleActionWithResult{c.deletePatroniClusterEndpoints, c.deletePatroniClusterServices, c.deletePatroniClusterConfigMaps} {

if !c.patroniKubernetesUseConfigMaps() {
actionsList = append(actionsList, c.deletePatroniClusterEndpoints)
}
actionsList = append(actionsList, c.deletePatroniClusterServices, c.deletePatroniClusterConfigMaps)

c.logger.Debugf("removing leftover Patroni objects (endpoints / services and configmaps)")
for _, deleter := range actionsList {
ReSearchITEng marked this conversation as resolved.
Show resolved Hide resolved
if err := deleter(); err != nil {
return err
}
Expand Down
7 changes: 4 additions & 3 deletions pkg/cluster/sync.go
View file
Open in desktop
Expand Up @@ -122,10 +122,11 @@ func (c *Cluster) syncServices() error {
for _, role := range []PostgresRole{Master, Replica} {
c.logger.Debugf("syncing %s service", role)

if err := c.syncEndpoint(role); err != nil {
return fmt.Errorf("could not sync %s endpoint: %v", role, err)
if !c.patroniKubernetesUseConfigMaps() {
if err := c.syncEndpoint(role); err != nil {
return fmt.Errorf("could not sync %s endpoint: %v", role, err)
}
}

if err := c.syncService(role); err != nil {
return fmt.Errorf("could not sync %s service: %v", role, err)
}
Expand Down