Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: project-codeflare/codeflare-operator
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v1.7.0
Choose a base ref
...
head repository: project-codeflare/codeflare-operator
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v1.8.0
Choose a head ref
  • 7 commits
  • 19 files changed
  • 7 contributors

Commits on Aug 27, 2024

  1. Add sleep before creating Kueue resources 

    Fixes following errors. Service for webhook is not available immediately:
error appears Error from server (InternalError): error when creating "STDIN":
Internal error occurred: failed calling webhook "mresourceflavor.kb.io": failed to call webhook:
Post "https://kueue-webhook-service.kueue-system.svc:443/mutate-kueue-x-k8s-io-v1beta1-resourceflavor?timeout=10s":
dial tcp 10.96.115.38:443: connect: connection refused
    @jiripetrlik @openshift-merge-bot
    jiripetrlik authored and openshift-merge-bot[bot] committed Aug 27, 2024
    Loading
    Loading status checks…
    Copy the full SHA
    6808761 View commit details

  2. codflare-operator manifests kustomize v5 upgrade

    @oksanabaza @openshift-merge-bot
    oksanabaza authored and openshift-merge-bot[bot] committed Aug 27, 2024
    Loading
    Loading status checks…
    Copy the full SHA
    ccf0f24 View commit details

Commits on Aug 29, 2024

  1. Add varshaprasad96 to OWNERS

    @astefanutti
    astefanutti committed Aug 29, 2024
    Loading
    Loading status checks…
    Copy the full SHA
    78d6333 View commit details

Commits on Aug 30, 2024

  1. update appwrappers to v0.24.0 (#611) 

    Features
* Upgrade to Kueue 0.8.0
* Use Patch operations to update AppWrapper.Status
* Inject AppWrapper finalizer in WebHook

Bugs and Regressions
* Get dev mode (make run) working again
* account for all covered resources when a node is cordoned

Other Changes
* Logging improvements for development/debugging
* Upgrade to Kind v0.24.0
* Unit test improvement
* add failing job with retry to end-to-end tests
* improve e2e testing of failures
* need non-zero reset pause to reliably detect Resetting phase

Full Changelog: project-codeflare/appwrapper@v0.23.0...v0.24.0
    @dgrove-oss
    dgrove-oss authored Aug 30, 2024
    Loading
    Loading status checks…
    Copy the full SHA
    8057522 View commit details

Commits on Sep 3, 2024

  1. add hash to end of resource names to avoid name clash 

    also added a version annotation to raycluster for the CFO version

Signed-off-by: Kevin <[email protected]>
    @KPostOffice @openshift-merge-bot
    KPostOffice authored and openshift-merge-bot[bot] committed Sep 3, 2024
    Loading
    Loading status checks…
    Copy the full SHA
    7f00118 View commit details

Commits on Sep 4, 2024

  1. RBAC fix to enable slack cluster queue lending limit adjustment 

    The codeflare operator needs permission to read and write clusterqueues
to enable the AppWrapper controller to adjust the lending limit of
a designated slack cluster queue to reflect cordoned nodes.
    @dgrove-oss @openshift-merge-bot
    dgrove-oss authored and openshift-merge-bot[bot] committed Sep 4, 2024
    Loading
    Loading status checks…
    Copy the full SHA
    8fa9455 View commit details

Commits on Sep 6, 2024

  1. Update dependency versions for release v1.8.0

    @codeflare-machine-account @openshift-merge-bot
    codeflare-machine-account authored and openshift-merge-bot[bot] committed Sep 6, 2024
    Loading
    Loading status checks…
    Copy the full SHA
    73d5beb View commit details
4 changes: 2 additions & 2 deletions Makefile
View file
Original file line number Diff line number Diff line change
@@ -12,7 +12,7 @@ VERSION ?= v0.0.0-dev
BUNDLE_VERSION ?= $(VERSION:v%=%)

# APPWRAPPER_VERSION defines the default version of the AppWrapper controller
APPWRAPPER_VERSION ?= v0.23.0
APPWRAPPER_VERSION ?= v0.24.0
APPWRAPPER_REPO ?= github.com/project-codeflare/appwrapper
APPWRAPPER_CRD ?= ${APPWRAPPER_REPO}/config/crd?ref=${APPWRAPPER_VERSION}

@@ -240,7 +240,7 @@ GH_CLI ?= $(LOCALBIN)/gh
SED ?= /usr/bin/sed

## Tool Versions
KUSTOMIZE_VERSION ?= v4.5.4
KUSTOMIZE_VERSION ?= v5.4.3
CODEGEN_VERSION ?= v0.27.2
CONTROLLER_TOOLS_VERSION ?= v0.9.2
YQ_VERSION ?= v4.35.2 ## latest version that works with go1.20
2 changes: 2 additions & 0 deletions OWNERS
View file
Original file line number Diff line number Diff line change
@@ -5,6 +5,7 @@ approvers:
- kpostoffice
- sutaakar
- tedhtchang
- varshaprasad96

reviewers:
- astefanutti
@@ -16,6 +17,7 @@ reviewers:
- kpostoffice
- sutaakar
- tedhtchang
- varshaprasad96

emeritus_approvers:
- anishasthana # 2024-07-02
6 changes: 3 additions & 3 deletions README.md
View file
Original file line number Diff line number Diff line change
@@ -8,9 +8,9 @@ CodeFlare Stack Compatibility Matrix

| Component | Version |
|------------------------------|---------------------------------------------------------------------------------------------------|
| CodeFlare Operator | [v1.7.0](https://github.com/project-codeflare/codeflare-operator/releases/tag/v1.7.0) |
| CodeFlare-SDK | [v0.19.1](https://github.com/project-codeflare/codeflare-sdk/releases/tag/v0.19.1) |
| AppWrapper | [v0.23.0](https://github.com/project-codeflare/appwrapper/releases/tag/v0.23.0) |
| CodeFlare Operator | [v1.8.0](https://github.com/project-codeflare/codeflare-operator/releases/tag/v1.8.0) |
| CodeFlare-SDK | [v0.20.2](https://github.com/project-codeflare/codeflare-sdk/releases/tag/v0.20.2) |
| AppWrapper | [v0.24.0](https://github.com/project-codeflare/appwrapper/releases/tag/v0.24.0) |
| KubeRay | [v1.1.0](https://github.com/opendatahub-io/kuberay/releases/tag/v1.1.0) |
| Kueue | [v0.7.0](https://github.com/opendatahub-io/kueue/releases/tag/v0.7.0) |
<!-- Compatibility Matrix end -->
2 changes: 1 addition & 1 deletion config/crd/appwrapper/kustomization.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
resources:
- github.com/project-codeflare/appwrapper/config/crd?ref=v0.23.0
- github.com/project-codeflare/appwrapper/config/crd?ref=v0.24.0
15 changes: 7 additions & 8 deletions config/default/kustomization.yaml
View file
Original file line number Diff line number Diff line change
@@ -9,20 +9,19 @@ namespace: openshift-operators
namePrefix: codeflare-operator-

# Labels to add to all resources and selectors.
commonLabels:
app.kubernetes.io/name: codeflare-operator
app.kubernetes.io/part-of: codeflare

bases:
labels:
- pairs:
app.kubernetes.io/name: codeflare-operator
app.kubernetes.io/part-of: codeflare
includeSelectors: true
resources:
- ../crd
- ../rbac
- ../manager
- ../webhook
- metrics_service.yaml
# [PROMETHEUS] To enable prometheus monitor, uncomment all sections with 'PROMETHEUS'.
# - ../prometheus

resources:
- metrics_service.yaml

patches:
- path: manager_webhook_patch.yaml
2 changes: 1 addition & 1 deletion config/e2e/kustomization.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
namespace: openshift-operators

bases:
resources:
- config.yaml
- ../default

16 changes: 10 additions & 6 deletions config/manager/kustomization.yaml
View file
Original file line number Diff line number Diff line change
@@ -11,11 +11,15 @@ configMapGenerator:
configurations:
- params.yaml

vars:
- name: codeflare_operator_controller_image
objref:
replacements:
- source:
kind: ConfigMap
name: stack-config
apiVersion: v1
fieldref:
fieldpath: data.codeflare-operator-controller-image
version: v1
fieldPath: data.codeflare-operator-controller-image
targets:
- select:
kind: Deployment
name: manager
fieldPaths:
- spec.template.spec.containers.0.image
2 changes: 1 addition & 1 deletion config/manager/params.env
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
codeflare-operator-controller-image=quay.io/opendatahub/codeflare-operator:v1.7.0
codeflare-operator-controller-image=quay.io/opendatahub/codeflare-operator:v1.8.0
namespace=opendatahub
10 changes: 10 additions & 0 deletions config/rbac/role.yaml
View file
Original file line number Diff line number Diff line change
@@ -168,6 +168,16 @@ rules:
- patch
- update
- watch
- apiGroups:
- kueue.x-k8s.io
resources:
- clusterqueues
verbs:
- get
- list
- patch
- update
- watch
- apiGroups:
- kueue.x-k8s.io
resources:
4 changes: 2 additions & 2 deletions config/scorecard/kustomization.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
resources:
- bases/config.yaml
patchesJson6902:
patches:
- path: patches/basic.config.yaml
target:
group: scorecard.operatorframework.io
@@ -13,4 +13,4 @@ patchesJson6902:
version: v1alpha3
kind: Configuration
name: config
#+kubebuilder:scaffold:patchesJson6902
#+kubebuilder:scaffold:patches
55 changes: 27 additions & 28 deletions go.mod
View file
Original file line number Diff line number Diff line change
@@ -10,20 +10,20 @@ require (
github.com/opendatahub-io/opendatahub-operator/v2 v2.10.0
github.com/openshift/api v0.0.0-20230823114715-5fdd7511b790
github.com/openshift/client-go v0.0.0-20221019143426-16aed247da5c
github.com/project-codeflare/appwrapper v0.23.0
github.com/project-codeflare/appwrapper v0.24.0
github.com/project-codeflare/codeflare-common v0.0.0-20240628111341-56c962a09b7e
github.com/ray-project/kuberay/ray-operator v1.1.1
go.uber.org/zap v1.27.0
golang.org/x/exp v0.0.0-20231006140011-7918f672742d
k8s.io/api v0.30.1
golang.org/x/exp v0.0.0-20240530194437-404ba88c7ed0
k8s.io/api v0.30.2
k8s.io/apiextensions-apiserver v0.29.2
k8s.io/apimachinery v0.30.1
k8s.io/apimachinery v0.30.2
k8s.io/client-go v11.0.0+incompatible
k8s.io/component-base v0.29.5
k8s.io/component-base v0.29.6
k8s.io/klog/v2 v2.120.1
k8s.io/utils v0.0.0-20240102154912-e7106e64919e
k8s.io/utils v0.0.0-20240502163921-fe8a2dddb1d0
sigs.k8s.io/controller-runtime v0.17.3
sigs.k8s.io/kueue v0.7.1
sigs.k8s.io/kueue v0.8.0
sigs.k8s.io/yaml v1.4.0
)

@@ -36,26 +36,26 @@ replace go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp => go.open
replace github.com/jackc/pgx/v4 => github.com/jackc/pgx/v5 v5.5.4

// These replace directives support the backlevel go version required by ODH build
replace github.com/project-codeflare/appwrapper v0.23.0 => github.com/project-codeflare/appwrapper v0.23.1-0.20240731154950-ad486fb7e7ee
replace github.com/project-codeflare/appwrapper v0.24.0 => github.com/project-codeflare/appwrapper v0.24.1-0.20240828152845-bfaac68eef30

replace sigs.k8s.io/kueue v0.7.1 => github.com/opendatahub-io/kueue v0.7.0-odh-test
replace sigs.k8s.io/kueue v0.8.0 => github.com/opendatahub-io/kueue v0.7.0-odh-test

require (
github.com/aymerick/douceur v0.2.0 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/blang/semver/v4 v4.0.0 // indirect
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
github.com/cespare/xxhash/v2 v2.3.0 // indirect
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/distribution/reference v0.5.0 // indirect
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
github.com/emicklei/go-restful/v3 v3.12.1 // indirect
github.com/evanphx/json-patch v5.9.0+incompatible // indirect
github.com/evanphx/json-patch/v5 v5.8.0 // indirect
github.com/fsnotify/fsnotify v1.7.0 // indirect
github.com/go-logr/zapr v1.3.0 // indirect
github.com/go-openapi/jsonpointer v0.20.0 // indirect
github.com/go-openapi/jsonreference v0.20.2 // indirect
github.com/go-openapi/swag v0.22.4 // indirect
github.com/go-openapi/jsonpointer v0.21.0 // indirect
github.com/go-openapi/jsonreference v0.21.0 // indirect
github.com/go-openapi/swag v0.23.0 // indirect
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang-jwt/jwt/v4 v4.5.0 // indirect
@@ -93,22 +93,21 @@ require (
github.com/spf13/pflag v1.0.5 // indirect
go.uber.org/atomic v1.11.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
golang.org/x/net v0.25.0 // indirect
golang.org/x/oauth2 v0.16.0 // indirect
golang.org/x/sys v0.20.0 // indirect
golang.org/x/term v0.20.0 // indirect
golang.org/x/text v0.15.0 // indirect
golang.org/x/time v0.3.0 // indirect
golang.org/x/tools v0.21.0 // indirect
golang.org/x/net v0.28.0 // indirect
golang.org/x/oauth2 v0.20.0 // indirect
golang.org/x/sys v0.23.0 // indirect
golang.org/x/term v0.23.0 // indirect
golang.org/x/text v0.17.0 // indirect
golang.org/x/time v0.5.0 // indirect
golang.org/x/tools v0.24.0 // indirect
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
google.golang.org/appengine v1.6.8 // indirect
google.golang.org/protobuf v1.33.0 // indirect
google.golang.org/protobuf v1.34.1 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/apiserver v0.29.5 // indirect
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
sigs.k8s.io/jobset v0.5.1 // indirect
k8s.io/apiserver v0.29.6 // indirect
k8s.io/kube-openapi v0.0.0-20240521193020-835d969ad83a // indirect
sigs.k8s.io/jobset v0.5.2 // indirect
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
)
Loading