Skip to content

Commit

Permalink
chore(deps): bump k8s libs and openebs/api/v3 (#454)
Browse files Browse the repository at this point in the history
* chore(gitignore): update entry for JetBrains IDEs

Signed-off-by: Niladri Halder <[email protected]>

* chore(deps): bump k8s libs and openebs/api/v3

Signed-off-by: Niladri Halder <[email protected]>

* feat(deploy): update yamls

Signed-off-by: Abhinandan Purkait <[email protected]>

* chore: bump github.com/openebs/api/v3 version to v3.0.3

Signed-off-by: Abhinandan Purkait <[email protected]>

* fix(deploy): add upgradetasks and migrationtasks CRDs

Signed-off-by: Niladri Halder <[email protected]>

---------

Signed-off-by: Niladri Halder <[email protected]>
Signed-off-by: Abhinandan Purkait <[email protected]>
Co-authored-by: Abhinandan Purkait <[email protected]>
  • Loading branch information
niladrih and Abhinandan-Purkait committed Nov 22, 2023
1 parent 79beefa commit 33d8c66
Show file tree
Hide file tree
Showing 95 changed files with 3,906 additions and 2,541 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@
./ci/sanity/cspc.yaml

# IDE files
.idea/
**/.idea/
2 changes: 1 addition & 1 deletion cmd/cspc-operator/app/start.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ import (
"k8s.io/client-go/kubernetes"
"k8s.io/client-go/rest"
"k8s.io/client-go/tools/clientcmd"
"k8s.io/klog"
"k8s.io/klog/v2"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion cmd/cspc-operator/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
"os"

"github.com/openebs/cstor-operators/cmd/cspc-operator/app"
"k8s.io/klog"
"k8s.io/klog/v2"
)

func main() {
Expand Down
2 changes: 1 addition & 1 deletion cmd/cvc-operator/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
"os"

cvc "github.com/openebs/cstor-operators/pkg/controllers/cstorvolumeconfig"
"k8s.io/klog"
"k8s.io/klog/v2"
)

func main() {
Expand Down
2 changes: 1 addition & 1 deletion cmd/pool-manager/app/start.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import (
restorecontroller "github.com/openebs/cstor-operators/pkg/controllers/restore-controller"
"github.com/openebs/cstor-operators/pkg/pool"
"github.com/pkg/errors"
"k8s.io/klog"
"k8s.io/klog/v2"

clientset "github.com/openebs/api/v3/pkg/client/clientset/versioned"
informers "github.com/openebs/api/v3/pkg/client/informers/externalversions"
Expand Down
2 changes: 1 addition & 1 deletion cmd/pool-manager/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
"os"

"github.com/openebs/cstor-operators/cmd/pool-manager/app"
"k8s.io/klog"
"k8s.io/klog/v2"
)

func main() {
Expand Down
2 changes: 1 addition & 1 deletion cmd/volume-manager/app/commands.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ package app
import (
"github.com/openebs/api/v3/pkg/util"
"github.com/spf13/cobra"
"k8s.io/klog"
"k8s.io/klog/v2"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion cmd/webhook/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import (
"k8s.io/client-go/kubernetes"
"k8s.io/client-go/rest"
"k8s.io/client-go/tools/clientcmd"
"k8s.io/klog"
"k8s.io/klog/v2"

clientset "github.com/openebs/api/v3/pkg/client/clientset/versioned"
//snapclientset "github.com/openebs/maya/pkg/client/generated/openebs.io/snapshot/v1alpha1/clientset/internalclientset"
Expand Down
475 changes: 344 additions & 131 deletions deploy/crds/all_cstor_crds.yaml

Large diffs are not rendered by default.

2,782 changes: 1,304 additions & 1,478 deletions deploy/cstor-operator.yaml

Large diffs are not rendered by default.

1,476 changes: 735 additions & 741 deletions deploy/yamls/csi-operator.yaml

Large diffs are not rendered by default.

67 changes: 31 additions & 36 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -5,38 +5,39 @@ go 1.19
require (
github.com/cespare/xxhash v1.1.0
github.com/davecgh/go-spew v1.1.1
github.com/ghodss/yaml v1.0.0
github.com/hashicorp/go-version v1.6.0
github.com/onsi/ginkgo v1.16.5
github.com/onsi/gomega v1.20.2
github.com/openebs/api/v3 v3.0.0-20220927112951-89777143758b
github.com/onsi/gomega v1.27.4
github.com/openebs/api/v3 v3.0.3
github.com/pkg/errors v0.9.1
github.com/spf13/cobra v1.5.0
github.com/spf13/pflag v1.0.5
github.com/stretchr/testify v1.8.0
github.com/stretchr/testify v1.8.4
github.com/ugorji/go/codec v1.2.7
go.uber.org/zap v1.23.0
golang.org/x/net v0.0.0-20220926192436-02166a98028e
google.golang.org/grpc v1.49.0
k8s.io/api v0.25.2
k8s.io/apimachinery v0.25.2
k8s.io/client-go v1.5.2
k8s.io/klog v1.0.0
golang.org/x/net v0.18.0
google.golang.org/grpc v1.54.0
k8s.io/api v0.27.2
k8s.io/apimachinery v0.27.2
k8s.io/client-go v0.27.2
k8s.io/klog/v2 v2.110.1
sigs.k8s.io/yaml v1.4.0
)

require (
github.com/emicklei/go-restful/v3 v3.9.0 // indirect
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
github.com/fsnotify/fsnotify v1.5.4 // indirect
github.com/go-logr/logr v1.2.3 // indirect
github.com/go-openapi/jsonpointer v0.19.5 // indirect
github.com/go-openapi/jsonreference v0.20.0 // indirect
github.com/go-openapi/swag v0.22.3 // indirect
github.com/go-logr/logr v1.3.0 // indirect
github.com/go-openapi/jsonpointer v0.20.0 // indirect
github.com/go-openapi/jsonreference v0.20.2 // indirect
github.com/go-openapi/swag v0.22.4 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/protobuf v1.5.2 // indirect
github.com/google/gnostic v0.6.9 // indirect
github.com/google/go-cmp v0.5.9 // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/google/gnostic v0.7.0 // indirect
github.com/google/gnostic-models v0.6.9-0.20230804172637-c7be7c783f49 // indirect
github.com/google/go-cmp v0.6.0 // indirect
github.com/google/gofuzz v1.2.0 // indirect
github.com/google/uuid v1.3.0 // indirect
github.com/imdario/mergo v0.3.13 // indirect
Expand All @@ -53,28 +54,22 @@ require (
github.com/ryanuber/columnize v2.1.2+incompatible // indirect
go.uber.org/atomic v1.10.0 // indirect
go.uber.org/multierr v1.8.0 // indirect
golang.org/x/oauth2 v0.0.0-20220909003341-f21342109be1 // indirect
golang.org/x/sys v0.0.0-20220926163933-8cfa568d3c25 // indirect
golang.org/x/term v0.0.0-20220919170432-7a66f970e087 // indirect
golang.org/x/text v0.3.7 // indirect
golang.org/x/time v0.0.0-20220922220347-f3bd1da661af // indirect
golang.org/x/oauth2 v0.6.0 // indirect
golang.org/x/sys v0.14.0 // indirect
golang.org/x/term v0.14.0 // indirect
golang.org/x/text v0.14.0 // indirect
golang.org/x/time v0.3.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto v0.0.0-20220926220553-6981cbe3cfce // indirect
google.golang.org/protobuf v1.28.1 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20230525234030-28d5490b6b19 // indirect
google.golang.org/protobuf v1.31.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/klog/v2 v2.80.1 // indirect
k8s.io/kube-openapi v0.0.0-20220803164354-a70c9af30aea // indirect
k8s.io/utils v0.0.0-20220922133306-665eaaec4324 // indirect
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
sigs.k8s.io/yaml v1.3.0 // indirect
k8s.io/kube-openapi v0.0.0-20231113174909-778a5567bc1e // indirect
k8s.io/utils v0.0.0-20230209194617-a36077c30491 // indirect
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
)

replace (
k8s.io/api => k8s.io/api v0.25.2
k8s.io/apimachinery => k8s.io/apimachinery v0.25.2
k8s.io/client-go => k8s.io/client-go v0.25.2
)
replace k8s.io/client-go => k8s.io/client-go v0.27.2
Loading

0 comments on commit 33d8c66

Please sign in to comment.