Skip to content

Commit

Permalink
fix: PB-4394 vendor changes to have fix work for NFS BL
Browse files Browse the repository at this point in the history
Signed-off-by: vsundarraj-px <[email protected]>
  • Loading branch information
vsundarraj-px committed Apr 23, 2024
1 parent 7530705 commit c997e0d
Show file tree
Hide file tree
Showing 13 changed files with 267 additions and 40 deletions.
6 changes: 3 additions & 3 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ require (
github.com/hashicorp/go-version v1.6.0
github.com/kubernetes-csi/external-snapshotter/client/v4 v4.2.0
github.com/kubernetes-incubator/external-storage v0.20.4-openstorage-rc7
github.com/libopenstorage/stork v1.4.1-0.20240328182547-c2b9a7f58456
github.com/libopenstorage/stork v1.4.1-0.20240423095633-85719d1cbf2c
github.com/portworx/pxc v0.33.0
github.com/portworx/sched-ops v1.20.4-rc1.0.20240327204940-8669c1f67a40
github.com/portworx/sched-ops v1.20.4-rc1.0.20240331082638-605dbf61e0be
github.com/sirupsen/logrus v1.9.3
github.com/spf13/cobra v1.7.0
github.com/spf13/pflag v1.0.5
Expand Down Expand Up @@ -209,7 +209,7 @@ replace (
github.com/kubernetes-incubator/external-storage v0.20.4-openstorage-rc10 => github.com/libopenstorage/external-storage v0.20.4-openstorage-rc10
github.com/libopenstorage/openstorage => github.com/libopenstorage/openstorage v1.0.1-0.20240304221553-5aaf2148a210
github.com/libopenstorage/secrets => github.com/libopenstorage/secrets v0.0.0-20220413195519-57d1c446c5e9
github.com/portworx/sched-ops => github.com/portworx/sched-ops v1.20.4-rc1.0.20240326040227-268b4afc2e7e
github.com/portworx/sched-ops => github.com/portworx/sched-ops v1.20.4-rc1.0.20240412161623-5bba89276178
golang.org/x/net => golang.org/x/net v0.20.0
google.golang.org/grpc => google.golang.org/grpc v1.60.0
k8s.io/api => k8s.io/api v0.25.0
Expand Down
8 changes: 4 additions & 4 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -3362,8 +3362,8 @@ github.com/libopenstorage/stork v1.4.1-0.20230502135851-9cacb19e1df5/go.mod h1:R
github.com/libopenstorage/stork v1.4.1-0.20230519043154-cbc10dffaf19/go.mod h1:Xm4DHoViynFXMQKBXGj3IkA77LY2RBFkNtv6vbo3wNw=
github.com/libopenstorage/stork v1.4.1-0.20230601053837-5dd68f026569/go.mod h1:+mKPMCPNhS/XOF2RPcNFijkr67CCCWp0o8OXVG6xxAk=
github.com/libopenstorage/stork v1.4.1-0.20230610103146-72cf75320066/go.mod h1:Yst+fnOYjWk6SA5pXZBKm19wtiinjxQ/vgYTXI3k80Q=
github.com/libopenstorage/stork v1.4.1-0.20240328182547-c2b9a7f58456 h1:UG/504ONcBlbsZjIyMmb+1e3YgQ9mIF1XkoBKht2pEs=
github.com/libopenstorage/stork v1.4.1-0.20240328182547-c2b9a7f58456/go.mod h1:C2cjADUSiR31AM298nRPx+Wz1q5cPeDCvtvq7SZAH9s=
github.com/libopenstorage/stork v1.4.1-0.20240423095633-85719d1cbf2c h1:UhJykH+NaQI4Sskm7gs2NZpuoj8bhQViT0TG7qfuAPQ=
github.com/libopenstorage/stork v1.4.1-0.20240423095633-85719d1cbf2c/go.mod h1:K+1WdxpmU3tS1CJQITl5UlHnV3JLWHXCxTzF9cN7BEM=
github.com/libopenstorage/systemutils v0.0.0-20160208220149-44ac83be3ce1/go.mod h1:xwNGC7xiz/BQ/wbMkvHujL8Gjgseg+x41xMek7sKRRQ=
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de h1:9TO3cAIGXtEhnIaL+V+BEER86oLrvS+kWobKpbJuye0=
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de/go.mod h1:zAbeS9B/r2mtpb6U+EI2rYA5OAXxsYw6wTamcNW+zcE=
Expand Down Expand Up @@ -3889,8 +3889,8 @@ github.com/portworx/px-backup-api v1.0.1-0.20200915150042-274508e876ef/go.mod h1
github.com/portworx/px-object-controller v0.0.0-20220804234424-40d3b8a84987/go.mod h1:g3pw2lI2AjqAixUCRhaBdKTY98znsCPR7NGRrlpimVU=
github.com/portworx/pxc v0.33.0 h1:tQmljY8uJNc74opxUBnxopR+6E77RKESsNUYBaDWIQY=
github.com/portworx/pxc v0.33.0/go.mod h1:Tl7hf4K2CDr0XtxzM08sr9H/KsMhscjf9ydb+MnT0U4=
github.com/portworx/sched-ops v1.20.4-rc1.0.20240326040227-268b4afc2e7e h1:lwzFD+EX1m+59Haw31cW/9qgnmRWOvwZNvf0PiBiO0E=
github.com/portworx/sched-ops v1.20.4-rc1.0.20240326040227-268b4afc2e7e/go.mod h1:aBipy9Jl9IS77SFZi2RqH2UT8MeKEmja1MYembOaZrY=
github.com/portworx/sched-ops v1.20.4-rc1.0.20240412161623-5bba89276178 h1:bMydYkNDHiwfKl0UO+ls4NBSG0BGoW0oLYP+VZfluik=
github.com/portworx/sched-ops v1.20.4-rc1.0.20240412161623-5bba89276178/go.mod h1:KOe618gr1FAzVmLNe9LFHss19df3MBZ0qom6Ct7RpyM=
github.com/portworx/talisman v0.0.0-20210302012732-8af4564777f7/go.mod h1:e8a6uFpSbOlRpZQlW9aXYogC+GWAo065G0RL9hDkD4Q=
github.com/portworx/torpedo v0.20.4-rc1.0.20210325154352-eb81b0cdd145/go.mod h1:CkLAs/ojTzSu3SPyeDxc3qhsbRU78H5Xz1qJlj1Ap1U=
github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI=
Expand Down
6 changes: 3 additions & 3 deletions pkg/controllers/dataexport/reconcile.go
Original file line number Diff line number Diff line change
Expand Up @@ -1137,9 +1137,9 @@ func (c *Controller) stageLocalSnapshotRestore(ctx context.Context, dataExport *
}
// Already done with max retries, so moving to kdmp restore anyway
data := updateDataExportDetail{
stage: kdmpapi.DataExportStageTransferScheduled,
status: kdmpapi.DataExportStatusInitial,
reason: "switching to restore from objectstore bucket as restoring from local snapshot did not happen",
stage: kdmpapi.DataExportStageTransferScheduled,
status: kdmpapi.DataExportStatusInitial,
reason: "switching to restore from objectstore bucket as restoring from local snapshot did not happen",
resetLocalSnapshotRestore: true,
}
logrus.Infof("%v: In stageLocalSnapshotRestore stage, local snapshot restore failed, trying KDMP restore.", dataExport.Name)
Expand Down

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

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

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

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

11 changes: 8 additions & 3 deletions vendor/github.com/libopenstorage/stork/pkg/rule/rule.go

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

5 changes: 4 additions & 1 deletion vendor/github.com/libopenstorage/stork/pkg/utils/utils.go

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

8 changes: 8 additions & 0 deletions vendor/github.com/portworx/sched-ops/k8s/common/pod.go

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

11 changes: 10 additions & 1 deletion vendor/github.com/portworx/sched-ops/k8s/core/pods.go

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

Loading

0 comments on commit c997e0d

Please sign in to comment.