pick up codeflare-common@mcadv1b2 changes

Author: dgrove-oss

go.mod

@@ -4,8 +4,8 @@ go 1.21
 
 require (
 	github.com/onsi/gomega v1.31.1
-	github.com/project-codeflare/appwrapper v0.6.4
-	github.com/project-codeflare/codeflare-common v0.0.0-20240328133031-85b5315fd82b
+	github.com/project-codeflare/appwrapper v0.7.0
+	github.com/project-codeflare/codeflare-common v0.0.0-20240328182412-38df643db183
 	github.com/ray-project/kuberay/ray-operator v1.0.0
 	k8s.io/api v0.29.1
 	k8s.io/apimachinery v0.29.1
@@ -51,6 +51,7 @@ require (
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
+	github.com/kubeflow/training-operator v1.7.0 // indirect
 	github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
 	github.com/mailru/easyjson v0.7.7 // indirect
 	github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
@@ -73,6 +74,7 @@ require (
 	github.com/prometheus/common v0.45.0 // indirect
 	github.com/prometheus/procfs v0.12.0 // indirect
 	github.com/russross/blackfriday/v2 v2.1.0 // indirect
+	github.com/sirupsen/logrus v1.9.3 // indirect
 	github.com/spf13/cobra v1.7.0 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
 	github.com/xlab/treeprint v1.1.0 // indirect

go.sum

@@ -312,6 +312,8 @@ github.com/kr/pty v1.1.8/go.mod h1:O1sed60cT9XZ5uDucP5qwvh+TE3NnUj51EiZO/lmSfw=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
+github.com/kubeflow/training-operator v1.7.0 h1:Zh61GlOWrlRi4UFOtJeV+/5REo/OndhwQ25KYd0llzc=
+github.com/kubeflow/training-operator v1.7.0/go.mod h1:BZCLX1h06wY3YSeSZZcGYAqI9/nVi7isVCRkfgZe9nE=
 github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
 github.com/lib/pq v1.1.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
 github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
@@ -384,14 +386,10 @@ github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/project-codeflare/appwrapper v0.6.4 h1:fFoEItJoetWsvK7qlMX0XPkSY0Eulll2CWBqKQRzVRs=
-github.com/project-codeflare/appwrapper v0.6.4/go.mod h1:1M0IXkdIa5uzyoqVfbubuIzZRtqIDLgzmJEcWBMPvdg=
-github.com/project-codeflare/codeflare-common v0.0.0-20240321160419-5fce7084f350 h1:yLv9HleCC2On9UhHlMwPNG91QIqzj7sN2aEzU7gIgrg=
-github.com/project-codeflare/codeflare-common v0.0.0-20240321160419-5fce7084f350/go.mod h1:k48kfd8LDWzku1bC4NMWLtN71MXKxuOmd8fWYx6bIZ0=
-github.com/project-codeflare/codeflare-common v0.0.0-20240328004251-117c22817715 h1:nz908of0ohu1PodLgQjwCsrmhAXkX9Ukj5oez+CGlg0=
-github.com/project-codeflare/codeflare-common v0.0.0-20240328004251-117c22817715/go.mod h1:k48kfd8LDWzku1bC4NMWLtN71MXKxuOmd8fWYx6bIZ0=
-github.com/project-codeflare/codeflare-common v0.0.0-20240328133031-85b5315fd82b h1:q7z3vccjFhcj/4tFLW+r2vxYAu+U86aT//8F580nqBo=
-github.com/project-codeflare/codeflare-common v0.0.0-20240328133031-85b5315fd82b/go.mod h1:5Yd55xTfpKfeCuof+IlrK1S2iT++vxQTJoP9rG8fE6E=
+github.com/project-codeflare/appwrapper v0.7.0 h1:hlsc7xI3rHLhtVlspxb0qHkPoAggdWyRUQkRdMOT20A=
+github.com/project-codeflare/appwrapper v0.7.0/go.mod h1:f4SYPB6sPteegtekwD4bjPdpWZ+nFlLF2Eoz9iyw73s=
+github.com/project-codeflare/codeflare-common v0.0.0-20240328182412-38df643db183 h1:WOy8nuzZ3zGLVxj2evwfSkTj5SLMVCX5rbI7J5NZxOg=
+github.com/project-codeflare/codeflare-common v0.0.0-20240328182412-38df643db183/go.mod h1:ebDcLOZsMe3t9JvUGAv4By2ttu+7NenSpAQZUAaYUak=
 github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
 github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
 github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M=
@@ -438,6 +436,8 @@ github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPx
 github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q=
 github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
 github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88=
+github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
+github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
 github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
 github.com/spf13/cobra v1.7.0 h1:hyqWnYt1ZQShIddO5kBpj3vu05/++x6tJ6dg8EC572I=
 github.com/spf13/cobra v1.7.0/go.mod h1:uLxZILRyS/50WlhOIKD7W6V5bgeIt+4sICxh6uRMrb0=
@@ -661,6 +661,7 @@ golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20220227234510-4e6760a101f9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220319134239-a9b59b0215f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.16.0 h1:xWw16ngr6ZMtmxDyKyIgsE93KNKz5HKmMa3b8ALHidU=
 golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=