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.

Sign up for GitHub

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

Jump to bottom

Move image to map #8362

Merged
merged 1 commit into from
Dec 3, 2024
Merged

Move image to map #8362

merged 1 commit into from
Dec 3, 2024

Conversation

matzew
Copy link
Member

@matzew matzew commented Dec 2, 2024

Proposed Changes

  • move image look up to map. will eventually be a config map

Pre-review Checklist

  • At least 80% unit test coverage
  • E2E tests for any new behavior
  • Docs PR for any user-facing impact
  • Spec PR for any new API feature
  • Conformance test for any change to the spec

Release Note

Docs

@knative-prow knative-prow bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Dec 2, 2024
@matzew
Copy link
Member Author

matzew commented Dec 2, 2024

/assign @dsimansk

@knative-prow knative-prow bot requested a review from Cali0707 December 2, 2024 14:19
@knative-prow knative-prow bot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Dec 2, 2024
@knative-prow knative-prow bot requested a review from Leo6Leo December 2, 2024 14:19
dsimansk
dsimansk reviewed Dec 2, 2024
View reviewed changes
pkg/reconciler/integration/source/resources/containersource.go
Comment on lines +125 to +135
switch {
case source.Spec.Timer != nil:
return sourceImageMap["timer"]
case source.Spec.Aws != nil && source.Spec.Aws.S3 != nil:
return sourceImageMap["aws-s3"]
case source.Spec.Aws != nil && source.Spec.Aws.SQS != nil:
return sourceImageMap["aws-sqs"]
case source.Spec.Aws != nil && source.Spec.Aws.DDBStreams != nil:
return sourceImageMap["aws-ddb-streams"]
default:
return ""
Copy link
Contributor

Choose a reason for hiding this comment

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

I like the nested if-s a bit more, but it's still readable. :)

dsimansk
dsimansk approved these changes Dec 2, 2024
View reviewed changes
Copy link
Contributor

@dsimansk dsimansk left a comment

Choose a reason for hiding this comment

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

/lgtm

@knative-prow knative-prow bot added the lgtm Indicates that a PR is ready to be merged. label Dec 2, 2024
@knative-prow Knative Prow
Copy link

knative-prow bot commented Dec 2, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dsimansk, matzew

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@codecov Codecov
Copy link

codecov bot commented Dec 2, 2024 •
edited
Loading

Codecov Report

Attention: Patch coverage is 30.00000% with 14 lines in your changes missing coverage. Please review.

Project coverage is 64.27%. Comparing base (408db83) to head (d9e8c9b).
Report is 1 commits behind head on main.

Files with missing lines Patch % Lines
...er/integration/source/resources/containersource.go 27.27% 8 Missing ⚠️
...iler/integration/sink/resources/container_image.go 33.33% 6 Missing ⚠️
Additional details and impacted files 
@@            Coverage Diff             @@
##             main    #8362      +/-   ##
==========================================
+ Coverage   64.26%   64.27%   +0.01%     
==========================================
  Files         389      389              
  Lines       23281    23276       -5     
==========================================
  Hits        14961    14961              
+ Misses       7526     7521       -5     
  Partials      794      794

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@dsimansk
Copy link
Contributor

dsimansk commented Dec 2, 2024

/retest

@matzew
Move image to map
d9e8c9b 
Signed-off-by: Matthias Wessendorf <mwessend@redhat.com>
@matzew matzew force-pushed the move_image_to_map branch from ab4773f to d9e8c9b Compare December 3, 2024 05:47
@knative-prow knative-prow bot removed the lgtm Indicates that a PR is ready to be merged. label Dec 3, 2024
@dsimansk
Copy link
Contributor

dsimansk commented Dec 3, 2024

/lgtm

@knative-prow knative-prow bot added the lgtm Indicates that a PR is ready to be merged. label Dec 3, 2024
@knative-prow knative-prow bot merged commit 795e4a3 into knative:main Dec 3, 2024
35 of 36 checks passed
matzew added a commit to matzew/eventing that referenced this pull request Feb 13, 2025
@matzew
Move image to map (knative#8362)
5166145 
Signed-off-by: Matthias Wessendorf <mwessend@redhat.com>
openshift-merge-bot bot pushed a commit to openshift-knative/eventing that referenced this pull request Feb 14, 2025
@matzew @pierDipi @creydr
[release-v1.16] Backport: Move all integration bits to OCP (#1077)
1e770ef 
* IntegrationSource CRD (knative#8238)

* Add initial raw API types and controller/reconciler. Levering internally the container source for the handling of the kamelet workloads. the logic for applying the env-vars is a bit verbose, but can be improved.
Tests/lifeccyle and some other improvements are still missing. but this works.

Signed-off-by: Matthias Wessendorf <mwessend@redhat.com>

* adding reflection to make the mapping less verbose, and more flexible to extend...

Signed-off-by: Matthias Wessendorf <mwessend@redhat.com>

* Add DDB Streams

Signed-off-by: Matthias Wessendorf <mwessend@redhat.com>

* polish and add minimal tests

Signed-off-by: Matthias Wessendorf <mwessend@redhat.com>

* Update pkg/apis/sources/v1alpha1/integration_lifecycle.go

Co-authored-by: Pierangelo Di Pilato <pierangelodipilato@gmail.com>

* Update pkg/apis/sources/v1alpha1/integration_lifecycle.go

Co-authored-by: Pierangelo Di Pilato <pierangelodipilato@gmail.com>

* Fix compiler warnings

Signed-off-by: Matthias Wessendorf <mwessend@redhat.com>

* use other image coordinates

Signed-off-by: Matthias Wessendorf <mwessend@redhat.com>

* first test for source

Signed-off-by: Matthias Wessendorf <mwessend@redhat.com>

* Adding initial rekt test

Signed-off-by: Matthias Wessendorf <mwessend@redhat.com>

* Adding SSL support and test for IntegrationSource

Signed-off-by: Matthias Wessendorf <mwessend@redhat.com>

* Formatting fixes

Signed-off-by: Matthias Wessendorf <mwessend@redhat.com>

* Disable OIDC tests for now

Signed-off-by: Matthias Wessendorf <mwessend@redhat.com>

* use knative nightly images

Signed-off-by: Matthias Wessendorf <mwessend@redhat.com>

* Fixing linters

Signed-off-by: Matthias Wessendorf <mwessend@redhat.com>

* addressing comments, Part1

Signed-off-by: Matthias Wessendorf <mwessend@redhat.com>

---------

Signed-off-by: Matthias Wessendorf <mwessend@redhat.com>
Co-authored-by: Pierangelo Di Pilato <pierangelodipilato@gmail.com>

* Add missing copyright boilerplate (knative#8305)

:lipstick: add missing copyright boilerplate

Signed-off-by: Matthias Wessendorf <mwessend@redhat.com>

* [chore] Use a generic access/secret key in the secret for AWS connections (knative#8312)

:key: Use a generic access/secret key in the secret for AWS connections

Signed-off-by: Matthias Wessendorf <mwessend@redhat.com>

* [chore] Do not generate SSL env vars for each struct entry, just once per containersource/image (knative#8315)

:lipstick: Do not generate SSL env vars for each struct entry, just once per containersource/image

Signed-off-by: Matthias Wessendorf <mwessend@redhat.com>

* Update Integration API and use custom tags on structs for better readability (knative#8321)

Update API and use custom tags on structs

Signed-off-by: Matthias Wessendorf <mwessend@redhat.com>

* Integration Api moved to versioned common (knative#8325)

Moving API to a versioned common/integration folder

Signed-off-by: Matthias Wessendorf <mwessend@redhat.com>

* Introducing common integration helper and change package name (knative#8327)

* create new integration/source folder and factor common code into helper.go

Signed-off-by: Matthias Wessendorf <mwessend@redhat.com>

* 💄 improve formatting...

Signed-off-by: Matthias Wessendorf <mwessend@redhat.com>

* fixing import

Signed-off-by: Matthias Wessendorf <mwessend@redhat.com>

---------

Signed-off-by: Matthias Wessendorf <mwessend@redhat.com>

* chore: correct comments (knative#8336)

:lipstick: correct comments ...

Signed-off-by: Matthias Wessendorf <mwessend@redhat.com>

* Add IntegrationSink CRD  (knative#8304)

* create new integration/source folder and factor common code into helper.go

Signed-off-by: Matthias Wessendorf <mwessend@redhat.com>

* 💄 improve formatting...

Signed-off-by: Matthias Wessendorf <mwessend@redhat.com>

* fixing import

Signed-off-by: Matthias Wessendorf <mwessend@redhat.com>

* First Sink

Signed-off-by: Matthias Wessendorf <mwessend@redhat.com>

* Updates on sink

Signed-off-by: Matthias Wessendorf <mwessend@redhat.com>

* starting common types for source

Signed-off-by: Matthias Wessendorf <mwessend@redhat.com>

* starting common types for sink

Signed-off-by: Matthias Wessendorf <mwessend@redhat.com>

* some code share and refactorings

* use other image coordinates

Signed-off-by: Matthias Wessendorf <mwessend@redhat.com>

* Add missing api and tests for sink and run codegen

Signed-off-by: Matthias Wessendorf <mwessend@redhat.com>

* Fixes

Signed-off-by: Matthias Wessendorf <mwessend@redhat.com>

* Adding cert

Signed-off-by: Matthias Wessendorf <mwessend@redhat.com>

* Adding test

Signed-off-by: Matthias Wessendorf <mwessend@redhat.com>

* Rekt test for sink

Signed-off-by: Matthias Wessendorf <mwessend@redhat.com>

* Rekt test for sink

Signed-off-by: Matthias Wessendorf <mwessend@redhat.com>

* correct status code

Signed-off-by: Matthias Wessendorf <mwessend@redhat.com>

* More...

Signed-off-by: Matthias Wessendorf <mwessend@redhat.com>

* re-add service

Signed-off-by: Matthias Wessendorf <mwessend@redhat.com>

* delete unversioned common api

Signed-off-by: Matthias Wessendorf <mwessend@redhat.com>

* Updates, latest conflicts and formatting
Clean ups
Adding tests for reconciler

Signed-off-by: Matthias Wessendorf <mwessend@redhat.com>

---------

Signed-off-by: Matthias Wessendorf <mwessend@redhat.com>

conflict

Signed-off-by: Matthias Wessendorf <mwessend@redhat.com>

* IntegrationSink: rek-test templating support for bool annotations (knative#8342)

bool annotations for represented as string, to avoid parsing errors

Signed-off-by: Matthias Wessendorf <mwessend@redhat.com>

* Update integrationsink crd  (knative#8347)

* Align IntegrationSink CRD w/ IntegrationSource CRD

Signed-off-by: Matthias Wessendorf <mwessend@redhat.com>

* 💄 Remove old job-sink references

Signed-off-by: Matthias Wessendorf <mwessend@redhat.com>

* Docs change

Signed-off-by: Matthias Wessendorf <mwessend@redhat.com>

---------

Signed-off-by: Matthias Wessendorf <mwessend@redhat.com>

* Avoid using twice hardcoded strings for the names of the Kube Secret keys, for AWS access/secret key vals (knative#8345)

:lipstick: Avoid using twice hardcoded strings for the names of the Kubescret keys, for AWS access/secret key vals

Signed-off-by: Matthias Wessendorf <mwessend@redhat.com>

* Add integrationsinks-addressable-resolver cluster role (knative#8356)

:passport_control: Add integrationsinks-addressable-resolver cluster role

Signed-off-by: Matthias Wessendorf <mwessend@redhat.com>

* Align label generation and apply on container-source as well (knative#8355)

Signed-off-by: Matthias Wessendorf <mwessend@redhat.com>

* We changed the event type on the images (knative#8364)

:fire: We changed the event type on the images

Signed-off-by: Matthias Wessendorf <mwessend@redhat.com>

* Move image to map (knative#8362)

Signed-off-by: Matthias Wessendorf <mwessend@redhat.com>

* Adding sns sink to Integration Sink (knative#8365)

adding sns sink

Signed-off-by: Matthias Wessendorf <mwessend@redhat.com>

* Clean up remove session token (knative#8369)

Remove session token and profile credential name

Signed-off-by: Matthias Wessendorf <mwessend@redhat.com>

* Chore: field semantic correction  (knative#8370)

:lipstick: We renamed those fields to , and we reflect that now in validation

Signed-off-by: Matthias Wessendorf <mwessend@redhat.com>

* Remove unused filter function (knative#8375)

:broom: Remove unused filter function

Signed-off-by: Matthias Wessendorf <mwessend@redhat.com>

* add new integration CRDs to storage version migrator tool (knative#8386)

Signed-off-by: Matthias Wessendorf <mwessend@redhat.com>

* Going OIDC for Integration Source (knative#8383)

Going OIDC for Integration Source:
- Generating OIDC specific evn_vars for Knative client of camel
- Adding rekt-test for OIDC feature of the source

Signed-off-by: Matthias Wessendorf <mwessend@redhat.com>

* Adding reconciler test for OIDC of the Integration Source (knative#8404)

Signed-off-by: Matthias Wessendorf <mwessend@redhat.com>

* Not just render oidc env-vars when cfg is on, we need also a present audience to ensure the camel containers work correct (knative#8448)

Signed-off-by: Matthias Wessendorf <mwessend@redhat.com>

* run `make generate-release`

---------

Signed-off-by: Matthias Wessendorf <mwessend@redhat.com>
Co-authored-by: Pierangelo Di Pilato <pierangelodipilato@gmail.com>
Co-authored-by: Christoph Stäbler <cstabler@redhat.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dsimansk dsimansk

@Cali0707 Cali0707

@Leo6Leo Leo6Leo

Assignees

@dsimansk dsimansk

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@matzew @dsimansk