Create ODH v1.11.0 release (#686)

Dockerfile

@@ -17,12 +17,13 @@ COPY main.go main.go
 COPY apis/ apis/
 COPY controllers/ controllers/
 COPY pkg/ pkg/
+COPY odh-manifests/ odh-manifests/
 # Build
 RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -a -o manager main.go
 
 # Get all manifests from remote git repo to builder_local_false by script
-COPY get_all_manifests.sh get_all_manifests.sh
-RUN ./get_all_manifests.sh
+#COPY get_all_manifests.sh get_all_manifests.sh
+#RUN ./get_all_manifests.sh
 RUN tar -czvf odh-manifests.tar.gz odh-manifests
 
 ################################################################################

bundle/manifests/opendatahub-operator.clusterserviceversion.yaml

@@ -82,21 +82,6 @@ metadata:
                 },
                 "name": "model-mesh"
               },
-              {
-                "kustomizeConfig": {
-                  "parameters": [
-                    {
-                      "name": "deployment-namespace",
-                      "value": "opendatahub"
-                    }
-                  ],
-                  "repoRef": {
-                    "name": "manifests",
-                    "path": "modelmesh-monitoring"
-                  }
-                },
-                "name": "modelmesh-monitoring"
-              },
               {
                 "kustomizeConfig": {
                   "repoRef": {
@@ -208,15 +193,15 @@ metadata:
     capabilities: Deep Insights
     categories: AI/Machine Learning, Big Data
     certified: "False"
-    containerImage: quay.io/opendatahub/opendatahub-operator:v1.10.1
-    createdAt: "2023-10-09T00:00:00Z"
+    containerImage: quay.io/opendatahub/opendatahub-operator:v1.11.0
+    createdAt: "2023-10-31T00:00:00Z"
     description: Open Data Hub Operator for deployment and management of Open Data
       Hub
     operators.operatorframework.io/builder: operator-sdk-v1.24.1
     operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
     repository: https://github.com/opendatahub-io/opendatahub-operator
     support: Open Data Hub
-  name: opendatahub-operator.v1.10.1
+  name: opendatahub-operator.v1.11.0
   namespace: placeholder
 spec:
   apiservicedefinitions: {}
@@ -342,7 +327,7 @@ spec:
                 - --leader-elect
                 command:
                 - /manager
-                image: quay.io/opendatahub/opendatahub-operator:v1.10.1
+                image: quay.io/opendatahub/opendatahub-operator:v1.11.0
                 imagePullPolicy: Always
                 livenessProbe:
                   httpGet:
@@ -428,8 +413,8 @@ spec:
   minKubeVersion: 1.22.0
   provider:
     name: Open Data Hub
-  replaces: opendatahub-operator.v1.10.0
+  replaces: opendatahub-operator.v1.10.1
   selector:
     matchLabels:
       component: opendatahub-operator
-  version: 1.10.1
+  version: 1.11.0

get_all_manifests.sh

@@ -4,11 +4,14 @@ set -e
 # component: dsp, kserve, dashbaord, cf/ray. in the format of "repo-name:branch-name:source-folder:target-folder"
 # TODO: workbench, modelmesh, monitoring, etc
 REPO_LIST=(
-    "data-science-pipelines-operator:v1.4.0:config:data-science-pipelines-operator"
-    "odh-dashboard:v2.15.0-incubation-fixes:manifests:odh-dashboard"
-    "notebooks:v1.10.1:manifests:notebook-images"
-    "kubeflow:v1.7.0-3:components/notebook-controller/config:odh-notebook-controller/kf-notebook-controller"
-    "kubeflow:v1.7.0-3:components/odh-notebook-controller/config:odh-notebook-controller/odh-notebook-controller"
+    "data-science-pipelines-operator:v1.6.0:config:data-science-pipelines-operator"
+    "odh-dashboard:v2.17.0-incubation:manifests:odh-dashboard"
+    "notebooks:v1.12.0:manifests:notebook-images"
+    "trustyai-service-operator:v1.11.1:config:trustyai-service-operator"
+    "kubeflow:v1.7.0-5:components/notebook-controller/config:odh-notebook-controller/kf-notebook-controller"
+    "kubeflow:v1.7.0-5:components/odh-notebook-controller/config:odh-notebook-controller/odh-notebook-controller"
+    "odh-model-controller:v0.11.1.0:config:model-mesh/odh-model-controller"
+    "modelmesh-serving:v0.11.1.0:config:model-mesh/modelmesh"
 )
 
 # pre-cleanup local env
@@ -18,19 +21,16 @@ GITHUB_URL="https://github.com/"
 # update to use different git repo
 MANIFEST_ORG="opendatahub-io"
 
-MANIFEST_RELEASE="v1.10.0"
+MANIFEST_RELEASE="master"
 MANIFESTS_TARBALL_URL="${GITHUB_URL}/${MANIFEST_ORG}/odh-manifests/tarball/${MANIFEST_RELEASE}"
 mkdir -p ./.odh-manifests-tmp/ ./odh-manifests/
 wget -q -c ${MANIFESTS_TARBALL_URL} -O - | tar -zxv -C ./.odh-manifests-tmp/ --strip-components 1 > /dev/null
-cp -r ./.odh-manifests-tmp/model-mesh/ ./odh-manifests
-cp -r ./.odh-manifests-tmp/odh-model-controller/ ./odh-manifests
-cp -r ./.odh-manifests-tmp/modelmesh-monitoring/ ./odh-manifests
 cp -r ./.odh-manifests-tmp/prometheus ./odh-manifests
-cp -r ./.odh-manifests-tmp/trustyai-service-operator ./odh-manifests
 cp -r ./.odh-manifests-tmp/odh-common ./odh-manifests
-# This is required, so that base dir under odh-notebook-controller. Overlays are not working with KfDef
+# This is required, adding base dir under components. Overlays are not working with KfDef
 mkdir -p ./odh-manifests/odh-notebook-controller/base
 cp -r ./.odh-manifests-tmp/odh-notebook-controller/base/ ./odh-manifests/odh-notebook-controller
+cp -r ./pkg/manifests/model-mesh/ ./odh-manifests/model-mesh
 rm -rf ${MANIFEST_RELEASE}.tar.gz ./.odh-manifests-tmp/
 
 for repo_info in ${REPO_LIST[@]}; do
@@ -39,7 +39,14 @@ for repo_info in ${REPO_LIST[@]}; do
     repo_branch=$( echo $repo_info | cut -d ":" -f 2 )
     source_path=$( echo $repo_info | cut -d ":" -f 3 )
     target_path=$( echo $repo_info | cut -d ":" -f 4 )
-    repo_url="${GITHUB_URL}/${MANIFEST_ORG}/${repo_name}.git"
+
+    if [ ${repo_name} == "trustyai-service-operator" ]
+    then
+       repo_url="${GITHUB_URL}/trustyai-explainability/${repo_name}.git"
+    else
+       repo_url="${GITHUB_URL}/${MANIFEST_ORG}/${repo_name}.git"
+    fi
+
     rm -rf ./.${repo_name}
     git clone --depth 1 --branch ${repo_branch} ${repo_url} ./.${repo_name}
     mkdir -p ./odh-manifests/${target_path}

odh-manifests/data-science-pipelines-operator/base/kustomization.yaml

@@ -0,0 +1,117 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+namespace: odh-applications
+namePrefix: data-science-pipelines-operator-
+resources:
+  - ../crd
+  - ../rbac
+  - ../manager
+  - ../prometheus
+  - ../configmaps
+
+# Parameterize images via KfDef in ODH
+configMapGenerator:
+  - name: dspo-parameters
+    envs:
+      - params.env
+vars:
+  - name: IMAGES_APISERVER
+    objref:
+      kind: ConfigMap
+      name: dspo-parameters
+      apiVersion: v1
+    fieldref:
+      fieldpath: data.IMAGES_APISERVER
+  - name: IMAGES_ARTIFACT
+    objref:
+      kind: ConfigMap
+      name: dspo-parameters
+      apiVersion: v1
+    fieldref:
+      fieldpath: data.IMAGES_ARTIFACT
+  - name: IMAGES_OAUTHPROXY
+    objref:
+      kind: ConfigMap
+      name: dspo-parameters
+      apiVersion: v1
+    fieldref:
+      fieldpath: data.IMAGES_OAUTHPROXY
+  - name: IMAGES_PERSISTENTAGENT
+    objref:
+      kind: ConfigMap
+      name: dspo-parameters
+      apiVersion: v1
+    fieldref:
+      fieldpath: data.IMAGES_PERSISTENTAGENT
+  - name: IMAGES_SCHEDULEDWORKFLOW
+    objref:
+      kind: ConfigMap
+      name: dspo-parameters
+      apiVersion: v1
+    fieldref:
+      fieldpath: data.IMAGES_SCHEDULEDWORKFLOW
+  - name: IMAGES_CACHE
+    objref:
+      kind: ConfigMap
+      name: dspo-parameters
+      apiVersion: v1
+    fieldref:
+      fieldpath: data.IMAGES_CACHE
+  - name: IMAGES_MOVERESULTSIMAGE
+    objref:
+      kind: ConfigMap
+      name: dspo-parameters
+      apiVersion: v1
+    fieldref:
+      fieldpath: data.IMAGES_MOVERESULTSIMAGE
+  - name: IMAGES_MARIADB
+    objref:
+      kind: ConfigMap
+      name: dspo-parameters
+      apiVersion: v1
+    fieldref:
+      fieldpath: data.IMAGES_MARIADB
+  - name: IMAGES_MLMDENVOY
+    objref:
+      kind: ConfigMap
+      name: dspo-parameters
+      apiVersion: v1
+    fieldref:
+      fieldpath: data.IMAGES_MLMDENVOY
+  - name: IMAGES_MLMDGRPC
+    objref:
+      kind: ConfigMap
+      name: dspo-parameters
+      apiVersion: v1
+    fieldref:
+      fieldpath: data.IMAGES_MLMDGRPC
+  - name: IMAGES_MLMDWRITER
+    objref:
+      kind: ConfigMap
+      name: dspo-parameters
+      apiVersion: v1
+    fieldref:
+      fieldpath: data.IMAGES_MLMDWRITER
+  - name: IMAGES_DSPO
+    objref:
+      kind: ConfigMap
+      name: dspo-parameters
+      apiVersion: v1
+    fieldref:
+      fieldpath: data.IMAGES_DSPO
+  - name: ZAP_LOG_LEVEL
+    objref:
+      kind: ConfigMap
+      name: dspo-parameters
+      apiVersion: v1
+    fieldref:
+      fieldpath: data.ZAP_LOG_LEVEL
+  - name: MAX_CONCURRENT_RECONCILES
+    objref:
+      kind: ConfigMap
+      name: dspo-parameters
+      apiVersion: v1
+    fieldref:
+      fieldpath: data.MAX_CONCURRENT_RECONCILES
+configurations:
+  - params.yaml

odh-manifests/data-science-pipelines-operator/base/params.env

@@ -0,0 +1,14 @@
+IMAGES_APISERVER=quay.io/opendatahub/ds-pipelines-api-server@sha256:274e638eb22a1b38fe139a02bdb2395d6e706cb8a361b415db62d5b9ab964611
+IMAGES_ARTIFACT=quay.io/opendatahub/ds-pipelines-artifact-manager@sha256:db16085f67fd817088e7f6f592cf1b9c1558c56e0855303b3adea0b2fa18455f
+IMAGES_PERSISTENTAGENT=quay.io/opendatahub/ds-pipelines-persistenceagent@sha256:bc01f219f1109693f878352b9d6685027222c77c502866902e106351e5de73ca
+IMAGES_SCHEDULEDWORKFLOW=quay.io/opendatahub/ds-pipelines-scheduledworkflow@sha256:b52880e6a681e0e506016f5b00d2c0e62fb55c2a8d6405d2034d4a92a3264bd0
+IMAGES_MLMDENVOY=quay.io/opendatahub/ds-pipelines-metadata-envoy@sha256:c491e63c8885c7d59005f9305b77cd1fa776b50e63db90c4f8ccdee963759630
+IMAGES_MLMDGRPC=quay.io/opendatahub/ds-pipelines-metadata-grpc@sha256:4af88c246d77cce33099489090508734978aafa83a0a5745408ae8d139d5378a
+IMAGES_MLMDWRITER=quay.io/opendatahub/ds-pipelines-metadata-writer@sha256:3c1a8ecdb7d019da786b5c534bb55565bad9b26ffbcb02e76137b9c9c67f3d67
+IMAGES_DSPO=quay.io/opendatahub/data-science-pipelines-operator@sha256:ba445b27a158e382d4746c26deb6510c668baf90d4ef81018bc3225c4feaa4b1
+IMAGES_CACHE=registry.access.redhat.com/ubi8/ubi-minimal@sha256:a49924d9d685a35b2d0817ffe9c84f3429d97e9ad29ed3816c389f45564c9e19
+IMAGES_MOVERESULTSIMAGE=registry.access.redhat.com/ubi8/ubi-micro@sha256:396baed3d689157d96aa7d8988fdfea7eb36684c8335eb391cf1952573e689c1
+IMAGES_MARIADB=registry.redhat.io/rhel8/mariadb-103@sha256:2370ca7fd91c0d35910006c8ba40bb9651244b2a42050cb9b2dd9d5163155e15
+IMAGES_OAUTHPROXY=registry.redhat.io/openshift4/ose-oauth-proxy@sha256:ab112105ac37352a2a4916a39d6736f5db6ab4c29bad4467de8d613e80e9bb33
+ZAP_LOG_LEVEL=info
+MAX_CONCURRENT_RECONCILES=10

odh-manifests/data-science-pipelines-operator/base/params.yaml

@@ -0,0 +1,7 @@
+varReference:
+- path: data
+  kind: ConfigMap
+- path: spec/template/spec/containers/env/value
+  kind: Deployment
+- path: spec/template/spec/containers/image
+  kind: Deployment

odh-manifests/data-science-pipelines-operator/configmaps/files/config.yaml

@@ -0,0 +1,12 @@
+Images:
+  ApiServer: $(IMAGES_APISERVER)
+  Artifact: $(IMAGES_ARTIFACT)
+  OAuthProxy: $(IMAGES_OAUTHPROXY)
+  PersistentAgent: $(IMAGES_PERSISTENTAGENT)
+  ScheduledWorkflow: $(IMAGES_SCHEDULEDWORKFLOW)
+  Cache: $(IMAGES_CACHE)
+  MoveResultsImage: $(IMAGES_MOVERESULTSIMAGE)
+  MariaDB: $(IMAGES_MARIADB)
+  MlmdEnvoy: $(IMAGES_MLMDENVOY)
+  MlmdGRPC: $(IMAGES_MLMDGRPC)
+  MlmdWriter: $(IMAGES_MLMDWRITER)

odh-manifests/data-science-pipelines-operator/configmaps/kustomization.yaml

@@ -0,0 +1,6 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+configMapGenerator:
+  - name: dspo-config
+    files:
+      - files/config.yaml