Update the deps

go.sum

@@ -808,8 +808,6 @@ k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f h1:2kWPakN3i/k81b0gvD5C5F
 k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f/go.mod h1:byini6yhqGC14c3ebc/QwanvYwhuMWF6yz2F8uwW8eg=
 k8s.io/utils v0.0.0-20230209194617-a36077c30491 h1:r0BAOLElQnnFhE/ApUsg3iHdVYYPBjNSSOMowRZxxsY=
 k8s.io/utils v0.0.0-20230209194617-a36077c30491/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
-<<<<<<< HEAD
-<<<<<<< HEAD
 knative.dev/caching v0.0.0-20231108204433-b3781bc47aeb h1:9kuTebXS3SuSxWLGr/5eplg8qu+xn9y/CjFHgVBBo2Q=
 knative.dev/caching v0.0.0-20231108204433-b3781bc47aeb/go.mod h1:owQX47ghEY9OIaxvoTZ9KyJTfEiwLgwY94tyHoUlLUU=
 knative.dev/hack v0.0.0-20231109190034-5deaddeb51a7 h1:HXf7M7n9jwn+Hp904r0HXRSymf+DLXSciFpXVpCg+Bs=
@@ -820,44 +818,6 @@ knative.dev/pkg v0.0.0-20231109234131-6564cf14689f h1:DA4Gu57CAVdhWna0dj6OAFfwur
 knative.dev/pkg v0.0.0-20231109234131-6564cf14689f/go.mod h1:bG/l4f2gZBUCcpsTEf+yFB6NSG+Epmz6idd7cctlmIM=
 knative.dev/serving v0.39.1-0.20231110001346-17fa595188b1 h1:Mz8w0UkXF468bzE7vECjs13Zc8pVDaRyDcR/QfTdx/o=
 knative.dev/serving v0.39.1-0.20231110001346-17fa595188b1/go.mod h1:V3y4IjbCI31gRAoXMtYf8eF8v5KON/2iUPOLxJ/QHrI=
-=======
-<<<<<<< HEAD
-=======
->>>>>>> eb20787 (Updated the dependencies)
-knative.dev/caching v0.0.0-20231101191025-c6425778e5ba h1:wMfEfoiu+yfpKG79k9MUhY4ww8p3YiuqQOt0QfgqMoE=
-knative.dev/caching v0.0.0-20231101191025-c6425778e5ba/go.mod h1:36UniA7tdm8pj9dPAt44dneazLbcQqraNSftnOUYRks=
-knative.dev/hack v0.0.0-20231102183416-0d99b7ee9d63 h1:QNbIbsep8jreNCXj3EFrsw0RtsrmMZw7yxYyUG5AILs=
-knative.dev/hack v0.0.0-20231102183416-0d99b7ee9d63/go.mod h1:yk2OjGDsbEnQjfxdm0/HJKS2WqTLEFg/N6nUs6Rqx3Q=
-knative.dev/networking v0.0.0-20231103063604-18529fd26a8b h1:bimYPtsVmXBGjA0dARsoyNFKtREIVceVScnKdsHmqjo=
-knative.dev/networking v0.0.0-20231103063604-18529fd26a8b/go.mod h1:XKuKrS5QCQ3LkPeOYBZqyUxseBIBLpujxttejIBjoCk=
-knative.dev/pkg v0.0.0-20231102200604-fac3a4ffbc74 h1:phT8Z3zNyL0OPh9z0EpTJdDMT9sn2x9wtFB5IqI4vJA=
-knative.dev/pkg v0.0.0-20231102200604-fac3a4ffbc74/go.mod h1:i7ifWvAVgStXzSwZcfwA3T6D00IPJrqu3XRKKSiYZvw=
-knative.dev/serving v0.39.1-0.20231102153144-141747a2bc3e h1:F7onEMCnp0VOq+Fet0j2rVK4+6M6/g8bKyLPVvd2lRY=
-knative.dev/serving v0.39.1-0.20231102153144-141747a2bc3e/go.mod h1:OwgMhUqz/RICNYvaIRmzVFQN6isQFOEFPPr3Fypn05Q=
-<<<<<<< HEAD
-knative.dev/caching v0.0.0-20231017130712-54d0758671ef h1:92Gn5HUcgMJ78mbSpkCfUxrCTHHZSnvjURk0YRCbUqo=
-knative.dev/caching v0.0.0-20231017130712-54d0758671ef/go.mod h1:plGN+mIBKRtVxZ0vQeZ3Gt02RIaj0niwIMnQNkQHycw=
-knative.dev/hack v0.0.0-20231016131700-2c938d4918da h1:xy+fvuz2LDOMsZ5UwXRaMF70NYUs9fsG+EF5/ierYBg=
-knative.dev/hack v0.0.0-20231016131700-2c938d4918da/go.mod h1:yk2OjGDsbEnQjfxdm0/HJKS2WqTLEFg/N6nUs6Rqx3Q=
-knative.dev/networking v0.0.0-20231017124814-2a7676e912b7 h1:6+1icZuxiZO1paFZ4d/ysKWVG2M4WB7OxNJNyLG0P/E=
-knative.dev/networking v0.0.0-20231017124814-2a7676e912b7/go.mod h1:1gcHoIVG47ekQWjkddqRq+/7tWRh+CB9W4k/NAcdRbk=
-knative.dev/pkg v0.0.0-20231023151236-29775d7c9e5c h1:xyPoEToTWeBdn6tinhLxXfnhJhTNQt5WzHiTNiFphRw=
-knative.dev/pkg v0.0.0-20231023151236-29775d7c9e5c/go.mod h1:HHRXEd7ZlFpthgE+rwAZ6MUVnuJOAeolnaFSthXloUQ=
-knative.dev/serving v0.39.0 h1:NVt8WthHmFFMWZ3qpBblXt47del8qqrbCegqwGBVSwk=
-knative.dev/serving v0.39.0/go.mod h1:0QIp5mvgWa1oUC2MxMf+Q/JWgG8JhAsSdJKc6iTRlvE=
-knative.dev/caching v0.0.0-20231012110827-8551914fdf65 h1:Uc8C/3ymQGO/JDLwiWojhfxmKvj0UjlywKDJF/mjq1o=
-knative.dev/caching v0.0.0-20231012110827-8551914fdf65/go.mod h1:93dIqn2QXQP179R+gZKUFF7RaZFxJcL6ioXR04imKy0=
-knative.dev/hack v0.0.0-20231016131700-2c938d4918da h1:xy+fvuz2LDOMsZ5UwXRaMF70NYUs9fsG+EF5/ierYBg=
-knative.dev/hack v0.0.0-20231016131700-2c938d4918da/go.mod h1:yk2OjGDsbEnQjfxdm0/HJKS2WqTLEFg/N6nUs6Rqx3Q=
-knative.dev/networking v0.0.0-20231012062439-c0863403c83b h1:yGtVPNHek3rmKb50k7G9fG/NuuC4FRzESVrWmPFU9AM=
-knative.dev/networking v0.0.0-20231012062439-c0863403c83b/go.mod h1:uEvP4spV82HGB8loxo8nH/LGmwsd9jUGWvDVC+tH4O4=
-knative.dev/pkg v0.0.0-20231023151236-29775d7c9e5c h1:xyPoEToTWeBdn6tinhLxXfnhJhTNQt5WzHiTNiFphRw=
-knative.dev/pkg v0.0.0-20231023151236-29775d7c9e5c/go.mod h1:HHRXEd7ZlFpthgE+rwAZ6MUVnuJOAeolnaFSthXloUQ=
-knative.dev/serving v0.38.1-0.20231017140341-264588a0dc98 h1:cXsSNACjvxirJX5uKxOHMcFAutlBLCCHt63BkRZ3R4Q=
-knative.dev/serving v0.38.1-0.20231017140341-264588a0dc98/go.mod h1:cuia3pUQNF4sa3g3KsPFgqpLnF1pf9iquDLgk71iLfo=
->>>>>>> 9e4d459 (Added controller and autoscaler into this extension)
-=======
->>>>>>> eb20787 (Updated the dependencies)
 rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
 rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
 rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=

vendor/modules.txt

@@ -1061,23 +1061,7 @@ k8s.io/utils/net
 k8s.io/utils/pointer
 k8s.io/utils/strings/slices
 k8s.io/utils/trace
-<<<<<<< HEAD
-<<<<<<< HEAD
 # knative.dev/caching v0.0.0-20231108204433-b3781bc47aeb
-=======
-<<<<<<< HEAD
-# knative.dev/caching v0.0.0-20231101191025-c6425778e5ba
-=======
-<<<<<<< HEAD
-# knative.dev/caching v0.0.0-20231017130712-54d0758671ef
-=======
-# knative.dev/caching v0.0.0-20231012110827-8551914fdf65
->>>>>>> c87b801 (Added controller and autoscaler into this extension)
->>>>>>> 4367a82 (Added controller and autoscaler into this extension)
->>>>>>> 9e4d459 (Added controller and autoscaler into this extension)
-=======
-# knative.dev/caching v0.0.0-20231101191025-c6425778e5ba
->>>>>>> eb20787 (Updated the dependencies)
 ## explicit; go 1.18
 knative.dev/caching/pkg/apis/caching
 knative.dev/caching/pkg/apis/caching/v1alpha1
@@ -1095,23 +1079,7 @@ knative.dev/caching/pkg/client/listers/caching/v1alpha1
 # knative.dev/hack v0.0.0-20231109190034-5deaddeb51a7
 ## explicit; go 1.18
 knative.dev/hack
-<<<<<<< HEAD
-<<<<<<< HEAD
 # knative.dev/networking v0.0.0-20231109233957-8f3c5211035b
-=======
-<<<<<<< HEAD
-# knative.dev/networking v0.0.0-20231103063604-18529fd26a8b
-=======
-<<<<<<< HEAD
-# knative.dev/networking v0.0.0-20231017124814-2a7676e912b7
-=======
-# knative.dev/networking v0.0.0-20231012062439-c0863403c83b
->>>>>>> c87b801 (Added controller and autoscaler into this extension)
->>>>>>> 4367a82 (Added controller and autoscaler into this extension)
->>>>>>> 9e4d459 (Added controller and autoscaler into this extension)
-=======
-# knative.dev/networking v0.0.0-20231103063604-18529fd26a8b
->>>>>>> eb20787 (Updated the dependencies)
 ## explicit; go 1.18
 knative.dev/networking/pkg
 knative.dev/networking/pkg/apis/networking
@@ -1197,23 +1165,7 @@ knative.dev/pkg/version
 knative.dev/pkg/webhook
 knative.dev/pkg/webhook/certificates/resources
 knative.dev/pkg/websocket
-<<<<<<< HEAD
-<<<<<<< HEAD
 # knative.dev/serving v0.39.1-0.20231110001346-17fa595188b1
-=======
-<<<<<<< HEAD
-# knative.dev/serving v0.39.1-0.20231102153144-141747a2bc3e
-=======
-<<<<<<< HEAD
-# knative.dev/serving v0.39.0
-=======
-# knative.dev/serving v0.38.1-0.20231017140341-264588a0dc98
->>>>>>> c87b801 (Added controller and autoscaler into this extension)
->>>>>>> 4367a82 (Added controller and autoscaler into this extension)
->>>>>>> 9e4d459 (Added controller and autoscaler into this extension)
-=======
-# knative.dev/serving v0.39.1-0.20231102153144-141747a2bc3e
->>>>>>> eb20787 (Updated the dependencies)
 ## explicit; go 1.18
 knative.dev/serving/pkg/activator
 knative.dev/serving/pkg/apis/autoscaling