Skip to content
Merged
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
17 changes: 0 additions & 17 deletions cmd/postgres-operator/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import (
"crypto/tls"
"errors"
"fmt"
"net/http"
"os"
"os/signal"
"strconv"
Expand All @@ -24,8 +23,6 @@ import (
"sigs.k8s.io/controller-runtime/pkg/healthz"
"sigs.k8s.io/controller-runtime/pkg/metrics/filters"

"github.com/crunchydata/postgres-operator/internal/bridge"
"github.com/crunchydata/postgres-operator/internal/bridge/crunchybridgecluster"
"github.com/crunchydata/postgres-operator/internal/controller/pgupgrade"
"github.com/crunchydata/postgres-operator/internal/controller/postgrescluster"
"github.com/crunchydata/postgres-operator/internal/controller/runtime"
Expand Down Expand Up @@ -241,24 +238,10 @@ func main() {
manager := need(runtime.NewManager(config, options))
must(manager.Add(k8s))

bridgeURL := os.Getenv("PGO_BRIDGE_URL")
bridgeClient := func() *bridge.Client {
client := bridge.NewClient(bridgeURL, versionString)
client.Transport = otelTransportWrapper()(http.DefaultTransport)
return client
}

// add all PostgreSQL Operator controllers to the runtime manager
must(pgupgrade.ManagedReconciler(manager))
must(postgrescluster.ManagedReconciler(manager))
must(standalone_pgadmin.ManagedReconciler(manager))
must(crunchybridgecluster.ManagedReconciler(manager, func() bridge.ClientInterface {
return bridgeClient()
}))

if features.Enabled(feature.BridgeIdentifiers) {
must(bridge.ManagedInstallationReconciler(manager, bridgeClient))
}

// Enable health probes
must(manager.AddHealthzCheck("health", healthz.Ping))
Expand Down

This file was deleted.

1 change: 0 additions & 1 deletion config/crd/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
kind: Kustomization

resources:
- bases/postgres-operator.crunchydata.com_crunchybridgeclusters.yaml
- bases/postgres-operator.crunchydata.com_postgresclusters.yaml
- bases/postgres-operator.crunchydata.com_pgupgrades.yaml
- bases/postgres-operator.crunchydata.com_pgadmins.yaml
Expand Down
18 changes: 0 additions & 18 deletions config/rbac/role.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -111,24 +111,6 @@ rules:
- list
- patch
- watch
- apiGroups:
- postgres-operator.crunchydata.com
resources:
- crunchybridgeclusters
verbs:
- get
- list
- patch
- update
- watch
- apiGroups:
- postgres-operator.crunchydata.com
resources:
- crunchybridgeclusters/finalizers
- crunchybridgeclusters/status
verbs:
- patch
- update
- apiGroups:
- postgres-operator.crunchydata.com
resources:
Expand Down
Loading
Loading