Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
35 changes: 19 additions & 16 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@ require (
k8s.io/client-go v0.27.2
knative.dev/eventing v0.37.1
knative.dev/eventing-kafka-broker v0.37.0
knative.dev/hack v0.0.0-20230417170854-f591fea109b3
knative.dev/networking v0.0.0-20230225001731-5e096d63b0cb
knative.dev/operator v0.36.5
knative.dev/pkg v0.0.0-20230418073056-dfad48eaa5d0
knative.dev/serving v0.36.0
knative.dev/hack v0.0.0-20230712131415-ddae80293c43
knative.dev/networking v0.0.0-20230419144338-e5d04e805e50
knative.dev/operator v0.37.3
knative.dev/pkg v0.0.0-20230718152110-aef227e72ead
knative.dev/serving v0.37.0
sigs.k8s.io/controller-runtime v0.15.0
sigs.k8s.io/yaml v1.3.0
)
Expand All @@ -42,8 +42,10 @@ require (
github.com/cloudevents/conformance v0.2.0 // indirect
github.com/emicklei/go-restful/v3 v3.10.2 // indirect
github.com/google/gnostic v0.6.9 // indirect
github.com/google/s2a-go v0.1.4 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.11.3 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/opencontainers/go-digest v1.0.0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20230525234035-dd9d682886f9 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20230629202037-9506855d4529 // indirect
)
Expand Down Expand Up @@ -84,11 +86,11 @@ require (
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/golang/snappy v0.0.4 // indirect
github.com/google/go-containerregistry v0.8.1-0.20220414143355-892d7a808387 // indirect
github.com/google/go-containerregistry v0.13.0 // indirect
github.com/google/gofuzz v1.2.0 // indirect
github.com/google/uuid v1.3.0
github.com/googleapis/enterprise-certificate-proxy v0.2.3 // indirect
github.com/googleapis/gax-go/v2 v2.7.1 // indirect
github.com/googleapis/gax-go/v2 v2.8.0 // indirect
github.com/gorilla/websocket v1.4.2 // indirect
github.com/hashicorp/errwrap v1.1.0 // indirect
github.com/hashicorp/go-multierror v1.1.1 // indirect
Expand Down Expand Up @@ -148,7 +150,7 @@ require (
golang.org/x/tools v0.11.0 // indirect
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
gomodules.xyz/jsonpatch/v2 v2.3.0 // indirect
google.golang.org/api v0.114.0 // indirect
google.golang.org/api v0.124.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto v0.0.0-20230526161137-0005af68ea54 // indirect
google.golang.org/protobuf v1.31.0 // indirect
Expand All @@ -164,7 +166,7 @@ require (
k8s.io/klog/v2 v2.100.1 // indirect
k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f // indirect
k8s.io/utils v0.0.0-20230505201702-9f6742963106
knative.dev/caching v0.0.0-20230225001731-71041a310e84 // indirect
knative.dev/caching v0.0.0-20230418150356-05a86ad5d7db // indirect
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
)
Expand All @@ -173,17 +175,18 @@ require (
github.com/go-logr/logr v1.2.4
go.uber.org/atomic v1.11.0 // indirect
k8s.io/apiextensions-apiserver v0.27.2
knative.dev/reconciler-test v0.0.0-20230503093155-937cf5922570
knative.dev/reconciler-test v0.0.0-20230810072039-8843b15af690
)

replace (
// Knative components
knative.dev/eventing => github.com/openshift-knative/eventing v0.99.1-0.20230612132502-c991bb2a3cd1
knative.dev/eventing-kafka-broker => github.com/openshift-knative/eventing-kafka-broker v0.25.1-0.20230530161159-ecd8c928d85a
knative.dev/hack => knative.dev/hack v0.0.0-20230217102752-199139daec7e
knative.dev/networking => knative.dev/networking v0.0.0-20230225001731-5e096d63b0cb
knative.dev/pkg => knative.dev/pkg v0.0.0-20230224205330-75da922ef055
knative.dev/serving => github.com/openshift-knative/serving v0.10.1-0.20230511104239-03cf72c1c069
knative.dev/eventing => github.com/openshift-knative/eventing v0.99.1-0.20230811091754-f22178d5c46c
knative.dev/eventing-kafka-broker => github.com/openshift-knative/eventing-kafka-broker v0.25.1-0.20230803130431-bf8f4e608e85
knative.dev/hack => knative.dev/hack v0.0.0-20230417170854-f591fea109b3
knative.dev/networking => knative.dev/networking v0.0.0-20230419144338-e5d04e805e50
knative.dev/pkg => knative.dev/pkg v0.0.0-20230418073056-dfad48eaa5d0
knative.dev/reconciler-test => knative.dev/reconciler-test v0.0.0-20230810072039-8843b15af690
knative.dev/serving => github.com/openshift-knative/serving v0.10.1-0.20230721070749-1af735104330
)

replace (
Expand Down
55 changes: 31 additions & 24 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -360,8 +360,8 @@ github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
github.com/google/go-containerregistry v0.8.1-0.20220414143355-892d7a808387 h1:GWICy4b02s8EA1M9H5krRQ48BKpIHO5LtBBm2BQLhx0=
github.com/google/go-containerregistry v0.8.1-0.20220414143355-892d7a808387/go.mod h1:eTLvLZaEe2FoQsb25t7BLxQQryyrwHTzFfwxN87mhAw=
github.com/google/go-containerregistry v0.13.0 h1:y1C7Z3e149OJbOPDBxLYR8ITPz8dTKqQwjErKVHJC8k=
github.com/google/go-containerregistry v0.13.0/go.mod h1:J9FQ+eSS4a1aC2GNZxvNpbWhgp0487v+cgiilB4FqDo=
github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
github.com/google/gofuzz v1.1.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0=
Expand Down Expand Up @@ -389,6 +389,8 @@ github.com/google/pprof v0.0.0-20210601050228-01bbb1931b22/go.mod h1:kpwsk12EmLe
github.com/google/pprof v0.0.0-20210609004039-a478d1d731e9/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
github.com/google/s2a-go v0.1.4 h1:1kZ/sQM3srePvKs3tXAvQzo66XfcReoqFpIpIccE7Oc=
github.com/google/s2a-go v0.1.4/go.mod h1:Ej+mSEMGRnqRzjc7VtF+jdBwYG5fuJfiZ8ELkjEwM0A=
github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
Expand All @@ -397,8 +399,8 @@ github.com/googleapis/enterprise-certificate-proxy v0.2.3/go.mod h1:AwSRAtLfXpU5
github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=
github.com/googleapis/gax-go/v2 v2.1.0/go.mod h1:Q3nei7sK6ybPYH7twZdmQpAd1MKb7pfu6SK+H1/DsU0=
github.com/googleapis/gax-go/v2 v2.7.1 h1:gF4c0zjUP2H/s/hEGyLA3I0fA2ZWjzYiONAD6cvPr8A=
github.com/googleapis/gax-go/v2 v2.7.1/go.mod h1:4orTrqY6hXxxaUL4LHIPl6lGo8vAE38/qKbhSAKP6QI=
github.com/googleapis/gax-go/v2 v2.8.0 h1:UBtEZqx1bjXtOQ5BVTkuYghXrr3N4V123VKJK67vJZc=
github.com/googleapis/gax-go/v2 v2.8.0/go.mod h1:4orTrqY6hXxxaUL4LHIPl6lGo8vAE38/qKbhSAKP6QI=
github.com/googleapis/gnostic v0.4.0/go.mod h1:on+2t9HRStVgn95RSsFWFz+6Q0Snyqv1awfrALZdbtU=
github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg=
Expand Down Expand Up @@ -597,12 +599,14 @@ github.com/onsi/gomega v1.18.1/go.mod h1:0q+aL8jAiMXy9hbwj2mr5GziHiwhAIQpFmmtT5h
github.com/onsi/gomega v1.19.0/go.mod h1:LY+I3pBVzYsTBU1AnDwOSxaYi9WoWiqgwooUqq9yPro=
github.com/onsi/gomega v1.20.1/go.mod h1:DtrZpjmvpn2mPm4YWQa0/ALMDj9v4YxLgojwPeREyVo=
github.com/onsi/gomega v1.24.1 h1:KORJXNNTzJXzu4ScJWssJfJMnJ+2QJqhoQSRwNlze9E=
github.com/openshift-knative/eventing v0.99.1-0.20230612132502-c991bb2a3cd1 h1:u3cC31YfguU/82QJSvk75GE9/SIOzVGXwlRJgJ3Ytgs=
github.com/openshift-knative/eventing v0.99.1-0.20230612132502-c991bb2a3cd1/go.mod h1:KYXv6I8okKVrCq1EZXlGH+BZhbBEI7TQF86MaDvp7DM=
github.com/openshift-knative/eventing-kafka-broker v0.25.1-0.20230530161159-ecd8c928d85a h1:e0khjsVw7KCp85NVICO6GxNeQ1AIMsui2nDD3YPf3RE=
github.com/openshift-knative/eventing-kafka-broker v0.25.1-0.20230530161159-ecd8c928d85a/go.mod h1:2XXAh/B9WexfpVUZ1Cy82pmPvA84HDDsidns9w5RSF4=
github.com/openshift-knative/serving v0.10.1-0.20230511104239-03cf72c1c069 h1:DE1odpVnK9W/jJipv4xm51xz/TYu0kazLRTowi0YeSI=
github.com/openshift-knative/serving v0.10.1-0.20230511104239-03cf72c1c069/go.mod h1:1xtMO2p5x4BTb28Z0/hE94QMdmHPIweZ2v4wV/9HAkI=
github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U=
github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM=
github.com/openshift-knative/eventing v0.99.1-0.20230811091754-f22178d5c46c h1:7T43mjIE9ol69jpWs3b2f588xzZriVqSTiMKb7rxiyI=
github.com/openshift-knative/eventing v0.99.1-0.20230811091754-f22178d5c46c/go.mod h1:tUUt7Myic84z4nSY00Km4noZE/JZ9/Gz4mf8yCwFzRg=
github.com/openshift-knative/eventing-kafka-broker v0.25.1-0.20230803130431-bf8f4e608e85 h1:Jlwnd48IFvAZjeDkAFcEWoT3WMLfI3i39OVI759T0Es=
github.com/openshift-knative/eventing-kafka-broker v0.25.1-0.20230803130431-bf8f4e608e85/go.mod h1:ewu1vcgRwlTms6aHPQ9LrxAtAbEu3uggEsrx+GOju+A=
github.com/openshift-knative/serving v0.10.1-0.20230721070749-1af735104330 h1:kJpmb4D04ELjCM+0qt4isWDkwhFD8ofEQElQ8TMa+Ko=
github.com/openshift-knative/serving v0.10.1-0.20230721070749-1af735104330/go.mod h1:v0Xbfp7olb0Gljm5l4qNuLsIf8/2p1rIt/mphxvx1z0=
github.com/openshift/api v0.0.0-20221013123533-341d389bd4a7 h1:0ozX+r8aE4SYr/v0UoThlrd4ucx7GbIbeq+luFm0ASw=
github.com/openshift/api v0.0.0-20221013123533-341d389bd4a7/go.mod h1:F/eU6jgr6Q2VhMu1mSpMmygxAELd7+BUxs3NHZ25jV4=
github.com/openshift/build-machinery-go v0.0.0-20211213093930-7e33a7eb4ce3/go.mod h1:b1BuldmJlbA/xYtdZvKi+7j5YGB44qJUJDZ9zwiNCfE=
Expand Down Expand Up @@ -861,6 +865,7 @@ golang.org/x/crypto v0.0.0-20210920023735-84f357641f63/go.mod h1:GvvjBRRGRdwPK5y
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
golang.org/x/crypto v0.0.0-20220214200702-86341886e292/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
golang.org/x/crypto v0.0.0-20220314234659-1baeb1ce4c0b/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
golang.org/x/crypto v0.0.0-20220315160706-3147a52a75dd/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
golang.org/x/crypto v0.11.0 h1:6Ewdq3tDic1mg5xRO4milcWCfMVQhI4NkqWWvqejpuA=
Expand Down Expand Up @@ -1103,6 +1108,7 @@ golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
golang.org/x/text v0.11.0 h1:LAntKIrcmeSKERyiOh0XMV39LXS8IE9UL2yP7+f5ij4=
golang.org/x/text v0.11.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
Expand Down Expand Up @@ -1223,8 +1229,8 @@ google.golang.org/api v0.51.0/go.mod h1:t4HdrdoNgyN5cbEfm7Lum0lcLDLiise1F8qDKX00
google.golang.org/api v0.54.0/go.mod h1:7C4bFFOvVDGXjfDTAsgGwDgAxRDeQ4X8NvUedIt6z3k=
google.golang.org/api v0.55.0/go.mod h1:38yMfeP1kfjsl8isn0tliTjIb1rJXcQi4UXlbqivdVE=
google.golang.org/api v0.57.0/go.mod h1:dVPlbZyBo2/OjBpmvNdpn2GRm6rPy75jyU7bmhdrMgI=
google.golang.org/api v0.114.0 h1:1xQPji6cO2E2vLiI+C/XiFAnsn1WV3mjaEwGLhi3grE=
google.golang.org/api v0.114.0/go.mod h1:ifYI2ZsFK6/uGddGfAD5BMxlnkBqCmqHSDUVi45N5Yg=
google.golang.org/api v0.124.0 h1:dP6Ef1VgOGqQ8eiv4GiY8RhmeyqzovcXBYPDUYG8Syo=
google.golang.org/api v0.124.0/go.mod h1:xu2HQurE5gi/3t1aFCvhPD781p0a3p11sdunTJ2BlP4=
google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
Expand Down Expand Up @@ -1327,6 +1333,7 @@ google.golang.org/grpc v1.39.1/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnD
google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34=
google.golang.org/grpc v1.41.0/go.mod h1:U3l9uK9J0sini8mHphKoXyaqDA/8VyGnDee1zzIUK6k=
google.golang.org/grpc v1.42.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU=
google.golang.org/grpc v1.45.0/go.mod h1:lN7owxKUQEqMfSyQikvvk5tf/6zMPsrK+ONuO11+0rQ=
google.golang.org/grpc v1.57.0 h1:kfzNeI/klCGD2YPMUlaGNT3pxvYfga7smW3Vth8Zsiw=
google.golang.org/grpc v1.57.0/go.mod h1:Sd+9RMTACXwmub0zcNY2c4arhtrbBYD1AUHI/dt16Mo=
google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw=
Expand Down Expand Up @@ -1430,18 +1437,18 @@ k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1 h1:MQ8BAZPZlWk3S9K4a9NCkI
k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1/go.mod h1:C/N6wCaBHeBHkHUesQOQy2/MZqGgMAFPqGsGQLdbZBU=
k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed h1:jAne/RjBTyawwAy0utX5eqigAwz/lQhTmy+Hr/Cpue4=
k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
knative.dev/caching v0.0.0-20230225001731-71041a310e84 h1:QDqwMP8TJP+/bRZ0eF83z4kcrRRab8UVp8iZO7hPgk0=
knative.dev/caching v0.0.0-20230225001731-71041a310e84/go.mod h1:eD6g87SUEoP9O7IP8+emIy3SPjucL+eJm7ICrJc/50c=
knative.dev/hack v0.0.0-20230217102752-199139daec7e h1:eWgg59nZ5wZK1XMAK1Fiy4+LQSK6kuleM67TOJlSAx8=
knative.dev/hack v0.0.0-20230217102752-199139daec7e/go.mod h1:yk2OjGDsbEnQjfxdm0/HJKS2WqTLEFg/N6nUs6Rqx3Q=
knative.dev/networking v0.0.0-20230225001731-5e096d63b0cb h1:RJsO4x2kqp2yIac9Av9Q+QqX40Y4WMuHNDkLLWciYZs=
knative.dev/networking v0.0.0-20230225001731-5e096d63b0cb/go.mod h1:GLkeWEfzSf7L/WUTueRzzOcTgR04jf+3bXGw8vex2nM=
knative.dev/operator v0.36.5 h1:8DopiNoeD/UDakL43iF+wToI9oxRM6Z3TOmrHWOjUQI=
knative.dev/operator v0.36.5/go.mod h1:3KW5oOziig3eJu9gkAlRlcpt9s34mwkL9/BC9S5pWvM=
knative.dev/pkg v0.0.0-20230224205330-75da922ef055 h1:VfKOAnbgJXJMz7n66yW7Rj6Sl2bQZng6RzvX4MMB2Jg=
knative.dev/pkg v0.0.0-20230224205330-75da922ef055/go.mod h1:QkgVAUCziNOZmoqL/E25ig2cbVQ2teZyGNCNqaApO44=
knative.dev/reconciler-test v0.0.0-20230503093155-937cf5922570 h1:4vbk91V/3Ds+fzB2UyesuPrrBgxs2W4bhcS4qaLwBoI=
knative.dev/reconciler-test v0.0.0-20230503093155-937cf5922570/go.mod h1:vZihHUKPh+sMzzx2lHgkM2tKr+f/lZqMJ9O7Jw0DaYs=
knative.dev/caching v0.0.0-20230418150356-05a86ad5d7db h1:69NjUKOsucU5tmCrnkdlULjai+2bZLHF97ZrA/v8PZI=
knative.dev/caching v0.0.0-20230418150356-05a86ad5d7db/go.mod h1:d261UN7aE93sODDnqVuhlaRcEUPjSBOyrUlBxuBp+UU=
knative.dev/hack v0.0.0-20230417170854-f591fea109b3 h1:+W4WBOq83tfGXKhtv8OB/uJeYqze3zh69GKiz1ucuqk=
knative.dev/hack v0.0.0-20230417170854-f591fea109b3/go.mod h1:yk2OjGDsbEnQjfxdm0/HJKS2WqTLEFg/N6nUs6Rqx3Q=
knative.dev/networking v0.0.0-20230419144338-e5d04e805e50 h1:X9rPBYr7Vrm075q0iXTr7/0oklkYoyqvlnrUwNzcUhI=
knative.dev/networking v0.0.0-20230419144338-e5d04e805e50/go.mod h1:o2MyGpGfU5DoSAWCE2f/jnSC9GjGOplCslbA99yDkGo=
knative.dev/operator v0.37.3 h1:HJWUsqpffKktAs0gcwbblcnB07DwbUNkOhBl7a25Lw4=
knative.dev/operator v0.37.3/go.mod h1:HRXP4e3UfvbIzLGyc6vdaAPyWLC1PJUZwqBRnljHcrg=
knative.dev/pkg v0.0.0-20230418073056-dfad48eaa5d0 h1:EFQcoUo8I4bc+U3y6tR1B3ONYZSHWUdAfI7Vh7dae8g=
knative.dev/pkg v0.0.0-20230418073056-dfad48eaa5d0/go.mod h1:2qWPP9Gjh9Q7ETti+WRHnBnGCSCq+6q7m3p/nmUQviE=
knative.dev/reconciler-test v0.0.0-20230810072039-8843b15af690 h1:47Ik6D1Wx8JxCc8u9oDHzeLcukFKRiysr204FnemZ84=
knative.dev/reconciler-test v0.0.0-20230810072039-8843b15af690/go.mod h1:By7fsbkjKWbTmxwAs9lL1itxZI1otbhiEsAZmprEtvI=
pgregory.net/rapid v0.3.3 h1:jCjBsY4ln4Atz78QoBWxUEvAHaFyNDQg9+WU62aCn1U=
pgregory.net/rapid v0.3.3/go.mod h1:UYpPVyjFHzYBGHIxLFoupi8vwk6rXNzRY9OMvVxFIOU=
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
Expand Down
60 changes: 34 additions & 26 deletions hack/patches/005-conversion-webhook.patch
Original file line number Diff line number Diff line change
@@ -1,33 +1,43 @@
diff --git a/vendor/knative.dev/pkg/webhook/webhook.go b/vendor/knative.dev/pkg/webhook/webhook.go
index ffb806ee..4f828b33 100644
--- a/vendor/knative.dev/pkg/webhook/webhook.go
+++ b/vendor/knative.dev/pkg/webhook/webhook.go
@@ -23,6 +23,7 @@ import (
--- a/vendor/knative.dev/pkg/webhook/webhook.go (revision 2c1d13a1415e5ecc3ef6e25b091a2d8f588a543e)
+++ b/vendor/knative.dev/pkg/webhook/webhook.go (date 1691045295909)
@@ -23,6 +23,7 @@
"fmt"
"html"
"net/http"
+ "os"
"time"

// Injection stuff
@@ -135,26 +136,44 @@ func New(
@@ -146,26 +147,44 @@
// a new secret informer from it.
secretInformer := kubeinformerfactory.Get(ctx).Core().V1().Secrets()

- webhook.tlsConfig = &tls.Config{
- MinVersion: tls.VersionTLS12,
- MinVersion: opts.TLSMinVersion,
-
- // If we return (nil, error) the client sees - 'tls: internal error"
- // If we return (nil, nil) the client sees - 'tls: no certificates configured'
- //
- // We'll return (nil, nil) when we don't find a certificate
- GetCertificate: func(*tls.ClientHelloInfo) (*tls.Certificate, error) {
- secret, err := secretInformer.Lister().Secrets(system.Namespace()).Get(opts.SecretName)
- if err != nil {
- logger.Errorw("failed to fetch secret", zap.Error(err))
- return nil, nil
- }
+ var getCertificate = func(*tls.ClientHelloInfo) (*tls.Certificate, error) {
+ secret, err := secretInformer.Lister().Secrets(system.Namespace()).Get(opts.SecretName)
+ if err != nil {
+ logger.Errorw("failed to fetch secret", zap.Error(err))
+ return nil, nil
+ }

- // If we return (nil, error) the client sees - 'tls: internal error"
- // If we return (nil, nil) the client sees - 'tls: no certificates configured'
- //
- // We'll return (nil, nil) when we don't find a certificate
- GetCertificate: func(*tls.ClientHelloInfo) (*tls.Certificate, error) {
- serverKey, ok := secret.Data[certresources.ServerKey]
- if !ok {
- logger.Warn("server key missing")
- return nil, nil
- }
- serverCert, ok := secret.Data[certresources.ServerCert]
+ serverKey, ok := secret.Data[certresources.ServerKey]
+ if !ok {
+ logger.Warn("server key missing")
Expand All @@ -47,24 +57,22 @@ index ffb806ee..4f828b33 100644
+
+ if os.Getenv("USE_OLM_TLS") != "" {
+ getCertificate = func(*tls.ClientHelloInfo) (*tls.Certificate, error) {
secret, err := secretInformer.Lister().Secrets(system.Namespace()).Get(opts.SecretName)
if err != nil {
logger.Errorw("failed to fetch secret", zap.Error(err))
return nil, nil
}

- serverKey, ok := secret.Data[certresources.ServerKey]
+ secret, err := secretInformer.Lister().Secrets(system.Namespace()).Get(opts.SecretName)
+ if err != nil {
+ logger.Errorw("failed to fetch secret", zap.Error(err))
+ return nil, nil
+ }
+
+ serverKey, ok := secret.Data["tls.key"]
if !ok {
logger.Warn("server key missing")
return nil, nil
}
- serverCert, ok := secret.Data[certresources.ServerCert]
+ if !ok {
+ logger.Warn("server key missing")
+ return nil, nil
+ }
+ serverCert, ok := secret.Data["tls.crt"]
if !ok {
logger.Warn("server cert missing")
return nil, nil
@@ -164,7 +183,17 @@ func New(
@@ -175,7 +194,17 @@
return nil, err
}
return &cert, nil
Expand All @@ -73,7 +81,7 @@ index ffb806ee..4f828b33 100644
+ }
+
+ webhook.tlsConfig = &tls.Config{
+ MinVersion: tls.VersionTLS12,
+ MinVersion: opts.TLSMinVersion,
+
+ // If we return (nil, error) the client sees - 'tls: internal error"
+ // If we return (nil, nil) the client sees - 'tls: no certificates configured'
Expand Down
Loading