restructured odh manifests

.github/pull_request_template.md

@@ -3,3 +3,13 @@
 #### Modifications
 
 #### Result
+
+
+#### PR checklist
+
+Checklist items below are applicable for development targeted to both fast and stable branches/tags
+- [ ] Unit tests pass locally
+- [ ] FVT tests pass locally
+
+Checklist items below are applicable for development targeted to both fast and stable branches/tags
+- [ ] Tested modelmesh serving deployment with odh-manifests and ran odh-manifests-e2e tests locally 

.gitignore

@@ -34,3 +34,9 @@ bin
 devbuild
 .develop_image_name
 .dev/
+.cache/
+kustomize/
+.temp_new_modelmesh_manifests
+opendatahub/scripts/manifests/params.env
+opendatahub/scripts/manifests/fvt/
+opendatahub/scripts/manifests/runtimes/

Dockerfile.develop

@@ -44,8 +44,11 @@ RUN microdnf install \
     python38 \
     nodejs && \
     pip3 install pre-commit && \
-# Install go
+# Install yq 4.x
     set -eux; \
+    wget https://github.com/mikefarah/yq/releases/download/v4.33.3/yq_linux_amd64.tar.gz -O - |\
+    tar xz && mv yq_linux_amd64 /usr/local/bin/yq && \
+# Install go
     wget -qO go.tgz "https://golang.org/dl/go${GOLANG_VERSION}.linux-amd64.tar.gz"; \
 #    sha256sum *go.tgz; \
     tar -C /usr/local -xzf go.tgz; \

Makefile

@@ -164,26 +164,80 @@ check-doc-links:
 # Override targets if they are included in RUN_ARGs so it doesn't run them twice
 $(eval $(RUN_ARGS):;@:)
 
+
+before-pr: fmt test 
+	./opendatahub/scripts/gen_odh_model_manifests.sh
+	./opendatahub/scripts/gen_odh_modelmesh_manifests.sh
+
+repeat-fvt:
+	./opendatahub/scripts/repeat_fvt.sh ${NAMESPACE} ${CONTROLLERNAMESPACE} ${NAMESPACESCOPEMODE}
+
 # Openshift CI
+## Upstream
+## This deploy modelmesh using manifests in config folder
 deploy-release-dev-mode-fvt:		
 ifdef MODELMESH_SERVING_IMAGE
 	./scripts/install.sh --namespace ${NAMESPACE} --install-config-path config --dev-mode-logging --fvt --modelmesh-serving-image ${MODELMESH_SERVING_IMAGE}
 else
 	./scripts/install.sh --namespace ${NAMESPACE} --install-config-path config --dev-mode-logging --fvt
 endif
 
-# Pre-downloadin required images.
+# Pre-download required images.
 download-images:
 	oc project ${NAMESPACE} || oc new-project ${NAMESPACE} 
 	./scripts/download-images-on-nodes.sh
 
 # This must use modelmesh-serving namespace because fvt has hardcoded namspace. globals.go
 # usage: NAMESPACE=modelmesh-serving make e2e-test
-e2e-test: download-images deploy-release-dev-mode-fvt fvt
+e2e-test: download-images deploy-release-dev-mode-fvt repeat-fvt
 
 # usage: NAMESPACE=modelmesh-serving make e2e-delete
 e2e-delete: delete
 	oc delete ns ${NAMESPACE}
 
+## ODH
+## This deploy modelmesh using manifests in opendatahub/odh-manifests folder
+deploy-fvt-for-odh:
+ifdef CUSTOM_IMG
+	$(eval extra_options += --image ${CUSTOM_IMG}) 
+endif
+ifdef FORCE
+	$(eval extra_options += --force) 
+endif
+ifdef TAG
+	$(eval extra_options += --tag ${TAG}) 
+endif
+ifdef CONTROLLERNAMESPACE
+	$(eval extra_options += --ctrl-namespace ${CONTROLLERNAMESPACE}) 
+endif
+	./opendatahub/scripts/deploy_fvt.sh --namespace ${NAMESPACE} ${extra_options}
+
+deploy-mm-for-odh:
+ifdef CUSTOM_IMG
+	$(eval deploy_mm_extra_options += --image ${CUSTOM_IMG}) 
+endif
+ifdef TAG
+	$(eval deploy_mm_extra_options += --tag ${TAG}) 
+endif
+ifdef USER
+	$(eval deploy_mm_extra_options += --user ${USER}) 
+endif
+ifdef BRANCH
+	$(eval deploy_mm_extra_options += --branch ${BRANCH}) 
+endif
+ifdef OP_KFDEF
+	$(eval deploy_mm_extra_options += --operator) 
+endif
+ifdef CONTROLLERNAMESPACE
+	$(eval deploy_mm_extra_options += --ctrl-namespace ${CONTROLLERNAMESPACE}) 
+endif
+	./opendatahub/scripts/install_odh.sh ${deploy_mm_extra_options}
+
+# usage: TAG=fast/stable make e2e-test-for-odh
+e2e-test-for-odh: deploy-mm-for-odh deploy-fvt-for-odh repeat-fvt
+
+cleanup-for-odh:
+	./opendatahub/scripts/cleanup.sh
+
 # Remove $(MAKECMDGOALS) if you don't intend make to just be a taskrunner
 .PHONY: all generate manifests check-doc-links fmt fvt controller-gen oc-login deploy-release build.develop $(MAKECMDGOALS)

OWNERS

@@ -1,9 +1,12 @@
 approvers:
-  - anishasthana
+  - heyselbi
+  - israel-hdez
   - Jooho
+  - VedantMahabaleshwarkar
+  - Xaenalt
 reviewers:
-  - anishasthana
   - heyselbi
+  - israel-hdez
   - Jooho
-  - Xaenalt
   - VedantMahabaleshwarkar
+  - Xaenalt

config/dependencies/fvt.yaml

@@ -51,7 +51,7 @@ spec:
             - /tmp/etcd.data
           # image: quay.io/coreos/etcd:v3.5.4
           # Tag -> registry.access.redhat.com/rhel7/etcd:3.2.32-34
-          image: registry.access.redhat.com/rhel7/etcd@sha256:0d391b2f91a72d0a1f0ac7d5b0fe97698b2c5a4b3fb3e47c596521349e39c58f
+          image: registry.redhat.io/rhel7/etcd@sha256:d3495b263b103681f1b09a558be43c21989bfc269eb90f84c2609042cebdc626
           name: etcd
           ports:
             - containerPort: 2379