Skip to content

Commit

Permalink
Merge pull request #170 from bank-vaults/dependabot/go_modules/sigs.k…
Browse files Browse the repository at this point in the history
…8s.io/controller-runtime-0.16.0

build(deps): bump sigs.k8s.io/controller-runtime from 0.15.1 to 0.16.0
  • Loading branch information
akijakya authored Aug 25, 2023
2 parents 4e36867 + 8a18fde commit c82da25
Show file tree
Hide file tree
Showing 3 changed files with 55 additions and 22 deletions.
13 changes: 6 additions & 7 deletions cmd/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,14 @@ import (
"os"
"time"

// Import all Kubernetes client auth plugins (e.g. Azure, GCP, OIDC, etc.)
// to ensure that exec-entrypoint and run can make use of them.
_ "k8s.io/client-go/plugin/pkg/client/auth"
ctrl "sigs.k8s.io/controller-runtime"
"sigs.k8s.io/controller-runtime/pkg/cache"
"sigs.k8s.io/controller-runtime/pkg/client/config"
"sigs.k8s.io/controller-runtime/pkg/healthz"
"sigs.k8s.io/controller-runtime/pkg/log/zap"
"sigs.k8s.io/controller-runtime/pkg/manager"
metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"

"github.com/bank-vaults/vault-operator/pkg/apis"
vaultv1alpha1 "github.com/bank-vaults/vault-operator/pkg/apis/vault/v1alpha1"
Expand Down Expand Up @@ -73,11 +72,11 @@ func main() {
namespace = os.Getenv(envWatchNamespace)
}

namespaces := []string{}
namespaces := make(map[string]cache.Config)
if namespace == "" {
log.Info("no watched namespace found, watching the entire cluster")
} else {
namespaces = []string{namespace}
namespaces[namespace] = cache.Config{}
log.Info("watched namespace: " + namespace)
}

Expand All @@ -99,14 +98,14 @@ func main() {
// Create a new Cmd to provide shared dependencies and start components
mgr, err := manager.New(k8sConfig, manager.Options{
Cache: cache.Options{
Namespaces: namespaces,
SyncPeriod: syncPeriod,
DefaultNamespaces: namespaces,
SyncPeriod: syncPeriod,
},
LeaderElection: true,
LeaderElectionNamespace: leaderElectionNamespace,
LeaderElectionID: "vault-operator-lock",
HealthProbeBindAddress: healthProbeBindAddress,
MetricsBindAddress: metricsBindAddress,
Metrics: metricsserver.Options{BindAddress: metricsBindAddress},
LivenessEndpointName: "/", // For Chart backwards compatibility
ReadinessEndpointName: "/ready", // For Chart backwards compatibility
})
Expand Down
10 changes: 5 additions & 5 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ require (
k8s.io/apimachinery v0.28.0
k8s.io/client-go v0.28.0
k8s.io/utils v0.0.0-20230505201702-9f6742963106
sigs.k8s.io/controller-runtime v0.15.1
sigs.k8s.io/controller-runtime v0.16.0
)

require (
Expand Down Expand Up @@ -98,18 +98,18 @@ require (
github.com/spf13/pflag v1.0.5 // indirect
github.com/urfave/cli v1.22.4 // indirect
go.opencensus.io v0.24.0 // indirect
go.uber.org/atomic v1.10.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
go.uber.org/zap v1.24.0 // indirect
go.uber.org/zap v1.25.0 // indirect
golang.org/x/crypto v0.11.0 // indirect
golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect
golang.org/x/net v0.13.0 // indirect
golang.org/x/oauth2 v0.8.0 // indirect
golang.org/x/sys v0.10.0 // indirect
golang.org/x/sys v0.11.0 // indirect
golang.org/x/term v0.10.0 // indirect
golang.org/x/text v0.11.0 // indirect
golang.org/x/time v0.3.0 // indirect
golang.org/x/tools v0.9.3 // indirect
gomodules.xyz/jsonpatch/v2 v2.3.0 // indirect
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
google.golang.org/api v0.122.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto v0.0.0-20230526161137-0005af68ea54 // indirect
Expand Down
Loading

0 comments on commit c82da25

Please # to comment.