Skip to content

Commit b40bcb8

Browse files
diptiranjanpxdiptiranjanpx
authored
PWX-38874: Pulling stork and externalstorage apis from schedops to stork. (#1859)
* PWX-38874: Pulling stork and externalstorage apis from schedops to stork. * Fixed the staticcheck errors.
1 parent 18e0e01 commit b40bcb8

116 files changed

Lines changed: 3127 additions & 109 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎drivers/volume/aws/aws.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@ import (
1818
"github.com/libopenstorage/openstorage/pkg/units"
1919
storkvolume "github.com/libopenstorage/stork/drivers/volume"
2020
storkapi "github.com/libopenstorage/stork/pkg/apis/stork/v1alpha1"
21+
storkops "github.com/libopenstorage/stork/pkg/crud/stork"
2122
"github.com/libopenstorage/stork/pkg/errors"
2223
"github.com/libopenstorage/stork/pkg/k8sutils"
2324
"github.com/libopenstorage/stork/pkg/log"
2425
"github.com/portworx/sched-ops/k8s/core"
2526
"github.com/portworx/sched-ops/k8s/storage"
26-
storkops "github.com/portworx/sched-ops/k8s/stork"
2727
"github.com/sirupsen/logrus"
2828
v1 "k8s.io/api/core/v1"
2929
"k8s.io/apimachinery/pkg/runtime"

‎drivers/volume/azure/azure.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@ import (
1919
snapshotVolume "github.com/kubernetes-incubator/external-storage/snapshot/pkg/volume"
2020
storkvolume "github.com/libopenstorage/stork/drivers/volume"
2121
storkapi "github.com/libopenstorage/stork/pkg/apis/stork/v1alpha1"
22+
storkops "github.com/libopenstorage/stork/pkg/crud/stork"
2223
"github.com/libopenstorage/stork/pkg/errors"
2324
"github.com/libopenstorage/stork/pkg/k8sutils"
2425
"github.com/libopenstorage/stork/pkg/log"
2526
"github.com/portworx/sched-ops/k8s/core"
2627
"github.com/portworx/sched-ops/k8s/storage"
27-
storkops "github.com/portworx/sched-ops/k8s/stork"
2828
"github.com/sirupsen/logrus"
2929
v1 "k8s.io/api/core/v1"
3030
"k8s.io/apimachinery/pkg/runtime"

‎drivers/volume/csi/csi.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ import (
1717
storkvolume "github.com/libopenstorage/stork/drivers/volume"
1818
storkapi "github.com/libopenstorage/stork/pkg/apis/stork/v1alpha1"
1919
"github.com/libopenstorage/stork/pkg/applicationmanager/controllers"
20+
storkops "github.com/libopenstorage/stork/pkg/crud/stork"
2021
"github.com/libopenstorage/stork/pkg/crypto"
2122
"github.com/libopenstorage/stork/pkg/errors"
2223
"github.com/libopenstorage/stork/pkg/k8sutils"
@@ -27,7 +28,6 @@ import (
2728
"github.com/libopenstorage/stork/pkg/version"
2829
"github.com/portworx/kdmp/pkg/executor"
2930
"github.com/portworx/sched-ops/k8s/core"
30-
storkops "github.com/portworx/sched-ops/k8s/stork"
3131
"github.com/sirupsen/logrus"
3232
"gocloud.dev/blob"
3333
"gocloud.dev/gcerrors"

‎drivers/volume/gcp/gcp.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@ import (
1111
snapshotVolume "github.com/kubernetes-incubator/external-storage/snapshot/pkg/volume"
1212
storkvolume "github.com/libopenstorage/stork/drivers/volume"
1313
storkapi "github.com/libopenstorage/stork/pkg/apis/stork/v1alpha1"
14+
storkops "github.com/libopenstorage/stork/pkg/crud/stork"
1415
"github.com/libopenstorage/stork/pkg/errors"
1516
"github.com/libopenstorage/stork/pkg/k8sutils"
1617
"github.com/libopenstorage/stork/pkg/log"
1718
"github.com/portworx/sched-ops/k8s/core"
1819
"github.com/portworx/sched-ops/k8s/storage"
19-
storkops "github.com/portworx/sched-ops/k8s/stork"
2020
"github.com/sirupsen/logrus"
2121
"golang.org/x/oauth2/google"
2222
compute "google.golang.org/api/compute/v1"

‎drivers/volume/kdmp/kdmp.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import (
1414
stork_driver "github.com/libopenstorage/stork/drivers"
1515
storkvolume "github.com/libopenstorage/stork/drivers/volume"
1616
storkapi "github.com/libopenstorage/stork/pkg/apis/stork/v1alpha1"
17+
storkops "github.com/libopenstorage/stork/pkg/crud/stork"
1718
"github.com/libopenstorage/stork/pkg/errors"
1819
"github.com/libopenstorage/stork/pkg/k8sutils"
1920
"github.com/libopenstorage/stork/pkg/log"
@@ -27,7 +28,6 @@ import (
2728
"github.com/portworx/sched-ops/k8s/externalsnapshotter"
2829
kdmpShedOps "github.com/portworx/sched-ops/k8s/kdmp"
2930
"github.com/portworx/sched-ops/k8s/storage"
30-
storkops "github.com/portworx/sched-ops/k8s/stork"
3131
"github.com/sirupsen/logrus"
3232
v1 "k8s.io/api/core/v1"
3333
k8serror "k8s.io/apimachinery/pkg/api/errors"

‎drivers/volume/portworx/portworx.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,16 +38,16 @@ import (
3838
storkapi "github.com/libopenstorage/stork/pkg/apis/stork/v1alpha1"
3939
applicationcontrollers "github.com/libopenstorage/stork/pkg/applicationmanager/controllers"
4040
storkcache "github.com/libopenstorage/stork/pkg/cache"
41+
k8sextops "github.com/libopenstorage/stork/pkg/crud/externalstorage"
42+
storkops "github.com/libopenstorage/stork/pkg/crud/stork"
4143
"github.com/libopenstorage/stork/pkg/errors"
4244
"github.com/libopenstorage/stork/pkg/k8sutils"
4345
"github.com/libopenstorage/stork/pkg/log"
4446
"github.com/libopenstorage/stork/pkg/resourcecollector"
4547
"github.com/libopenstorage/stork/pkg/snapshot"
4648
snapshotcontrollers "github.com/libopenstorage/stork/pkg/snapshot/controllers"
4749
"github.com/portworx/sched-ops/k8s/core"
48-
k8sextops "github.com/portworx/sched-ops/k8s/externalstorage"
4950
"github.com/portworx/sched-ops/k8s/storage"
50-
storkops "github.com/portworx/sched-ops/k8s/stork"
5151
"github.com/sirupsen/logrus"
5252
"google.golang.org/grpc"
5353
"google.golang.org/grpc/codes"

‎pkg/action/actioncontroller.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ import (
99
"github.com/libopenstorage/stork/drivers/volume"
1010
storkv1 "github.com/libopenstorage/stork/pkg/apis/stork/v1alpha1"
1111
"github.com/libopenstorage/stork/pkg/controllers"
12+
storkops "github.com/libopenstorage/stork/pkg/crud/stork"
1213
"github.com/libopenstorage/stork/pkg/k8sutils"
1314
"github.com/libopenstorage/stork/pkg/log"
1415
"github.com/libopenstorage/stork/pkg/resourceutils"
1516
"github.com/portworx/sched-ops/k8s/apiextensions"
16-
storkops "github.com/portworx/sched-ops/k8s/stork"
1717
"github.com/sirupsen/logrus"
1818
v1 "k8s.io/api/core/v1"
1919
apiextensionsv1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"

‎pkg/action/drutils.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@ import (
1010
"github.com/libopenstorage/stork/pkg/resourceutils"
1111

1212
storkv1 "github.com/libopenstorage/stork/pkg/apis/stork/v1alpha1"
13+
storkops "github.com/libopenstorage/stork/pkg/crud/stork"
1314
"github.com/libopenstorage/stork/pkg/log"
1415
migration "github.com/libopenstorage/stork/pkg/migration/controllers"
1516
"github.com/libopenstorage/stork/pkg/utils"
1617
"github.com/pborman/uuid"
1718
"github.com/portworx/sched-ops/k8s/core"
18-
storkops "github.com/portworx/sched-ops/k8s/stork"
1919
"github.com/portworx/sched-ops/task"
2020
"github.com/sirupsen/logrus"
2121
v1 "k8s.io/api/core/v1"

‎pkg/action/failback.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ package action
33
import (
44
"fmt"
55
storkv1 "github.com/libopenstorage/stork/pkg/apis/stork/v1alpha1"
6+
storkops "github.com/libopenstorage/stork/pkg/crud/stork"
67
"github.com/libopenstorage/stork/pkg/log"
78
"github.com/libopenstorage/stork/pkg/schedule"
89
"github.com/libopenstorage/stork/pkg/utils"
9-
storkops "github.com/portworx/sched-ops/k8s/stork"
1010
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1111
"k8s.io/client-go/rest"
1212
)

‎pkg/action/failover.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ package action
33
import (
44
"fmt"
55
storkv1 "github.com/libopenstorage/stork/pkg/apis/stork/v1alpha1"
6+
storkops "github.com/libopenstorage/stork/pkg/crud/stork"
67
"github.com/libopenstorage/stork/pkg/log"
78
migration "github.com/libopenstorage/stork/pkg/migration/controllers"
89
"github.com/libopenstorage/stork/pkg/utils"
9-
storkops "github.com/portworx/sched-ops/k8s/stork"
1010
v1 "k8s.io/api/core/v1"
1111
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1212
"k8s.io/client-go/rest"

0 commit comments

Comments
 (0)