Skip to content

Commit b36b5e2

Browse files
committed
Use k8s 1.29 client libs
Signed-off-by: Tamal Saha <tamal@appscode.com>
1 parent eb11a69 commit b36b5e2

File tree

8,867 files changed

+781833
-1032054
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

8,867 files changed

+781833
-1032054
lines changed

.github/workflows/ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@ concurrency:
1616
jobs:
1717
build:
1818
name: Build
19-
runs-on: ubuntu-20.04
19+
runs-on: ubuntu-22.04
2020
steps:
21-
- name: Set up Go 1.20
21+
- name: Set up Go 1.21
2222
uses: actions/setup-go@v1
2323
with:
24-
go-version: '1.20'
24+
go-version: '1.21'
2525
id: go
2626

2727
- uses: actions/checkout@v1

.github/workflows/release-tracker.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ concurrency:
1111

1212
jobs:
1313
build:
14-
runs-on: ubuntu-20.04
14+
runs-on: ubuntu-22.04
1515

1616
steps:
1717
- uses: actions/checkout@v1

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ concurrency:
1313
jobs:
1414
build:
1515
name: Build
16-
runs-on: ubuntu-20.04
16+
runs-on: ubuntu-22.04
1717
steps:
1818
- uses: actions/checkout@v1
1919

cmd/demo-client/main.go

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ import (
2828
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2929
"k8s.io/client-go/kubernetes"
3030
clientgoscheme "k8s.io/client-go/kubernetes/scheme"
31+
"k8s.io/client-go/rest"
3132
"k8s.io/klog/v2/klogr"
3233
clustermeta "kmodules.xyz/client-go/cluster"
3334
ctrl "sigs.k8s.io/controller-runtime"
@@ -52,15 +53,19 @@ func main() {
5253
// panic(err)
5354
// }
5455

55-
mapper, err := apiutil.NewDynamicRESTMapper(config)
56+
hc, err := rest.HTTPClientFor(config)
57+
if err != nil {
58+
panic(err)
59+
}
60+
mapper, err := apiutil.NewDynamicRESTMapper(config, hc)
5661
if err != nil {
5762
panic(err)
5863
}
5964

6065
c, err := client.New(config, client.Options{
6166
Scheme: clientgoscheme.Scheme,
6267
Mapper: mapper,
63-
Opts: client.WarningHandlerOptions{
68+
WarningHandler: client.WarningHandlerOptions{
6469
SuppressWarnings: false,
6570
AllowDuplicateLogs: false,
6671
},

cmd/demo-server/main.go

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ import (
3232
"go.wandrs.dev/inject"
3333
"gomodules.xyz/blobfs"
3434
clientgoscheme "k8s.io/client-go/kubernetes/scheme"
35+
"k8s.io/client-go/rest"
3536
"k8s.io/klog/v2/klogr"
3637
clustermeta "kmodules.xyz/client-go/cluster"
3738
"kubepack.dev/lib-helm/pkg/repo"
@@ -105,15 +106,19 @@ func getNatsClient() (*nats.Conn, error) {
105106
// panic(err)
106107
// }
107108

108-
mapper, err := apiutil.NewDynamicRESTMapper(config)
109+
hc, err := rest.HTTPClientFor(config)
110+
if err != nil {
111+
return nil, err
112+
}
113+
mapper, err := apiutil.NewDynamicRESTMapper(config, hc)
109114
if err != nil {
110115
return nil, err
111116
}
112117

113118
c, err := client.New(config, client.Options{
114119
Scheme: clientgoscheme.Scheme,
115120
Mapper: mapper,
116-
Opts: client.WarningHandlerOptions{
121+
WarningHandler: client.WarningHandlerOptions{
117122
SuppressWarnings: false,
118123
AllowDuplicateLogs: false,
119124
},

cmd/proxy-server/main.go

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ import (
3939
"k8s.io/apimachinery/pkg/api/errors"
4040
utilnet "k8s.io/apimachinery/pkg/util/net"
4141
clientgoscheme "k8s.io/client-go/kubernetes/scheme"
42+
"k8s.io/client-go/rest"
4243
"k8s.io/klog/v2/klogr"
4344
clustermeta "kmodules.xyz/client-go/cluster"
4445
ctrl "sigs.k8s.io/controller-runtime"
@@ -136,15 +137,19 @@ func getNatsClient() (*nats.Conn, error) {
136137
// panic(err)
137138
// }
138139

139-
mapper, err := apiutil.NewDynamicRESTMapper(config)
140+
hc, err := rest.HTTPClientFor(config)
141+
if err != nil {
142+
return nil, err
143+
}
144+
mapper, err := apiutil.NewDynamicRESTMapper(config, hc)
140145
if err != nil {
141146
return nil, err
142147
}
143148

144149
c, err := client.New(config, client.Options{
145150
Scheme: clientgoscheme.Scheme,
146151
Mapper: mapper,
147-
Opts: client.WarningHandlerOptions{
152+
WarningHandler: client.WarningHandlerOptions{
148153
SuppressWarnings: false,
149154
AllowDuplicateLogs: false,
150155
},

0 commit comments

Comments
 (0)