Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

OCPBUGS-19324: fix: CVE-2023-37788 #481

Merged
merged 1 commit into from
Nov 9, 2023
Merged

OCPBUGS-19324: fix: CVE-2023-37788 #481

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion cmd/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"os"

"github.com/go-logr/logr"
snapapi "github.com/kubernetes-csi/external-snapshotter/client/v4/apis/volumesnapshot/v1"
snapapi "github.com/kubernetes-csi/external-snapshotter/client/v6/apis/volumesnapshot/v1"
configv1 "github.com/openshift/api/config/v1"
secv1 "github.com/openshift/api/security/v1"
lvmv1alpha1 "github.com/openshift/lvm-operator/api/v1alpha1"
Expand Down
2 changes: 1 addition & 1 deletion cmd/operator/operator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ import (
metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"
"sigs.k8s.io/controller-runtime/pkg/webhook"

snapapi "github.com/kubernetes-csi/external-snapshotter/client/v4/apis/volumesnapshot/v1"
snapapi "github.com/kubernetes-csi/external-snapshotter/client/v6/apis/volumesnapshot/v1"
"github.com/openshift/library-go/pkg/config/leaderelection"

lvmv1alpha1 "github.com/openshift/lvm-operator/api/v1alpha1"
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ require (
github.com/go-logr/logr v1.3.0
github.com/go-logr/zapr v1.3.0
github.com/google/go-cmp v0.6.0
github.com/kubernetes-csi/external-snapshotter/client/v4 v4.2.0
github.com/kubernetes-csi/external-snapshotter/client/v6 v6.3.0
github.com/onsi/ginkgo/v2 v2.13.0
github.com/onsi/gomega v1.29.0
github.com/openshift/api v0.0.0-20231102215821-c90b4c82852e
Expand Down
103 changes: 2 additions & 101 deletions go.sum
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion internal/controllers/lvmcluster/controller_watches.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ package lvmcluster
import (
"context"

snapapiv1 "github.com/kubernetes-csi/external-snapshotter/client/v4/apis/volumesnapshot/v1"
snapapiv1 "github.com/kubernetes-csi/external-snapshotter/client/v6/apis/volumesnapshot/v1"
"github.com/openshift/lvm-operator/internal/controllers/labels"
internalselector "github.com/openshift/lvm-operator/internal/controllers/lvmcluster/selector"
v1 "k8s.io/api/core/v1"
Expand Down
2 changes: 1 addition & 1 deletion internal/controllers/lvmcluster/resource/topolvm_snapshotclass.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
"context"
"fmt"

snapapi "github.com/kubernetes-csi/external-snapshotter/client/v4/apis/volumesnapshot/v1"
snapapi "github.com/kubernetes-csi/external-snapshotter/client/v6/apis/volumesnapshot/v1"
"github.com/openshift/lvm-operator/internal/controllers/constants"
"github.com/openshift/lvm-operator/internal/controllers/labels"
"k8s.io/apimachinery/pkg/api/errors"
Expand Down
2 changes: 1 addition & 1 deletion internal/controllers/lvmcluster/suite_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ import (
logf "sigs.k8s.io/controller-runtime/pkg/log"
"sigs.k8s.io/controller-runtime/pkg/log/zap"

snapapi "github.com/kubernetes-csi/external-snapshotter/client/v4/apis/volumesnapshot/v1"
snapapi "github.com/kubernetes-csi/external-snapshotter/client/v6/apis/volumesnapshot/v1"
lvmv1alpha1 "github.com/openshift/lvm-operator/api/v1alpha1"
topolvmv1 "github.com/topolvm/topolvm/api/v1"
//+kubebuilder:scaffold:imports
Expand Down
2 changes: 1 addition & 1 deletion internal/controllers/lvmcluster/vgmanager_resource_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (
"gotest.tools/v3/assert"

"github.com/go-logr/logr/testr"
snapapi "github.com/kubernetes-csi/external-snapshotter/client/v4/apis/volumesnapshot/v1"
snapapi "github.com/kubernetes-csi/external-snapshotter/client/v6/apis/volumesnapshot/v1"
lvmv1alpha1 "github.com/openshift/lvm-operator/api/v1alpha1"
appsv1 "k8s.io/api/apps/v1"
corev1 "k8s.io/api/core/v1"
Expand Down
2 changes: 1 addition & 1 deletion internal/controllers/vgmanager/controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"testing"
"time"

snapapi "github.com/kubernetes-csi/external-snapshotter/client/v4/apis/volumesnapshot/v1"
snapapi "github.com/kubernetes-csi/external-snapshotter/client/v6/apis/volumesnapshot/v1"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
configv1 "github.com/openshift/api/config/v1"
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/config_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"fmt"
"os"

snapapi "github.com/kubernetes-csi/external-snapshotter/client/v4/apis/volumesnapshot/v1"
snapapi "github.com/kubernetes-csi/external-snapshotter/client/v6/apis/volumesnapshot/v1"
configv1 "github.com/openshift/api/config/v1"
secv1 "github.com/openshift/api/security/v1"

Expand Down
2 changes: 1 addition & 1 deletion test/e2e/lvm_pvc_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (
. "github.com/onsi/gomega"
"k8s.io/apimachinery/pkg/api/meta"

snapapi "github.com/kubernetes-csi/external-snapshotter/client/v4/apis/volumesnapshot/v1"
snapapi "github.com/kubernetes-csi/external-snapshotter/client/v6/apis/volumesnapshot/v1"

k8sv1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/resource"
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/validation_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (
. "github.com/onsi/gomega"
"k8s.io/apimachinery/pkg/api/meta"

snapapi "github.com/kubernetes-csi/external-snapshotter/client/v4/apis/volumesnapshot/v1"
snapapi "github.com/kubernetes-csi/external-snapshotter/client/v6/apis/volumesnapshot/v1"

appsv1 "k8s.io/api/apps/v1"
k8sv1 "k8s.io/api/core/v1"
Expand Down
2 changes: 1 addition & 1 deletion test/performance/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
"time"

"github.com/go-logr/zapr"
snapapi "github.com/kubernetes-csi/external-snapshotter/client/v4/apis/volumesnapshot/v1"
snapapi "github.com/kubernetes-csi/external-snapshotter/client/v6/apis/volumesnapshot/v1"
configv1 "github.com/openshift/api/config/v1"
routesv1 "github.com/openshift/api/route/v1"
secv1 "github.com/openshift/api/security/v1"
Expand Down
0 ...si/external-snapshotter/client/v4/LICENSE → ...si/external-snapshotter/client/v6/LICENSE
View file
Open in desktop
File renamed without changes.
0 ...r/client/v4/apis/volumesnapshot/v1/doc.go → ...r/client/v6/apis/volumesnapshot/v1/doc.go
View file
Open in desktop
File renamed without changes.
0 ...ent/v4/apis/volumesnapshot/v1/register.go → ...ent/v6/apis/volumesnapshot/v1/register.go
View file
Open in desktop
File renamed without changes.
56 changes: 36 additions & 20 deletions ...client/v4/apis/volumesnapshot/v1/types.go → ...client/v6/apis/volumesnapshot/v1/types.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

19 changes: 18 additions & 1 deletion ...olumesnapshot/v1/zz_generated.deepcopy.go → ...olumesnapshot/v1/zz_generated.deepcopy.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions vendor/modules.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,9 +223,9 @@ github.com/josharian/intern
# github.com/json-iterator/go v1.1.12
## explicit; go 1.12
github.com/json-iterator/go
# github.com/kubernetes-csi/external-snapshotter/client/v4 v4.2.0
## explicit; go 1.15
github.com/kubernetes-csi/external-snapshotter/client/v4/apis/volumesnapshot/v1
# github.com/kubernetes-csi/external-snapshotter/client/v6 v6.3.0
## explicit; go 1.20
github.com/kubernetes-csi/external-snapshotter/client/v6/apis/volumesnapshot/v1
# github.com/magiconair/properties v1.8.5
## explicit; go 1.13
github.com/magiconair/properties
Expand Down