Skip to content

Commit

Permalink
Bump eventing 1.15 (#2867)
Browse files Browse the repository at this point in the history 
* Run make generated-files

Signed-off-by: Pierangelo Di Pilato <pierdipi@redhat.com>

* Bump Go dependencies to 1.15

Signed-off-by: Pierangelo Di Pilato <pierdipi@redhat.com>

* Drop toolchain

Signed-off-by: Pierangelo Di Pilato <pierdipi@redhat.com>

* Metadata webhook

Signed-off-by: Pierangelo Di Pilato <pierdipi@redhat.com>

* Fix compilation errors in /test

Signed-off-by: Pierangelo Di Pilato <pierdipi@redhat.com>

* Upgrade dependencies

Signed-off-by: Pierangelo Di Pilato <pierdipi@redhat.com>

* Migrate downgrade flow to channel v2 process

Signed-off-by: Pierangelo Di Pilato <pierdipi@redhat.com>

* Use Eventing test namespace

Signed-off-by: Pierangelo Di Pilato <pierdipi@redhat.com>

---------

Signed-off-by: Pierangelo Di Pilato <pierdipi@redhat.com>
  • Loading branch information
@pierDipi
pierDipi authored Sep 24, 2024
1 parent 5f30382 commit 96c8eba
Show file tree
Hide file tree
Showing 1,070 changed files with 17,095 additions and 176,292 deletions.
2 changes: 2 additions & 0 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -323,11 +323,13 @@ generate-dockerfiles:
--includes knative-operator \
--includes openshift-knative-operator \
--includes serving/ingress \
--includes serving/metadata-webhook \
--project-file olm-catalog/serverless-operator/project.yaml \
--output /tmp/serverless-operator-generator/
cp /tmp/serverless-operator-generator/ci-operator/knative-images/knative-operator/Dockerfile knative-operator/Dockerfile
cp /tmp/serverless-operator-generator/ci-operator/knative-images/openshift-knative-operator/Dockerfile openshift-knative-operator/Dockerfile
cp /tmp/serverless-operator-generator/ci-operator/knative-images/ingress/Dockerfile serving/ingress/Dockerfile
cp /tmp/serverless-operator-generator/ci-operator/knative-images/webhook/Dockerfile serving/metadata-webhook/Dockerfile

git apply knative-operator/dockerfile.patch
git apply openshift-knative-operator/dockerfile.patch
Expand Down
63 changes: 24 additions & 39 deletions go.mod
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
module github.com/openshift-knative/serverless-operator

go 1.21.0

toolchain go1.22.5
go 1.22

require (
github.com/blang/semver/v4 v4.0.0
Expand All @@ -12,65 +10,55 @@ require (
github.com/manifestival/controller-runtime-client v0.4.0
github.com/manifestival/manifestival v0.7.2
github.com/openshift/api v3.9.0+incompatible
github.com/openshift/client-go v0.0.0-20220831193253-4950ae70c8ea
github.com/openshift/client-go v0.0.0-20230120202327-72f107311084
github.com/openshift/machine-config-operator v0.0.1-0.20220201192635-14a1ca2cb91f
github.com/operator-framework/api v0.23.0
github.com/operator-framework/operator-lifecycle-manager v0.25.0
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.73.2
github.com/prometheus-operator/prometheus-operator/pkg/client v0.73.2
github.com/prometheus/client_golang v1.20.3
github.com/prometheus/common v0.55.0
github.com/spf13/pflag v1.0.5
github.com/spf13/pflag v1.0.6-0.20210604193023-d5e0c0615ace
github.com/stretchr/testify v1.9.0
go.uber.org/zap v1.27.0
golang.org/x/sync v0.8.0
google.golang.org/grpc v1.66.1
k8s.io/api v0.29.3
k8s.io/apimachinery v0.29.3
k8s.io/client-go v0.29.3
knative.dev/eventing v0.41.0
knative.dev/eventing v0.42.0
knative.dev/eventing-kafka-broker v0.37.0
knative.dev/hack v0.0.0-20240404013450-1133b37da8d7
knative.dev/networking v0.0.0-20240418213116-979f63728302
knative.dev/operator v0.41.2
knative.dev/pkg v0.0.0-20240416145024-0f34a8815650
knative.dev/serving v0.41.0
knative.dev/hack v0.0.0-20240814130635-06f7aff93954
knative.dev/networking v0.0.0-20240716111826-bab7f2a3e556
knative.dev/operator v0.42.4
knative.dev/pkg v0.0.0-20240716082220-4355f0c73608
knative.dev/serving v0.42.1
sigs.k8s.io/controller-runtime v0.17.3
sigs.k8s.io/yaml v1.4.0
)

require (
cloud.google.com/go/compute/metadata v0.3.0 // indirect
github.com/IBM/sarama v1.43.2 // indirect
github.com/cloudevents/conformance v0.2.0 // indirect
github.com/coreos/go-oidc/v3 v3.9.0 // indirect
github.com/emicklei/go-restful/v3 v3.12.0 // indirect
github.com/felixge/httpsnoop v1.0.4 // indirect
github.com/go-jose/go-jose/v3 v3.0.3 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/google/gnostic-models v0.6.8 // indirect
github.com/google/s2a-go v0.1.7 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 // indirect
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
github.com/hashicorp/go-retryablehttp v0.7.7 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/opencontainers/go-digest v1.0.0 // indirect
github.com/rs/dnscache v0.0.0-20211102005908-e0241e321417 // indirect
github.com/valyala/bytebufferpool v1.0.0 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.53.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect
go.opentelemetry.io/otel v1.28.0 // indirect
go.opentelemetry.io/otel/metric v1.28.0 // indirect
go.opentelemetry.io/otel/trace v1.28.0 // indirect
golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // indirect
)

require (
cloud.google.com/go v0.112.1 // indirect
cloud.google.com/go/iam v1.1.7 // indirect
cloud.google.com/go/storage v1.40.0 // indirect
contrib.go.opencensus.io/exporter/ocagent v0.7.1-0.20200907061046-05415f1de66d // indirect
contrib.go.opencensus.io/exporter/prometheus v0.4.2 // indirect
contrib.go.opencensus.io/exporter/zipkin v0.1.2 // indirect
Expand Down Expand Up @@ -103,8 +91,6 @@ require (
github.com/google/go-containerregistry v0.13.0 // indirect
github.com/google/gofuzz v1.2.0 // indirect
github.com/google/uuid v1.6.0
github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect
github.com/googleapis/gax-go/v2 v2.12.3 // indirect
github.com/gorilla/websocket v1.5.1 // indirect
github.com/hashicorp/errwrap v1.1.0 // indirect
github.com/hashicorp/go-multierror v1.1.1 // indirect
Expand Down Expand Up @@ -151,17 +137,16 @@ require (
go.uber.org/automaxprocs v1.5.3 // indirect
go.uber.org/multierr v1.11.0 // indirect
golang.org/x/crypto v0.25.0 // indirect
golang.org/x/mod v0.17.0 // indirect
golang.org/x/mod v0.19.0 // indirect
golang.org/x/net v0.27.0 // indirect
golang.org/x/oauth2 v0.21.0 // indirect
golang.org/x/sys v0.23.0 // indirect
golang.org/x/term v0.22.0 // indirect
golang.org/x/text v0.16.0 // indirect
golang.org/x/time v0.5.0 // indirect
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
golang.org/x/tools v0.23.0 // indirect
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
google.golang.org/api v0.172.0 // indirect
google.golang.org/genproto v0.0.0-20240227224415-6ceb2ff114de // indirect
google.golang.org/api v0.183.0 // indirect
google.golang.org/protobuf v1.34.2 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
Expand All @@ -175,7 +160,7 @@ require (
k8s.io/klog/v2 v2.120.1 // indirect
k8s.io/kube-openapi v0.0.0-20240322212309-b815d8309940 // indirect
k8s.io/utils v0.0.0-20240310230437-4693a0247e57
knative.dev/caching v0.0.0-20240416165252-b8488ea65413 // indirect
knative.dev/caching v0.0.0-20240716132144-989f54c83776 // indirect
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
)
Expand All @@ -184,25 +169,25 @@ require (
github.com/go-logr/logr v1.4.2
go.uber.org/atomic v1.11.0 // indirect
k8s.io/apiextensions-apiserver v0.29.3
knative.dev/reconciler-test v0.0.0-20240503125949-8fd5ae6217a3
knative.dev/reconciler-test v0.0.0-20240716134925-00d94f40c470
)

replace (
// Knative components
knative.dev/eventing => github.com/openshift-knative/eventing v0.99.1-0.20240523124750-771225217dab
knative.dev/eventing-kafka-broker => github.com/openshift-knative/eventing-kafka-broker v0.25.1-0.20240515072058-56235ea0c0e7
knative.dev/hack => knative.dev/hack v0.0.0-20240404013450-1133b37da8d7
knative.dev/networking => knative.dev/networking v0.0.0-20240418213116-979f63728302
knative.dev/pkg => knative.dev/pkg v0.0.0-20240416145024-0f34a8815650
knative.dev/reconciler-test => knative.dev/reconciler-test v0.0.0-20240503125949-8fd5ae6217a3
knative.dev/serving => github.com/openshift-knative/serving v0.10.1-0.20240514051318-0a65b046b206
knative.dev/eventing => github.com/openshift-knative/eventing v0.99.1-0.20240918092417-3789dfefcce5
knative.dev/eventing-kafka-broker => github.com/openshift-knative/eventing-kafka-broker v0.25.1-0.20240917152412-5dd3c57c9356
knative.dev/hack => knative.dev/hack v0.0.0-20240814135050-f9643117f6a1
knative.dev/networking => knative.dev/networking v0.0.0-20240716111826-bab7f2a3e556
knative.dev/pkg => knative.dev/pkg v0.0.0-20240716082220-4355f0c73608
knative.dev/reconciler-test => knative.dev/reconciler-test v0.0.0-20240716134925-00d94f40c470
knative.dev/serving => github.com/openshift-knative/serving v0.10.1-0.20240906121033-618992fcbd27
)

replace (
// OpenShift components
github.com/openshift/api => github.com/openshift/api v0.0.0-20240103200955-7ca3a4634e46
github.com/openshift/client-go => github.com/openshift/client-go v0.0.0-20221019143426-16aed247da5c
github.com/openshift/machine-config-operator => github.com/openshift/machine-config-operator v0.0.1-0.20240517173717-dd2a0b3f915b
github.com/openshift/api => github.com/openshift/api v0.0.0-20231118005202-0f638a8a4705
github.com/openshift/client-go => github.com/openshift/client-go v0.0.0-20230120202327-72f107311084
github.com/openshift/machine-config-operator => github.com/openshift/machine-config-operator v0.0.1-0.20240813185428-b1a8f6946397
)

// This replacement can be removed once we bump to k8s.io@v1.30.x, as from release 1.30+
Expand Down
Loading

0 comments on commit 96c8eba

Please sign in to comment.