Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add relatedImages to ClusterServiceVersion #243

Merged
merged 3 commits into from
Aug 9, 2024

Conversation

bmangoen
Copy link
Contributor

We want to add relatedImages to the Sail Operator ClusterServiceVersion ( cf. #216 )

@bmangoen bmangoen requested a review from a team as a code owner July 31, 2024 14:25
Makefile.core.mk Outdated Show resolved Hide resolved
Signed-off-by: bmangoen <bmangoen@redhat.com>
Signed-off-by: bmangoen <bmangoen@redhat.com>
@bmangoen bmangoen force-pushed the olm/csv-post-modif branch from 0b49b7d to 11f97ac Compare August 5, 2024 13:08
@bmangoen bmangoen requested a review from dgn August 6, 2024 14:16
Copy link
Collaborator

@FilipB FilipB left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I tried to run the script in our fork and it adds olm.relatedImage fields to already existing images fields which is not correct. I'm not sure what is the best solution but we need to make sure this change will not break downstream builds

@dgn
Copy link
Collaborator

dgn commented Aug 7, 2024

I tried to run the script in our fork and it adds olm.relatedImage fields to already existing images fields which is not correct. I'm not sure what is the best solution but we need to make sure this change will not break downstream builds

maybe we can add an env var to control whether the related images are added? then we can disable it in the fork

Signed-off-by: bmangoen <bmangoen@redhat.com>
@bmangoen
Copy link
Contributor Author

bmangoen commented Aug 8, 2024

@FilipB @dgn make -e GENERATE_RELATED_IMAGES=false gen should not generate the annotations olm.relatedImage.<version>.<component_name> and the relatedImages part

@dgn
Copy link
Collaborator

dgn commented Aug 9, 2024

@FilipB @dgn make -e GENERATE_RELATED_IMAGES=false gen should not generate the annotations olm.relatedImage.<version>.<component_name> and the relatedImages part

The annotations should stay - but it looks to me like they will?

Update: ah nevermind, yeah in product we have our own annotations in the values so it's all good.

@FilipB
Copy link
Collaborator

FilipB commented Aug 9, 2024

Added openshift-service-mesh#112 to disable this in our fork.

@istio-testing istio-testing merged commit 963ae6d into istio-ecosystem:main Aug 9, 2024
11 checks passed
dgn pushed a commit to dgn/sail-operator that referenced this pull request Aug 13, 2024
* Add relatedImages to ClusterServiceVersion

Signed-off-by: bmangoen <bmangoen@redhat.com>

* Change patch-csv order for avoiding reformatting

Signed-off-by: bmangoen <bmangoen@redhat.com>

* Add possibility to not generate relatedImages

Signed-off-by: bmangoen <bmangoen@redhat.com>

---------

Signed-off-by: bmangoen <bmangoen@redhat.com>
Signed-off-by: Daniel Grimm <dgrimm@redhat.com>
openshift-service-mesh-bot pushed a commit to openshift-service-mesh-bot/sail-operator that referenced this pull request Aug 13, 2024
* upstream/main:
  Ensure `make gen-check` works when go mod cache is empty (istio-ecosystem#270)
  Introduce RemoteIstio (istio-ecosystem#202)
  api_transformer: use `go env` to detect mod cache dir (istio-ecosystem#269)
  Add field values.experimental to API (istio-ecosystem#264)
  Fix errors in tables for api reference documentation (istio-ecosystem#263)
  Generate CNIGlobalConfig from GlobalConfig automatically (istio-ecosystem#260)
  Fix errors in api reference doc (istio-ecosystem#262)
  Rename `addTags` to `addComments` in API transformer (istio-ecosystem#259)
  Add relatedImages to ClusterServiceVersion (istio-ecosystem#243)
  Generate API from versions defined in go.mod (istio-ecosystem#258)
  Fix issues identified during API review (istio-ecosystem#254)

# Conflicts:
#	bundle/manifests/sailoperator.clusterserviceversion.yaml
istio-testing pushed a commit that referenced this pull request Aug 13, 2024
* Add relatedImages to ClusterServiceVersion

Signed-off-by: bmangoen <bmangoen@redhat.com>

* Change patch-csv order for avoiding reformatting

Signed-off-by: bmangoen <bmangoen@redhat.com>

* Add possibility to not generate relatedImages

Signed-off-by: bmangoen <bmangoen@redhat.com>

---------

Signed-off-by: bmangoen <bmangoen@redhat.com>
Signed-off-by: Daniel Grimm <dgrimm@redhat.com>
openshift-service-mesh-bot pushed a commit to openshift-service-mesh-bot/sail-operator that referenced this pull request Aug 13, 2024
* upstream/main:
  Add `RemoteIstio` to API concepts in docs (istio-ecosystem#272)
  Ensure `make gen-check` works when go mod cache is empty (istio-ecosystem#270)
  Introduce RemoteIstio (istio-ecosystem#202)
  api_transformer: use `go env` to detect mod cache dir (istio-ecosystem#269)
  Add field values.experimental to API (istio-ecosystem#264)
  Fix errors in tables for api reference documentation (istio-ecosystem#263)
  Generate CNIGlobalConfig from GlobalConfig automatically (istio-ecosystem#260)
  Fix errors in api reference doc (istio-ecosystem#262)
  Rename `addTags` to `addComments` in API transformer (istio-ecosystem#259)
  Add relatedImages to ClusterServiceVersion (istio-ecosystem#243)
  Generate API from versions defined in go.mod (istio-ecosystem#258)
  Fix issues identified during API review (istio-ecosystem#254)

# Conflicts:
#	bundle/manifests/sailoperator.clusterserviceversion.yaml
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants