Skip to content

Commit 699f898

Browse files
dgrove-ossdgrove-oss
committed
bump AppWrapper to 1.0.0
+ Update to Kueue 0.10 + Remove deprecated kube-rbac-proxy + Refactor workload controller to prepare to upstream to Kueue
1 parent 1945b65 commit 699f898

File tree

5 files changed

+105
-112
lines changed

5 files changed

+105
-112
lines changed

‎Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ VERSION ?= v0.0.0-dev
1212
BUNDLE_VERSION ?= $(VERSION:v%=%)
1313

1414
# APPWRAPPER_VERSION defines the default version of the AppWrapper controller
15-
APPWRAPPER_VERSION ?= v0.30.0
15+
APPWRAPPER_VERSION ?= v1.0.0
1616
APPWRAPPER_REPO ?= github.com/project-codeflare/appwrapper
1717
APPWRAPPER_CRD ?= ${APPWRAPPER_REPO}/config/crd?ref=${APPWRAPPER_VERSION}
1818

‎config/crd/appwrapper/kustomization.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
apiVersion: kustomize.config.k8s.io/v1beta1
22
kind: Kustomization
33
resources:
4-
- github.com/project-codeflare/appwrapper/config/crd?ref=v0.30.0
4+
- github.com/project-codeflare/appwrapper/config/crd?ref=v1.0.0

‎config/crd/crd-appwrapper.yml

Lines changed: 5 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
22
kind: CustomResourceDefinition
33
metadata:
44
annotations:
5-
controller-gen.kubebuilder.io/version: v0.14.0
5+
controller-gen.kubebuilder.io/version: v0.16.5
66
name: appwrappers.workload.codeflare.dev
77
spec:
88
group: workload.codeflare.dev
@@ -178,13 +178,11 @@ spec:
178178
description: |-
179179
Conditions hold the latest available observations of the Component's current state.
180180
181-
182181
The type of the condition could be:
183182
184-
185183
- ResourcesDeployed: The component is deployed on the cluster
186184
items:
187-
description: "Condition contains details for one aspect of the current state of this API Resource.\n---\nThis struct is intended for direct use as an array at the field path .status.conditions. For example,\n\n\n\ttype FooStatus struct{\n\t // Represents the observations of a foo's current state.\n\t // Known .status.conditions.type are: \"Available\", \"Progressing\", and \"Degraded\"\n\t // +patchMergeKey=type\n\t // +patchStrategy=merge\n\t // +listType=map\n\t // +listMapKey=type\n\t Conditions []metav1.Condition `json:\"conditions,omitempty\" patchStrategy:\"merge\" patchMergeKey:\"type\" protobuf:\"bytes,1,rep,name=conditions\"`\n\n\n\t // other fields\n\t}"
185+
description: Condition contains details for one aspect of the current state of this API Resource.
188186
properties:
189187
lastTransitionTime:
190188
description: |-
@@ -225,12 +223,7 @@ spec:
225223
- Unknown
226224
type: string
227225
type:
228-
description: |-
229-
type of condition in CamelCase or in foo.example.com/CamelCase.
230-
---
231-
Many .condition.type values are consistent across resources like Available, but because arbitrary conditions can be
232-
useful (see .node.status.conditions), the ability to deconflict is important.
233-
The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt)
226+
description: type of condition in CamelCase or in foo.example.com/CamelCase.
234227
maxLength: 316
235228
pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$
236229
type: string
@@ -278,17 +271,15 @@ spec:
278271
description: |-
279272
Conditions hold the latest available observations of the AppWrapper current state.
280273
281-
282274
The type of the condition could be:
283275
284-
285276
- QuotaReserved: The AppWrapper was admitted by Kueue and has quota allocated to it
286277
- ResourcesDeployed: The contained resources are deployed (or being deployed) on the cluster
287278
- PodsReady: All pods of the contained resources are in the Ready or Succeeded state
288279
- Unhealthy: One or more of the contained resources is unhealthy
289280
- DeletingResources: The contained resources are in the process of being deleted from the cluster
290281
items:
291-
description: "Condition contains details for one aspect of the current state of this API Resource.\n---\nThis struct is intended for direct use as an array at the field path .status.conditions. For example,\n\n\n\ttype FooStatus struct{\n\t // Represents the observations of a foo's current state.\n\t // Known .status.conditions.type are: \"Available\", \"Progressing\", and \"Degraded\"\n\t // +patchMergeKey=type\n\t // +patchStrategy=merge\n\t // +listType=map\n\t // +listMapKey=type\n\t Conditions []metav1.Condition `json:\"conditions,omitempty\" patchStrategy:\"merge\" patchMergeKey:\"type\" protobuf:\"bytes,1,rep,name=conditions\"`\n\n\n\t // other fields\n\t}"
282+
description: Condition contains details for one aspect of the current state of this API Resource.
292283
properties:
293284
lastTransitionTime:
294285
description: |-
@@ -329,12 +320,7 @@ spec:
329320
- Unknown
330321
type: string
331322
type:
332-
description: |-
333-
type of condition in CamelCase or in foo.example.com/CamelCase.
334-
---
335-
Many .condition.type values are consistent across resources like Available, but because arbitrary conditions can be
336-
useful (see .node.status.conditions), the ability to deconflict is important.
337-
The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt)
323+
description: type of condition in CamelCase or in foo.example.com/CamelCase.
338324
maxLength: 316
339325
pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$
340326
type: string

‎go.mod

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,42 @@
11
module github.com/project-codeflare/codeflare-operator
22

3-
go 1.22.4
3+
go 1.23.0
44

55
require (
66
github.com/go-logr/logr v1.4.2
7-
github.com/onsi/ginkgo/v2 v2.19.0
8-
github.com/onsi/gomega v1.33.1
9-
github.com/open-policy-agent/cert-controller v0.10.1
7+
github.com/onsi/ginkgo/v2 v2.22.0
8+
github.com/onsi/gomega v1.36.1
9+
github.com/open-policy-agent/cert-controller v0.12.0
1010
github.com/opendatahub-io/opendatahub-operator/v2 v2.10.0
11-
github.com/openshift/api v0.0.0-20230823114715-5fdd7511b790
11+
github.com/openshift/api v0.0.0-20240625084701-0689f006bcde
1212
github.com/openshift/client-go v0.0.0-20221019143426-16aed247da5c
13-
github.com/project-codeflare/appwrapper v0.30.0
13+
github.com/project-codeflare/appwrapper v1.0.0
1414
github.com/project-codeflare/codeflare-common v0.0.0-20241216183607-222395d38924
15-
github.com/ray-project/kuberay/ray-operator v1.2.1
15+
github.com/ray-project/kuberay/ray-operator v1.2.2
1616
go.uber.org/zap v1.27.0
17-
golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8
18-
k8s.io/api v0.30.2
19-
k8s.io/apiextensions-apiserver v0.29.6
20-
k8s.io/apimachinery v0.30.2
17+
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56
18+
k8s.io/api v0.31.4
19+
k8s.io/apiextensions-apiserver v0.31.2
20+
k8s.io/apimachinery v0.31.4
2121
k8s.io/client-go v11.0.0+incompatible
22-
k8s.io/component-base v0.29.6
22+
k8s.io/component-base v0.31.4
2323
k8s.io/klog/v2 v2.130.1
24-
k8s.io/utils v0.0.0-20240502163921-fe8a2dddb1d0
25-
sigs.k8s.io/controller-runtime v0.17.5
26-
sigs.k8s.io/kueue v0.8.3
24+
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8
25+
sigs.k8s.io/controller-runtime v0.19.3
26+
sigs.k8s.io/kueue v0.10.0
2727
sigs.k8s.io/yaml v1.4.0
2828
)
2929

30-
replace k8s.io/client-go => k8s.io/client-go v0.29.2
30+
replace k8s.io/client-go => k8s.io/client-go v0.31.4
3131

3232
replace sigs.k8s.io/custom-metrics-apiserver => sigs.k8s.io/custom-metrics-apiserver v1.25.1-0.20230306170449-63d8c93851f3
3333

3434
replace go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp => go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.44.0
3535

3636
replace github.com/jackc/pgx/v4 => github.com/jackc/pgx/v5 v5.5.4
3737

38-
// This replace directive deal with the backlevel ODH kueue version
39-
replace sigs.k8s.io/kueue v0.8.3 => github.com/opendatahub-io/kueue v0.8.3
40-
4138
// This replace directive deal with the unaligned Ray operator version transitively pulled by Kueue 0.8.3
42-
replace github.com/ray-project/kuberay/ray-operator v1.2.1 => github.com/ray-project/kuberay/ray-operator v1.1.1
39+
replace github.com/ray-project/kuberay/ray-operator => github.com/ray-project/kuberay/ray-operator v1.1.1
4340

4441
require (
4542
github.com/aymerick/douceur v0.2.0 // indirect
@@ -50,9 +47,8 @@ require (
5047
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
5148
github.com/distribution/reference v0.5.0 // indirect
5249
github.com/emicklei/go-restful/v3 v3.12.1 // indirect
53-
github.com/evanphx/json-patch v5.9.0+incompatible // indirect
5450
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
55-
github.com/fsnotify/fsnotify v1.7.0 // indirect
51+
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
5652
github.com/go-logr/zapr v1.3.0 // indirect
5753
github.com/go-openapi/jsonpointer v0.21.0 // indirect
5854
github.com/go-openapi/jsonreference v0.21.0 // indirect
@@ -66,7 +62,7 @@ require (
6662
github.com/google/gnostic-models v0.6.8 // indirect
6763
github.com/google/go-cmp v0.6.0 // indirect
6864
github.com/google/gofuzz v1.2.0 // indirect
69-
github.com/google/pprof v0.0.0-20240424215950-a892ee059fd6 // indirect
65+
github.com/google/pprof v0.0.0-20241029153458-d1b30febd7db // indirect
7066
github.com/google/uuid v1.6.0 // indirect
7167
github.com/gorilla/css v1.0.0 // indirect
7268
github.com/imdario/mergo v0.3.16 // indirect
@@ -75,7 +71,8 @@ require (
7571
github.com/jpillora/backoff v1.0.0 // indirect
7672
github.com/json-iterator/go v1.1.12 // indirect
7773
github.com/klauspost/compress v1.17.9 // indirect
78-
github.com/kubeflow/training-operator v1.7.0 // indirect
74+
github.com/kubeflow/mpi-operator v0.6.0 // indirect
75+
github.com/kubeflow/training-operator v1.8.1 // indirect
7976
github.com/mailru/easyjson v0.7.7 // indirect
8077
github.com/microcosm-cc/bluemonday v1.0.18 // indirect
8178
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
@@ -86,30 +83,33 @@ require (
8683
github.com/openshift-online/ocm-sdk-go v0.1.411 // indirect
8784
github.com/openshift/custom-resource-status v1.1.2 // indirect
8885
github.com/pkg/errors v0.9.1 // indirect
89-
github.com/prometheus/client_golang v1.20.4 // indirect
86+
github.com/prometheus/client_golang v1.20.5 // indirect
9087
github.com/prometheus/client_model v0.6.1 // indirect
9188
github.com/prometheus/common v0.57.0 // indirect
9289
github.com/prometheus/procfs v0.15.1 // indirect
9390
github.com/sirupsen/logrus v1.9.3 // indirect
9491
github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966 // indirect
9592
github.com/spf13/pflag v1.0.5 // indirect
93+
github.com/x448/float16 v0.8.4 // indirect
9694
go.uber.org/atomic v1.11.0 // indirect
9795
go.uber.org/multierr v1.11.0 // indirect
9896
golang.org/x/net v0.33.0 // indirect
9997
golang.org/x/oauth2 v0.21.0 // indirect
10098
golang.org/x/sys v0.28.0 // indirect
10199
golang.org/x/term v0.27.0 // indirect
102100
golang.org/x/text v0.21.0 // indirect
103-
golang.org/x/time v0.5.0 // indirect
104-
golang.org/x/tools v0.24.0 // indirect
101+
golang.org/x/time v0.6.0 // indirect
102+
golang.org/x/tools v0.26.0 // indirect
105103
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
106-
google.golang.org/protobuf v1.34.2 // indirect
104+
google.golang.org/protobuf v1.35.1 // indirect
105+
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
107106
gopkg.in/inf.v0 v0.9.1 // indirect
108107
gopkg.in/yaml.v2 v2.4.0 // indirect
109108
gopkg.in/yaml.v3 v3.0.1 // indirect
110-
k8s.io/apiserver v0.29.6 // indirect
111-
k8s.io/kube-openapi v0.0.0-20240620174524-b456828f718b // indirect
112-
sigs.k8s.io/jobset v0.5.2 // indirect
109+
k8s.io/apiserver v0.31.4 // indirect
110+
k8s.io/component-helpers v0.31.4 // indirect
111+
k8s.io/kube-openapi v0.0.0-20240812233141-91dab695df6f // indirect
112+
sigs.k8s.io/jobset v0.7.1 // indirect
113113
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
114-
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
114+
sigs.k8s.io/structured-merge-diff/v4 v4.4.3 // indirect
115115
)

0 commit comments

Comments
 (0)