Skip to content

Commit c604296

Browse files
upgrade AppWrapper from v0.11.1 to v0.12.0
1 parent e71b554 commit c604296

File tree

6 files changed

+97
-19
lines changed

6 files changed

+97
-19
lines changed

Makefile

+1-1
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.11.1
15+
APPWRAPPER_VERSION ?= v0.12.0
1616
APPWRAPPER_REPO ?= github.com/project-codeflare/appwrapper
1717
# Upstream AppWrapper is currently only creating release tags of the form `vX.Y.Z` (i.e the version)
1818
APPWRAPPER_CRD ?= ${APPWRAPPER_REPO}/config/crd?ref=${APPWRAPPER_VERSION}

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ CodeFlare Stack Compatibility Matrix
1010
|------------------------------|---------------------------------------------------------------------------------------------------|
1111
| CodeFlare Operator | [v1.4.1](https://github.com/project-codeflare/codeflare-operator/releases/tag/v1.4.1) |
1212
| CodeFlare-SDK | [v0.16.1](https://github.com/project-codeflare/codeflare-sdk/releases/tag/v0.16.1) |
13-
| AppWrapper | [v0.11.1](https://github.com/project-codeflare/appwrapper/releases/tag/v0.11.1) |
13+
| AppWrapper | [v0.12.0](https://github.com/project-codeflare/appwrapper/releases/tag/v0.12.0) |
1414
| KubeRay | [v1.1.0](https://github.com/opendatahub-io/kuberay/releases/tag/v1.1.0) |
1515
| Kueue | [v0.6.2](https://github.com/opendatahub-io/kueue/releases/tag/v0.6.2) |
1616
<!-- Compatibility Matrix end -->
+1-1
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.11.1
4+
- github.com/project-codeflare/appwrapper/config/crd?ref=v0.12.0

config/crd/crd-appwrapper.yml

+91-10
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,6 @@ metadata:
55
controller-gen.kubebuilder.io/version: v0.14.0
66
name: appwrappers.workload.codeflare.dev
77
spec:
8-
conversion:
9-
strategy: Webhook
10-
webhook:
11-
clientConfig:
12-
service:
13-
name: webhook-service
14-
namespace: system
15-
path: /convert
16-
conversionReviewVersions:
17-
- v1
188
group: workload.codeflare.dev
199
names:
2010
kind: AppWrapper
@@ -168,6 +158,97 @@ spec:
168158
status:
169159
description: AppWrapperStatus defines the observed state of the appwrapper
170160
properties:
161+
componentStatus:
162+
description: ComponentStatus parallels the Components array in the Spec and tracks the actually deployed resources
163+
items:
164+
description: AppWrapperComponentStatus tracks the status of a single managed Component
165+
properties:
166+
apiVersion:
167+
description: APIVersion is the APIVersion of the Component
168+
type: string
169+
conditions:
170+
description: |-
171+
Conditions hold the latest available observations of the Component's current state.
172+
173+
174+
The type of the condition could be:
175+
176+
177+
- ResourcesDeployed: The component is deployed on the cluster
178+
items:
179+
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}"
180+
properties:
181+
lastTransitionTime:
182+
description: |-
183+
lastTransitionTime is the last time the condition transitioned from one status to another.
184+
This should be when the underlying condition changed. If that is not known, then using the time when the API field changed is acceptable.
185+
format: date-time
186+
type: string
187+
message:
188+
description: |-
189+
message is a human readable message indicating details about the transition.
190+
This may be an empty string.
191+
maxLength: 32768
192+
type: string
193+
observedGeneration:
194+
description: |-
195+
observedGeneration represents the .metadata.generation that the condition was set based upon.
196+
For instance, if .metadata.generation is currently 12, but the .status.conditions[x].observedGeneration is 9, the condition is out of date
197+
with respect to the current state of the instance.
198+
format: int64
199+
minimum: 0
200+
type: integer
201+
reason:
202+
description: |-
203+
reason contains a programmatic identifier indicating the reason for the condition's last transition.
204+
Producers of specific condition types may define expected values and meanings for this field,
205+
and whether the values are considered a guaranteed API.
206+
The value should be a CamelCase string.
207+
This field may not be empty.
208+
maxLength: 1024
209+
minLength: 1
210+
pattern: ^[A-Za-z]([A-Za-z0-9_,:]*[A-Za-z0-9_])?$
211+
type: string
212+
status:
213+
description: status of the condition, one of True, False, Unknown.
214+
enum:
215+
- "True"
216+
- "False"
217+
- Unknown
218+
type: string
219+
type:
220+
description: |-
221+
type of condition in CamelCase or in foo.example.com/CamelCase.
222+
---
223+
Many .condition.type values are consistent across resources like Available, but because arbitrary conditions can be
224+
useful (see .node.status.conditions), the ability to deconflict is important.
225+
The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt)
226+
maxLength: 316
227+
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])$
228+
type: string
229+
required:
230+
- lastTransitionTime
231+
- message
232+
- reason
233+
- status
234+
- type
235+
type: object
236+
type: array
237+
x-kubernetes-list-map-keys:
238+
- type
239+
x-kubernetes-list-type: map
240+
kind:
241+
description: Kind is the Kind of the Component
242+
type: string
243+
name:
244+
description: Name is the name of the Component
245+
type: string
246+
required:
247+
- apiVersion
248+
- kind
249+
- name
250+
type: object
251+
type: array
171252
conditions:
172253
description: |-
173254
Conditions hold the latest available observations of the AppWrapper current state.

go.mod

+1-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ require (
99
github.com/opendatahub-io/opendatahub-operator/v2 v2.10.0
1010
github.com/openshift/api v0.0.0-20230823114715-5fdd7511b790
1111
github.com/openshift/client-go v0.0.0-20221019143426-16aed247da5c
12-
github.com/project-codeflare/appwrapper v0.11.1
12+
github.com/project-codeflare/appwrapper v0.12.0
1313
github.com/project-codeflare/codeflare-common v0.0.0-20240422163521-380101642c8f
1414
github.com/ray-project/kuberay/ray-operator v1.1.0
1515
go.uber.org/zap v1.26.0
@@ -101,7 +101,6 @@ require (
101101
gopkg.in/yaml.v3 v3.0.1 // indirect
102102
k8s.io/apiserver v0.29.2 // indirect
103103
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect
104-
k8s.io/kubernetes v1.29.2 // indirect
105104
sigs.k8s.io/jobset v0.3.1 // indirect
106105
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
107106
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect

go.sum

+2-4
Original file line numberDiff line numberDiff line change
@@ -242,8 +242,8 @@ github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
242242
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
243243
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
244244
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
245-
github.com/project-codeflare/appwrapper v0.11.1 h1:bQ+OLzO+osR1Lo9nNl4Lk/QIFl0y8Cf6byPSPFJfkH4=
246-
github.com/project-codeflare/appwrapper v0.11.1/go.mod h1:MLmgm7cVHgeatBKhANSpos7GcB0bdllaWF9c1jEJKho=
245+
github.com/project-codeflare/appwrapper v0.12.0 h1:QMxryBPK6ir3VK6Qx4NWOA05/s4xU6uDHI/nXmLznvw=
246+
github.com/project-codeflare/appwrapper v0.12.0/go.mod h1:sH9j/rXX6WIlZzFXUOuqK5pagASPZNhuCtdFK+3BDkw=
247247
github.com/project-codeflare/codeflare-common v0.0.0-20240422163521-380101642c8f h1:9Uron4ej4Tt5ULX5CMzjmPqIZu3q/m07d4jhbNSwdPY=
248248
github.com/project-codeflare/codeflare-common v0.0.0-20240422163521-380101642c8f/go.mod h1:tlPi2e1HZQuf7AAFc7keWdVUNcxV+Gfh6Ss4KAQs1O0=
249249
github.com/prometheus/client_golang v1.18.0 h1:HzFfmkOzH5Q8L8G+kSJKUx5dtG87sewO+FoDDqP5Tbk=
@@ -524,8 +524,6 @@ k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65/go.mod h1:sX9MT8g7NVZM5lV
524524
k8s.io/kube-openapi v0.0.0-20220124234850-424119656bbf/go.mod h1:sX9MT8g7NVZM5lVL/j8QyCCJe8YSMW30QvGZWaCIDIk=
525525
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 h1:aVUu9fTY98ivBPKR9Y5w/AuzbMm96cd3YHRTU83I780=
526526
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00/go.mod h1:AsvuZPBlUDVuCdzJ87iajxtXuR9oktsTctW/R9wwouA=
527-
k8s.io/kubernetes v1.29.2 h1:8hh1cntqdulanjQt7wSSSsJfBgOyx6fUdFWslvGL5m0=
528-
k8s.io/kubernetes v1.29.2/go.mod h1:xZPKU0yO0CBbLTnbd+XGyRmmtmaVuJykDb8gNCkeeUE=
529527
k8s.io/metrics v0.29.1 h1:qutc3aIPMCniMuEApuLaeYX47rdCn8eycVDx7R6wMlQ=
530528
k8s.io/metrics v0.29.1/go.mod h1:JrbV2U71+v7d/9qb90UVKL8r0uJ6Z2Hy4V7mDm05cKs=
531529
k8s.io/utils v0.0.0-20210802155522-efc7438f0176/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=

0 commit comments

Comments
 (0)