From 397963f4d705d4a9ad8930655d5b2b77b8737fdf Mon Sep 17 00:00:00 2001 From: David Grove Date: Thu, 31 Oct 2024 14:06:54 -0400 Subject: [PATCH 1/3] Add RBAC aggregator cluster roles for appwrappers --- config/rbac/appwrapper_editor_role.yaml | 27 +++++++++++++++++++++++++ config/rbac/appwrapper_viewer_role.yaml | 22 ++++++++++++++++++++ config/rbac/kustomization.yaml | 2 ++ 3 files changed, 51 insertions(+) create mode 100644 config/rbac/appwrapper_editor_role.yaml create mode 100644 config/rbac/appwrapper_viewer_role.yaml diff --git a/config/rbac/appwrapper_editor_role.yaml b/config/rbac/appwrapper_editor_role.yaml new file mode 100644 index 000000000..73fa98691 --- /dev/null +++ b/config/rbac/appwrapper_editor_role.yaml @@ -0,0 +1,27 @@ +# permissions for end users to edit appwrappers. +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRole +metadata: + labels: + rbac.authorization.k8s.io/aggregate-to-admin: "true" + rbac.authorization.k8s.io/aggregate-to-edit: "true" + name: appwrapper-editor-role +rules: +- apiGroups: + - workload.codeflare.dev + resources: + - appwrappers + verbs: + - create + - delete + - get + - list + - patch + - update + - watch +- apiGroups: + - workload.codeflare.dev + resources: + - appwrappers/status + verbs: + - get diff --git a/config/rbac/appwrapper_viewer_role.yaml b/config/rbac/appwrapper_viewer_role.yaml new file mode 100644 index 000000000..1efbb8599 --- /dev/null +++ b/config/rbac/appwrapper_viewer_role.yaml @@ -0,0 +1,22 @@ +# permissions for end users to view appwrappers. +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRole +metadata: + labels: + rbac.authorization.k8s.io/aggregate-to-view: "true" + name: viewer-role +rules: +- apiGroups: + - workload.codeflare.dev + resources: + - appwrappers + verbs: + - get + - list + - watch +- apiGroups: + - workload.codeflare.dev + resources: + - appwrappers/status + verbs: + - get diff --git a/config/rbac/kustomization.yaml b/config/rbac/kustomization.yaml index 166fe7986..29b817651 100644 --- a/config/rbac/kustomization.yaml +++ b/config/rbac/kustomization.yaml @@ -9,3 +9,5 @@ resources: - role_binding.yaml - leader_election_role.yaml - leader_election_role_binding.yaml +- appwrapper_editor_role.yaml +- appwrapper_viewer_role.yaml From 1810758edc05d9acc87bef7ac5551fe497f4fe89 Mon Sep 17 00:00:00 2001 From: David Grove Date: Tue, 5 Nov 2024 11:42:18 -0500 Subject: [PATCH 2/3] Update appwrappers to 0.27.0 Changes: * Append autopilot anti-affinities to existing matchExpressions array * Add labels to aggregate appwrapper editor/viewer role RBACs * Bump Kueue from 0.8.1 to 0.8.3 --- Makefile | 4 ++-- config/crd/appwrapper/kustomization.yaml | 2 +- go.mod | 8 ++++---- go.sum | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index 529841c60..5ae089c59 100644 --- a/Makefile +++ b/Makefile @@ -12,12 +12,12 @@ VERSION ?= v0.0.0-dev BUNDLE_VERSION ?= $(VERSION:v%=%) # APPWRAPPER_VERSION defines the default version of the AppWrapper controller -APPWRAPPER_VERSION ?= v0.26.0 +APPWRAPPER_VERSION ?= v0.27.0 APPWRAPPER_REPO ?= github.com/project-codeflare/appwrapper APPWRAPPER_CRD ?= ${APPWRAPPER_REPO}/config/crd?ref=${APPWRAPPER_VERSION} # KUEUE_VERSION defines the default version of Kueue (used for testing) -KUEUE_VERSION ?= v0.8.1 +KUEUE_VERSION ?= v0.8.3 USE_RHOAI ?= true # KUBERAY_VERSION defines the default version of the KubeRay operator (used for testing) diff --git a/config/crd/appwrapper/kustomization.yaml b/config/crd/appwrapper/kustomization.yaml index f9579adb2..75e9b5310 100644 --- a/config/crd/appwrapper/kustomization.yaml +++ b/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.26.0 +- github.com/project-codeflare/appwrapper/config/crd?ref=v0.27.0 diff --git a/go.mod b/go.mod index 8cd893c4d..8e6e0a74d 100644 --- a/go.mod +++ b/go.mod @@ -10,7 +10,7 @@ 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.26.0 + github.com/project-codeflare/appwrapper v0.27.0 github.com/project-codeflare/codeflare-common v0.0.0-20240930133152-11fd6e3be6b3 github.com/ray-project/kuberay/ray-operator v1.1.1 go.uber.org/zap v1.27.0 @@ -23,7 +23,7 @@ require ( k8s.io/klog/v2 v2.130.1 k8s.io/utils v0.0.0-20240502163921-fe8a2dddb1d0 sigs.k8s.io/controller-runtime v0.17.5 - sigs.k8s.io/kueue v0.8.1 + sigs.k8s.io/kueue v0.8.3 sigs.k8s.io/yaml v1.4.0 ) @@ -36,10 +36,10 @@ 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 // This replace directive supports the backlevel go version required by the ODH build -replace github.com/project-codeflare/appwrapper v0.26.0 => github.com/project-codeflare/appwrapper v0.26.1-0.20241016213414-d3825c270f61 +replace github.com/project-codeflare/appwrapper v0.27.0 => github.com/project-codeflare/appwrapper v0.27.1-0.20241105160939-f71c6326acce // These replace directives deal with the backlevel ODH kueue version -replace sigs.k8s.io/kueue v0.8.1 => github.com/opendatahub-io/kueue v0.7.0-odh-2 +replace sigs.k8s.io/kueue v0.8.3 => github.com/opendatahub-io/kueue v0.7.0-odh-2 require ( github.com/aymerick/douceur v0.2.0 // indirect diff --git a/go.sum b/go.sum index 34c4da85b..8f6d198be 100644 --- a/go.sum +++ b/go.sum @@ -247,8 +247,8 @@ github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/project-codeflare/appwrapper v0.26.1-0.20241016213414-d3825c270f61 h1:jSqZDG4RihAkBaQp2fYFbp6EO4EGMv0pxfvO+6C2Cis= -github.com/project-codeflare/appwrapper v0.26.1-0.20241016213414-d3825c270f61/go.mod h1:zDALq3/gn+eiczpD7TBZWWbAVuwcCGDFuN/77oh+CDw= +github.com/project-codeflare/appwrapper v0.27.1-0.20241105160939-f71c6326acce h1:fFxewNcpKzvxYfJdwmHjJswoupX+5u1o9U3P8Gfh49o= +github.com/project-codeflare/appwrapper v0.27.1-0.20241105160939-f71c6326acce/go.mod h1:CDh8V/IGrfT9UW1CWGZNZQmb/5PNK8VGzZsiUL8ywlo= github.com/project-codeflare/codeflare-common v0.0.0-20240930133152-11fd6e3be6b3 h1:Eupu9yxaGTddtoxb9SjrYJlokRHEYU5NNVRQmdXSNVs= github.com/project-codeflare/codeflare-common v0.0.0-20240930133152-11fd6e3be6b3/go.mod h1:v7XKwaDoCspsHQlWJNarO7gOpR+iumSS+c1bWs3kJOI= github.com/prometheus/client_golang v1.20.4 h1:Tgh3Yr67PaOv/uTqloMsCEdeuFTatm5zIq5+qNN23vI= From d6be0ab6c728a4052ff12951ce4c4515843f6d4b Mon Sep 17 00:00:00 2001 From: codeflare-machine-account Date: Thu, 7 Nov 2024 12:52:10 +0000 Subject: [PATCH 3/3] Update dependency versions for release v1.11.0 --- README.md | 8 ++++---- config/manager/params.env | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 83e17c4ea..6d76b453d 100644 --- a/README.md +++ b/README.md @@ -8,11 +8,11 @@ CodeFlare Stack Compatibility Matrix | Component | Version | |------------------------------|---------------------------------------------------------------------------------------------------| -| CodeFlare Operator | [v1.10.0](https://github.com/project-codeflare/codeflare-operator/releases/tag/v1.10.0) | -| CodeFlare-SDK | [v0.22.0](https://github.com/project-codeflare/codeflare-sdk/releases/tag/v0.22.0) | -| AppWrapper | [v0.26.0](https://github.com/project-codeflare/appwrapper/releases/tag/v0.26.0) | +| CodeFlare Operator | [v1.11.0](https://github.com/project-codeflare/codeflare-operator/releases/tag/v1.11.0) | +| CodeFlare-SDK | [v0.23.1](https://github.com/project-codeflare/codeflare-sdk/releases/tag/v0.23.1) | +| AppWrapper | [v0.27.0](https://github.com/project-codeflare/appwrapper/releases/tag/v0.27.0) | | KubeRay | [v1.1.0](https://github.com/opendatahub-io/kuberay/releases/tag/v1.1.0) | -| Kueue | [v0.8.1](https://github.com/opendatahub-io/kueue/releases/tag/v0.8.1) | +| Kueue | [v0.8.3](https://github.com/opendatahub-io/kueue/releases/tag/v0.8.3) | ## Development diff --git a/config/manager/params.env b/config/manager/params.env index 8b226eb77..7b6fd8c90 100644 --- a/config/manager/params.env +++ b/config/manager/params.env @@ -1,2 +1,2 @@ -codeflare-operator-controller-image=quay.io/opendatahub/codeflare-operator:v1.10.0 +codeflare-operator-controller-image=quay.io/opendatahub/codeflare-operator:v1.11.0 namespace=opendatahub