Skip to content

Commit

Permalink
Bump operator-sdk to 0.17.1 version (#22)
Browse files Browse the repository at this point in the history 
Fixes #21
  • Loading branch information
@toha10
toha10 authored Oct 4, 2020
1 parent 71e4f9c commit 6baac7e
Show file tree
Hide file tree
Showing 2,042 changed files with 261,800 additions and 222,199 deletions.
6 changes: 3 additions & 3 deletions cmd/manager/BUILD.bazel
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,17 @@ go_library(
"//vendor/github.com/operator-framework/operator-sdk/pkg/leader:go_default_library",
"//vendor/github.com/operator-framework/operator-sdk/pkg/log/zap:go_default_library",
"//vendor/github.com/operator-framework/operator-sdk/pkg/metrics:go_default_library",
"//vendor/github.com/operator-framework/operator-sdk/pkg/restmapper:go_default_library",
"//vendor/github.com/operator-framework/operator-sdk/version:go_default_library",
"//vendor/github.com/spf13/pflag:go_default_library",
"//vendor/k8s.io/api/core/v1:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/util/intstr:go_default_library",
"//vendor/k8s.io/client-go/plugin/pkg/client/auth:go_default_library",
"//vendor/k8s.io/client-go/rest:go_default_library",
"//vendor/sigs.k8s.io/controller-runtime/pkg/client/apiutil:go_default_library",
"//vendor/sigs.k8s.io/controller-runtime/pkg/client/config:go_default_library",
"//vendor/sigs.k8s.io/controller-runtime/pkg/log:go_default_library",
"//vendor/sigs.k8s.io/controller-runtime/pkg/manager:go_default_library",
"//vendor/sigs.k8s.io/controller-runtime/pkg/runtime/log:go_default_library",
"//vendor/sigs.k8s.io/controller-runtime/pkg/runtime/signals:go_default_library",
"//vendor/sigs.k8s.io/controller-runtime/pkg/manager/signals:go_default_library",
"//version:go_default_library",
],
)
Expand Down
9 changes: 4 additions & 5 deletions cmd/manager/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,18 +26,17 @@ import (
"github.com/operator-framework/operator-sdk/pkg/leader"
"github.com/operator-framework/operator-sdk/pkg/log/zap"
"github.com/operator-framework/operator-sdk/pkg/metrics"
"github.com/operator-framework/operator-sdk/pkg/restmapper"
sdkVersion "github.com/operator-framework/operator-sdk/version"
"github.com/spf13/pflag"
v1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/util/intstr"
// Import all Kubernetes client auth plugins (e.g. Azure, GCP, OIDC, etc.)
_ "k8s.io/client-go/plugin/pkg/client/auth"
"k8s.io/client-go/rest"
"sigs.k8s.io/controller-runtime/pkg/client/apiutil"
"sigs.k8s.io/controller-runtime/pkg/client/config"
logf "sigs.k8s.io/controller-runtime/pkg/log"
"sigs.k8s.io/controller-runtime/pkg/manager"
logf "sigs.k8s.io/controller-runtime/pkg/runtime/log"
"sigs.k8s.io/controller-runtime/pkg/runtime/signals"
"sigs.k8s.io/controller-runtime/pkg/manager/signals"

"github.com/amaizfinance/redis-operator/pkg/apis"
"github.com/amaizfinance/redis-operator/pkg/controller"
Expand Down Expand Up @@ -106,7 +105,7 @@ func main() {
// Create a new Cmd to provide shared dependencies and start components
mgr, err := manager.New(cfg, manager.Options{
Namespace: namespace,
MapperProvider: restmapper.NewDynamicRESTMapper,
MapperProvider: apiutil.NewDiscoveryRESTMapper,
MetricsBindAddress: fmt.Sprintf("%s:%d", metricsHost, metricsPort),
})
if err != nil {
Expand Down
33 changes: 11 additions & 22 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,31 +4,20 @@ go 1.15

require (
github.com/cenkalti/backoff/v3 v3.0.0
github.com/go-openapi/spec v0.19.0
github.com/go-openapi/spec v0.19.4
github.com/go-redis/redis v6.15.5+incompatible
github.com/operator-framework/operator-sdk v0.10.0
github.com/operator-framework/operator-sdk v0.17.1
github.com/spf13/cast v1.3.0
github.com/spf13/pflag v1.0.3
golang.org/x/crypto v0.0.0-20190404164418-38d8ce5564a5
k8s.io/api v0.0.0-20190612125737-db0771252981
k8s.io/apimachinery v0.0.0-20190612125636-6a5db36e93ad
k8s.io/client-go v11.0.0+incompatible
k8s.io/kube-openapi v0.0.0-20190603182131-db7b694dc208
sigs.k8s.io/controller-runtime v0.1.12
sigs.k8s.io/controller-tools v0.1.10
github.com/spf13/pflag v1.0.5
golang.org/x/crypto v0.0.0-20200220183623-bac4c82f6975
k8s.io/api v0.17.4
k8s.io/apimachinery v0.17.4
k8s.io/client-go v12.0.0+incompatible
k8s.io/kube-openapi v0.0.0-20191107075043-30be4d16710a
sigs.k8s.io/controller-runtime v0.5.2
)

// Pinned to kubernetes-1.13.4
replace (
k8s.io/api => k8s.io/api v0.0.0-20190222213804-5cb15d344471
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.0.0-20190228180357-d002e88f6236
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190221213512-86fb29eff628
k8s.io/client-go => k8s.io/client-go v0.0.0-20190228174230-b40b2a5939e4
)

replace (
github.com/coreos/prometheus-operator => github.com/coreos/prometheus-operator v0.29.0
k8s.io/kube-state-metrics => k8s.io/kube-state-metrics v1.6.0
sigs.k8s.io/controller-runtime => sigs.k8s.io/controller-runtime v0.1.12
sigs.k8s.io/controller-tools => sigs.k8s.io/controller-tools v0.1.11-0.20190411181648-9d55346c2bde
github.com/Azure/go-autorest => github.com/Azure/go-autorest v13.3.2+incompatible // Required by OLM
k8s.io/client-go => k8s.io/client-go v0.17.4 // Required by prometheus-operator
)
Loading

0 comments on commit 6baac7e

Please sign in to comment.