Skip to content

Commit b3241a5

Browse files
committed
Upgrade from AppWrapper v1beta1 to v1beta2
1. Replace MCAD dependency with AppWrapper 2. Upgrade AppWrapper from v1beta1 to v1beta2 3. Upgrade to go 1.21 4. Upgrade go dependencies to match Kueue/AppWrapper requirements 5. Fix bug in fakeclient initialization (dynamic interface not initialized)
1 parent ca0dc4e commit b3241a5

File tree

10 files changed

+239
-219
lines changed

10 files changed

+239
-219
lines changed

Diff for: .github/workflows/verify_generated_files.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,6 @@ jobs:
2222
- name: Set Go
2323
uses: actions/setup-go@v5
2424
with:
25-
go-version: v1.19
25+
go-version: v1.21
2626
- name: Verify that imports are organized
2727
run: make verify-imports

Diff for: .github/workflows/verify_unit_test.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
- name: Set up Go
1717
uses: actions/setup-go@v5
1818
with:
19-
go-version: v1.19
19+
go-version: v1.21
2020

2121

2222

Diff for: go.mod

+35-35
Original file line numberDiff line numberDiff line change
@@ -1,71 +1,71 @@
11
module github.com/project-codeflare/codeflare-common
22

3-
go 1.19
3+
go 1.21
44

55
require (
6-
github.com/onsi/gomega v1.27.10
6+
github.com/onsi/gomega v1.31.1
77
github.com/openshift-online/ocm-sdk-go v0.1.368
88
github.com/openshift/api v0.0.0-20230213134911-7ba313770556
99
github.com/openshift/client-go v0.0.0-20221019143426-16aed247da5c
10-
github.com/project-codeflare/multi-cluster-app-dispatcher v1.37.0
10+
github.com/project-codeflare/appwrapper v0.6.1
1111
github.com/ray-project/kuberay/ray-operator v0.0.0-20231016183545-097828931d15
12-
k8s.io/api v0.26.3
13-
k8s.io/apimachinery v0.26.3
14-
k8s.io/client-go v0.26.3
12+
k8s.io/api v0.29.1
13+
k8s.io/apimachinery v0.29.1
14+
k8s.io/client-go v0.29.1
1515
)
1616

1717
require (
1818
github.com/aymerick/douceur v0.2.0 // indirect
1919
github.com/beorn7/perks v1.0.1 // indirect
20-
github.com/cenkalti/backoff/v4 v4.1.3 // indirect
21-
github.com/cespare/xxhash/v2 v2.1.2 // indirect
20+
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
21+
github.com/cespare/xxhash/v2 v2.2.0 // indirect
2222
github.com/davecgh/go-spew v1.1.1 // indirect
23-
github.com/emicklei/go-restful/v3 v3.10.1 // indirect
23+
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
2424
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
25-
github.com/go-logr/logr v1.2.4 // indirect
26-
github.com/go-openapi/jsonpointer v0.19.6 // indirect
27-
github.com/go-openapi/jsonreference v0.20.1 // indirect
28-
github.com/go-openapi/swag v0.22.3 // indirect
25+
github.com/go-logr/logr v1.4.1 // indirect
26+
github.com/go-openapi/jsonpointer v0.20.0 // indirect
27+
github.com/go-openapi/jsonreference v0.20.2 // indirect
28+
github.com/go-openapi/swag v0.22.4 // indirect
2929
github.com/gogo/protobuf v1.3.2 // indirect
3030
github.com/golang-jwt/jwt/v4 v4.4.1 // indirect
3131
github.com/golang/glog v1.0.0 // indirect
3232
github.com/golang/protobuf v1.5.3 // indirect
33-
github.com/google/gnostic v0.6.9 // indirect
34-
github.com/google/go-cmp v0.5.9 // indirect
33+
github.com/google/gnostic-models v0.6.8 // indirect
34+
github.com/google/go-cmp v0.6.0 // indirect
3535
github.com/google/gofuzz v1.2.0 // indirect
36-
github.com/google/uuid v1.3.0 // indirect
36+
github.com/google/uuid v1.3.1 // indirect
3737
github.com/gorilla/css v1.0.0 // indirect
38-
github.com/imdario/mergo v0.3.12 // indirect
38+
github.com/imdario/mergo v0.3.16 // indirect
3939
github.com/josharian/intern v1.0.0 // indirect
4040
github.com/json-iterator/go v1.1.12 // indirect
4141
github.com/mailru/easyjson v0.7.7 // indirect
42-
github.com/matttproud/golang_protobuf_extensions v1.0.2 // indirect
42+
github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
4343
github.com/microcosm-cc/bluemonday v1.0.18 // indirect
4444
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
4545
github.com/modern-go/reflect2 v1.0.2 // indirect
4646
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
4747
github.com/pkg/errors v0.9.1 // indirect
48-
github.com/prometheus/client_golang v1.14.0 // indirect
49-
github.com/prometheus/client_model v0.3.0 // indirect
50-
github.com/prometheus/common v0.37.0 // indirect
51-
github.com/prometheus/procfs v0.8.0 // indirect
48+
github.com/prometheus/client_golang v1.18.0 // indirect
49+
github.com/prometheus/client_model v0.5.0 // indirect
50+
github.com/prometheus/common v0.45.0 // indirect
51+
github.com/prometheus/procfs v0.12.0 // indirect
5252
github.com/spf13/pflag v1.0.5 // indirect
53-
golang.org/x/net v0.12.0 // indirect
54-
golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5 // indirect
55-
golang.org/x/sys v0.10.0 // indirect
56-
golang.org/x/term v0.10.0 // indirect
57-
golang.org/x/text v0.11.0 // indirect
53+
golang.org/x/net v0.20.0 // indirect
54+
golang.org/x/oauth2 v0.12.0 // indirect
55+
golang.org/x/sys v0.16.0 // indirect
56+
golang.org/x/term v0.16.0 // indirect
57+
golang.org/x/text v0.14.0 // indirect
5858
golang.org/x/time v0.3.0 // indirect
59-
google.golang.org/appengine v1.6.7 // indirect
60-
google.golang.org/protobuf v1.28.1 // indirect
59+
google.golang.org/appengine v1.6.8 // indirect
60+
google.golang.org/protobuf v1.32.0 // indirect
6161
gopkg.in/inf.v0 v0.9.1 // indirect
6262
gopkg.in/yaml.v2 v2.4.0 // indirect
6363
gopkg.in/yaml.v3 v3.0.1 // indirect
64-
k8s.io/klog/v2 v2.90.1 // indirect
65-
k8s.io/kube-openapi v0.0.0-20230303024457-afdc3dddf62d // indirect
66-
k8s.io/utils v0.0.0-20230220204549-a5ecb0141aa5 // indirect
67-
sigs.k8s.io/controller-runtime v0.14.6 // indirect
64+
k8s.io/klog/v2 v2.110.1 // indirect
65+
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect
66+
k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
67+
sigs.k8s.io/controller-runtime v0.17.0 // indirect
6868
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
69-
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
70-
sigs.k8s.io/yaml v1.3.0 // indirect
69+
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
70+
sigs.k8s.io/yaml v1.4.0 // indirect
7171
)

0 commit comments

Comments
 (0)