Skip to content

Commit a6d46a5

Browse files
suhas-developer07suhas-developer07
authored
Merge branch 'knative:main' into main
2 parents 9e190af + 39c321d commit a6d46a5

6 files changed

Lines changed: 26 additions & 25 deletions

File tree

‎cmd/build.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import (
99
"github.com/AlecAivazis/survey/v2"
1010
"github.com/ory/viper"
1111
"github.com/spf13/cobra"
12-
1312
"knative.dev/func/pkg/builders"
1413
pack "knative.dev/func/pkg/builders/buildpacks"
1514
"knative.dev/func/pkg/builders/s2i"
@@ -454,6 +453,7 @@ func (c buildConfig) clientOptions() ([]fn.Option, error) {
454453
o = append(o,
455454
fn.WithBuilder(oci.NewBuilder(builders.Host, c.Verbose)),
456455
fn.WithPusher(oci.NewPusher(c.RegistryInsecure, false, c.Verbose,
456+
oci.WithTransport(newTransport(c.RegistryInsecure)),
457457
oci.WithCredentialsProvider(creds),
458458
oci.WithVerbose(c.Verbose))),
459459
)

‎go.mod‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -67,11 +67,11 @@ require (
6767
k8s.io/apimachinery v0.33.5
6868
k8s.io/client-go v0.33.5
6969
k8s.io/klog/v2 v2.130.1
70-
knative.dev/client/pkg v0.0.0-20251021023141-56277740a620
71-
knative.dev/eventing v0.46.1-0.20251021203748-4a4a50b0ad9d
70+
knative.dev/client/pkg v0.0.0-20251023140448-a186e112f541
71+
knative.dev/eventing v0.46.1-0.20251023025147-54aad5a248ac
7272
knative.dev/hack v0.0.0-20251021013703-4fae78067103
73-
knative.dev/pkg v0.0.0-20251021084441-487f9df8d315
74-
knative.dev/serving v0.46.1-0.20251021202624-95dd834759da
73+
knative.dev/pkg v0.0.0-20251022152246-7bf6febca0b3
74+
knative.dev/serving v0.46.1-0.20251023180446-a2a2441bb848
7575
)
7676

7777
require (
@@ -302,7 +302,7 @@ require (
302302
k8s.io/cli-runtime v0.31.4 // indirect
303303
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff // indirect
304304
k8s.io/utils v0.0.0-20250321185631-1f6e0b77f77e // indirect
305-
knative.dev/networking v0.0.0-20251021014706-2d0f1a84e418 // indirect
305+
knative.dev/networking v0.0.0-20251021092443-0bde19154dce // indirect
306306
sigs.k8s.io/controller-runtime v0.20.4 // indirect
307307
sigs.k8s.io/gateway-api v1.1.0 // indirect
308308
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect

‎go.sum‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1891,18 +1891,18 @@ k8s.io/utils v0.0.0-20210819203725-bdf08cb9a70a/go.mod h1:jPW/WVKK9YHAvNhRxK0md/
18911891
k8s.io/utils v0.0.0-20230209194617-a36077c30491/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
18921892
k8s.io/utils v0.0.0-20250321185631-1f6e0b77f77e h1:KqK5c/ghOm8xkHYhlodbp6i6+r+ChV2vuAuVRdFbLro=
18931893
k8s.io/utils v0.0.0-20250321185631-1f6e0b77f77e/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
1894-
knative.dev/client/pkg v0.0.0-20251021023141-56277740a620 h1:Dm1e61s8Zd6yfKkc7IPOEMRQEjwJmAt+tsfOqBWs0cM=
1895-
knative.dev/client/pkg v0.0.0-20251021023141-56277740a620/go.mod h1:2rxgk8HxgOhqOv8fgpP/KTDpSKivwdeN9htelDf+VIU=
1896-
knative.dev/eventing v0.46.1-0.20251021203748-4a4a50b0ad9d h1:IS42PUHd5dHS+zEjqo+om2zcS7vXtxyKO23A9s46KZc=
1897-
knative.dev/eventing v0.46.1-0.20251021203748-4a4a50b0ad9d/go.mod h1:4vebXdQdWORZl6kY8Or4docTUoW1P/CE1uyDTmZ0a/0=
1894+
knative.dev/client/pkg v0.0.0-20251023140448-a186e112f541 h1:Y3lY5TNgFXJXTqgACq52ysANRVSy+KMhnHDUSz7PKLc=
1895+
knative.dev/client/pkg v0.0.0-20251023140448-a186e112f541/go.mod h1:TzmlmDSTVC0CVTM1JqKzP7MALtLVHDmA8pxVv3nVVUw=
1896+
knative.dev/eventing v0.46.1-0.20251023025147-54aad5a248ac h1:e2tquxbo7M0sRYGLeUm/+TXk5P8qvz2D6eCAE3lcFf0=
1897+
knative.dev/eventing v0.46.1-0.20251023025147-54aad5a248ac/go.mod h1:Iio1ZGL4W9aSZxFrwlhGzPu+DsqkHx9/hZTaRqM1Mpk=
18981898
knative.dev/hack v0.0.0-20251021013703-4fae78067103 h1:j96YY5CLCTytWZsGVzixVvNasRbrni2NuXI54R+IPvA=
18991899
knative.dev/hack v0.0.0-20251021013703-4fae78067103/go.mod h1:L5RzHgbvam0u8QFHfzCX6MKxu/a/gIGEdaRBqNiVbl0=
1900-
knative.dev/networking v0.0.0-20251021014706-2d0f1a84e418 h1:IlwEOI3KOe+CLM+t3E77i4bhc5RWx1Kn8G6wNre1e0Q=
1901-
knative.dev/networking v0.0.0-20251021014706-2d0f1a84e418/go.mod h1:BBF9R4ayT7sobPrO2nU/V62XliJS5oJIwgKMs1StcZQ=
1900+
knative.dev/networking v0.0.0-20251021092443-0bde19154dce h1:INRJxej8DPwRUfXzuBQ6Ldg2/QaHF1tZrBUA8LVTaso=
1901+
knative.dev/networking v0.0.0-20251021092443-0bde19154dce/go.mod h1:CMOeNLRWFxcMQALbhhwr6XmsyMX7EuSHNi+Gzfq0HE0=
19021902
knative.dev/pkg v0.0.0-20250716115900-19d3cc2da0b9 h1:P9GFsqTmX4WokSVVUK1IbHOnbJLi8EW1pd4PvbUEodo=
19031903
knative.dev/pkg v0.0.0-20250716115900-19d3cc2da0b9/go.mod h1:Hq2y1gu4P/MWEk9zB8L/zrjJ19ywEnYgwXq8ZMjRl30=
1904-
knative.dev/serving v0.46.1-0.20251021202624-95dd834759da h1:3eaY9BRYnY4HbUf9HN0aysiqqvoK7dNHoH2wF/ai3gI=
1905-
knative.dev/serving v0.46.1-0.20251021202624-95dd834759da/go.mod h1:viZqMepeW6UNc/KQvD3iC/lv7fNXjhgqMPMq/9yqyGI=
1904+
knative.dev/serving v0.46.1-0.20251023180446-a2a2441bb848 h1:ouPTxZ21sBFAhMRgv74x259NWD7hHunTmxI6VACavVk=
1905+
knative.dev/serving v0.46.1-0.20251023180446-a2a2441bb848/go.mod h1:ayk7SVBSEFlg5yDajNOy2+xHX2Yn3snc+XAhHhf4kMI=
19061906
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
19071907
rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
19081908
rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=

‎hack/component-versions.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"version": "v0.35.2"
1717
},
1818
"Serving": {
19-
"version": "v1.19.6",
19+
"version": "v1.19.7",
2020
"owner": "knative",
2121
"repo": "serving"
2222
},

‎hack/component-versions.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ set_versions() {
1111
kind_node_version=v1.32.0@sha256:c48c62eac5da28cdadcf560d1d8616cfa6783b58f0d94cf63ad1bf49600cb027
1212

1313
# find source-of-truth in component-versions.json to add/modify components
14-
knative_serving_version="v1.19.6"
14+
knative_serving_version="v1.19.7"
1515
knative_eventing_version="v1.19.6"
1616
contour_version="v1.19.5"
1717
tekton_version="v1.1.0"

‎pkg/oci/pusher.go‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package oci
22

33
import (
44
"context"
5-
"crypto/tls"
65
"fmt"
76
"net/http"
87
"os"
@@ -42,6 +41,8 @@ type Pusher struct {
4241

4342
updates chan v1.Update
4443
done chan bool
44+
45+
transport http.RoundTripper
4546
}
4647

4748
func EmptyCredentialsProvider(ctx context.Context, registry string) (Credentials, error) {
@@ -60,6 +61,12 @@ func WithVerbose(verbose bool) Opt {
6061
}
6162
}
6263

64+
func WithTransport(transport http.RoundTripper) Opt {
65+
return func(pusher *Pusher) {
66+
pusher.transport = transport
67+
}
68+
}
69+
6370
func NewPusher(insecure, anon, verbose bool, opts ...Opt) *Pusher {
6471
result := &Pusher{
6572
credentialsProvider: EmptyCredentialsProvider,
@@ -68,6 +75,7 @@ func NewPusher(insecure, anon, verbose bool, opts ...Opt) *Pusher {
6875
Verbose: verbose,
6976
updates: make(chan v1.Update, 10),
7077
done: make(chan bool, 1),
78+
transport: remote.DefaultTransport,
7179
}
7280
for _, opt := range opts {
7381
opt(result)
@@ -157,14 +165,7 @@ func (p *Pusher) writeIndex(ctx context.Context, ref name.Reference, ii v1.Image
157165
oo := []remote.Option{
158166
remote.WithContext(ctx),
159167
remote.WithProgress(p.updates),
160-
}
161-
162-
if p.Insecure {
163-
t := remote.DefaultTransport.(*http.Transport).Clone()
164-
t.TLSClientConfig = &tls.Config{
165-
InsecureSkipVerify: true,
166-
}
167-
oo = append(oo, remote.WithTransport(t))
168+
remote.WithTransport(p.transport),
168169
}
169170

170171
if !p.Anonymous {

0 commit comments

Comments
 (0)