This is an automated email from the ASF dual-hosted git repository. ccondit pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/yunikorn-k8shim.git
The following commit(s) were added to refs/heads/master by this push: new 4dbf99b7 [YUNIKORN-2508] Remove starting app state references from shim (#805) 4dbf99b7 is described below commit 4dbf99b7fb6b081fb1df945bc78b9bee03d9622e Author: Craig Condit <ccon...@apache.org> AuthorDate: Wed Mar 20 12:26:51 2024 -0500 [YUNIKORN-2508] Remove starting app state references from shim (#805) Closes: #805 --- go.mod | 6 +++--- go.sum | 8 ++++---- pkg/cache/context_test.go | 2 +- test/e2e/basic_scheduling/basic_scheduling_test.go | 4 ++-- test/e2e/framework/helpers/yunikorn/states.go | 2 -- test/e2e/recovery_and_restart/recovery_and_restart_test.go | 2 +- 6 files changed, 11 insertions(+), 13 deletions(-) diff --git a/go.mod b/go.mod index a881d094..8f0d0e92 100644 --- a/go.mod +++ b/go.mod @@ -21,8 +21,8 @@ module github.com/apache/yunikorn-k8shim go 1.21 require ( - github.com/apache/yunikorn-core v0.0.0-20240222210045-b926dce1f914 - github.com/apache/yunikorn-scheduler-interface v0.0.0-20240222205935-94c25b6d2579 + github.com/apache/yunikorn-core v0.0.0-20240320142832-09e5d741b67c + github.com/apache/yunikorn-scheduler-interface v0.0.0-20240320010951-d392f3c7272d github.com/google/go-cmp v0.6.0 github.com/google/uuid v1.6.0 github.com/looplab/fsm v1.0.1 @@ -135,7 +135,7 @@ require ( google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect google.golang.org/grpc v1.59.0 // indirect - google.golang.org/protobuf v1.31.0 // indirect + google.golang.org/protobuf v1.33.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect diff --git a/go.sum b/go.sum index 11bba29f..1c77184e 100644 --- a/go.sum +++ b/go.sum @@ -9,10 +9,10 @@ github.com/NYTimes/gziphandler v1.1.1 h1:ZUDjpQae29j0ryrS0u/B8HZfJBtBQHjqw2rQ2cq github.com/NYTimes/gziphandler v1.1.1/go.mod h1:n/CVRwUEOgIxrgPvAQhUUr9oeUtvrhMomdKFjzJNB0c= github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df h1:7RFfzj4SSt6nnvCPbCqijJi1nWCd+TqAT3bYCStRC18= github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df/go.mod h1:pSwJ0fSY5KhvocuWSx4fz3BA8OrA1bQn+K1Eli3BRwM= -github.com/apache/yunikorn-core v0.0.0-20240222210045-b926dce1f914 h1:RlP/qF/kETBBoOKITCuEioyNRzSvY0REECYWTV/Xd0g= -github.com/apache/yunikorn-core v0.0.0-20240222210045-b926dce1f914/go.mod h1:KwuORF6felegIAwomFqleDkKbzQ13eMtmRXlUL/oG4o= -github.com/apache/yunikorn-scheduler-interface v0.0.0-20240222205935-94c25b6d2579 h1:uXGmiGX3sfrUtPM8sb4Nco5pgzPKrDJ0CtiBizhgbRM= -github.com/apache/yunikorn-scheduler-interface v0.0.0-20240222205935-94c25b6d2579/go.mod h1:3jCo/Ash4yEmw05ozK3BihJDEEAMOZEN7rmxNfb0gO0= +github.com/apache/yunikorn-core v0.0.0-20240320142832-09e5d741b67c h1:xabRyfVmPle5gAnppiY3jeoS5t9+lVgbfoOlS24E5e4= +github.com/apache/yunikorn-core v0.0.0-20240320142832-09e5d741b67c/go.mod h1:eLQ4wT62D3L05Fu+0OHh7hXMga6EXU1aMb4aOBwzEEM= +github.com/apache/yunikorn-scheduler-interface v0.0.0-20240320010951-d392f3c7272d h1:ywKv8csdOkrUcQqHit60/PuHXuELpHcZ4ftm7/b3c6Q= +github.com/apache/yunikorn-scheduler-interface v0.0.0-20240320010951-d392f3c7272d/go.mod h1:0f4l3ManMROX60xU7GbhejCEYYyMksH275oY2xIVkbM= github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio= github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs= github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a h1:idn718Q4B6AGu/h5Sxe66HYVdqdGu2l9Iebqhi/AEoA= diff --git a/pkg/cache/context_test.go b/pkg/cache/context_test.go index cd3a23fb..4c279e36 100644 --- a/pkg/cache/context_test.go +++ b/pkg/cache/context_test.go @@ -1364,7 +1364,7 @@ func TestFilteredEventsNotPublished(t *testing.T) { eventRecords[5] = &si.EventRecord{ Type: si.EventRecord_APP, EventChangeType: si.EventRecord_ADD, - EventChangeDetail: si.EventRecord_APP_STARTING, + EventChangeDetail: si.EventRecord_APP_RUNNING, ObjectID: "app-1", Message: "", } diff --git a/test/e2e/basic_scheduling/basic_scheduling_test.go b/test/e2e/basic_scheduling/basic_scheduling_test.go index f6d74801..4a7de566 100644 --- a/test/e2e/basic_scheduling/basic_scheduling_test.go +++ b/test/e2e/basic_scheduling/basic_scheduling_test.go @@ -97,8 +97,8 @@ var _ = ginkgo.Describe("", func() { }) ginkgo.It("Verify_Job_State", func() { - ginkgo.By("Verify that the job is scheduled & starting by YuniKorn") - gomega.Ω(appsInfo.State).To(gomega.Equal("Starting")) + ginkgo.By("Verify that the job is scheduled & running by YuniKorn") + gomega.Ω(appsInfo.State).To(gomega.Equal("Running")) gomega.Ω("yunikorn").To(gomega.Equal(sleepRespPod.Spec.SchedulerName)) }) diff --git a/test/e2e/framework/helpers/yunikorn/states.go b/test/e2e/framework/helpers/yunikorn/states.go index 4d6a7e60..512ca81d 100644 --- a/test/e2e/framework/helpers/yunikorn/states.go +++ b/test/e2e/framework/helpers/yunikorn/states.go @@ -31,7 +31,6 @@ type ApplicationStates struct { New string Recovering string Submitted string - Starting string Accepted string Running string Rejected string @@ -59,7 +58,6 @@ func States() *AllStates { New: "New", Recovering: "Recovering", Submitted: "Submitted", - Starting: "Starting", Accepted: "Accepted", Running: "Running", Rejected: "Rejected", diff --git a/test/e2e/recovery_and_restart/recovery_and_restart_test.go b/test/e2e/recovery_and_restart/recovery_and_restart_test.go index d06dd489..0492890d 100644 --- a/test/e2e/recovery_and_restart/recovery_and_restart_test.go +++ b/test/e2e/recovery_and_restart/recovery_and_restart_test.go @@ -129,7 +129,7 @@ var _ = ginkgo.AfterSuite(func() { var _ = ginkgo.Describe("", func() { ginkgo.It("Verify_Pod_Alloc_Props", func() { - err := restClient.WaitForAppStateTransition("default", "root."+dev, sleepRespPod.ObjectMeta.Labels["applicationId"], "Starting", 30) + err := restClient.WaitForAppStateTransition("default", "root."+dev, sleepRespPod.ObjectMeta.Labels["applicationId"], "Running", 30) gomega.Ω(err).NotTo(gomega.HaveOccurred()) appsInfo, err := restClient.GetAppInfo("default", "root."+dev, sleepRespPod.ObjectMeta.Labels["applicationId"]) gomega.Ω(err).NotTo(gomega.HaveOccurred()) --------------------------------------------------------------------- To unsubscribe, e-mail: issues-unsubscr...@yunikorn.apache.org For additional commands, e-mail: issues-h...@yunikorn.apache.org