This repository holds Openshift's fork of
knative/serving
with additions and
fixes needed only for the OpenShift side of things.
The default branch holds up-to-date specific openshift files that are necessary for CI setups and maintaining it. This includes:
- Scripts to create a new release branch from
upstream
- CI setup files
- operator configuration (for Openshift's CI setup)
- tests scripts
- Operator's base configurations
Each release branch holds the upstream code for that release and our openshift's specific files.
For the CI setup, two repositories are of importance:
- This repository
- openshift/release which contains the configuration of CI jobs that are run on this repository
All of the following is based on OpenShift’s CI operator configs. General understanding of that mechanism is assumed in the following documentation.
The job manifests for the CI jobs are generated automatically. The basic configuration lives in the /ci-operator/config/openshift/knative-serving folder of the openshift/release repository. These files include which version to build against (OCP 4.0 for our recent cases), which images to build (this includes all the images needed to run Knative and also all the images required for running e2e tests) and which command to execute for the CI jobs to run (more on this later).
Before we can create the ci-operator configs mentioned above, we need to make sure there are Dockerfiles for all images that we need (they’ll be referenced by the ci-operator config hence we need to create them first). The generate-dockerfiles.sh script takes care of creating all the Dockerfiles needed automatically. The files now need to be committed to the branch that CI is being setup for.
The basic ci-operator configs mentioned above are generated via the generate-release.sh file in the openshift/knative-serving repository. They are generated to alleviate the burden of having to add all possible test images to the manifest manually, which is error prone.
Once the file is generated, it must be committed to the
openshift/release repository, as the other manifests linked above. The
naming schema is openshift-knative-serving-BRANCH.yaml
, thus the
files existing already correspond to our existing releases and the
default branch itself.
After the file has been added to the folder as mentioned above, the job manifests itself will need to be generated as is described in the corresponding ci-operator documentation.
Once all of this is done (Dockerfiles committed, ci-operator config created and job manifests generated) a PR must be opened against openshift/release to include all the ci-operator related files. Once this PR is merged, the CI setup for that branch is active.
- Tagged images on quay.io
- An OLM manifest referencing these images
- Install documentation
- Create a release branch from the upstream’s release tag, i.e. release-v0.5.0. This is created in the fork that we maintain of upstream. See our branching instructions for deeper information.
- Create a CI job for that branch in openshift/release. See our CI setup instructions for deeper information.
- Do whatever you need to do to make this CI pass
- Create a “dummy” PR with a ci file, which contains the current output of “date”. This is to trigger CI explicitly.
- Make sure that PR is green and merge it. This will trigger the images to become available on the CI registry.
- Make sure the images for the release are built and “promoted”. This can be verified by “docker pull”ing them, for example: “docker pull registry.svc.ci.openshift.org/openshift/knative-v0.5.0:knative-serving-controller”
- If that’s the case, create/amend an image mirroring mapping file as described here.
- Copy the upstream release manifest to the operator’s deploy/resources directory. All files in this directory will be applied, so remove any old ones.
- Update the manifest[s] to replace gcr.io images with quay.io images.
- Build/test the operator
- Commit the source
export VERSION="vX.Y.Z" # replace X.Y.Z as appropriate
6..operator-sdk build --docker-build-args "--build-arg version=$VERSION" quay.io/openshift-knative/$OPERATOR_NAME:$VERSION
docker push quay.io/openshift-knative/$OPERATOR_NAME:$VERSION
git tag $VERSION; git push --tags
- The following instructions amount to mirroring upstream changes in the OLM manifests beneath openshift/olm in our forks.
- Create a new
*.clusterserviceversion.yaml
for the upstream release. It’s easiest to copy the previous release’s CSV to a new file and update the name, version, and replaces fields, as well as the version of the operator’s image. - Ensure the upstream release’s RBAC policies match what’s in the CSV. Any upstream edits should be carried over.
- Mirror any upstream manifest changes to CRD’s in the corresponding
*.crd.yaml
file. - Update the currentCSV field in the
*.package.yaml
file. - Regenerate the
*.catalogsource.yaml
file using thecatalog.sh
script. For example,
DIR=openshift/olm \
~/src/knative-operators/etc/scripts/catalog.sh \
> openshift/olm/knative-serving.catalogsource.yaml