Skip to content

[release-v1.16] More Integration backports from upstream #1151

Merged
matzew merged 12 commits intoopenshift-knative:release-v1.16from
matzew:more_backports_ocp.1.16
Mar 11, 2025
Merged

[release-v1.16] More Integration backports from upstream #1151
matzew merged 12 commits intoopenshift-knative:release-v1.16from
matzew:more_backports_ocp.1.16

Conversation

@matzew
Copy link
Member

@matzew matzew commented Feb 25, 2025

catch up for OCP 1.16, from upstream

@openshift-ci openshift-ci bot requested review from lberk and pierDipi February 25, 2025 09:42
@openshift-ci
Copy link

openshift-ci bot commented Feb 25, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: matzew

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

The pull request process is described here

Details 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

@matzew matzew force-pushed the more_backports_ocp.1.16 branch from 72ed3a0 to e5029eb Compare March 4, 2025 09:10
@matzew
Copy link
Member Author

matzew commented Mar 5, 2025

/retest

@matzew matzew closed this Mar 5, 2025
@matzew matzew reopened this Mar 5, 2025
@creydr
Copy link
Collaborator

creydr commented Mar 6, 2025

/retest

@dsimansk
Copy link

dsimansk commented Mar 6, 2025

/test 417-images

matzew and others added 10 commits March 7, 2025 07:50
💄 Adding missing sinks and sources to schema file

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

* Adding cert-mananger bits
Basics for Cert-manager

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

* Adding create cert manifest function

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

* Use the make cert

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

* Reconcile Certificate manifest and add RBAC

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

* Add secret filter to controller

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

* Look up secrets/certs for sink

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

* Remove old/wrong Certificate manifest and reference

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

* Fix controller compile

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

* Formatting

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

* change the reconcile of cert manifest, and run it only w/ some form of TLS

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

* using filtered informer

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

* Adding Rekt test for IntegrationSink TLS support

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

* adding a bit of https port for deployment/service of the IntegrationSink

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

* Mounting secrets and setting quarkus env vars for TLS support

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

* Adding flags for different TLS levels resulting in diffeerent quarkus env vars

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

* Remove bad comment

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

* Adding label

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

* Update codegen

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

* Disable tmp. the cert manager feature

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

* Fixing header/year

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

* More test tweaking

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

* Remove unused and comment out the hooks for now

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

---------

Signed-off-by: Matthias Wessendorf <mwessend@redhat.com>
Signed-off-by: Matthias Wessendorf <mwessend@redhat.com>
Little refactors on IntegrationSink

Signed-off-by: Matthias Wessendorf <mwessend@redhat.com>
Make Certifacte factory more generic

Signed-off-by: Matthias Wessendorf <mwessend@redhat.com>
Signed-off-by: Pierangelo Di Pilato <pierdipi@redhat.com>
Signed-off-by: Matthias Wessendorf <mwessend@redhat.com>
Signed-off-by: Matthias Wessendorf <mwessend@redhat.com>
Signed-off-by: Matthias Wessendorf <mwessend@redhat.com>
@matzew matzew force-pushed the more_backports_ocp.1.16 branch from 200e206 to a317a0c Compare March 7, 2025 06:59
@matzew
Copy link
Member Author

matzew commented Mar 7, 2025

Rebased.

I had tons of conflicts on openshift/ci-operator generated images. I ran make generate-release, and that pooped into this file rpms.lock.yaml

I just accepted the changes, and than I was done w/ the rebase

@matzew
Copy link
Member Author

matzew commented Mar 10, 2025

/retest

matzew added 2 commits March 11, 2025 09:57
Signed-off-by: Matthias Wessendorf <mwessend@redhat.com>
Signed-off-by: Matthias Wessendorf <mwessend@redhat.com>
@creydr
Copy link
Collaborator

creydr commented Mar 11, 2025

/retest kn-eventing-apiserver-receive-adapter-116-on-pull-request

@openshift-ci
Copy link

openshift-ci bot commented Mar 11, 2025

@creydr: The /retest command does not accept any targets.
The following commands are available to trigger required jobs:

/test 414-images
/test 414-test-conformance
/test 414-test-e2e
/test 414-test-encryption-auth-e2e
/test 414-test-reconciler
/test 417-images
/test 417-test-conformance
/test 417-test-e2e
/test 417-test-encryption-auth-e2e
/test 417-test-reconciler
/test 418-images
/test 418-test-conformance
/test 418-test-e2e
/test 418-test-encryption-auth-e2e
/test 418-test-reconciler

Use /test all to run the following jobs that were automatically triggered:

pull-ci-openshift-knative-eventing-release-v1.16-417-images
pull-ci-openshift-knative-eventing-release-v1.16-417-test-conformance
pull-ci-openshift-knative-eventing-release-v1.16-417-test-e2e
pull-ci-openshift-knative-eventing-release-v1.16-417-test-encryption-auth-e2e
pull-ci-openshift-knative-eventing-release-v1.16-417-test-reconciler
Details

In response to this:

/retest kn-eventing-apiserver-receive-adapter-116-on-pull-request

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@pierDipi
Copy link
Member

/lgtm

@matzew matzew changed the title [release-v1.16] More backports from upstream [release-v1.16] More Integration backports from upstream Mar 11, 2025
Comment on lines +59 to +62
//for _, inf := range []injection.InformerInjector{v1certificate.WithInformer} {
// injection.Default.RegisterInformer(inf)
//}

Copy link
Collaborator

Choose a reason for hiding this comment

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

leftover?

Copy link
Member Author

Choose a reason for hiding this comment

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

no... on purpose.

follow up coming

Copy link
Member Author

Choose a reason for hiding this comment

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

is really 1-1 cherry pick from the upstream.

See commits and their upstream PRs, for more

@matzew matzew merged commit bba27c1 into openshift-knative:release-v1.16 Mar 11, 2025
32 of 33 checks passed
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