Skip to content

Commit 659077e

Browse files
author
Jonathan S. Katz
committed
Fix compilation errors from bad backpatch
The apiserver binary was missing one import, and rmdata required an update to a data structure.
1 parent 9f9941e commit 659077e

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

internal/apiserver/common.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ import (
1919
"errors"
2020
"fmt"
2121
"strconv"
22+
"strings"
2223

2324
"github.com/crunchydata/postgres-operator/internal/config"
2425
"github.com/crunchydata/postgres-operator/internal/kubeapi"

pgo-rmdata/rmdata/process.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ func removeBackupSecrets(request Request) {
222222
// <cluster-name>-pgha-config (stores a Patroni config file in YAML format)
223223
func removeClusterConfigmaps(request Request) {
224224
// Store the derived names of the three configmaps in an array
225-
clusterConfigmaps := [4]string{
225+
clusterConfigmaps := []string{
226226
// first, derive the name of the PG HA default configmap, which is
227227
// "`clusterName`-`LABEL_PGHA_CONFIGMAP`"
228228
fmt.Sprintf("%s-%s", request.ClusterName, config.LABEL_PGHA_CONFIGMAP),

0 commit comments

Comments
 (0)