diff --git a/hack/patches/023-wait-for-webhook-services.patch b/hack/patches/023-wait-for-webhook-services.patch new file mode 100644 index 0000000000..3a517bfb45 --- /dev/null +++ b/hack/patches/023-wait-for-webhook-services.patch @@ -0,0 +1,137 @@ +diff --git a/vendor/knative.dev/operator/pkg/reconciler/common/deployments.go b/vendor/knative.dev/operator/pkg/reconciler/common/deployments.go +index c0c5afcea..b115f1407 100644 +--- a/vendor/knative.dev/operator/pkg/reconciler/common/deployments.go ++++ b/vendor/knative.dev/operator/pkg/reconciler/common/deployments.go +@@ -18,6 +18,7 @@ package common + + import ( + "context" ++ "time" + + mf "github.com/manifestival/manifestival" + appsv1 "k8s.io/api/apps/v1" +@@ -25,6 +26,7 @@ import ( + "k8s.io/apimachinery/pkg/api/errors" + "k8s.io/client-go/kubernetes/scheme" + "knative.dev/operator/pkg/apis/operator/base" ++ "knative.dev/pkg/controller" + ) + + // CheckDeployments checks all deployments in the given manifest and updates the given +@@ -52,7 +54,7 @@ func CheckDeployments(ctx context.Context, manifest *mf.Manifest, instance base. + + if len(nonReadyDeployments) > 0 { + status.MarkDeploymentsNotReady(nonReadyDeployments) +- return nil ++ return controller.NewRequeueAfter(5*time.Second) + } + + status.MarkDeploymentsAvailable() +diff --git a/vendor/knative.dev/operator/pkg/reconciler/common/install.go b/vendor/knative.dev/operator/pkg/reconciler/common/install.go +index 4b3b3adaf..0f0925b85 100644 +--- a/vendor/knative.dev/operator/pkg/reconciler/common/install.go ++++ b/vendor/knative.dev/operator/pkg/reconciler/common/install.go +@@ -20,6 +20,8 @@ import ( + "context" + "fmt" + "strings" ++ ++ "k8s.io/apimachinery/pkg/runtime/schema" + + mf "github.com/manifestival/manifestival" + "knative.dev/pkg/logging" +@@ -31,8 +33,9 @@ import ( + var ( + role mf.Predicate = mf.Any(mf.ByKind("ClusterRole"), mf.ByKind("Role")) + rolebinding mf.Predicate = mf.Any(mf.ByKind("ClusterRoleBinding"), mf.ByKind("RoleBinding")) +- webhook mf.Predicate = mf.Any(mf.ByKind("MutatingWebhookConfiguration"), mf.ByKind("ValidatingWebhookConfiguration")) +- gatewayNotMatch = "no matches for kind \"Gateway\"" ++ webhook mf.Predicate = mf.Any(mf.ByKind("MutatingWebhookConfiguration"), mf.ByKind("ValidatingWebhookConfiguration")) ++ webhookDependantResources mf.Predicate = mf.ByGVK(schema.GroupVersionKind{"networking.internal.knative.dev", "v1alpha1", "Certificate"}) ++ gatewayNotMatch = "no matches for kind \"Gateway\"" + ) + + // Install applies the manifest resources for the given version and updates the given +@@ -52,7 +55,7 @@ func Install(ctx context.Context, manifest *mf.Manifest, instance base.KComponen + status.MarkInstallFailed(err.Error()) + return fmt.Errorf("failed to apply (cluster)rolebindings: %w", err) + } +- if err := manifest.Filter(mf.Not(mf.Any(role, rolebinding, webhook))).Apply(); err != nil { ++ if err := manifest.Filter(mf.Not(mf.Any(role, rolebinding, webhook, webhookDependantResources))).Apply(); err != nil { + status.MarkInstallFailed(err.Error()) + if ks, ok := instance.(*v1beta1.KnativeServing); ok && strings.Contains(err.Error(), gatewayNotMatch) && + (ks.Spec.Ingress == nil || ks.Spec.Ingress.Istio.Enabled) { +@@ -63,10 +66,29 @@ func Install(ctx context.Context, manifest *mf.Manifest, instance base.KComponen + + return fmt.Errorf("failed to apply non rbac manifest: %w", err) + } ++ return nil ++} ++ ++func InstallWebhookConfigs(ctx context.Context, manifest *mf.Manifest, instance base.KComponent) error { ++ status := instance.GetStatus() + if err := manifest.Filter(webhook).Apply(); err != nil { + status.MarkInstallFailed(err.Error()) + return fmt.Errorf("failed to apply webhooks: %w", err) + } ++ return nil ++} ++ ++func InstallWebhookDepResources(ctx context.Context, manifest *mf.Manifest, instance base.KComponent) error { ++ status := instance.GetStatus() ++ if err := manifest.Filter(webhookDependantResources).Apply(); err != nil { ++ status.MarkInstallFailed(err.Error()) ++ return fmt.Errorf("failed to apply webhooks: %w", err) ++ } ++ return nil ++} ++ ++func MarkStatusSuccess(ctx context.Context, manifest *mf.Manifest, instance base.KComponent) error { ++ status := instance.GetStatus() + status.MarkInstallSucceeded() + status.SetVersion(TargetVersion(instance)) + return nil +diff --git a/vendor/knative.dev/operator/pkg/reconciler/knativeeventing/knativeeventing.go b/vendor/knative.dev/operator/pkg/reconciler/knativeeventing/knativeeventing.go +index 7d652cb0d..6c1c10ed7 100644 +--- a/vendor/knative.dev/operator/pkg/reconciler/knativeeventing/knativeeventing.go ++++ b/vendor/knative.dev/operator/pkg/reconciler/knativeeventing/knativeeventing.go +@@ -143,6 +143,9 @@ func (r *Reconciler) ReconcileKind(ctx context.Context, ke *v1beta1.KnativeEvent + r.handleBackstageResources, + manifests.Install, + common.CheckDeployments, ++ common.InstallWebhookConfigs, ++ manifests.SetManifestPaths, ++ common.MarkStatusSuccess, + common.DeleteObsoleteResources(ctx, ke, r.installed), + } + manifest := r.manifest.Append() +diff --git a/vendor/knative.dev/operator/pkg/reconciler/knativeserving/knativeserving.go b/vendor/knative.dev/operator/pkg/reconciler/knativeserving/knativeserving.go +index ccf9f2f67..df16adfb5 100644 +--- a/vendor/knative.dev/operator/pkg/reconciler/knativeserving/knativeserving.go ++++ b/vendor/knative.dev/operator/pkg/reconciler/knativeserving/knativeserving.go +@@ -145,6 +145,10 @@ func (r *Reconciler) ReconcileKind(ctx context.Context, ks *v1beta1.KnativeServi + r.transform, + manifests.Install, + common.CheckDeployments, ++ common.InstallWebhookConfigs, ++ common.InstallWebhookDepResources, ++ manifests.SetManifestPaths, ++ common.MarkStatusSuccess, + common.DeleteObsoleteResources(ctx, ks, r.installed), + } + manifest := r.manifest.Append() +diff --git a/vendor/knative.dev/operator/pkg/reconciler/manifests/install.go b/vendor/knative.dev/operator/pkg/reconciler/manifests/install.go +index dc5bf0d77..275763d5b 100644 +--- a/vendor/knative.dev/operator/pkg/reconciler/manifests/install.go ++++ b/vendor/knative.dev/operator/pkg/reconciler/manifests/install.go +@@ -34,6 +34,10 @@ func Install(ctx context.Context, manifest *mf.Manifest, instance base.KComponen + if err != nil { + return err + } ++ return nil ++} ++ ++func SetManifestPaths(ctx context.Context, manifest *mf.Manifest, instance base.KComponent) error { + status := instance.GetStatus() + path := common.TargetManifestPathArray(instance) + version := common.TargetVersion(instance) diff --git a/olm-catalog/serverless-operator-index/Dockerfile b/olm-catalog/serverless-operator-index/Dockerfile index 6ef91b7db5..6848e626fd 100644 --- a/olm-catalog/serverless-operator-index/Dockerfile +++ b/olm-catalog/serverless-operator-index/Dockerfile @@ -11,7 +11,7 @@ RUN /bin/opm init serverless-operator --default-channel=stable --output yaml >> RUN /bin/opm render --skip-tls-verify -o yaml \ registry.ci.openshift.org/knative/release-1.34.0:serverless-bundle \ registry.ci.openshift.org/knative/release-1.35.0:serverless-bundle \ - quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-135/serverless-bundle@sha256:9ed31ef6fc4499a8ca4747163ad5f9da1bb7537d42dc2976826e7a771d8833fb >> /configs/index.yaml + quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-135/serverless-bundle@sha256:d3e592f34127fb1c2dcfdfb1f91cafc3a6e7fe6a4420ca6bccfc6c681ea24ef9 >> /configs/index.yaml # The base image is expected to contain # /bin/opm (with a serve subcommand) and /bin/grpc_health_probe diff --git a/olm-catalog/serverless-operator/manifests/serverless-operator.clusterserviceversion.yaml b/olm-catalog/serverless-operator/manifests/serverless-operator.clusterserviceversion.yaml index 08b8dc4895..4d126c121b 100644 --- a/olm-catalog/serverless-operator/manifests/serverless-operator.clusterserviceversion.yaml +++ b/olm-catalog/serverless-operator/manifests/serverless-operator.clusterserviceversion.yaml @@ -72,7 +72,7 @@ metadata: repository: https://github.com/openshift-knative/serverless-operator support: Red Hat olm.skipRange: '>=1.35.0 <1.35.1' - operators.openshift.io/must-gather-image: registry.redhat.io/openshift-serverless-1/serverless-must-gather-rhel8@sha256:0ce23a94f52a7ba4ab886dbc02e88af367f4c004d98eeaf1ebecfd9d1ad430d3 + operators.openshift.io/must-gather-image: registry.redhat.io/openshift-serverless-1/serverless-must-gather-rhel8@sha256:5ad67b6513473434dd6f4b8780eca499d0671aa5b4c1fcc13ac0b8be3c00b63f labels: operatorframework.io/arch.amd64: supported operatorframework.io/arch.ppc64le: supported @@ -830,7 +830,7 @@ spec: serviceAccountName: knative-operator containers: - name: knative-operator - image: registry.redhat.io/openshift-serverless-1/serverless-openshift-kn-rhel8-operator@sha256:5d4dc3570671e5d002117da70d5a7c03409135f09201a34d453627c876416570 + image: registry.redhat.io/openshift-serverless-1/serverless-openshift-kn-rhel8-operator@sha256:28c760fe238af2a8ee977f047da0fcd673047ff90b9ce08157dd55a0467b2606 readinessProbe: periodSeconds: 1 httpGet: @@ -883,33 +883,33 @@ spec: - name: KUBERNETES_MIN_VERSION value: "v1.0.0" - name: "IMAGE_queue-proxy" - value: "registry.redhat.io/openshift-serverless-1/kn-serving-queue-rhel8@sha256:aa16b9cb5c140751d7a1319a0b1bb0f4a65f6030b670d1bdd156208f2a5cdd99" + value: "registry.redhat.io/openshift-serverless-1/kn-serving-queue-rhel8@sha256:54a8c664084c4d53243b221da6a1b91c14ba562c174ed56174940a852fda1f0e" - name: "IMAGE_activator" - value: "registry.redhat.io/openshift-serverless-1/kn-serving-activator-rhel8@sha256:70a370aefc5921665b65245c295dfbe9ec9a02c2b4d8e93e72b78ace8730abfb" + value: "registry.redhat.io/openshift-serverless-1/kn-serving-activator-rhel8@sha256:70b70463581d2fcd3323f2b84b7d89f25d9334b12affd583fb77099821651694" - name: "IMAGE_autoscaler" - value: "registry.redhat.io/openshift-serverless-1/kn-serving-autoscaler-rhel8@sha256:a3281f559ce240e7af81aa2d472ec0beaea6d558766968127dc8ace64e032a43" + value: "registry.redhat.io/openshift-serverless-1/kn-serving-autoscaler-rhel8@sha256:0fe475b4661f811d20eebf7b3586df0f0e2409c0aefa6ba3dedc888ef8d8cbd5" - name: "IMAGE_autoscaler-hpa" - value: "registry.redhat.io/openshift-serverless-1/kn-serving-autoscaler-hpa-rhel8@sha256:b36122ac874a36f105d36bc48e50243c9e5c71d29805046b5760393c8b8d96e2" + value: "registry.redhat.io/openshift-serverless-1/kn-serving-autoscaler-hpa-rhel8@sha256:7c76216a126edb2334a628c39a2d45ef9da4bfc9b4ad4aa107f2d6200273dae0" - name: "IMAGE_controller__controller" - value: "registry.redhat.io/openshift-serverless-1/kn-serving-controller-rhel8@sha256:457402f0f060c7cb7fe3f7fb14b181c8d55004ca30c1e19731acdbd352edcdd8" + value: "registry.redhat.io/openshift-serverless-1/kn-serving-controller-rhel8@sha256:a45737b51b40321c6e173af1917b9ec590fbfe5d7006395d27f0986676d8f7bc" - name: "IMAGE_webhook__webhook" - value: "registry.redhat.io/openshift-serverless-1/kn-serving-webhook-rhel8@sha256:02755a1c535a2281ea27731abf8a6d14a27b88a6a232efd24b0cde36d360106a" + value: "registry.redhat.io/openshift-serverless-1/kn-serving-webhook-rhel8@sha256:b6bcdf72e0216dc87c27143e5246050f9bf641f22341a96b1cf81dcd7936f823" - name: "IMAGE_storage-version-migration-serving-__migrate" - value: "registry.redhat.io/openshift-serverless-1/kn-serving-storage-version-migration-rhel8@sha256:a479117f6d6ef5234d7eeaa28c58fc7aa4da453eeb3f94a7b72c44bcdecd8e12" + value: "registry.redhat.io/openshift-serverless-1/kn-serving-storage-version-migration-rhel8@sha256:616bdc5df77e4d0a048eac16d475e91fc0c677af08f9c87b065503846d2e8ba0" - name: "IMAGE_kourier-gateway" value: "registry.redhat.io/openshift-service-mesh/proxyv2-rhel8@sha256:a8c1de7e6c7244626e623c4f41faf139825062696a113d30abd669e47b8418c4" - name: "IMAGE_net-kourier-controller__controller" - value: "registry.redhat.io/openshift-serverless-1/net-kourier-kourier-rhel8@sha256:d9da998ddcf945634c1cde4d0de032057c65cf79f1a4e4ef8eee010c2f8f63a1" + value: "registry.redhat.io/openshift-serverless-1/net-kourier-kourier-rhel8@sha256:682aea80469852001d5b19eb71c4370683bb1f83b44f02fc3376b6039074b50e" - name: "IMAGE_net-istio-controller__controller" - value: "registry.redhat.io/openshift-serverless-1/net-istio-controller-rhel8@sha256:53e100b21a95526183d0ec159a7e53d5b9cb293d8aef1390729c1e3c85abcc48" + value: "registry.redhat.io/openshift-serverless-1/net-istio-controller-rhel8@sha256:50a3ce92af3955754077df02c7f97960d6525236b9c37179a956ff6b11253c71" - name: "IMAGE_net-istio-webhook__webhook" - value: "registry.redhat.io/openshift-serverless-1/net-istio-webhook-rhel8@sha256:71c9482b302ba193624f05f367679fdc42f3f5ea931214dc5815396585bcc5b5" + value: "registry.redhat.io/openshift-serverless-1/net-istio-webhook-rhel8@sha256:eaae5f971605a453b77477632f2b92fb5ec5fce60b387ab366022db9b8b81cb6" - name: "IMAGE_eventing-controller__eventing-controller" value: "registry.redhat.io/openshift-serverless-1/kn-eventing-controller-rhel8@sha256:1424b0b3c56f3e363cff9454466cba85ba5aac08b93ff9252a8d0ffbcdbfc0cf" - name: "IMAGE_eventing-istio-controller__eventing-istio-controller" - value: "registry.redhat.io/openshift-serverless-1/kn-eventing-istio-controller-rhel8@sha256:e405e291295bb2f74d92684c186ee37d9a00eeab830a8887795420f2a334ac85" + value: "registry.redhat.io/openshift-serverless-1/kn-eventing-istio-controller-rhel8@sha256:c6793d6589b51ac93193a23eca4a060f207904a2e2e2470d761d9a4121875e76" - name: "IMAGE_eventing-webhook__eventing-webhook" - value: "registry.redhat.io/openshift-serverless-1/kn-eventing-webhook-rhel8@sha256:4de7e0b2946b79395af3b042a1b89b3bfc9c236efb593e8acfcd21120841392c" + value: "registry.redhat.io/openshift-serverless-1/kn-eventing-webhook-rhel8@sha256:f1f62f5090ec6706b9cfada5062179dce226a59f69240ca3e34b027aba7f17df" - name: "IMAGE_storage-version-migration-eventing-__migrate" value: "registry.redhat.io/openshift-serverless-1/kn-eventing-migrate-rhel8@sha256:1ccfc99e399f15d3d2753574433d53be546134be1136606d025de88dbaa61bd1" - name: "IMAGE_mt-broker-controller__mt-broker-controller" @@ -923,7 +923,7 @@ spec: - name: "IMAGE_imc-dispatcher__dispatcher" value: "registry.redhat.io/openshift-serverless-1/kn-eventing-channel-dispatcher-rhel8@sha256:3708392e21ac87ff1268af64b14e8a03ac9df7aa10d00b64f6e51309e7535532" - name: "IMAGE_pingsource-mt-adapter__dispatcher" - value: "registry.redhat.io/openshift-serverless-1/kn-eventing-mtping-rhel8@sha256:eb22a407040ec3354a07a549a0df862aa62c5eeb9c9de95ca93a8a7e4f640ca3" + value: "registry.redhat.io/openshift-serverless-1/kn-eventing-mtping-rhel8@sha256:d753cb3794dbefb26ed78a97b1441e98f21d90992d3a9c775f6402fa23bd73f1" - name: "IMAGE_APISERVER_RA_IMAGE" value: "registry.redhat.io/openshift-serverless-1/kn-eventing-apiserver-receive-adapter-rhel8@sha256:14c8cb78ad03f1174af9bd9690ad487dc4f2142d47ec5743f4cc4186e9645123" - name: "IMAGE_DISPATCHER_IMAGE" @@ -935,11 +935,11 @@ spec: - name: "IMAGE_KUBE_RBAC_PROXY" value: "registry.redhat.io/openshift4/ose-kube-rbac-proxy-rhel9@sha256:6136488d256d1f805162f462a68a0a50eef1dc5ba9b57daf49d1a7db274b0d22" - name: "IMAGE_KN_PLUGIN_EVENT_SENDER" - value: "registry.redhat.io/openshift-serverless-1/kn-plugin-event-sender-rhel8@sha256:9f8cd0de0922c51eec4e99986d0ff45a3e5bfb4a967d1d92f80be379303301d7" + value: "registry.redhat.io/openshift-serverless-1/kn-plugin-event-sender-rhel8@sha256:62f4eff00506ec5b460c54aa024dcff2bea32c6a61351910d7906668d7ccbc6c" - name: "IMAGE_KN_CLIENT" value: "registry.redhat.io/openshift-serverless-1/kn-client-kn-rhel8@sha256:8f19047b88831262346f1889791cb3716d89ea0bb239b194485ec69a0e86f693" - name: "IMAGE_KN_PLUGIN_FUNC_UTIL" - value: "registry.redhat.io/openshift-serverless-1/kn-plugin-func-func-util-rhel8@sha256:0a2f431f477ad83bea5f6d7016afa82e6fa5404dba2fbfb8b408555e659b008f" + value: "registry.redhat.io/openshift-serverless-1/kn-plugin-func-func-util-rhel8@sha256:aed83420e16318fe9f328cb0c381745f595424d893d8f80f869d500ba1e3a1be" - name: "IMAGE_KN_PLUGIN_FUNC_TEKTON_S2I" value: "registry.redhat.io/source-to-image/source-to-image-rhel8@sha256:6a6025914296a62fdf2092c3a40011bd9b966a6806b094d51eec5e1bd5026ef4" - name: "IMAGE_KN_PLUGIN_FUNC_TEKTON_BUILDAH" @@ -995,7 +995,7 @@ spec: - ALL containers: - name: knative-openshift - image: registry.redhat.io/openshift-serverless-1/serverless-kn-operator-rhel8@sha256:6ab7f43f082659a2730e5d818317f328395f8a3f0daf7d82a2df4bf91fdbfa57 + image: registry.redhat.io/openshift-serverless-1/serverless-kn-operator-rhel8@sha256:2b9b3327b4b0460ee033ec39163e821a2a6e67ffb4aae5f656ed88b180e41abd imagePullPolicy: Always readinessProbe: httpGet: @@ -1057,33 +1057,33 @@ spec: - name: KUBERNETES_MIN_VERSION value: "v1.0.0" - name: "IMAGE_queue-proxy" - value: "registry.redhat.io/openshift-serverless-1/kn-serving-queue-rhel8@sha256:aa16b9cb5c140751d7a1319a0b1bb0f4a65f6030b670d1bdd156208f2a5cdd99" + value: "registry.redhat.io/openshift-serverless-1/kn-serving-queue-rhel8@sha256:54a8c664084c4d53243b221da6a1b91c14ba562c174ed56174940a852fda1f0e" - name: "IMAGE_activator" - value: "registry.redhat.io/openshift-serverless-1/kn-serving-activator-rhel8@sha256:70a370aefc5921665b65245c295dfbe9ec9a02c2b4d8e93e72b78ace8730abfb" + value: "registry.redhat.io/openshift-serverless-1/kn-serving-activator-rhel8@sha256:70b70463581d2fcd3323f2b84b7d89f25d9334b12affd583fb77099821651694" - name: "IMAGE_autoscaler" - value: "registry.redhat.io/openshift-serverless-1/kn-serving-autoscaler-rhel8@sha256:a3281f559ce240e7af81aa2d472ec0beaea6d558766968127dc8ace64e032a43" + value: "registry.redhat.io/openshift-serverless-1/kn-serving-autoscaler-rhel8@sha256:0fe475b4661f811d20eebf7b3586df0f0e2409c0aefa6ba3dedc888ef8d8cbd5" - name: "IMAGE_autoscaler-hpa" - value: "registry.redhat.io/openshift-serverless-1/kn-serving-autoscaler-hpa-rhel8@sha256:b36122ac874a36f105d36bc48e50243c9e5c71d29805046b5760393c8b8d96e2" + value: "registry.redhat.io/openshift-serverless-1/kn-serving-autoscaler-hpa-rhel8@sha256:7c76216a126edb2334a628c39a2d45ef9da4bfc9b4ad4aa107f2d6200273dae0" - name: "IMAGE_controller__controller" - value: "registry.redhat.io/openshift-serverless-1/kn-serving-controller-rhel8@sha256:457402f0f060c7cb7fe3f7fb14b181c8d55004ca30c1e19731acdbd352edcdd8" + value: "registry.redhat.io/openshift-serverless-1/kn-serving-controller-rhel8@sha256:a45737b51b40321c6e173af1917b9ec590fbfe5d7006395d27f0986676d8f7bc" - name: "IMAGE_webhook__webhook" - value: "registry.redhat.io/openshift-serverless-1/kn-serving-webhook-rhel8@sha256:02755a1c535a2281ea27731abf8a6d14a27b88a6a232efd24b0cde36d360106a" + value: "registry.redhat.io/openshift-serverless-1/kn-serving-webhook-rhel8@sha256:b6bcdf72e0216dc87c27143e5246050f9bf641f22341a96b1cf81dcd7936f823" - name: "IMAGE_storage-version-migration-serving-__migrate" - value: "registry.redhat.io/openshift-serverless-1/kn-serving-storage-version-migration-rhel8@sha256:a479117f6d6ef5234d7eeaa28c58fc7aa4da453eeb3f94a7b72c44bcdecd8e12" + value: "registry.redhat.io/openshift-serverless-1/kn-serving-storage-version-migration-rhel8@sha256:616bdc5df77e4d0a048eac16d475e91fc0c677af08f9c87b065503846d2e8ba0" - name: "IMAGE_kourier-gateway" value: "registry.redhat.io/openshift-service-mesh/proxyv2-rhel8@sha256:a8c1de7e6c7244626e623c4f41faf139825062696a113d30abd669e47b8418c4" - name: "IMAGE_net-kourier-controller__controller" - value: "registry.redhat.io/openshift-serverless-1/net-kourier-kourier-rhel8@sha256:d9da998ddcf945634c1cde4d0de032057c65cf79f1a4e4ef8eee010c2f8f63a1" + value: "registry.redhat.io/openshift-serverless-1/net-kourier-kourier-rhel8@sha256:682aea80469852001d5b19eb71c4370683bb1f83b44f02fc3376b6039074b50e" - name: "IMAGE_net-istio-controller__controller" - value: "registry.redhat.io/openshift-serverless-1/net-istio-controller-rhel8@sha256:53e100b21a95526183d0ec159a7e53d5b9cb293d8aef1390729c1e3c85abcc48" + value: "registry.redhat.io/openshift-serverless-1/net-istio-controller-rhel8@sha256:50a3ce92af3955754077df02c7f97960d6525236b9c37179a956ff6b11253c71" - name: "IMAGE_net-istio-webhook__webhook" - value: "registry.redhat.io/openshift-serverless-1/net-istio-webhook-rhel8@sha256:71c9482b302ba193624f05f367679fdc42f3f5ea931214dc5815396585bcc5b5" + value: "registry.redhat.io/openshift-serverless-1/net-istio-webhook-rhel8@sha256:eaae5f971605a453b77477632f2b92fb5ec5fce60b387ab366022db9b8b81cb6" - name: "IMAGE_eventing-controller__eventing-controller" value: "registry.redhat.io/openshift-serverless-1/kn-eventing-controller-rhel8@sha256:1424b0b3c56f3e363cff9454466cba85ba5aac08b93ff9252a8d0ffbcdbfc0cf" - name: "IMAGE_eventing-istio-controller__eventing-istio-controller" - value: "registry.redhat.io/openshift-serverless-1/kn-eventing-istio-controller-rhel8@sha256:e405e291295bb2f74d92684c186ee37d9a00eeab830a8887795420f2a334ac85" + value: "registry.redhat.io/openshift-serverless-1/kn-eventing-istio-controller-rhel8@sha256:c6793d6589b51ac93193a23eca4a060f207904a2e2e2470d761d9a4121875e76" - name: "IMAGE_eventing-webhook__eventing-webhook" - value: "registry.redhat.io/openshift-serverless-1/kn-eventing-webhook-rhel8@sha256:4de7e0b2946b79395af3b042a1b89b3bfc9c236efb593e8acfcd21120841392c" + value: "registry.redhat.io/openshift-serverless-1/kn-eventing-webhook-rhel8@sha256:f1f62f5090ec6706b9cfada5062179dce226a59f69240ca3e34b027aba7f17df" - name: "IMAGE_storage-version-migration-eventing-__migrate" value: "registry.redhat.io/openshift-serverless-1/kn-eventing-migrate-rhel8@sha256:1ccfc99e399f15d3d2753574433d53be546134be1136606d025de88dbaa61bd1" - name: "IMAGE_mt-broker-controller__mt-broker-controller" @@ -1097,7 +1097,7 @@ spec: - name: "IMAGE_imc-dispatcher__dispatcher" value: "registry.redhat.io/openshift-serverless-1/kn-eventing-channel-dispatcher-rhel8@sha256:3708392e21ac87ff1268af64b14e8a03ac9df7aa10d00b64f6e51309e7535532" - name: "IMAGE_pingsource-mt-adapter__dispatcher" - value: "registry.redhat.io/openshift-serverless-1/kn-eventing-mtping-rhel8@sha256:eb22a407040ec3354a07a549a0df862aa62c5eeb9c9de95ca93a8a7e4f640ca3" + value: "registry.redhat.io/openshift-serverless-1/kn-eventing-mtping-rhel8@sha256:d753cb3794dbefb26ed78a97b1441e98f21d90992d3a9c775f6402fa23bd73f1" - name: "IMAGE_APISERVER_RA_IMAGE" value: "registry.redhat.io/openshift-serverless-1/kn-eventing-apiserver-receive-adapter-rhel8@sha256:14c8cb78ad03f1174af9bd9690ad487dc4f2142d47ec5743f4cc4186e9645123" - name: "IMAGE_DISPATCHER_IMAGE" @@ -1109,11 +1109,11 @@ spec: - name: "IMAGE_KUBE_RBAC_PROXY" value: "registry.redhat.io/openshift4/ose-kube-rbac-proxy-rhel9@sha256:6136488d256d1f805162f462a68a0a50eef1dc5ba9b57daf49d1a7db274b0d22" - name: "IMAGE_KN_PLUGIN_EVENT_SENDER" - value: "registry.redhat.io/openshift-serverless-1/kn-plugin-event-sender-rhel8@sha256:9f8cd0de0922c51eec4e99986d0ff45a3e5bfb4a967d1d92f80be379303301d7" + value: "registry.redhat.io/openshift-serverless-1/kn-plugin-event-sender-rhel8@sha256:62f4eff00506ec5b460c54aa024dcff2bea32c6a61351910d7906668d7ccbc6c" - name: "IMAGE_KN_CLIENT" value: "registry.redhat.io/openshift-serverless-1/kn-client-kn-rhel8@sha256:8f19047b88831262346f1889791cb3716d89ea0bb239b194485ec69a0e86f693" - name: "IMAGE_KN_PLUGIN_FUNC_UTIL" - value: "registry.redhat.io/openshift-serverless-1/kn-plugin-func-func-util-rhel8@sha256:0a2f431f477ad83bea5f6d7016afa82e6fa5404dba2fbfb8b408555e659b008f" + value: "registry.redhat.io/openshift-serverless-1/kn-plugin-func-func-util-rhel8@sha256:aed83420e16318fe9f328cb0c381745f595424d893d8f80f869d500ba1e3a1be" - name: "IMAGE_KN_PLUGIN_FUNC_TEKTON_S2I" value: "registry.redhat.io/source-to-image/source-to-image-rhel8@sha256:6a6025914296a62fdf2092c3a40011bd9b966a6806b094d51eec5e1bd5026ef4" - name: "IMAGE_KN_PLUGIN_FUNC_TEKTON_BUILDAH" @@ -1125,23 +1125,23 @@ spec: - name: "IMAGE_KN_PLUGIN_FUNC_PYTHON_39" value: "registry.access.redhat.com/ubi8/python-39@sha256:27e795fd6b1b77de70d1dc73a65e4c790650748a9cfda138fdbd194b3d6eea3d" - name: "KAFKA_IMAGE_kafka-broker-receiver__kafka-broker-receiver" - value: "registry.redhat.io/openshift-serverless-1/kn-ekb-receiver-rhel8@sha256:c8dcc59b5b12ed9fed84d90096b92daa16bc117ee2d4c8a2c400c4c52f9257a6" + value: "registry.redhat.io/openshift-serverless-1/kn-ekb-receiver-rhel8@sha256:fa8a4e0e4f8739f7ac008a437aaf55a1622b555fb55130068645733f464eb11e" - name: "KAFKA_IMAGE_kafka-broker-dispatcher__kafka-broker-dispatcher" - value: "registry.redhat.io/openshift-serverless-1/kn-ekb-dispatcher-rhel8@sha256:bb2bebb6943ba87d33ed944a12fcffbfc41211eb29a6aca249b982f7c58ef976" + value: "registry.redhat.io/openshift-serverless-1/kn-ekb-dispatcher-rhel8@sha256:cd71226f8e3fb93b6aca513fa002e7238de4fca0358e8dd9c76c7375b9ceb296" - name: "KAFKA_IMAGE_kafka-channel-receiver__kafka-channel-receiver" - value: "registry.redhat.io/openshift-serverless-1/kn-ekb-receiver-rhel8@sha256:c8dcc59b5b12ed9fed84d90096b92daa16bc117ee2d4c8a2c400c4c52f9257a6" + value: "registry.redhat.io/openshift-serverless-1/kn-ekb-receiver-rhel8@sha256:fa8a4e0e4f8739f7ac008a437aaf55a1622b555fb55130068645733f464eb11e" - name: "KAFKA_IMAGE_kafka-channel-dispatcher__kafka-channel-dispatcher" - value: "registry.redhat.io/openshift-serverless-1/kn-ekb-dispatcher-rhel8@sha256:bb2bebb6943ba87d33ed944a12fcffbfc41211eb29a6aca249b982f7c58ef976" + value: "registry.redhat.io/openshift-serverless-1/kn-ekb-dispatcher-rhel8@sha256:cd71226f8e3fb93b6aca513fa002e7238de4fca0358e8dd9c76c7375b9ceb296" - name: "KAFKA_IMAGE_kafka-controller__controller" - value: "registry.redhat.io/openshift-serverless-1/kn-ekb-kafka-controller-rhel8@sha256:e0c40cdb1c40da46ca7483b54627d5a52a346c2d0885af27493445096582c8b4" + value: "registry.redhat.io/openshift-serverless-1/kn-ekb-kafka-controller-rhel8@sha256:34c3154db5cddba110a493b8ad59186d24674459a4fb34822c0396f5a69edb9a" - name: "KAFKA_IMAGE_kafka-sink-receiver__kafka-sink-receiver" - value: "registry.redhat.io/openshift-serverless-1/kn-ekb-receiver-rhel8@sha256:c8dcc59b5b12ed9fed84d90096b92daa16bc117ee2d4c8a2c400c4c52f9257a6" + value: "registry.redhat.io/openshift-serverless-1/kn-ekb-receiver-rhel8@sha256:fa8a4e0e4f8739f7ac008a437aaf55a1622b555fb55130068645733f464eb11e" - name: "KAFKA_IMAGE_kafka-source-dispatcher__kafka-source-dispatcher" - value: "registry.redhat.io/openshift-serverless-1/kn-ekb-dispatcher-rhel8@sha256:bb2bebb6943ba87d33ed944a12fcffbfc41211eb29a6aca249b982f7c58ef976" + value: "registry.redhat.io/openshift-serverless-1/kn-ekb-dispatcher-rhel8@sha256:cd71226f8e3fb93b6aca513fa002e7238de4fca0358e8dd9c76c7375b9ceb296" - name: "KAFKA_IMAGE_kafka-webhook-eventing__kafka-webhook-eventing" - value: "registry.redhat.io/openshift-serverless-1/kn-ekb-webhook-kafka-rhel8@sha256:25ad9dc0ee6758b10d69c03c6cdb4a2aaea42e5a043cffc0859a8afa0109bb43" + value: "registry.redhat.io/openshift-serverless-1/kn-ekb-webhook-kafka-rhel8@sha256:abe9669709a5436c39ffb2d1492889a63d45b12c2a0acc3e129c8f36f767523e" - name: "KAFKA_IMAGE_kafka-controller-post-install__post-install" - value: "registry.redhat.io/openshift-serverless-1/kn-ekb-post-install-rhel8@sha256:b5051a47f23861b0ae5e4cbd01c43c4e93c2fbe2606db46ff98f964de5d1536a" + value: "registry.redhat.io/openshift-serverless-1/kn-ekb-post-install-rhel8@sha256:59aee77593b33bb545f4425ecbfd40d74eb08319b96486a8cfea19e6a1af44b1" - name: "KAFKA_IMAGE_knative-kafka-storage-version-migrator__migrate" value: "registry.redhat.io/openshift-serverless-1/kn-eventing-migrate-rhel8@sha256:1ccfc99e399f15d3d2753574433d53be546134be1136606d025de88dbaa61bd1" - name: "CURRENT_VERSION" @@ -1177,7 +1177,7 @@ spec: serviceAccountName: knative-openshift-ingress containers: - name: knative-openshift-ingress - image: registry.redhat.io/openshift-serverless-1/serverless-ingress-rhel8@sha256:f83a868da5ab04edda3364f84d4105546dc8cea9af207a700d598556d8d6471d + image: registry.redhat.io/openshift-serverless-1/serverless-ingress-rhel8@sha256:7db7af753c2494667cfbcee4afdeb6f1f9af5fd32ccfc33691ff1a425c150253 imagePullPolicy: Always ports: - containerPort: 9090 @@ -1328,39 +1328,39 @@ spec: - knativeeventings.operator.knative.dev relatedImages: - name: "knative-operator" - image: "registry.redhat.io/openshift-serverless-1/serverless-openshift-kn-rhel8-operator@sha256:5d4dc3570671e5d002117da70d5a7c03409135f09201a34d453627c876416570" + image: "registry.redhat.io/openshift-serverless-1/serverless-openshift-kn-rhel8-operator@sha256:28c760fe238af2a8ee977f047da0fcd673047ff90b9ce08157dd55a0467b2606" - name: "knative-openshift" - image: "registry.redhat.io/openshift-serverless-1/serverless-kn-operator-rhel8@sha256:6ab7f43f082659a2730e5d818317f328395f8a3f0daf7d82a2df4bf91fdbfa57" + image: "registry.redhat.io/openshift-serverless-1/serverless-kn-operator-rhel8@sha256:2b9b3327b4b0460ee033ec39163e821a2a6e67ffb4aae5f656ed88b180e41abd" - name: "knative-openshift-ingress" - image: "registry.redhat.io/openshift-serverless-1/serverless-ingress-rhel8@sha256:f83a868da5ab04edda3364f84d4105546dc8cea9af207a700d598556d8d6471d" + image: "registry.redhat.io/openshift-serverless-1/serverless-ingress-rhel8@sha256:7db7af753c2494667cfbcee4afdeb6f1f9af5fd32ccfc33691ff1a425c150253" - name: "IMAGE_queue-proxy" - image: "registry.redhat.io/openshift-serverless-1/kn-serving-queue-rhel8@sha256:aa16b9cb5c140751d7a1319a0b1bb0f4a65f6030b670d1bdd156208f2a5cdd99" + image: "registry.redhat.io/openshift-serverless-1/kn-serving-queue-rhel8@sha256:54a8c664084c4d53243b221da6a1b91c14ba562c174ed56174940a852fda1f0e" - name: "IMAGE_activator" - image: "registry.redhat.io/openshift-serverless-1/kn-serving-activator-rhel8@sha256:70a370aefc5921665b65245c295dfbe9ec9a02c2b4d8e93e72b78ace8730abfb" + image: "registry.redhat.io/openshift-serverless-1/kn-serving-activator-rhel8@sha256:70b70463581d2fcd3323f2b84b7d89f25d9334b12affd583fb77099821651694" - name: "IMAGE_autoscaler" - image: "registry.redhat.io/openshift-serverless-1/kn-serving-autoscaler-rhel8@sha256:a3281f559ce240e7af81aa2d472ec0beaea6d558766968127dc8ace64e032a43" + image: "registry.redhat.io/openshift-serverless-1/kn-serving-autoscaler-rhel8@sha256:0fe475b4661f811d20eebf7b3586df0f0e2409c0aefa6ba3dedc888ef8d8cbd5" - name: "IMAGE_autoscaler-hpa" - image: "registry.redhat.io/openshift-serverless-1/kn-serving-autoscaler-hpa-rhel8@sha256:b36122ac874a36f105d36bc48e50243c9e5c71d29805046b5760393c8b8d96e2" + image: "registry.redhat.io/openshift-serverless-1/kn-serving-autoscaler-hpa-rhel8@sha256:7c76216a126edb2334a628c39a2d45ef9da4bfc9b4ad4aa107f2d6200273dae0" - name: "IMAGE_controller__controller" - image: "registry.redhat.io/openshift-serverless-1/kn-serving-controller-rhel8@sha256:457402f0f060c7cb7fe3f7fb14b181c8d55004ca30c1e19731acdbd352edcdd8" + image: "registry.redhat.io/openshift-serverless-1/kn-serving-controller-rhel8@sha256:a45737b51b40321c6e173af1917b9ec590fbfe5d7006395d27f0986676d8f7bc" - name: "IMAGE_webhook__webhook" - image: "registry.redhat.io/openshift-serverless-1/kn-serving-webhook-rhel8@sha256:02755a1c535a2281ea27731abf8a6d14a27b88a6a232efd24b0cde36d360106a" + image: "registry.redhat.io/openshift-serverless-1/kn-serving-webhook-rhel8@sha256:b6bcdf72e0216dc87c27143e5246050f9bf641f22341a96b1cf81dcd7936f823" - name: "IMAGE_storage-version-migration-serving-__migrate" - image: "registry.redhat.io/openshift-serverless-1/kn-serving-storage-version-migration-rhel8@sha256:a479117f6d6ef5234d7eeaa28c58fc7aa4da453eeb3f94a7b72c44bcdecd8e12" + image: "registry.redhat.io/openshift-serverless-1/kn-serving-storage-version-migration-rhel8@sha256:616bdc5df77e4d0a048eac16d475e91fc0c677af08f9c87b065503846d2e8ba0" - name: "IMAGE_kourier-gateway" image: "registry.redhat.io/openshift-service-mesh/proxyv2-rhel8@sha256:a8c1de7e6c7244626e623c4f41faf139825062696a113d30abd669e47b8418c4" - name: "IMAGE_net-kourier-controller__controller" - image: "registry.redhat.io/openshift-serverless-1/net-kourier-kourier-rhel8@sha256:d9da998ddcf945634c1cde4d0de032057c65cf79f1a4e4ef8eee010c2f8f63a1" + image: "registry.redhat.io/openshift-serverless-1/net-kourier-kourier-rhel8@sha256:682aea80469852001d5b19eb71c4370683bb1f83b44f02fc3376b6039074b50e" - name: "IMAGE_net-istio-controller__controller" - image: "registry.redhat.io/openshift-serverless-1/net-istio-controller-rhel8@sha256:53e100b21a95526183d0ec159a7e53d5b9cb293d8aef1390729c1e3c85abcc48" + image: "registry.redhat.io/openshift-serverless-1/net-istio-controller-rhel8@sha256:50a3ce92af3955754077df02c7f97960d6525236b9c37179a956ff6b11253c71" - name: "IMAGE_net-istio-webhook__webhook" - image: "registry.redhat.io/openshift-serverless-1/net-istio-webhook-rhel8@sha256:71c9482b302ba193624f05f367679fdc42f3f5ea931214dc5815396585bcc5b5" + image: "registry.redhat.io/openshift-serverless-1/net-istio-webhook-rhel8@sha256:eaae5f971605a453b77477632f2b92fb5ec5fce60b387ab366022db9b8b81cb6" - name: "IMAGE_eventing-controller__eventing-controller" image: "registry.redhat.io/openshift-serverless-1/kn-eventing-controller-rhel8@sha256:1424b0b3c56f3e363cff9454466cba85ba5aac08b93ff9252a8d0ffbcdbfc0cf" - name: "IMAGE_eventing-istio-controller__eventing-istio-controller" - image: "registry.redhat.io/openshift-serverless-1/kn-eventing-istio-controller-rhel8@sha256:e405e291295bb2f74d92684c186ee37d9a00eeab830a8887795420f2a334ac85" + image: "registry.redhat.io/openshift-serverless-1/kn-eventing-istio-controller-rhel8@sha256:c6793d6589b51ac93193a23eca4a060f207904a2e2e2470d761d9a4121875e76" - name: "IMAGE_eventing-webhook__eventing-webhook" - image: "registry.redhat.io/openshift-serverless-1/kn-eventing-webhook-rhel8@sha256:4de7e0b2946b79395af3b042a1b89b3bfc9c236efb593e8acfcd21120841392c" + image: "registry.redhat.io/openshift-serverless-1/kn-eventing-webhook-rhel8@sha256:f1f62f5090ec6706b9cfada5062179dce226a59f69240ca3e34b027aba7f17df" - name: "IMAGE_storage-version-migration-eventing-__migrate" image: "registry.redhat.io/openshift-serverless-1/kn-eventing-migrate-rhel8@sha256:1ccfc99e399f15d3d2753574433d53be546134be1136606d025de88dbaa61bd1" - name: "IMAGE_mt-broker-controller__mt-broker-controller" @@ -1374,7 +1374,7 @@ spec: - name: "IMAGE_imc-dispatcher__dispatcher" image: "registry.redhat.io/openshift-serverless-1/kn-eventing-channel-dispatcher-rhel8@sha256:3708392e21ac87ff1268af64b14e8a03ac9df7aa10d00b64f6e51309e7535532" - name: "IMAGE_pingsource-mt-adapter__dispatcher" - image: "registry.redhat.io/openshift-serverless-1/kn-eventing-mtping-rhel8@sha256:eb22a407040ec3354a07a549a0df862aa62c5eeb9c9de95ca93a8a7e4f640ca3" + image: "registry.redhat.io/openshift-serverless-1/kn-eventing-mtping-rhel8@sha256:d753cb3794dbefb26ed78a97b1441e98f21d90992d3a9c775f6402fa23bd73f1" - name: "IMAGE_APISERVER_RA_IMAGE" image: "registry.redhat.io/openshift-serverless-1/kn-eventing-apiserver-receive-adapter-rhel8@sha256:14c8cb78ad03f1174af9bd9690ad487dc4f2142d47ec5743f4cc4186e9645123" - name: "IMAGE_DISPATCHER_IMAGE" @@ -1386,11 +1386,11 @@ spec: - name: "IMAGE_KUBE_RBAC_PROXY" image: "registry.redhat.io/openshift4/ose-kube-rbac-proxy-rhel9@sha256:6136488d256d1f805162f462a68a0a50eef1dc5ba9b57daf49d1a7db274b0d22" - name: "IMAGE_KN_PLUGIN_EVENT_SENDER" - image: "registry.redhat.io/openshift-serverless-1/kn-plugin-event-sender-rhel8@sha256:9f8cd0de0922c51eec4e99986d0ff45a3e5bfb4a967d1d92f80be379303301d7" + image: "registry.redhat.io/openshift-serverless-1/kn-plugin-event-sender-rhel8@sha256:62f4eff00506ec5b460c54aa024dcff2bea32c6a61351910d7906668d7ccbc6c" - name: "IMAGE_KN_CLIENT" image: "registry.redhat.io/openshift-serverless-1/kn-client-kn-rhel8@sha256:8f19047b88831262346f1889791cb3716d89ea0bb239b194485ec69a0e86f693" - name: "IMAGE_KN_PLUGIN_FUNC_UTIL" - image: "registry.redhat.io/openshift-serverless-1/kn-plugin-func-func-util-rhel8@sha256:0a2f431f477ad83bea5f6d7016afa82e6fa5404dba2fbfb8b408555e659b008f" + image: "registry.redhat.io/openshift-serverless-1/kn-plugin-func-func-util-rhel8@sha256:aed83420e16318fe9f328cb0c381745f595424d893d8f80f869d500ba1e3a1be" - name: "IMAGE_KN_PLUGIN_FUNC_TEKTON_S2I" image: "registry.redhat.io/source-to-image/source-to-image-rhel8@sha256:6a6025914296a62fdf2092c3a40011bd9b966a6806b094d51eec5e1bd5026ef4" - name: "IMAGE_KN_PLUGIN_FUNC_TEKTON_BUILDAH" @@ -1402,27 +1402,27 @@ spec: - name: "IMAGE_KN_PLUGIN_FUNC_PYTHON_39" image: "registry.access.redhat.com/ubi8/python-39@sha256:27e795fd6b1b77de70d1dc73a65e4c790650748a9cfda138fdbd194b3d6eea3d" - name: "KAFKA_IMAGE_kafka-broker-receiver__kafka-broker-receiver" - image: "registry.redhat.io/openshift-serverless-1/kn-ekb-receiver-rhel8@sha256:c8dcc59b5b12ed9fed84d90096b92daa16bc117ee2d4c8a2c400c4c52f9257a6" + image: "registry.redhat.io/openshift-serverless-1/kn-ekb-receiver-rhel8@sha256:fa8a4e0e4f8739f7ac008a437aaf55a1622b555fb55130068645733f464eb11e" - name: "KAFKA_IMAGE_kafka-broker-dispatcher__kafka-broker-dispatcher" - image: "registry.redhat.io/openshift-serverless-1/kn-ekb-dispatcher-rhel8@sha256:bb2bebb6943ba87d33ed944a12fcffbfc41211eb29a6aca249b982f7c58ef976" + image: "registry.redhat.io/openshift-serverless-1/kn-ekb-dispatcher-rhel8@sha256:cd71226f8e3fb93b6aca513fa002e7238de4fca0358e8dd9c76c7375b9ceb296" - name: "KAFKA_IMAGE_kafka-channel-receiver__kafka-channel-receiver" - image: "registry.redhat.io/openshift-serverless-1/kn-ekb-receiver-rhel8@sha256:c8dcc59b5b12ed9fed84d90096b92daa16bc117ee2d4c8a2c400c4c52f9257a6" + image: "registry.redhat.io/openshift-serverless-1/kn-ekb-receiver-rhel8@sha256:fa8a4e0e4f8739f7ac008a437aaf55a1622b555fb55130068645733f464eb11e" - name: "KAFKA_IMAGE_kafka-channel-dispatcher__kafka-channel-dispatcher" - image: "registry.redhat.io/openshift-serverless-1/kn-ekb-dispatcher-rhel8@sha256:bb2bebb6943ba87d33ed944a12fcffbfc41211eb29a6aca249b982f7c58ef976" + image: "registry.redhat.io/openshift-serverless-1/kn-ekb-dispatcher-rhel8@sha256:cd71226f8e3fb93b6aca513fa002e7238de4fca0358e8dd9c76c7375b9ceb296" - name: "KAFKA_IMAGE_kafka-controller__controller" - image: "registry.redhat.io/openshift-serverless-1/kn-ekb-kafka-controller-rhel8@sha256:e0c40cdb1c40da46ca7483b54627d5a52a346c2d0885af27493445096582c8b4" + image: "registry.redhat.io/openshift-serverless-1/kn-ekb-kafka-controller-rhel8@sha256:34c3154db5cddba110a493b8ad59186d24674459a4fb34822c0396f5a69edb9a" - name: "KAFKA_IMAGE_kafka-sink-receiver__kafka-sink-receiver" - image: "registry.redhat.io/openshift-serverless-1/kn-ekb-receiver-rhel8@sha256:c8dcc59b5b12ed9fed84d90096b92daa16bc117ee2d4c8a2c400c4c52f9257a6" + image: "registry.redhat.io/openshift-serverless-1/kn-ekb-receiver-rhel8@sha256:fa8a4e0e4f8739f7ac008a437aaf55a1622b555fb55130068645733f464eb11e" - name: "KAFKA_IMAGE_kafka-source-dispatcher__kafka-source-dispatcher" - image: "registry.redhat.io/openshift-serverless-1/kn-ekb-dispatcher-rhel8@sha256:bb2bebb6943ba87d33ed944a12fcffbfc41211eb29a6aca249b982f7c58ef976" + image: "registry.redhat.io/openshift-serverless-1/kn-ekb-dispatcher-rhel8@sha256:cd71226f8e3fb93b6aca513fa002e7238de4fca0358e8dd9c76c7375b9ceb296" - name: "KAFKA_IMAGE_kafka-webhook-eventing__kafka-webhook-eventing" - image: "registry.redhat.io/openshift-serverless-1/kn-ekb-webhook-kafka-rhel8@sha256:25ad9dc0ee6758b10d69c03c6cdb4a2aaea42e5a043cffc0859a8afa0109bb43" + image: "registry.redhat.io/openshift-serverless-1/kn-ekb-webhook-kafka-rhel8@sha256:abe9669709a5436c39ffb2d1492889a63d45b12c2a0acc3e129c8f36f767523e" - name: "KAFKA_IMAGE_kafka-controller-post-install__post-install" - image: "registry.redhat.io/openshift-serverless-1/kn-ekb-post-install-rhel8@sha256:b5051a47f23861b0ae5e4cbd01c43c4e93c2fbe2606db46ff98f964de5d1536a" + image: "registry.redhat.io/openshift-serverless-1/kn-ekb-post-install-rhel8@sha256:59aee77593b33bb545f4425ecbfd40d74eb08319b96486a8cfea19e6a1af44b1" - name: "KAFKA_IMAGE_knative-kafka-storage-version-migrator__migrate" image: "registry.redhat.io/openshift-serverless-1/kn-eventing-migrate-rhel8@sha256:1ccfc99e399f15d3d2753574433d53be546134be1136606d025de88dbaa61bd1" - name: "IMAGE_MUST_GATHER" - image: "registry.redhat.io/openshift-serverless-1/serverless-must-gather-rhel8@sha256:0ce23a94f52a7ba4ab886dbc02e88af367f4c004d98eeaf1ebecfd9d1ad430d3" + image: "registry.redhat.io/openshift-serverless-1/serverless-must-gather-rhel8@sha256:5ad67b6513473434dd6f4b8780eca499d0671aa5b4c1fcc13ac0b8be3c00b63f" - name: "IMAGE_KN_CLIENT_CLI_ARTIFACTS" image: "registry.redhat.io/openshift-serverless-1/kn-client-cli-artifacts-rhel8@sha256:2d4674de6d1f5dc52099bbe7c1aab3b20da88d98c15f0d0709f520d974f82479" replaces: serverless-operator.v1.35.0 diff --git a/rpms.lock.yaml b/rpms.lock.yaml index a0c7fec817..df8575c6e3 100644 --- a/rpms.lock.yaml +++ b/rpms.lock.yaml @@ -14,13 +14,13 @@ arches: size: 858812 checksum: "sha256:6b0dc7341d743c89fa038292a7e04761ebb6cc98208ebc26dee9f01e2c1a9529" - repoid: ubi-8-baseos-rpms - url: "https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/x86_64/baseos/os/Packages/r/rsync-3.1.3-19.el8_7.1.x86_64.rpm" - size: 420156 - checksum: "sha256:7aef9de61fbf590995b07d92f99a3f3478d6c0543d7a6e1ebb6f4b1c02334283" + url: "https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/x86_64/baseos/os/Packages/r/rsync-3.1.3-20.el8_10.x86_64.rpm" + size: 420268 + checksum: "sha256:724036dda8f8d1df70f19e56bff6d5a19b5b5c48f7ebcb266c7ec82e65a876d2" - repoid: ubi-8-baseos-rpms - url: "https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/x86_64/baseos/os/Packages/t/tzdata-2024b-4.el8.noarch.rpm" - size: 486864 - checksum: "sha256:b629ec4b416d8127314c8aecce5ada2c0c102f5dbdeb48f9a3739cbcdf2ee500" + url: "https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/x86_64/baseos/os/Packages/t/tzdata-2025a-1.el8.noarch.rpm" + size: 487380 + checksum: "sha256:4fe61db2e8f416867f661457894570b9aa8b0829d90ec92e32d208b83ed6ee13" - arch: aarch64 packages: - repoid: ubi-8-appstream-rpms @@ -32,13 +32,13 @@ arches: size: 849892 checksum: "sha256:3ba95ecab30f49ecf168ee37e6bc332b626bde62ef7bf61801613f93e2126d8e" - repoid: ubi-8-baseos-rpms - url: "https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/aarch64/baseos/os/Packages/r/rsync-3.1.3-19.el8_7.1.aarch64.rpm" - size: 410088 - checksum: "sha256:d700d21063ae2b609031a3a8772012aff012899062e952ca43370c495f7e40ff" + url: "https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/aarch64/baseos/os/Packages/r/rsync-3.1.3-20.el8_10.aarch64.rpm" + size: 410256 + checksum: "sha256:e9ad118d3ae20863d1a67c8215b24b3e08471b94ae7fcb3ff4f7a5d085a63f0f" - repoid: ubi-8-baseos-rpms - url: "https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/aarch64/baseos/os/Packages/t/tzdata-2024b-4.el8.noarch.rpm" - size: 486864 - checksum: "sha256:b629ec4b416d8127314c8aecce5ada2c0c102f5dbdeb48f9a3739cbcdf2ee500" + url: "https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/aarch64/baseos/os/Packages/t/tzdata-2025a-1.el8.noarch.rpm" + size: 487380 + checksum: "sha256:4fe61db2e8f416867f661457894570b9aa8b0829d90ec92e32d208b83ed6ee13" - arch: s390x packages: - repoid: ubi-8-appstream-rpms @@ -50,13 +50,13 @@ arches: size: 853548 checksum: "sha256:1efadfc1d2113503b8b0e95939c4cb98a7e0095fb383dec2ac4bf652822a8d87" - repoid: ubi-8-baseos-rpms - url: "https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/s390x/baseos/os/Packages/r/rsync-3.1.3-19.el8_7.1.s390x.rpm" - size: 413364 - checksum: "sha256:8819079e4ea1236eab315348584007918798776c6ea23dae5725544148316cfb" + url: "https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/s390x/baseos/os/Packages/r/rsync-3.1.3-20.el8_10.s390x.rpm" + size: 413552 + checksum: "sha256:a94953d2cbc29deb89fba7d9b91eb1d0e25db541af5129dedc723f29290c5883" - repoid: ubi-8-baseos-rpms - url: "https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/s390x/baseos/os/Packages/t/tzdata-2024b-4.el8.noarch.rpm" - size: 486864 - checksum: "sha256:b629ec4b416d8127314c8aecce5ada2c0c102f5dbdeb48f9a3739cbcdf2ee500" + url: "https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/s390x/baseos/os/Packages/t/tzdata-2025a-1.el8.noarch.rpm" + size: 487380 + checksum: "sha256:4fe61db2e8f416867f661457894570b9aa8b0829d90ec92e32d208b83ed6ee13" - arch: ppc64le packages: - repoid: ubi-8-appstream-rpms @@ -68,10 +68,10 @@ arches: size: 878620 checksum: "sha256:c34619440c83b785306420d9ae4a21ccbafe09815e5631510cccb6433f435a47" - repoid: ubi-8-baseos-rpms - url: "https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/ppc64le/baseos/os/Packages/r/rsync-3.1.3-19.el8_7.1.ppc64le.rpm" - size: 442696 - checksum: "sha256:698ca98abf03ab4dcc3d4d1795f4a392d33a2e84f0b1b1f4b9856b38e8ef0b77" + url: "https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/ppc64le/baseos/os/Packages/r/rsync-3.1.3-20.el8_10.ppc64le.rpm" + size: 442812 + checksum: "sha256:1429409eee3a0ebca5a83925f0faebcc7f224702f028402199f3aef740af3af6" - repoid: ubi-8-baseos-rpms - url: "https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/ppc64le/baseos/os/Packages/t/tzdata-2024b-4.el8.noarch.rpm" - size: 486864 - checksum: "sha256:b629ec4b416d8127314c8aecce5ada2c0c102f5dbdeb48f9a3739cbcdf2ee500" + url: "https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/ppc64le/baseos/os/Packages/t/tzdata-2025a-1.el8.noarch.rpm" + size: 487380 + checksum: "sha256:4fe61db2e8f416867f661457894570b9aa8b0829d90ec92e32d208b83ed6ee13" diff --git a/test/images-rekt.yaml b/test/images-rekt.yaml index 5e997b5355..2776bd07a8 100644 --- a/test/images-rekt.yaml +++ b/test/images-rekt.yaml @@ -1,2 +1,2 @@ knative.dev/reconciler-test/cmd/eventshub: quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-135/kn-eventing-test-eventshub@sha256:615fe497c02d6ba36e456018cb3d4eb92c6cfa71cd1f1cb8f3f095cf4c5ff1d4 -knative.dev/eventing/cmd/heartbeats: quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-135/kn-eventing-heartbeats@sha256:b99a86d321d4ff323c098e00d1fb40e6a5438bfa9dcc724dd2f8d2f2a5ad2735 +knative.dev/eventing/cmd/heartbeats: quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-135/kn-eventing-heartbeats@sha256:3016393a7c90b97c74a6000adfffbbdb31819d71a6f6c87c3f7bc98c412f60f1 diff --git a/vendor/knative.dev/operator/pkg/reconciler/common/deployments.go b/vendor/knative.dev/operator/pkg/reconciler/common/deployments.go index c0c5afcea5..b115f14076 100644 --- a/vendor/knative.dev/operator/pkg/reconciler/common/deployments.go +++ b/vendor/knative.dev/operator/pkg/reconciler/common/deployments.go @@ -18,6 +18,7 @@ package common import ( "context" + "time" mf "github.com/manifestival/manifestival" appsv1 "k8s.io/api/apps/v1" @@ -25,6 +26,7 @@ import ( "k8s.io/apimachinery/pkg/api/errors" "k8s.io/client-go/kubernetes/scheme" "knative.dev/operator/pkg/apis/operator/base" + "knative.dev/pkg/controller" ) // CheckDeployments checks all deployments in the given manifest and updates the given @@ -52,7 +54,7 @@ func CheckDeployments(ctx context.Context, manifest *mf.Manifest, instance base. if len(nonReadyDeployments) > 0 { status.MarkDeploymentsNotReady(nonReadyDeployments) - return nil + return controller.NewRequeueAfter(5*time.Second) } status.MarkDeploymentsAvailable() diff --git a/vendor/knative.dev/operator/pkg/reconciler/common/install.go b/vendor/knative.dev/operator/pkg/reconciler/common/install.go index 4b3b3adafb..94b383e464 100644 --- a/vendor/knative.dev/operator/pkg/reconciler/common/install.go +++ b/vendor/knative.dev/operator/pkg/reconciler/common/install.go @@ -21,6 +21,8 @@ import ( "fmt" "strings" + "k8s.io/apimachinery/pkg/runtime/schema" + mf "github.com/manifestival/manifestival" "knative.dev/pkg/logging" @@ -31,8 +33,9 @@ import ( var ( role mf.Predicate = mf.Any(mf.ByKind("ClusterRole"), mf.ByKind("Role")) rolebinding mf.Predicate = mf.Any(mf.ByKind("ClusterRoleBinding"), mf.ByKind("RoleBinding")) - webhook mf.Predicate = mf.Any(mf.ByKind("MutatingWebhookConfiguration"), mf.ByKind("ValidatingWebhookConfiguration")) - gatewayNotMatch = "no matches for kind \"Gateway\"" + webhook mf.Predicate = mf.Any(mf.ByKind("MutatingWebhookConfiguration"), mf.ByKind("ValidatingWebhookConfiguration")) + webhookDependantResources mf.Predicate = mf.ByGVK(schema.GroupVersionKind{"networking.internal.knative.dev", "v1alpha1", "Certificate"}) + gatewayNotMatch = "no matches for kind \"Gateway\"" ) // Install applies the manifest resources for the given version and updates the given @@ -52,7 +55,7 @@ func Install(ctx context.Context, manifest *mf.Manifest, instance base.KComponen status.MarkInstallFailed(err.Error()) return fmt.Errorf("failed to apply (cluster)rolebindings: %w", err) } - if err := manifest.Filter(mf.Not(mf.Any(role, rolebinding, webhook))).Apply(); err != nil { + if err := manifest.Filter(mf.Not(mf.Any(role, rolebinding, webhook, webhookDependantResources))).Apply(); err != nil { status.MarkInstallFailed(err.Error()) if ks, ok := instance.(*v1beta1.KnativeServing); ok && strings.Contains(err.Error(), gatewayNotMatch) && (ks.Spec.Ingress == nil || ks.Spec.Ingress.Istio.Enabled) { @@ -63,10 +66,29 @@ func Install(ctx context.Context, manifest *mf.Manifest, instance base.KComponen return fmt.Errorf("failed to apply non rbac manifest: %w", err) } + return nil +} + +func InstallWebhookConfigs(ctx context.Context, manifest *mf.Manifest, instance base.KComponent) error { + status := instance.GetStatus() if err := manifest.Filter(webhook).Apply(); err != nil { status.MarkInstallFailed(err.Error()) return fmt.Errorf("failed to apply webhooks: %w", err) } + return nil +} + +func InstallWebhookDepResources(ctx context.Context, manifest *mf.Manifest, instance base.KComponent) error { + status := instance.GetStatus() + if err := manifest.Filter(webhookDependantResources).Apply(); err != nil { + status.MarkInstallFailed(err.Error()) + return fmt.Errorf("failed to apply webhooks: %w", err) + } + return nil +} + +func MarkStatusSuccess(ctx context.Context, manifest *mf.Manifest, instance base.KComponent) error { + status := instance.GetStatus() status.MarkInstallSucceeded() status.SetVersion(TargetVersion(instance)) return nil diff --git a/vendor/knative.dev/operator/pkg/reconciler/knativeeventing/knativeeventing.go b/vendor/knative.dev/operator/pkg/reconciler/knativeeventing/knativeeventing.go index 7d652cb0d5..6c1c10ed73 100644 --- a/vendor/knative.dev/operator/pkg/reconciler/knativeeventing/knativeeventing.go +++ b/vendor/knative.dev/operator/pkg/reconciler/knativeeventing/knativeeventing.go @@ -143,6 +143,9 @@ func (r *Reconciler) ReconcileKind(ctx context.Context, ke *v1beta1.KnativeEvent r.handleBackstageResources, manifests.Install, common.CheckDeployments, + common.InstallWebhookConfigs, + manifests.SetManifestPaths, + common.MarkStatusSuccess, common.DeleteObsoleteResources(ctx, ke, r.installed), } manifest := r.manifest.Append() diff --git a/vendor/knative.dev/operator/pkg/reconciler/knativeserving/knativeserving.go b/vendor/knative.dev/operator/pkg/reconciler/knativeserving/knativeserving.go index ccf9f2f67a..df16adfb5c 100644 --- a/vendor/knative.dev/operator/pkg/reconciler/knativeserving/knativeserving.go +++ b/vendor/knative.dev/operator/pkg/reconciler/knativeserving/knativeserving.go @@ -145,6 +145,10 @@ func (r *Reconciler) ReconcileKind(ctx context.Context, ks *v1beta1.KnativeServi r.transform, manifests.Install, common.CheckDeployments, + common.InstallWebhookConfigs, + common.InstallWebhookDepResources, + manifests.SetManifestPaths, + common.MarkStatusSuccess, common.DeleteObsoleteResources(ctx, ks, r.installed), } manifest := r.manifest.Append() diff --git a/vendor/knative.dev/operator/pkg/reconciler/manifests/install.go b/vendor/knative.dev/operator/pkg/reconciler/manifests/install.go index dc5bf0d77a..275763d5b8 100644 --- a/vendor/knative.dev/operator/pkg/reconciler/manifests/install.go +++ b/vendor/knative.dev/operator/pkg/reconciler/manifests/install.go @@ -34,6 +34,10 @@ func Install(ctx context.Context, manifest *mf.Manifest, instance base.KComponen if err != nil { return err } + return nil +} + +func SetManifestPaths(ctx context.Context, manifest *mf.Manifest, instance base.KComponent) error { status := instance.GetStatus() path := common.TargetManifestPathArray(instance) version := common.TargetVersion(instance)