Merge pull request #15900 from Peterk04/onboard-workload-variant-scaler

onboard odh-workload-variant-autoscaler-controller-rhel9 to rhoai-3.4

Author: alexxfan

.tekton/images-mirror-set.yaml

@@ -478,4 +478,7 @@ spec:
     source: registry.redhat.io/rhoai/odh-spark-operator-rhel9
   - mirrors:
     - quay.io/rhoai/odh-cli-rhel9
-    source: registry.redhat.io/rhoai/odh-cli-rhel9
+    source: registry.redhat.io/rhoai/odh-cli-rhel9
+  - mirrors:
+    - quay.io/rhoai/odh-workload-variant-autoscaler-controller-rhel9
+    source: registry.redhat.io/rhoai/odh-workload-variant-autoscaler-controller-rhel9

bundle/Dockerfile

@@ -158,6 +158,8 @@ ARG ODH_WORKBENCH_JUPYTER_TENSORFLOW_ROCM_PY312_GIT_URL=
 ARG ODH_WORKBENCH_JUPYTER_TENSORFLOW_ROCM_PY312_GIT_COMMIT=
 ARG ODH_WORKBENCH_JUPYTER_TRUSTYAI_CPU_PY312_GIT_URL=
 ARG ODH_WORKBENCH_JUPYTER_TRUSTYAI_CPU_PY312_GIT_COMMIT=
+ARG ODH_WORKLOAD_VARIANT_AUTOSCALER_CONTROLLER_GIT_URL=
+ARG ODH_WORKLOAD_VARIANT_AUTOSCALER_CONTROLLER_GIT_COMMIT=
 ARG OSE_KUBE_RBAC_PROXY_GIT_URL=
 ARG OSE_KUBE_RBAC_PROXY_GIT_COMMIT=
 ARG ODH_TRUSTYAI_GARAK_LLS_PROVIDER_DSP_GIT_URL=
@@ -341,6 +343,8 @@ LABEL \
       odh-workbench-jupyter-tensorflow-rocm-py312.git.commit="${ODH_WORKBENCH_JUPYTER_TENSORFLOW_ROCM_PY312_GIT_COMMIT}" \
       odh-workbench-jupyter-trustyai-cpu-py312.git.url="${ODH_WORKBENCH_JUPYTER_TRUSTYAI_CPU_PY312_GIT_URL}" \
       odh-workbench-jupyter-trustyai-cpu-py312.git.commit="${ODH_WORKBENCH_JUPYTER_TRUSTYAI_CPU_PY312_GIT_COMMIT}" \
+      odh-workload-variant-autoscaler-controller.git.url="${ODH_WORKLOAD_VARIANT_AUTOSCALER_CONTROLLER_GIT_URL}" \
+      odh-workload-variant-autoscaler-controller.git.commit="${ODH_WORKLOAD_VARIANT_AUTOSCALER_CONTROLLER_GIT_COMMIT}" \
       ose-kube-rbac-proxy.git.url="${OSE_KUBE_RBAC_PROXY_GIT_URL}" \
       ose-kube-rbac-proxy.git.commit="${OSE_KUBE_RBAC_PROXY_GIT_COMMIT}" \
       odh-trustyai-garak-lls-provider-dsp.git.url="${ODH_TRUSTYAI_GARAK_LLS_PROVIDER_DSP_GIT_URL}" \

bundle/bundle-patch.yaml

@@ -169,6 +169,8 @@ patch:
       value: "quay.io/rhoai/odh-spark-operator-rhel9@sha256:7c80c40210f8c8e2f7b3a5f0c7e4b1e2d3f4a5b6c7d8e9f0a1b2c3d4e5f6a7b8"
     - name: RELATED_IMAGE_ODH_CLI_IMAGE
       value: "quay.io/rhoai/odh-cli-rhel9@sha256:48251462258815e02b33615945db76fbdf798e3075ba6274435b99b97b60cf0d"
+    - name: RELATED_IMAGE_ODH_WORKLOAD_VARIANT_AUTOSCALER_CONTROLLER_IMAGE
+      value: "quay.io/rhoai/odh-workload-variant-autoscaler-controller-rhel9@sha256:8a259703397ebf746ed2e6169dd5f81db0883f1856d2868cdb58b6133b9d16a5"
 
   additional-related-images:
     file: additional-images-patch.yaml

catalog/v4.19/Dockerfile

@@ -164,6 +164,8 @@ ARG ODH_WORKBENCH_JUPYTER_TENSORFLOW_ROCM_PY312_GIT_URL=
 ARG ODH_WORKBENCH_JUPYTER_TENSORFLOW_ROCM_PY312_GIT_COMMIT=
 ARG ODH_WORKBENCH_JUPYTER_TRUSTYAI_CPU_PY312_GIT_URL=
 ARG ODH_WORKBENCH_JUPYTER_TRUSTYAI_CPU_PY312_GIT_COMMIT=
+ARG ODH_WORKLOAD_VARIANT_AUTOSCALER_CONTROLLER_GIT_URL=
+ARG ODH_WORKLOAD_VARIANT_AUTOSCALER_CONTROLLER_GIT_COMMIT=
 ARG OSE_KUBE_RBAC_PROXY_GIT_URL=
 ARG OSE_KUBE_RBAC_PROXY_GIT_COMMIT=
 ARG ODH_TRUSTYAI_GARAK_LLS_PROVIDER_DSP_GIT_URL=
@@ -348,6 +350,8 @@ LABEL \
       odh-workbench-jupyter-tensorflow-rocm-py312.git.commit="${ODH_WORKBENCH_JUPYTER_TENSORFLOW_ROCM_PY312_GIT_COMMIT}" \
       odh-workbench-jupyter-trustyai-cpu-py312.git.url="${ODH_WORKBENCH_JUPYTER_TRUSTYAI_CPU_PY312_GIT_URL}" \
       odh-workbench-jupyter-trustyai-cpu-py312.git.commit="${ODH_WORKBENCH_JUPYTER_TRUSTYAI_CPU_PY312_GIT_COMMIT}" \
+      odh-workload-variant-autoscaler-controller.git.url="${ODH_WORKLOAD_VARIANT_AUTOSCALER_CONTROLLER_GIT_URL}" \
+      odh-workload-variant-autoscaler-controller.git.commit="${ODH_WORKLOAD_VARIANT_AUTOSCALER_CONTROLLER_GIT_COMMIT}" \
       ose-kube-rbac-proxy.git.url="${OSE_KUBE_RBAC_PROXY_GIT_URL}" \
       ose-kube-rbac-proxy.git.commit="${OSE_KUBE_RBAC_PROXY_GIT_COMMIT}" \
       odh-trustyai-garak-lls-provider-dsp.git.url="${ODH_TRUSTYAI_GARAK_LLS_PROVIDER_DSP_GIT_URL}" \

catalog/v4.20/Dockerfile

@@ -164,6 +164,8 @@ ARG ODH_WORKBENCH_JUPYTER_TENSORFLOW_ROCM_PY312_GIT_URL=
 ARG ODH_WORKBENCH_JUPYTER_TENSORFLOW_ROCM_PY312_GIT_COMMIT=
 ARG ODH_WORKBENCH_JUPYTER_TRUSTYAI_CPU_PY312_GIT_URL=
 ARG ODH_WORKBENCH_JUPYTER_TRUSTYAI_CPU_PY312_GIT_COMMIT=
+ARG ODH_WORKLOAD_VARIANT_AUTOSCALER_CONTROLLER_GIT_URL=
+ARG ODH_WORKLOAD_VARIANT_AUTOSCALER_CONTROLLER_GIT_COMMIT=
 ARG OSE_KUBE_RBAC_PROXY_GIT_URL=
 ARG OSE_KUBE_RBAC_PROXY_GIT_COMMIT=
 ARG ODH_TRUSTYAI_GARAK_LLS_PROVIDER_DSP_GIT_URL=
@@ -349,6 +351,8 @@ LABEL \
       odh-workbench-jupyter-tensorflow-rocm-py312.git.commit="${ODH_WORKBENCH_JUPYTER_TENSORFLOW_ROCM_PY312_GIT_COMMIT}" \
       odh-workbench-jupyter-trustyai-cpu-py312.git.url="${ODH_WORKBENCH_JUPYTER_TRUSTYAI_CPU_PY312_GIT_URL}" \
       odh-workbench-jupyter-trustyai-cpu-py312.git.commit="${ODH_WORKBENCH_JUPYTER_TRUSTYAI_CPU_PY312_GIT_COMMIT}" \
+      odh-workload-variant-autoscaler-controller.git.url="${ODH_WORKLOAD_VARIANT_AUTOSCALER_CONTROLLER_GIT_URL}" \
+      odh-workload-variant-autoscaler-controller.git.commit="${ODH_WORKLOAD_VARIANT_AUTOSCALER_CONTROLLER_GIT_COMMIT}" \
       ose-kube-rbac-proxy.git.url="${OSE_KUBE_RBAC_PROXY_GIT_URL}" \
       ose-kube-rbac-proxy.git.commit="${OSE_KUBE_RBAC_PROXY_GIT_COMMIT}" \
       odh-trustyai-garak-lls-provider-dsp.git.url="${ODH_TRUSTYAI_GARAK_LLS_PROVIDER_DSP_GIT_URL}" \

catalog/v4.21/Dockerfile

@@ -164,6 +164,8 @@ ARG ODH_WORKBENCH_JUPYTER_TENSORFLOW_ROCM_PY312_GIT_URL=
 ARG ODH_WORKBENCH_JUPYTER_TENSORFLOW_ROCM_PY312_GIT_COMMIT=
 ARG ODH_WORKBENCH_JUPYTER_TRUSTYAI_CPU_PY312_GIT_URL=
 ARG ODH_WORKBENCH_JUPYTER_TRUSTYAI_CPU_PY312_GIT_COMMIT=
+ARG ODH_WORKLOAD_VARIANT_AUTOSCALER_CONTROLLER_GIT_URL=
+ARG ODH_WORKLOAD_VARIANT_AUTOSCALER_CONTROLLER_GIT_COMMIT=
 ARG OSE_KUBE_RBAC_PROXY_GIT_URL=
 ARG OSE_KUBE_RBAC_PROXY_GIT_COMMIT=
 ARG ODH_TRUSTYAI_GARAK_LLS_PROVIDER_DSP_GIT_URL=
@@ -349,6 +351,8 @@ LABEL \
       odh-workbench-jupyter-tensorflow-rocm-py312.git.commit="${ODH_WORKBENCH_JUPYTER_TENSORFLOW_ROCM_PY312_GIT_COMMIT}" \
       odh-workbench-jupyter-trustyai-cpu-py312.git.url="${ODH_WORKBENCH_JUPYTER_TRUSTYAI_CPU_PY312_GIT_URL}" \
       odh-workbench-jupyter-trustyai-cpu-py312.git.commit="${ODH_WORKBENCH_JUPYTER_TRUSTYAI_CPU_PY312_GIT_COMMIT}" \
+      odh-workload-variant-autoscaler-controller.git.url="${ODH_WORKLOAD_VARIANT_AUTOSCALER_CONTROLLER_GIT_URL}" \
+      odh-workload-variant-autoscaler-controller.git.commit="${ODH_WORKLOAD_VARIANT_AUTOSCALER_CONTROLLER_GIT_COMMIT}" \
       ose-kube-rbac-proxy.git.url="${OSE_KUBE_RBAC_PROXY_GIT_URL}" \
       ose-kube-rbac-proxy.git.commit="${OSE_KUBE_RBAC_PROXY_GIT_COMMIT}" \
       odh-trustyai-garak-lls-provider-dsp.git.url="${ODH_TRUSTYAI_GARAK_LLS_PROVIDER_DSP_GIT_URL}" \

config/build-config.yaml

@@ -86,6 +86,7 @@ config:
         rhoai/odh-eval-hub-rhel9: rhoai/odh-eval-hub-rhel9
         rhoai/odh-spark-operator-rhel9: rhoai/odh-spark-operator-rhel9
         rhoai/odh-cli-rhel9: rhoai/odh-cli-rhel9
+        rhoai/odh-workload-variant-autoscaler-controller-rhel9: rhoai/odh-workload-variant-autoscaler-controller-rhel9
   supported-ocp-versions:
     build:
       - name: v4.19