Merge remote-tracking branch 'upstream/main'

.github/workflows/odh-fork-sync.yml → .github/workflows/upstream-downstream-sync.yml

@@ -1,17 +1,17 @@
-name: Call sync on OpenDataHub CFO fork sync
+name: Upstream to Downstream - Release Auto-Merge
 on:
   release:
     types:
       - published
   workflow_dispatch:
 
 jobs:
-  sync-fork:
+  trigger-auto-sync:
     runs-on: ubuntu-latest
     steps:
-      - name: Sync-fork
+      - name: call-sync-workflow
         run: |
-          gh workflow run sync-fork.yaml --repo github.com/opendatahub-io/codeflare-operator --ref main
+          gh workflow run auto-merge-sync.yaml --repo github.com/red-hat-data-services/codeflare-operator --ref main
         env:
           GITHUB_TOKEN: ${{ secrets.CODEFLARE_MACHINE_ACCOUNT_TOKEN }}
         shell:

CONTRIBUTING.md

@@ -5,7 +5,7 @@ Here are a few things to go over before getting started with CodeFlare Operator
 ## Environment setup
 
 The following should be installed in your working environment:
- - Go 1.21.x
+ - Go 1.22.x
    - [Download release](https://go.dev/dl/)
    - [Install Instructions](https://go.dev/doc/install)
  - [Operator SDK](https://sdk.operatorframework.io/docs/installation/)

Dockerfile

@@ -1,8 +1,8 @@
 # Build the manager binary
 
-# BEGIN -- workaround lack of go-toolset for golang 1.21
+# BEGIN -- workaround lack of go-toolset for golang 1.22
 
-ARG GOLANG_IMAGE=golang:1.21
+ARG GOLANG_IMAGE=golang:1.22
 
 ARG GOARCH=amd64
 
@@ -20,7 +20,7 @@ RUN dnf upgrade -y && dnf install -y \
 ENV PATH=/usr/local/go/bin:$PATH
 COPY --from=golang /usr/local/go /usr/local/go
 
-# END -- workaround lack of go-toolset for golang 1.21
+# END -- workaround lack of go-toolset for golang 1.22
 
 WORKDIR /workspace
 # Copy the Go Modules manifests

Makefile

@@ -12,13 +12,13 @@ VERSION ?= v0.0.0-dev
 BUNDLE_VERSION ?= $(VERSION:v%=%)
 
 # APPWRAPPER_VERSION defines the default version of the AppWrapper controller
- APPWRAPPER_VERSION ?= v0.13.1
- APPWRAPPER_REPO ?= github.com/project-codeflare/appwrapper
- # Upstream AppWrapper is currently only creating release tags of the form `vX.Y.Z` (i.e the version)
- APPWRAPPER_CRD ?= ${APPWRAPPER_REPO}/config/crd?ref=${APPWRAPPER_VERSION}
+APPWRAPPER_VERSION ?= v0.20.2
+APPWRAPPER_REPO ?= github.com/project-codeflare/appwrapper
+# Upstream AppWrapper is currently only creating release tags of the form `vX.Y.Z` (i.e the version)
+APPWRAPPER_CRD ?= ${APPWRAPPER_REPO}/config/crd?ref=${APPWRAPPER_VERSION}
 
- # KUEUE_VERSION defines the default version of Kueue (used for testing)
- KUEUE_VERSION ?= v0.6.2
+# KUEUE_VERSION defines the default version of Kueue (used for testing)
+KUEUE_VERSION ?= v0.7.0
 
 USE_RHOAI ?= true
 # KUBERAY_VERSION defines the default version of the KubeRay operator (used for testing)

README.md

@@ -110,11 +110,9 @@ For ODH tests additional environment variables are needed:
 2. Once all jobs within the action are completed, verify that compatibility matrix in [README](https://github.com/project-codeflare/codeflare-operator/blob/main/README.md) was properly updated.
 3. Verify that opened pull request to [OpenShift community operators repository](https://github.com/redhat-openshift-ecosystem/community-operators-prod) has proper content.
 4. Once PR is merged, announce the new release in slack and mail lists, if any.
-5. Release automation should open a PR with changes in [ODH CodeFlare operator repo](https://github.com/opendatahub-io/codeflare-operator). Review the changes proposed by automation. If all the changes are correct then manually cherrypick all `CARRY` and `PATCH` commits from the current main branch, push the result to a dedicated branch and ask on Slack channel for review of the result branch content. Once agreed then push the changes directly to the `main` branch (branch protection has to be temporarily disabled).
-6. Build ODH/CFO image by triggering [Build and Push action](https://github.com/opendatahub-io/codeflare-operator/actions/workflows/build-and-push.yaml)
-7. Create a release branch on [Red Hat CodeFlare operator repo](https://github.com/red-hat-data-services/codeflare-operator) for the next release if it doesn't exist yet.
-8. Create a dedicated branch containing changes from [ODH CodeFlare operator repo](https://github.com/opendatahub-io/codeflare-operator). Cherrypick all relevant changes available in [Red Hat CodeFlare operator repo](https://github.com/red-hat-data-services/codeflare-operator) latest release branch which should be available also in the next release. Ask on Slack channel for review of the result branch content. Once agreed then push the changes directly to the release branch.
-9. Make sure that release automation created a PR updating CodeFlare SDK version in [ODH Notebooks repository](https://github.com/opendatahub-io/notebooks). Make sure the PR gets merged.
+5. Release automation should auto-merge changes to [ODH CodeFlare operator repo](https://github.com/opendatahub-io/codeflare-operator). Verify the [workflow](https://github.com/project-codeflare/codeflare-operator/actions/workflows/project-codeflare-release.yml) ran successfully and review the new merge-commit and commit history. Same for the [Red Hat CodeFlare Operator repo](https://github.com/red-hat-data-services/codeflare-operator), while also ensuring changes are in the latest `rhoai` release branch. - If the auto-merge fails, conflicts must be resolved and force pushed manually to each downstream repository and release branch.
+6. In ODH/CFO verify that the [Build and Push action](https://github.com/opendatahub-io/codeflare-operator/actions/workflows/build-and-push.yaml) was triggered and ran successfully.
+7. Make sure that release automation created a PR updating CodeFlare SDK version in [ODH Notebooks repository](https://github.com/opendatahub-io/notebooks). Make sure the PR gets merged.
 
 ### Releases involving part of the stack
 

config/crd/appwrapper/kustomization.yaml

@@ -1,4 +1,4 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-- github.com/project-codeflare/appwrapper/config/crd?ref=v0.13.1
+- github.com/project-codeflare/appwrapper/config/crd?ref=v0.20.2

go.mod

@@ -1,28 +1,28 @@
 module github.com/project-codeflare/codeflare-operator
 
-go 1.21
+go 1.22.2
 
 require (
-	github.com/onsi/ginkgo/v2 v2.16.0
-	github.com/onsi/gomega v1.31.1
+	github.com/onsi/ginkgo/v2 v2.19.0
+	github.com/onsi/gomega v1.33.1
 	github.com/open-policy-agent/cert-controller v0.10.1
 	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.13.1
+	github.com/project-codeflare/appwrapper v0.20.2
 	github.com/project-codeflare/codeflare-common v0.0.0-20240617130731-0c3f3b3c0e5f
-	github.com/ray-project/kuberay/ray-operator v1.1.0
-	go.uber.org/zap v1.26.0
+	github.com/ray-project/kuberay/ray-operator v1.1.1
+	go.uber.org/zap v1.27.0
 	golang.org/x/exp v0.0.0-20230905200255-921286631fa9
-	k8s.io/api v0.29.2
+	k8s.io/api v0.30.1
 	k8s.io/apiextensions-apiserver v0.29.2
-	k8s.io/apimachinery v0.29.2
+	k8s.io/apimachinery v0.30.1
 	k8s.io/client-go v11.0.0+incompatible
-	k8s.io/component-base v0.29.2
-	k8s.io/klog/v2 v2.110.1
-	k8s.io/utils v0.0.0-20230726121419-3b25d923346b
-	sigs.k8s.io/controller-runtime v0.17.0
-	sigs.k8s.io/kueue v0.6.2
+	k8s.io/component-base v0.29.5
+	k8s.io/klog/v2 v2.120.1
+	k8s.io/utils v0.0.0-20240102154912-e7106e64919e
+	sigs.k8s.io/controller-runtime v0.17.3
+	sigs.k8s.io/kueue v0.7.0
 	sigs.k8s.io/yaml v1.4.0
 )
 
@@ -46,22 +46,22 @@ require (
 	github.com/evanphx/json-patch v5.6.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/logr v1.4.1 // indirect
+	github.com/go-logr/logr v1.4.2 // 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-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // 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
 	github.com/golang/glog v1.1.2 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
-	github.com/golang/protobuf v1.5.3 // indirect
+	github.com/golang/protobuf v1.5.4 // indirect
 	github.com/google/gnostic-models v0.6.8 // indirect
 	github.com/google/go-cmp v0.6.0 // indirect
 	github.com/google/gofuzz v1.2.0 // indirect
-	github.com/google/pprof v0.0.0-20230323073829-e72429f035bd // indirect
-	github.com/google/uuid v1.3.1 // indirect
+	github.com/google/pprof v0.0.0-20240424215950-a892ee059fd6 // indirect
+	github.com/google/uuid v1.6.0 // indirect
 	github.com/gorilla/css v1.0.0 // indirect
 	github.com/imdario/mergo v0.3.16 // indirect
 	github.com/jackc/pgx/v5 v5.5.5 // indirect
@@ -78,30 +78,30 @@ require (
 	github.com/openshift/custom-resource-status v1.1.2 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/prometheus/client_golang v1.18.0 // indirect
-	github.com/prometheus/client_model v0.5.0 // indirect
+	github.com/prometheus/client_model v0.6.1 // indirect
 	github.com/prometheus/common v0.46.0 // indirect
 	github.com/prometheus/procfs v0.12.0 // indirect
 	github.com/sirupsen/logrus v1.9.3 // indirect
 	github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966 // indirect
 	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.23.0 // indirect
+	golang.org/x/net v0.25.0 // indirect
 	golang.org/x/oauth2 v0.16.0 // indirect
-	golang.org/x/sys v0.18.0 // indirect
-	golang.org/x/term v0.18.0 // indirect
-	golang.org/x/text v0.14.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.17.0 // indirect
+	golang.org/x/tools v0.21.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
 	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.2 // indirect
-	k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect
-	sigs.k8s.io/jobset v0.3.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
 	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
 	sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
 )