PWX-37466: vendor in the latest sched-ops (#1559)

Need to pick up the change to virtualmachineinstancemigration.go. Signed-off-by: Neelesh Thakur <neelesh.thakur@purestorage.com>
libopenstorage · May 29, 2024 · d702d7e · d702d7e
1 parent 06dd3ce
commit d702d7e
Show file tree

Hide file tree

Showing 10 changed files with 100 additions and 21 deletions.
diff --git a/go.mod b/go.mod
@@ -16,7 +16,7 @@ require (
 	github.com/operator-framework/api v0.17.1
 	github.com/pborman/uuid v1.2.1
 	github.com/portworx/kvdb v0.0.0-20230326003017-21a38cf82d4b
-	github.com/portworx/sched-ops v1.20.4-rc1.0.20240502044614-dc8638ea15f9
+	github.com/portworx/sched-ops v1.20.4-rc1.0.20240529170916-515f6d54c338
 	github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.63.0
 	github.com/prometheus-operator/prometheus-operator/pkg/client v0.46.0
 	github.com/sirupsen/logrus v1.9.3
@@ -136,7 +136,7 @@ require (
 replace (
 	github.com/kubernetes-incubator/external-storage => github.com/libopenstorage/external-storage v5.1.1-0.20190919185747-9394ee8dd536+incompatible
 	github.com/libopenstorage/openstorage => github.com/libopenstorage/openstorage v1.0.1-0.20240221210452-7757fdc2b8ff
-	github.com/portworx/sched-ops => github.com/portworx/sched-ops v1.20.4-rc1.0.20240502044614-dc8638ea15f9
+	github.com/portworx/sched-ops => github.com/portworx/sched-ops v1.20.4-rc1.0.20240529170916-515f6d54c338
 	golang.org/x/tools => golang.org/x/tools v0.1.11
 	google.golang.org/grpc => google.golang.org/grpc v1.29.1
 	google.golang.org/grpc/examples/helloworld/helloworld => google.golang.org/grpc/examples/helloworld/helloworld v1.29.1

diff --git a/go.sum b/go.sum
@@ -3863,8 +3863,8 @@ github.com/portworx/kvdb v0.0.0-20230326003017-21a38cf82d4b/go.mod h1:Q8YyrNDvPp
 github.com/portworx/px-backup-api v1.0.1-0.20200915150042-274508e876ef/go.mod h1:puy7YVXeb6glot1vVCIePIiRLSwB//+rFtN2ZjvXeEw=
 github.com/portworx/px-object-controller v0.0.0-20220804234424-40d3b8a84987/go.mod h1:g3pw2lI2AjqAixUCRhaBdKTY98znsCPR7NGRrlpimVU=
 github.com/portworx/pxc v0.33.0/go.mod h1:Tl7hf4K2CDr0XtxzM08sr9H/KsMhscjf9ydb+MnT0U4=
-github.com/portworx/sched-ops v1.20.4-rc1.0.20240502044614-dc8638ea15f9 h1:bPpp70Ll7bc1g0zDKB/af8ckNv01YmPZhHmfW4vU1HI=
-github.com/portworx/sched-ops v1.20.4-rc1.0.20240502044614-dc8638ea15f9/go.mod h1:KOe618gr1FAzVmLNe9LFHss19df3MBZ0qom6Ct7RpyM=
+github.com/portworx/sched-ops v1.20.4-rc1.0.20240529170916-515f6d54c338 h1:OQrP+tPFU9bzK6ZzjPOFE9ZBSQmAwWKx+RhjGYZPT1s=
+github.com/portworx/sched-ops v1.20.4-rc1.0.20240529170916-515f6d54c338/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=

diff --git a/pkg/migration/migration_test.go b/pkg/migration/migration_test.go
@@ -5351,6 +5351,8 @@ func TestTelemetryMigrationWithPX2_12(t *testing.T) {
 	err = testutil.Get(k8sClient, telemetryConfig, component.TelemetryConfigMapName, cluster.Namespace)
 	require.True(t, errors.IsNotFound(err))
 
+	// attempt to fix a panic: "send on closed channel" at migration.go:128
+	time.Sleep(500 * time.Millisecond)
 	close(recorder.Events)
 	var msg string
 	for e := range recorder.Events {

diff --git a/pkg/mock/mockcore/core.ops.mock.go b/pkg/mock/mockcore/core.ops.mock.go
diff --git a/vendor/github.com/portworx/sched-ops/k8s/core/core.go b/vendor/github.com/portworx/sched-ops/k8s/core/core.go
diff --git a/vendor/github.com/portworx/sched-ops/k8s/core/events.go b/vendor/github.com/portworx/sched-ops/k8s/core/events.go
diff --git a/vendor/github.com/portworx/sched-ops/k8s/kubevirt-dynamic/kubevirt.go b/vendor/github.com/portworx/sched-ops/k8s/kubevirt-dynamic/kubevirt.go
diff --git a/vendor/github.com/portworx/sched-ops/k8s/kubevirt-dynamic/virtualmachineinstance.go b/vendor/github.com/portworx/sched-ops/k8s/kubevirt-dynamic/virtualmachineinstance.go
diff --git a/vendor/github.com/portworx/sched-ops/k8s/kubevirt-dynamic/virtualmachineinstancemigration.go b/vendor/github.com/portworx/sched-ops/k8s/kubevirt-dynamic/virtualmachineinstancemigration.go
diff --git a/vendor/modules.txt b/vendor/modules.txt
@@ -331,7 +331,7 @@ github.com/portworx/kvdb/etcd/common
 github.com/portworx/kvdb/etcd/v2
 github.com/portworx/kvdb/etcd/v3
 github.com/portworx/kvdb/mem
-# github.com/portworx/sched-ops v1.20.4-rc1.0.20240502044614-dc8638ea15f9 => github.com/portworx/sched-ops v1.20.4-rc1.0.20240502044614-dc8638ea15f9
+# github.com/portworx/sched-ops v1.20.4-rc1.0.20240529170916-515f6d54c338 => github.com/portworx/sched-ops v1.20.4-rc1.0.20240529170916-515f6d54c338
 ## explicit; go 1.19
 github.com/portworx/sched-ops/k8s/apiextensions
 github.com/portworx/sched-ops/k8s/apps
@@ -1088,7 +1088,7 @@ sigs.k8s.io/yaml
 sigs.k8s.io/yaml/goyaml.v2
 # github.com/kubernetes-incubator/external-storage => github.com/libopenstorage/external-storage v5.1.1-0.20190919185747-9394ee8dd536+incompatible
 # github.com/libopenstorage/openstorage => github.com/libopenstorage/openstorage v1.0.1-0.20240221210452-7757fdc2b8ff
-# github.com/portworx/sched-ops => github.com/portworx/sched-ops v1.20.4-rc1.0.20240502044614-dc8638ea15f9
+# github.com/portworx/sched-ops => github.com/portworx/sched-ops v1.20.4-rc1.0.20240529170916-515f6d54c338
 # golang.org/x/tools => golang.org/x/tools v0.1.11
 # google.golang.org/grpc => google.golang.org/grpc v1.29.1
 # google.golang.org/grpc/examples/helloworld/helloworld => google.golang.org/grpc/examples/helloworld/helloworld v1.29.1