[wip] Bump code dependencies to 1.13 #2573

ReToCode · 2024-03-19T10:48:23Z

⚠️ See the separated commits for easier review (and because the GH UI dies if you open without filter 🤷)

Basic changes

Bump version of dependants to 1.12 (pointing to midstream 1.12 branches which are 1.13). So this is aligned with the yamls.
Bump operator to version 1.13 (as this is from upstream)
Re-order the dependencies to update upstream deps first. Otherwise the script was failing, as eventing deps depend on newer upstream deps.

Changes because of golang deps

kafka_source.go upstream uses a function from apimachinery 0.27.x (see slack discussion)
Bumping apimachinery to 1.27 requires controller-runtime to be at least 0.15.x
controller-runtime 0.15.x has major interface changes, see release notes
Bumped kube-openapi to version that is defined in apimachinery
Bumped K8s deps to 0.26.x to be aligned with apimachinery minus one version to also not be too far away from our 1.25 K8s version coming from OCP 4.12
Updated the 006-version.patch to new controller-runtime version.

/assign @skonto
/assign @creydr
/assign @mgencur
/assign @matzew
/assign @pierDipi

openshift-ci · 2024-03-19T10:48:57Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ReToCode

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:

~~OWNERS~~ [ReToCode]

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

ReToCode · 2024-03-19T15:04:29Z

hack/patches/006-version.patch

-
-diff --git a/vendor/sigs.k8s.io/controller-runtime/pkg/client/config/config.go b/vendor/sigs.k8s.io/controller-runtime/pkg/client/config/config.go
-index fd2772412..54aab6c3d 100644
--- a/vendor/sigs.k8s.io/controller-runtime/pkg/client/config/config.go


AFAIK this is no longer needed. But it might be good if someone can take another look.

ReToCode · 2024-03-19T15:12:21Z

hack/update-deps.sh

  "knative.dev/pkg=knative.dev/pkg@${KN_VERSION}"
  "knative.dev/hack=knative.dev/hack@${KN_VERSION}"
  "knative.dev/networking=knative.dev/networking@${KN_VERSION}"
  "knative.dev/reconciler-test=knative.dev/reconciler-test@${KN_VERSION}"
+  "knative.dev/eventing-kafka-broker=github.com/openshift-knative/eventing-kafka-broker@${EVENTING_KAFKA_BROKER_VERSION}"


reordered to make sure the script runs. Eventing deps need new version of upstream deps first

ReToCode · 2024-03-19T15:13:41Z

knative-operator/cmd/manager/main.go

@@ -66,13 +66,25 @@ func main() {
 		os.Exit(1)
 	}

+	// Setup all Webhooks


this is not longer exposed, to have a "custom" webhook, one needs to create it upfront and pass it to the manager. IMHO, might be good if somebody else can cross-check.

…ernetes-sigs/controller-runtime/releases/tag/v0.15.0

ReToCode · 2024-03-21T12:17:54Z

vendor/knative.dev/operator/pkg/reconciler/knativeeventing/eventing_tls.go

@@ -44,7 +46,11 @@ func (r *Reconciler) handleTLSResources(ctx context.Context, manifests *mf.Manif
 	// Delete TLS resources (if present)
 	toBeDeleted := manifests.Filter(tlsResourcesPred)
 	if err := toBeDeleted.Delete(mf.IgnoreNotFound(true)); err != nil && !meta.IsNoMatchError(err) {
-		return fmt.Errorf("failed to delete TLS resources: %v", err)


I don't know how this worked before, if CRDs are not installed, this will error out and not filter out the eventing manifests (below). With this, no resources in knative-eventing were created in make test-e2e. The current change is only here to test, we should do this upstream, if it works. cc @creydr @matzew @pierDipi @maschmid

related to https://issues.redhat.com/browse/SRVKE-1595

Note to myself, maybe the new client returns a different error that is not handled by IsNoMatchError? In debug I see it is a groupDiscoveryError.

https://issues.redhat.com/browse/SRVKE-1595 is just a warning not affecting functionality.

I'm not sure I understand what is the real issue here as upstream and previous version works

If the error is different with the new clients, I think we need to understand why and if it is intended or not

ReToCode · 2024-03-21T12:33:54Z

/test ?

ReToCode · 2024-03-21T12:40:43Z

/test 415-mesh-e2e-aws-415

/test 415-mesh-upgrade-aws-415

/test 415-upstream-e2e-aws-415

/test 415-upstream-e2e-kafka-aws-415

/test 415-operator-e2e-aws-415

ReToCode · 2024-03-22T06:26:36Z

/test 415-operator-e2e-aws-415

openshift-ci · 2024-03-22T07:26:54Z

@ReToCode: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name	Commit	Details	Required	Rerun command
ci/prow/415-upstream-e2e-kafka-aws-415	`8224d03`	link	false	`/test 415-upstream-e2e-kafka-aws-415`
ci/prow/415-mesh-upgrade-aws-415	`8224d03`	link	false	`/test 415-mesh-upgrade-aws-415`
ci/prow/415-upstream-e2e-aws-415	`8224d03`	link	false	`/test 415-upstream-e2e-aws-415`
ci/prow/415-mesh-e2e-aws-415	`8224d03`	link	false	`/test 415-mesh-e2e-aws-415`
ci/prow/415-operator-e2e-aws-415	`8224d03`	link	true	`/test 415-operator-e2e-aws-415`

Full PR test history. Your PR dashboard.

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/test-infra repository. I understand the commands that are listed here.

ReToCode · 2024-03-22T09:13:26Z

Seems like KnativeEventing now works, but EventingKafka has a similar problem:

{"level":"error","ts":"2024-03-22T07:04:32.701Z","msg":"Reconciler error","controller":"knativekafka-controller","object":{"name":"knative-kafka","namespace":"knative-eventing"},"namespace":"knative-eventing","name":"knative-kafka","reconcileID":"3b140e55-86f7-45ea-83b2-df96699aeb25","error":"failed to delete TLS resources: failed to get API group resources: unable to retrieve the complete list of server APIs: cert-manager.io/v1: the server could not find the requested resource","stacktrace":"sigs.k8s.io/controller-runtime/pkg/internal/controller.(*Controller).reconcileHandler\n\t/go/src/github.com/openshift-knative/serverless-operator/vendor/sigs.k8s.io/controller-runtime/pkg/internal/controller/controller.go:324\nsigs.k8s.io/controller-runtime/pkg/internal/controller.(*Controller).processNextWorkItem\n\t/go/src/github.com/openshift-knative/serverless-operator/vendor/sigs.k8s.io/controller-runtime/pkg/internal/controller/controller.go:265\nsigs.k8s.io/controller-runtime/pkg/internal/controller.(*Controller).Start.func2.2\n\t/go/src/github.com/openshift-knative/serverless-operator/vendor/sigs.k8s.io/controller-runtime/pkg/internal/controller/controller.go:226"}
{"level":"info","ts":"2024-03-22T07:07:16.541Z","logger":"controller_knativekafka","msg":"Reconciling KnativeKafka","Request.Namespace":"knative-eventing","Request.Name":"knative-kafka"}

Reconciler error this aborts reconciliation and ends up not creating the Knative Kafka resources.

openshift-ci bot assigned creydr, matzew, mgencur, pierDipi and skonto Mar 19, 2024

openshift-ci bot added the do-not-merge/work-in-progress label Mar 19, 2024

openshift-ci bot requested review from aliok and jcrossley3 March 19, 2024 10:48

openshift-ci bot added the approved label Mar 19, 2024

ReToCode mentioned this pull request Mar 19, 2024

Update deps to work with newer controller-runtime lib manifestival/client-go-client#8

Merged

ReToCode force-pushed the bump-operator-code-13 branch 2 times, most recently from 086fc24 to 95f02a5 Compare March 19, 2024 14:59

ReToCode commented Mar 19, 2024

View reviewed changes

ReToCode and others added 14 commits March 21, 2024 13:12

Bump versions and reorder deps

57951b5

Run ./hack/update-deps.sh --upgrade

d377eed

Run make generated-files

3b8a671

Fix Serving TLS Secret name

deac97e

Fix eventing build issues

04e123e

Bump K8s deps to 1.26 and apimachinery to 1.27

d44961b

Run ./hack/update-deps.sh

175d799

Bump kube-openapi to version that apimachinery defines

3624761

Run ./hack/update-deps.sh

8ffefbc

Bump controller-runtime to a version that is aligned with apimachinery

9cfbc63

Run ./hack/update-deps.sh

97768a3

Update version patch

6eec9aa

Update to new interface of controller runtime: https://github.com/kub…

533759e

…ernetes-sigs/controller-runtime/releases/tag/v0.15.0

Add "" for audience

797e9e0

ReToCode added 5 commits March 21, 2024 13:12

Run make generated-files

21140fa

Mark KnativeKafka to have a status subresource

1ad9086

Patch eventing_tls to not error on missing CRDs

cf133fd

Update manifestival/client-go-client

af50177

Run hack/update-deps.sh

8224d03

ReToCode force-pushed the bump-operator-code-13 branch from fea3718 to 8224d03 Compare March 21, 2024 12:14

ReToCode commented Mar 21, 2024

View reviewed changes

openshift-knative deleted a comment from openshift-ci bot Mar 21, 2024

openshift-knative deleted a comment from mgencur Mar 21, 2024

openshift-knative deleted a comment from openshift-ci bot Mar 21, 2024

openshift-knative deleted a comment from openshift-ci bot Mar 25, 2024

ReToCode mentioned this pull request Mar 25, 2024

Bump code dependencies to 1.13 #2578

Merged

ReToCode closed this Mar 26, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[wip] Bump code dependencies to 1.13 #2573

[wip] Bump code dependencies to 1.13 #2573

ReToCode commented Mar 19, 2024 •

edited

Loading

openshift-ci bot commented Mar 19, 2024

ReToCode Mar 19, 2024

ReToCode Mar 19, 2024

ReToCode Mar 19, 2024

ReToCode Mar 21, 2024

ReToCode Mar 21, 2024

pierDipi Mar 25, 2024 •

edited

Loading

pierDipi Mar 25, 2024

ReToCode commented Mar 21, 2024

ReToCode commented Mar 21, 2024

ReToCode commented Mar 22, 2024

openshift-ci bot commented Mar 22, 2024

ReToCode commented Mar 22, 2024 •

edited

Loading

[wip] Bump code dependencies to 1.13 #2573

[wip] Bump code dependencies to 1.13 #2573

Conversation

ReToCode commented Mar 19, 2024 • edited Loading

Basic changes

Changes because of golang deps

openshift-ci bot commented Mar 19, 2024

ReToCode Mar 19, 2024

Choose a reason for hiding this comment

ReToCode Mar 19, 2024

Choose a reason for hiding this comment

ReToCode Mar 19, 2024

Choose a reason for hiding this comment

ReToCode Mar 21, 2024

Choose a reason for hiding this comment

ReToCode Mar 21, 2024

Choose a reason for hiding this comment

pierDipi Mar 25, 2024 • edited Loading

Choose a reason for hiding this comment

pierDipi Mar 25, 2024

Choose a reason for hiding this comment

ReToCode commented Mar 21, 2024

ReToCode commented Mar 21, 2024

ReToCode commented Mar 22, 2024

openshift-ci bot commented Mar 22, 2024

ReToCode commented Mar 22, 2024 • edited Loading

ReToCode commented Mar 19, 2024 •

edited

Loading

pierDipi Mar 25, 2024 •

edited

Loading

ReToCode commented Mar 22, 2024 •

edited

Loading