Ossm merge #112
Ossm merge #112
Conversation
* Bumps opm version * Creates tasks to load olm needed images to Kind for local testing * Uses custom catalog Dockerfile [catalog] Custom Dockerfile for building catalog * In order to use instead of autogenerated index.Dockerfile * To mitigate operator-framework/operator-registry#619 [gh] Using custom catalog.Dockerfile to build catalog images [gh] Adding platforms for building images [makefile] Adding platform param in custom docker build command
| @@ -186,7 +186,7 @@ act: $(ACT) ## Download act locally if necessary. | |||
|
|
|||
| .PHONY: manifests | |||
| manifests: controller-gen ## Generate WebhookConfiguration, ClusterRole and CustomResourceDefinition objects. | |||
| $(CONTROLLER_GEN) rbac:roleName=manager-role crd webhook paths="./..." output:crd:artifacts:config=config/crd/bases | |||
| $(CONTROLLER_GEN) rbac:roleName=manager-role crd webhook paths="./api/v1beta1" output:crd:artifacts:config=config/crd/bases | |||
There was a problem hiding this comment.
It's because of the external API defs now hosted in our code base. We don't want them in the output generated manifests.
.github/workflows/build-images.yaml
Outdated
| @@ -69,6 +69,9 @@ jobs: | |||
| - name: Run make bundle | |||
| if: ${{ github.ref_name != env.MAIN_BRANCH_NAME }} | |||
| run: make bundle REGISTRY=${{ env.IMG_REGISTRY_HOST }} ORG=${{ env.IMG_REGISTRY_ORG }} IMAGE_TAG=${{ github.ref_name }} | |||
| - name: Run make bundle (main) | |||
There was a problem hiding this comment.
I think that's the only thing left unaddressed… Am not sure where this whole IMAGE_TAG=latest VERSION=0.0.0 thing is coming from or what it addresses, @didierofrivia Can you shed some light?
There was a problem hiding this comment.
I think I got this.
The key is the conditional if.
if: ${{ github.ref_name != env.MAIN_BRANCH_NAME }}-> The bundle will reference kuadrant operatorgithub.ref_nameif: ${{ github.ref_name == env.MAIN_BRANCH_NAME }}-> The bundle will reference kuadrant operatorlatest(instead ofmain). BTW bothlatestandmainare created and pushed to quay.
For me, specifying the VERSION here is useless, as the default value will be 0.0.0. I think this is just to make sure latest bundle has always ''0.0.0` version, no matter what is specified in the Makefile.
For the case of the bundle, the proposed changes are ok to me, although not very relevant. Thus, the bundle will reference latest with these changes and otherwise, the referenced image will be main.
There was a problem hiding this comment.
It looks good to me, except for the changes leaked from #105. I could fix the merge and changes requested by Eguz too if it proves tedious.
alexsnaps
force-pushed
the
OSSM-merge
branch
from
39e0807 to
e4dd7ec
Compare
|
There are a few things unaddressed still, @didierofrivia could you please have a look? You can either push one (or more) commits to this branch or just advise what you think might be best on moving forward… Thanks 🙏 |
* Removing diff task too
* The catalog pod has its image policy set to ALWAYS
* utilise wasm as the integration point (Kuadrant#111) * utilise wasm as the integration point * increase no. of retries * update broken manifests * fetch operations from virtualservice (Kuadrant#112) * fetch operation from virtualservice * use operations instead of 'operation' * update sha256 checksum * update wasm module sha256 checksum (Kuadrant#113) * Handle httproute signal from ratelimitpolicy controller (Kuadrant#116) * handle httproute signal from rlp controller * send signal to RLP from route reconciler * remove hosts field from SignalingNetwork * add comment over SendSignal * fix signal trigger in routing resources * remove hosts from RLP operations * bring back EnvoyFilter for route controller
No description provided.