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: opendatahub-io/odh-model-controller
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: main
Choose a base ref
...
head repository: red-hat-data-services/odh-model-controller
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: main
Choose a head ref

Commits on May 4, 2023

  1. This commit is for openshift-ci of modelmesh-serving

    Signed-off-by: jooho <jlee@redhat.com>
    Jooho committed May 4, 2023
    Copy the full SHA
    6a54994 View commit details
  2. add .pre-commit-config.yaml for linter

    Signed-off-by: jooho <jlee@redhat.com>
    Jooho committed May 4, 2023
    Copy the full SHA
    2292564 View commit details
  3. Merge pull request #32 from Jooho/cherry-pick-v0.11.0-alpha

    Cherry pick v0.11.0 alpha
    Jooho authored May 4, 2023
    Copy the full SHA
    e80efc2 View commit details

Commits on May 16, 2023

  1. Copy the full SHA
    c437468 View commit details

Commits on May 25, 2023

  1. regular sync from main to release

    Signed-off-by: jooho <jlee@redhat.com>
    Jooho committed May 25, 2023
    Copy the full SHA
    41139a9 View commit details
  2. Merge pull request #46 from Jooho/sync_release

    [Sync] 2023.05.25 from main to release branch
    openshift-merge-robot authored May 25, 2023
    Copy the full SHA
    ad3736f View commit details

Commits on May 26, 2023

  1. Copy the full SHA
    a08292a View commit details

Commits on Jun 19, 2023

  1. Add anti-affinity rules to manager pod

    Since the manager pod has 3 replicas, the anti-affinity rules are added to prefer (not require) scheduling the replicas in different worker nodes, rather than having replicas on the same node.
    
    Signed-off-by: Edgar Hernández <23639005+israel-hdez@users.noreply.github.com>
    israel-hdez committed Jun 19, 2023
    Copy the full SHA
    f774740 View commit details

Commits on Jun 23, 2023

  1. Merge pull request #52 from israel-hdez/add-anti-affinity-v011

    [0.11.0-alpha] Add anti-affinity rules to manager pod
    openshift-merge-robot authored Jun 23, 2023
    Copy the full SHA
    6f7d474 View commit details

Commits on Jun 24, 2023

  1. Copy the full SHA
    540a82a View commit details

Commits on Jun 30, 2023

  1. Remove unused .develop files

    Cherry-pick of 0ee9b65 from `main` branch.
    
    Signed-off-by: Edgar Hernández <23639005+israel-hdez@users.noreply.github.com>
    israel-hdez committed Jun 30, 2023
    Copy the full SHA
    4634ece View commit details
  2. Merge pull request #56 from israel-hdez/54-v011-remove-unused-ci-files

    [v0.11.0] Remove unused .develop files
    openshift-merge-robot authored Jun 30, 2023
    Copy the full SHA
    02a6bc7 View commit details

Commits on Jul 1, 2023

  1. Copy the full SHA
    6fcbf57 View commit details

Commits on Jul 28, 2023

  1. support AWS_CA_BUNDLE(issue-61)

    Signed-off-by: jooho <jlee@redhat.com>
    Jooho committed Jul 28, 2023
    Copy the full SHA
    fc80fe1 View commit details
  2. Add unit test for storageconfig controller

    Signed-off-by: jooho <jlee@redhat.com>
    Jooho committed Jul 28, 2023
    Copy the full SHA
    3610f9b View commit details

Commits on Aug 4, 2023

  1. Merge pull request #63 from Jooho/release-ca-cert

    [CherryPick] Add AWS_CA_BUNDLE for storage-config and fix opendatahub.io/managed=false behavior
    openshift-merge-robot authored Aug 4, 2023
    Copy the full SHA
    c61b059 View commit details
  2. Copy the full SHA
    7d8d722 View commit details

Commits on Aug 17, 2023

  1. Merge pull request #65 from VedantMahabaleshwarkar/kserve-metrics

    add monitoring controller for kserve and istio metrics
    Xaenalt authored and VedantMahabaleshwarkar committed Aug 17, 2023
    Copy the full SHA
    82427c7 View commit details
  2. Merge pull request #65 from VedantMahabaleshwarkar/kserve-metrics

    add monitoring controller for kserve and istio metrics
    Signed-off-by: Vedant Mahabaleshwarkar <vmahabal@redhat.com>
    Xaenalt authored and VedantMahabaleshwarkar committed Aug 17, 2023
    Copy the full SHA
    5c0489a View commit details
  3. Merge pull request #66 from VedantMahabaleshwarkar/cherry-pick-odh-re…

    …lease
    
    Merge pull request #65 from VedantMahabaleshwarkar/kserve-metrics
    VedantMahabaleshwarkar authored Aug 17, 2023
    Copy the full SHA
    e3285c5 View commit details
  4. Merge pull request #6 from VedantMahabaleshwarkar/cherry-pick-rhods-main

    Merge pull request #65 from VedantMahabaleshwarkar/kserve-metrics
    VedantMahabaleshwarkar authored Aug 17, 2023
    Copy the full SHA
    dc4d92e View commit details

Commits on Aug 18, 2023

  1. Copy the full SHA
    e6fa07c View commit details

Commits on Aug 21, 2023

  1. Merge pull request #68 from VedantMahabaleshwarkar/crd_fix

    fix the need to have istio crds for modelmesh reconciliation
    
    Signed-off-by: Vedant Mahabaleshwarkar <vmahabal@redhat.com>
    VedantMahabaleshwarkar committed Aug 21, 2023
    Copy the full SHA
    94b113d View commit details
  2. Merge pull request #68 from VedantMahabaleshwarkar/crd_fix

    fix the need to have istio crds for modelmesh reconciliation
    VedantMahabaleshwarkar committed Aug 21, 2023
    Copy the full SHA
    945f895 View commit details
  3. Merge pull request #70 from VedantMahabaleshwarkar/crd_fix_cherrypick

    fix the need to have istio crds for modelmesh reconciliation
    VedantMahabaleshwarkar authored Aug 21, 2023
    Copy the full SHA
    7e2cb00 View commit details

Commits on Aug 22, 2023

  1. Copy the full SHA
    3ebdb77 View commit details
  2. Copy the full SHA
    0839ce4 View commit details

Commits on Aug 31, 2023

  1. remove check for istio CRD installation

    Signed-off-by: Vedant Mahabaleshwarkar <vmahabal@redhat.com>
    VedantMahabaleshwarkar committed Aug 31, 2023
    Copy the full SHA
    22e1b85 View commit details
  2. Merge pull request #77 from VedantMahabaleshwarkar/bug_fix_odh_release

    remove check for istio CRD installation
    VedantMahabaleshwarkar authored Aug 31, 2023
    Copy the full SHA
    0f72c43 View commit details

Commits on Sep 1, 2023

  1. Copy the full SHA
    45cd8be View commit details

Commits on Sep 15, 2023

  1. Empty-Commit to build an image

    Jooho committed Sep 15, 2023
    Copy the full SHA
    4824b56 View commit details
  2. Merge pull request #82 from Jooho/20230915_0.11

    Empty-Commit to build an image
    openshift-merge-robot authored Sep 15, 2023
    Copy the full SHA
    cfbfe87 View commit details

Commits on Oct 19, 2023

  1. manifest readiness update for odh-operator v2

    Signed-off-by: Vedant Mahabaleshwarkar <vmahabal@redhat.com>
    VedantMahabaleshwarkar committed Oct 19, 2023
    Copy the full SHA
    f98a728 View commit details
  2. address PR comments

    Signed-off-by: Vedant Mahabaleshwarkar <vmahabal@redhat.com>
    VedantMahabaleshwarkar committed Oct 19, 2023
    Copy the full SHA
    680e95f View commit details
  3. fix variable substitution

    Signed-off-by: Vedant Mahabaleshwarkar <vmahabal@redhat.com>
    VedantMahabaleshwarkar committed Oct 19, 2023
    Copy the full SHA
    35e51cf View commit details
  4. manifest readiness update for odh-operator v2

    Signed-off-by: Vedant Mahabaleshwarkar <vmahabal@redhat.com>
    VedantMahabaleshwarkar committed Oct 19, 2023
    Copy the full SHA
    07c5e22 View commit details
  5. address PR comments

    Signed-off-by: Vedant Mahabaleshwarkar <vmahabal@redhat.com>
    VedantMahabaleshwarkar committed Oct 19, 2023
    Copy the full SHA
    aab9ef9 View commit details
  6. fix variable substitution

    Signed-off-by: Vedant Mahabaleshwarkar <vmahabal@redhat.com>
    VedantMahabaleshwarkar committed Oct 19, 2023
    Copy the full SHA
    270c3d1 View commit details
  7. change image tag to 0.11.1

    Signed-off-by: Vedant Mahabaleshwarkar <vmahabal@redhat.com>
    VedantMahabaleshwarkar committed Oct 19, 2023
    Copy the full SHA
    c5e9a75 View commit details
  8. change image tag to 0.11.0

    Signed-off-by: Vedant Mahabaleshwarkar <vmahabal@redhat.com>
    VedantMahabaleshwarkar committed Oct 19, 2023
    Copy the full SHA
    50a25d2 View commit details
  9. Merge pull request #105 from VedantMahabaleshwarkar/manifests_transit…

    …ion_0.11.0
    
    [Cherry-Pick] Manifests transition 0.11.0
    openshift-ci[bot] authored Oct 19, 2023
    Copy the full SHA
    1f94094 View commit details
  10. Merge pull request #106 from VedantMahabaleshwarkar/manifests_transit…

    …ion_0.11.1
    
    [Cherry-Pick] Manifests transition 0.11.1
    openshift-ci[bot] authored Oct 19, 2023
    Copy the full SHA
    3460fa3 View commit details
  11. Merge branch 'odh-release0110' into rhods-main

    Signed-off-by: heyselbi <selbi@redhat.com>
    heyselbi committed Oct 19, 2023
    Copy the full SHA
    440f6ea View commit details
  12. Merge pull request #19 from heyselbi/rhods-main

    Manual sync of rhods/main with odh/release branch
    Jooho authored Oct 19, 2023
    Copy the full SHA
    886d520 View commit details

Commits on Oct 20, 2023

  1. [RHODS-12555] - CVE-2023-44487

    Signed-off-by: Spolti <fspolti@redhat.com>
    spolti committed Oct 20, 2023
    Copy the full SHA
    8a9a777 View commit details
  2. Copy the full SHA
    7841430 View commit details
  3. [RHODS-12555] - CVE-2023-44487

    Signed-off-by: Spolti <fspolti@redhat.com>
    spolti committed Oct 20, 2023
    Copy the full SHA
    9597084 View commit details
  4. Copy the full SHA
    cfd22e1 View commit details
  5. Copy the full SHA
    7f99bac View commit details

Commits on Oct 26, 2023

  1. Copy the full SHA
    c268129 View commit details
Showing with 100 additions and 7 deletions.
  1. +6 −0 .github/renovate.json
  2. +26 −0 .github/workflows/instant-merge.yaml
  3. +48 −0 Dockerfile.konflux
  4. +12 −0 config/base/kustomization.yaml
  5. +1 −0 config/base/params-vllm-cpu.env
  6. +7 −7 config/runtimes/vllm-cuda-template.yaml
6 changes: 6 additions & 0 deletions .github/renovate.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
"extends": [
"github>red-hat-data-services/konflux-central//renovate/default-renovate.json"
]
}
26 changes: 26 additions & 0 deletions .github/workflows/instant-merge.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
name: Instant Merge Konflux PRs

on:
pull_request:
types:
- opened
paths:
- config/base/*.env

permissions:
contents: write
pull-requests: write
checks: write
security-events: write
statuses: write

jobs:
instant-merge:
runs-on: ubuntu-latest
steps:
- name: instant-merge
if: ${{ github.event.sender.login == 'red-hat-konflux[bot]' && ( contains(github.event.pull_request.title, 'Update caikit-nlp-') || contains(github.event.pull_request.title, 'Update vllm-cuda-') || contains(github.event.pull_request.title, 'Update vllm-rocm-') || contains(github.event.pull_request.title, 'Update vllm-gaudi-') || contains(github.event.pull_request.title, 'Update vllm-cpu-') || contains(github.event.pull_request.title, 'update fms-guardrails-') ) }}
env:
GITHUB_TOKEN: ${{ github.token }}
run: |
gh pr merge --merge --admin ${{ github.event.pull_request.html_url }}
48 changes: 48 additions & 0 deletions Dockerfile.konflux
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
# Build arguments
ARG SOURCE_CODE=.

# Build the manager binary

FROM registry.access.redhat.com/ubi9/go-toolset:1.23@sha256:381fb72f087a07432520fa93364f66b5981557f1dd708f3c4692d6d0a76299b3 as builder

# These built-in args are defined in the global scope, and are not automatically accessible within build stages or RUN commands.
# To expose these arguments inside the build stage, we need to redefine it without a value.
ARG TARGETOS TARGETARCH
RUN echo "GOOS=${TARGETOS} GOARCH=${TARGETARCH}"

WORKDIR /workspace
# Copy the Go Modules manifests
COPY go.mod go.mod
COPY go.sum go.sum
# cache deps before building and copying source so that we don't need to re-download as much
# and so that source changes don't invalidate our downloaded layer
RUN go mod download

# Copy the go source
COPY cmd/main.go cmd/main.go
COPY api/ api/
COPY internal/ internal/

# Build
USER root
RUN CGO_ENABLED=1 GOOS=${TARGETOS} GOARCH=${TARGETARCH} GOEXPERIMENT=strictfipsruntime go build -tags strictfipsruntime -a -o manager cmd/main.go

FROM registry.access.redhat.com/ubi9/ubi-minimal@sha256:6d5a6576c83816edcc0da7ed62ba69df8f6ad3cbe659adde2891bfbec4dbf187 AS runtime

ARG USER=2000

LABEL com.redhat.component="odh-model-controller-container" \
name="managed-open-data-hub/odh-model-controller-rhel8" \
description="The controller removes the need for users to perform manual steps when deploying their models" \
summary="odh-model-controller" \
maintainer="['managed-open-data-hub@redhat.com']" \
io.openshift.expose-services="" \
io.k8s.display-name="odh-model-controller" \
io.k8s.description="odh-model-controller" \
com.redhat.license_terms="https://www.redhat.com/licenses/Red_Hat_Standard_EULA_20191108.pdf"

WORKDIR /
COPY --from=builder /workspace/manager .
USER ${USER}

ENTRYPOINT ["/manager"]
12 changes: 12 additions & 0 deletions config/base/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -8,6 +8,7 @@ configMapGenerator:
- envs:
- params.env
- params-cuda.env
- params-vllm-cpu.env
- params-vllm-rocm.env
- params-vllm-gaudi.env
- params-guardrails-hf-runtime.env
@@ -104,6 +105,17 @@ replacements:
name: vllm-rocm-runtime-template
fieldPaths:
- objects.0.spec.containers.0.image
- source:
kind: ConfigMap
version: v1
name: odh-model-controller-parameters
fieldPath: data.vllm-cpu-image
targets:
- select:
kind: Template
name: vllm-cpu-runtime-template
fieldPaths:
- objects.0.spec.containers.0.image
- source:
kind: ConfigMap
version: v1
1 change: 1 addition & 0 deletions config/base/params-vllm-cpu.env
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
vllm-cpu-image=quay.io/modh/vllm:rhoai-2.19-cpu
14 changes: 7 additions & 7 deletions config/runtimes/vllm-cuda-template.yaml
Original file line number Diff line number Diff line change
@@ -2,17 +2,17 @@ apiVersion: template.openshift.io/v1
kind: Template
metadata:
labels:
opendatahub.io/dashboard: 'true'
opendatahub.io/ootb: 'true'
opendatahub.io/dashboard: "true"
opendatahub.io/ootb: "true"
annotations:
description: vLLM ServingRuntime with CUDA support (for NVIDIA GPUs)
description: vLLM ServingRuntime with CUDA support (for NVIDIA GPUs)
openshift.io/display-name: vLLM NVIDIA GPU ServingRuntime for KServe
openshift.io/provider-display-name: Red Hat, Inc.
tags: rhods,rhoai,kserve,servingruntime
template.openshift.io/documentation-url: https://github.com/opendatahub-io/vllm
template.openshift.io/long-description: This template defines resources needed to deploy vLLM NVIDIA GPU ServingRuntime with KServe in Red Hat OpenShift AI
opendatahub.io/modelServingSupport: '["single"]'
opendatahub.io/apiProtocol: 'REST'
opendatahub.io/apiProtocol: "REST"
name: vllm-cuda-runtime-template
objects:
- apiVersion: serving.kserve.io/v1alpha1
@@ -24,11 +24,11 @@ objects:
opendatahub.io/recommended-accelerators: '["nvidia.com/gpu"]'
opendatahub.io/runtime-version: 'v0.9.1.0'
labels:
opendatahub.io/dashboard: 'true'
opendatahub.io/dashboard: "true"
spec:
annotations:
prometheus.io/port: '8080'
prometheus.io/path: '/metrics'
prometheus.io/port: "8080"
prometheus.io/path: "/metrics"
multiModel: false
supportedModelFormats:
- autoSelect: true