From 9660e8c029786f59ce54b56f5e2dbfb133f558ad Mon Sep 17 00:00:00 2001 From: Hemant Kumar Date: Tue, 2 Jul 2024 15:42:51 -0400 Subject: [PATCH] Add additional docs for OLM based operators --- enhancements/storage/csi-driver-operator-merge.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/enhancements/storage/csi-driver-operator-merge.md b/enhancements/storage/csi-driver-operator-merge.md index 3ec64e04c4..038a5848af 100644 --- a/enhancements/storage/csi-driver-operator-merge.md +++ b/enhancements/storage/csi-driver-operator-merge.md @@ -488,7 +488,7 @@ git subtree push --prefix legacy/azure-disk-csi-driver-operator https://github.c ### Add Dockerfiles for building images from new location -Place a `Dockerfile.` and `Dockerfile..test` at top of csi-operator tree and make sure that you are able to build an image of the operator from csi-operator repository. +Place a `Dockerfile.` at top of csi-operator tree and make sure that you are able to build an image of the operator from csi-operator repository. ### Update openshift/release to build image from new location Make a PR to openshift/release repository to build the operator from csi-operator. For example - https://github.com/openshift/release/pull/46233. @@ -514,6 +514,8 @@ azure-disk-csi-driver-operator= \ oc adm release extract --command openshift-install quay.io/jsafrane/scratch:release1 ``` +This step is only applicable for CVO based operators and not OLM based operators. For OLM based operator - either an image can be built locally and deployed using your personal index image or you can ask ART team for a scratch image when you open `ocp-build-data` PR and proceed to include that image in your personal index image. + ### Co-ordinating merges in ocp-build-data and release repository Both PRs in openshift/release and ocp-build-data must be merged +/- at the same time. There is a robot that syncs some data from ocp-build-data to openshift/release and actually breaks things when these two repos use different source repository to build images.