Skip to content

Commit d80da24

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

File tree

1,822 files changed

+158253
-95798
lines changed

Some content is hidden

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

1,822 files changed

+158253
-95798
lines changed

.github/workflows/ci.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,22 +7,22 @@ on:
77
push:
88
branches:
99
- master
10-
1110
workflow_dispatch:
11+
1212
concurrency:
1313
group: ${{ github.workflow }}-${{ github.head_ref || github.ref }}
1414
cancel-in-progress: true
15-
jobs:
1615

16+
jobs:
1717
build:
1818
name: Build
1919
runs-on: ubuntu-20.04
2020
steps:
2121

22-
- name: Set up Go 1.20
22+
- name: Set up Go 1.21
2323
uses: actions/setup-go@v1
2424
with:
25-
go-version: '1.20'
25+
go-version: '1.21'
2626
id: go
2727

2828
- uses: actions/checkout@v2

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ ARCH := $(if $(GOARCH),$(GOARCH),$(shell go env GOARCH))
5858
BASEIMAGE_PROD ?= gcr.io/distroless/static-debian11
5959
BASEIMAGE_DBG ?= debian:bullseye
6060

61-
GO_VERSION ?= 1.20
61+
GO_VERSION ?= 1.21
6262
BUILD_IMAGE ?= ghcr.io/appscode/golang-dev:$(GO_VERSION)
6363

6464
OUTBIN = bin/$(OS)_$(ARCH)/$(BIN)

builder/builder.go

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -78,13 +78,7 @@ func (blder *WebhookBuilder) registerDefaultingWebhook() (hooks.AdmissionHook, e
7878
return nil, nil
7979
}
8080

81-
mwh := admission.DefaultingWebhookFor(defaulter)
82-
if err := mwh.InjectScheme(blder.scheme); err != nil {
83-
return nil, err
84-
}
85-
if err := mwh.InjectLogger(log); err != nil {
86-
return nil, err
87-
}
81+
mwh := admission.DefaultingWebhookFor(blder.scheme, defaulter)
8882
return &webhook{
8983
prefix: MutatorGroupPrefix,
9084
gk: blder.gk,
@@ -99,13 +93,7 @@ func (blder *WebhookBuilder) registerValidatingWebhook() (hooks.AdmissionHook, e
9993
return nil, nil
10094
}
10195

102-
vwh := admission.ValidatingWebhookFor(checker)
103-
if err := vwh.InjectScheme(blder.scheme); err != nil {
104-
return nil, err
105-
}
106-
if err := vwh.InjectLogger(log); err != nil {
107-
return nil, err
108-
}
96+
vwh := admission.ValidatingWebhookFor(blder.scheme, checker)
10997
return &webhook{
11098
prefix: ValidatorGroupPrefix,
11199
gk: blder.gk,

go.mod

Lines changed: 46 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -1,91 +1,81 @@
11
module kmodules.xyz/webhook-runtime
22

3-
go 1.18
3+
go 1.21.5
44

55
require (
6-
github.com/evanphx/json-patch v4.12.0+incompatible
6+
github.com/evanphx/json-patch v5.7.0+incompatible
77
github.com/json-iterator/go v1.1.12
8-
gomodules.xyz/jsonpatch/v2 v2.2.0
9-
k8s.io/api v0.25.1
10-
k8s.io/apimachinery v0.25.1
11-
k8s.io/apiserver v0.25.1
12-
k8s.io/client-go v0.25.1
13-
k8s.io/klog/v2 v2.80.1
8+
gomodules.xyz/jsonpatch/v2 v2.4.0
9+
k8s.io/api v0.29.0
10+
k8s.io/apimachinery v0.29.0
11+
k8s.io/apiserver v0.29.0
12+
k8s.io/client-go v0.29.0
13+
k8s.io/klog/v2 v2.110.1
1414
k8s.io/kubernetes v0.0.0-00010101000000-000000000000
15-
kmodules.xyz/client-go v0.25.10
16-
kmodules.xyz/openshift v0.25.0
17-
sigs.k8s.io/controller-runtime v0.13.1
15+
kmodules.xyz/client-go v0.29.1
16+
kmodules.xyz/openshift v0.29.0
17+
sigs.k8s.io/controller-runtime v0.16.1-0.20231215020716-1b80b9629af8
1818
)
1919

20-
require kmodules.xyz/apiversion v0.2.0 // indirect
21-
2220
require (
23-
cloud.google.com/go v0.97.0 // indirect
24-
github.com/Azure/go-autorest v14.2.0+incompatible // indirect
25-
github.com/Azure/go-autorest/autorest v0.11.27 // indirect
26-
github.com/Azure/go-autorest/autorest/adal v0.9.20 // indirect
27-
github.com/Azure/go-autorest/autorest/date v0.3.0 // indirect
28-
github.com/Azure/go-autorest/logger v0.2.1 // indirect
29-
github.com/Azure/go-autorest/tracing v0.6.0 // indirect
30-
github.com/Masterminds/semver/v3 v3.1.1 // indirect
31-
github.com/PuerkitoBio/purell v1.1.1 // indirect
32-
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
21+
github.com/Masterminds/semver/v3 v3.2.1 // indirect
3322
github.com/beorn7/perks v1.0.1 // indirect
3423
github.com/blang/semver/v4 v4.0.0 // indirect
35-
github.com/cespare/xxhash/v2 v2.1.2 // indirect
24+
github.com/cespare/xxhash/v2 v2.2.0 // indirect
3625
github.com/davecgh/go-spew v1.1.1 // indirect
37-
github.com/docker/distribution v2.8.1+incompatible // indirect
38-
github.com/emicklei/go-restful/v3 v3.8.0 // indirect
39-
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
26+
github.com/distribution/reference v0.5.0 // indirect
27+
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
28+
github.com/evanphx/json-patch/v5 v5.7.0 // indirect
4029
github.com/fatih/structs v1.1.0 // indirect
41-
github.com/go-logr/logr v1.2.3 // indirect
42-
github.com/go-openapi/jsonpointer v0.19.5 // indirect
43-
github.com/go-openapi/jsonreference v0.19.5 // indirect
44-
github.com/go-openapi/swag v0.19.14 // indirect
30+
github.com/go-logr/logr v1.3.0 // indirect
31+
github.com/go-openapi/jsonpointer v0.19.6 // indirect
32+
github.com/go-openapi/jsonreference v0.20.2 // indirect
33+
github.com/go-openapi/swag v0.22.3 // indirect
4534
github.com/gogo/protobuf v1.3.2 // indirect
46-
github.com/golang-jwt/jwt/v4 v4.2.0 // indirect
47-
github.com/golang/protobuf v1.5.2 // indirect
48-
github.com/google/gnostic v0.5.7-v3refs // indirect
49-
github.com/google/go-cmp v0.5.9 // indirect
35+
github.com/golang/protobuf v1.5.3 // indirect
36+
github.com/google/gnostic-models v0.6.8 // indirect
37+
github.com/google/go-cmp v0.6.0 // indirect
5038
github.com/google/gofuzz v1.2.0 // indirect
5139
github.com/google/uuid v1.3.0 // indirect
5240
github.com/imdario/mergo v0.3.13 // indirect
5341
github.com/josharian/intern v1.0.0 // indirect
54-
github.com/mailru/easyjson v0.7.6 // indirect
42+
github.com/mailru/easyjson v0.7.7 // indirect
5543
github.com/mattn/go-isatty v0.0.16 // indirect
56-
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
44+
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
5745
github.com/mitchellh/mapstructure v1.5.0 // indirect
5846
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
5947
github.com/modern-go/reflect2 v1.0.2 // indirect
6048
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
6149
github.com/opencontainers/go-digest v1.0.0 // indirect
6250
github.com/pkg/errors v0.9.1 // indirect
63-
github.com/prometheus/client_golang v1.12.2 // indirect
64-
github.com/prometheus/client_model v0.2.0 // indirect
65-
github.com/prometheus/common v0.32.1 // indirect
66-
github.com/prometheus/procfs v0.7.3 // indirect
51+
github.com/prometheus/client_golang v1.17.0 // indirect
52+
github.com/prometheus/client_model v0.5.0 // indirect
53+
github.com/prometheus/common v0.44.0 // indirect
54+
github.com/prometheus/procfs v0.11.1 // indirect
6755
github.com/sergi/go-diff v1.1.0 // indirect
6856
github.com/spf13/pflag v1.0.5 // indirect
6957
github.com/yudai/gojsondiff v1.0.0 // indirect
7058
github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82 // indirect
71-
golang.org/x/crypto v0.6.0 // indirect
72-
golang.org/x/net v0.7.0 // indirect
73-
golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 // indirect
74-
golang.org/x/sys v0.5.0 // indirect
75-
golang.org/x/term v0.5.0 // indirect
76-
golang.org/x/text v0.7.0 // indirect
77-
golang.org/x/time v0.0.0-20220722155302-e5dcc9cfc0b9 // indirect
59+
golang.org/x/net v0.17.0 // indirect
60+
golang.org/x/oauth2 v0.10.0 // indirect
61+
golang.org/x/sys v0.15.0 // indirect
62+
golang.org/x/term v0.15.0 // indirect
63+
golang.org/x/text v0.14.0 // indirect
64+
golang.org/x/time v0.3.0 // indirect
7865
google.golang.org/appengine v1.6.7 // indirect
79-
google.golang.org/protobuf v1.28.0 // indirect
66+
google.golang.org/protobuf v1.31.0 // indirect
8067
gopkg.in/inf.v0 v0.9.1 // indirect
68+
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
8169
gopkg.in/yaml.v2 v2.4.0 // indirect
8270
gopkg.in/yaml.v3 v3.0.1 // indirect
83-
k8s.io/component-base v0.25.1 // indirect
84-
k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1 // indirect
85-
k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed // indirect
86-
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
87-
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
88-
sigs.k8s.io/yaml v1.3.0 // indirect
71+
k8s.io/apiextensions-apiserver v0.29.0 // indirect
72+
k8s.io/component-base v0.29.0 // indirect
73+
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect
74+
k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
75+
kmodules.xyz/apiversion v0.2.0 // indirect
76+
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
77+
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
78+
sigs.k8s.io/yaml v1.4.0 // indirect
8979
)
9080

91-
replace k8s.io/kubernetes => github.com/kmodules/kubernetes v1.26.0-alpha.0.0.20220917022409-54ac9f3f1315
81+
replace k8s.io/kubernetes => github.com/kmodules/kubernetes v1.30.0-alpha.0.0.20231224075822-3bd9a13c86db

0 commit comments

Comments
 (0)