Skip to content

Commit 07e84b1

Browse files
bk201bk201
authored
Merge pull request #34 from FrankYang0529/HARV-SEC-38
2 parents f70e187 + 71e3ba0 commit 07e84b1

File tree

3 files changed

+1338
-255
lines changed

3 files changed

+1338
-255
lines changed

‎Dockerfile.dapper

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
FROM registry.suse.com/bci/golang:1.19-20.13
1+
FROM registry.suse.com/bci/golang:1.20
22

33
ARG DAPPER_HOST_ARCH
44
ENV ARCH $DAPPER_HOST_ARCH
55

66
RUN zypper in -y bash git gcc docker vim less file curl wget ca-certificates trousers-devel
77

88
RUN if [ "${ARCH}" == "amd64" ]; then \
9-
curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s v1.51.1; \
9+
curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s v1.51.1; \
1010
fi
1111

1212
ENV DAPPER_ENV REPO TAG DRONE_TAG CROSS

‎go.mod

+95-81
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,35 @@
11
module github.com/rancher/rancherd
22

3-
go 1.19
3+
go 1.20
44

55
replace (
6-
k8s.io/api => k8s.io/api v0.21.0
7-
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.21.0
8-
k8s.io/apimachinery => k8s.io/apimachinery v0.21.0
9-
k8s.io/apiserver => k8s.io/apiserver v0.21.0
10-
k8s.io/cli-runtime => k8s.io/cli-runtime v0.21.0
11-
k8s.io/client-go => github.com/rancher/client-go v0.21.0-rancher.1
12-
k8s.io/cloud-provider => k8s.io/cloud-provider v0.21.0
13-
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.21.0
14-
k8s.io/code-generator => k8s.io/code-generator v0.21.0
15-
k8s.io/component-base => k8s.io/component-base v0.21.0
16-
k8s.io/component-helpers => k8s.io/component-helpers v0.21.0
17-
k8s.io/controller-manager => k8s.io/controller-manager v0.21.0
18-
k8s.io/cri-api => k8s.io/cri-api v0.21.0
19-
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.21.0
20-
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.21.0
21-
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.21.0
22-
k8s.io/kube-proxy => k8s.io/kube-proxy v0.21.0
23-
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.21.0
24-
k8s.io/kubectl => k8s.io/kubectl v0.21.0
25-
k8s.io/kubelet => k8s.io/kubelet v0.21.0
26-
k8s.io/kubernetes => k8s.io/kubernetes v1.21.0
27-
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.21.0
28-
k8s.io/metrics => k8s.io/metrics v0.21.0
29-
k8s.io/mount-utils => k8s.io/mount-utils v0.21.0
30-
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.21.0
6+
k8s.io/api => k8s.io/api v0.24.10
7+
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.24.10
8+
k8s.io/apimachinery => k8s.io/apimachinery v0.24.10
9+
k8s.io/apiserver => k8s.io/apiserver v0.24.10
10+
k8s.io/cli-runtime => k8s.io/cli-runtime v0.24.10
11+
k8s.io/client-go => k8s.io/client-go v0.24.10
12+
k8s.io/cloud-provider => k8s.io/cloud-provider v0.24.10
13+
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.24.10
14+
k8s.io/code-generator => k8s.io/code-generator v0.24.10
15+
k8s.io/component-base => k8s.io/component-base v0.24.10
16+
k8s.io/component-helpers => k8s.io/component-helpers v0.24.10
17+
k8s.io/controller-manager => k8s.io/controller-manager v0.24.10
18+
k8s.io/cri-api => k8s.io/cri-api v0.24.10
19+
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.24.10
20+
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.24.10
21+
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.24.10
22+
k8s.io/kube-proxy => k8s.io/kube-proxy v0.24.10
23+
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.24.10
24+
k8s.io/kubectl => k8s.io/kubectl v0.24.10
25+
k8s.io/kubelet => k8s.io/kubelet v0.24.10
26+
k8s.io/kubernetes => k8s.io/kubernetes v1.24.10
27+
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.24.10
28+
k8s.io/metrics => k8s.io/metrics v0.24.10
29+
k8s.io/mount-utils => k8s.io/mount-utils v0.24.10
30+
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.24.10
31+
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.24.10
32+
sigs.k8s.io/controller-runtime => sigs.k8s.io/controller-runtime v0.12.3
3133
)
3234

3335
require (
@@ -42,18 +44,19 @@ require (
4244
github.com/rancher/wrangler v0.8.6-0.20210819203859-0babd42fbad8
4345
github.com/rancher/wrangler-cli v0.0.0-20210217230406-95cfa275f52f
4446
github.com/sirupsen/logrus v1.8.1
45-
github.com/spf13/cobra v1.1.3
46-
golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97
47+
github.com/spf13/cobra v1.7.0
48+
golang.org/x/crypto v0.14.0
4749
gopkg.in/yaml.v2 v2.4.0
48-
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b
49-
k8s.io/api v0.21.3
50-
k8s.io/apimachinery v0.21.3
50+
gopkg.in/yaml.v3 v3.0.1
51+
k8s.io/api v0.28.3
52+
k8s.io/apimachinery v0.28.3
5153
k8s.io/client-go v12.0.0+incompatible
52-
sigs.k8s.io/yaml v1.2.0
54+
sigs.k8s.io/yaml v1.4.0
5355
)
5456

5557
require (
56-
cloud.google.com/go v0.93.3 // indirect
58+
cloud.google.com/go/compute v1.23.1 // indirect
59+
cloud.google.com/go/compute/metadata v0.2.3 // indirect
5760
github.com/Azure/azure-sdk-for-go v55.7.0+incompatible // indirect
5861
github.com/Azure/go-autorest v14.2.0+incompatible // indirect
5962
github.com/Azure/go-autorest/autorest v0.11.19 // indirect
@@ -68,96 +71,107 @@ require (
6871
github.com/aws/aws-sdk-go v1.38.65 // indirect
6972
github.com/beorn7/perks v1.0.1 // indirect
7073
github.com/blang/semver v3.5.1+incompatible // indirect
71-
github.com/cespare/xxhash/v2 v2.1.1 // indirect
74+
github.com/blang/semver/v4 v4.0.0 // indirect
75+
github.com/cespare/xxhash/v2 v2.2.0 // indirect
7276
github.com/containerd/stargz-snapshotter/estargz v0.4.1 // indirect
73-
github.com/cpuguy83/go-md2man/v2 v2.0.0 // indirect
77+
github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
7478
github.com/davecgh/go-spew v1.1.1 // indirect
7579
github.com/denverdino/aliyungo v0.0.0-20170926055100-d3308649c661 // indirect
7680
github.com/digitalocean/godo v1.7.5 // indirect
7781
github.com/dimchansky/utfbom v1.1.0 // indirect
7882
github.com/docker/cli v20.10.6+incompatible // indirect
79-
github.com/docker/distribution v2.7.1+incompatible // indirect
80-
github.com/docker/docker v20.10.6+incompatible // indirect
83+
github.com/docker/distribution v2.8.1+incompatible // indirect
84+
github.com/docker/docker v20.10.12+incompatible // indirect
8185
github.com/docker/docker-credential-helpers v0.6.3 // indirect
82-
github.com/evanphx/json-patch v4.9.0+incompatible // indirect
86+
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
87+
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
8388
github.com/form3tech-oss/jwt-go v3.2.3+incompatible // indirect
84-
github.com/fsnotify/fsnotify v1.4.9 // indirect
89+
github.com/fsnotify/fsnotify v1.7.0 // indirect
8590
github.com/ghodss/yaml v1.0.0 // indirect
86-
github.com/go-logr/logr v0.4.0 // indirect
91+
github.com/go-logr/logr v1.3.0 // indirect
92+
github.com/go-openapi/jsonpointer v0.20.0 // indirect
93+
github.com/go-openapi/jsonreference v0.20.2 // indirect
94+
github.com/go-openapi/swag v0.22.4 // indirect
8795
github.com/gogo/protobuf v1.3.2 // indirect
8896
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
89-
github.com/golang/protobuf v1.5.2 // indirect
90-
github.com/golang/snappy v0.0.3 // indirect
91-
github.com/google/go-cmp v0.5.6 // indirect
97+
github.com/golang/protobuf v1.5.3 // indirect
98+
github.com/google/gnostic v0.7.0 // indirect
99+
github.com/google/gnostic-models v0.6.9-0.20230804172637-c7be7c783f49 // indirect
100+
github.com/google/go-cmp v0.6.0 // indirect
92101
github.com/google/go-containerregistry v0.5.0 // indirect
93102
github.com/google/go-querystring v1.0.0 // indirect
94103
github.com/google/go-tpm v0.3.2 // indirect
95104
github.com/google/go-tspi v0.2.1-0.20190423175329-115dea689aad // indirect
96105
github.com/google/gofuzz v1.2.0 // indirect
97-
github.com/google/uuid v1.2.0 // indirect
98-
github.com/googleapis/gax-go/v2 v2.0.5 // indirect
99-
github.com/googleapis/gnostic v0.5.4 // indirect
106+
github.com/google/s2a-go v0.1.4 // indirect
107+
github.com/google/uuid v1.4.0 // indirect
108+
github.com/googleapis/enterprise-certificate-proxy v0.2.4 // indirect
109+
github.com/googleapis/gax-go/v2 v2.12.0 // indirect
100110
github.com/gophercloud/gophercloud v0.7.0 // indirect
101111
github.com/hashicorp/errwrap v1.0.0 // indirect
102112
github.com/hashicorp/go-multierror v1.0.0 // indirect
103-
github.com/hashicorp/golang-lru v0.5.4 // indirect
104113
github.com/hashicorp/mdns v1.0.1 // indirect
105114
github.com/hashicorp/vic v1.5.1-0.20190403131502-bbfe86ec9443 // indirect
106-
github.com/imdario/mergo v0.3.11 // indirect
107-
github.com/inconshreveable/mousetrap v1.0.0 // indirect
115+
github.com/imdario/mergo v0.3.16 // indirect
116+
github.com/inconshreveable/mousetrap v1.1.0 // indirect
108117
github.com/jmespath/go-jmespath v0.4.0 // indirect
118+
github.com/josharian/intern v1.0.0 // indirect
109119
github.com/joyent/triton-go v0.0.0-20180628001255-830d2b111e62 // indirect
110-
github.com/json-iterator/go v1.1.11 // indirect
111-
github.com/klauspost/compress v1.12.2 // indirect
120+
github.com/json-iterator/go v1.1.12 // indirect
121+
github.com/klauspost/compress v1.15.9 // indirect
112122
github.com/linode/linodego v0.7.1 // indirect
113-
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
123+
github.com/mailru/easyjson v0.7.7 // indirect
124+
github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
114125
github.com/miekg/dns v1.1.35 // indirect
115126
github.com/mitchellh/go-homedir v1.1.0 // indirect
116127
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
117-
github.com/modern-go/reflect2 v1.0.1 // indirect
128+
github.com/modern-go/reflect2 v1.0.2 // indirect
129+
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
118130
github.com/nicolai86/scaleway-sdk v1.10.2-0.20180628010248-798f60e20bb2 // indirect
119131
github.com/opencontainers/go-digest v1.0.0 // indirect
120-
github.com/opencontainers/image-spec v1.0.1 // indirect
132+
github.com/opencontainers/image-spec v1.0.2 // indirect
121133
github.com/packethost/packngo v0.1.1-0.20180711074735-b9cb5096f54c // indirect
122134
github.com/pierrec/lz4 v2.6.0+incompatible // indirect
123-
github.com/prometheus/client_golang v1.11.0 // indirect
124-
github.com/prometheus/client_model v0.2.0 // indirect
125-
github.com/prometheus/common v0.26.0 // indirect
126-
github.com/prometheus/procfs v0.6.0 // indirect
135+
github.com/prometheus/client_golang v1.17.0 // indirect
136+
github.com/prometheus/client_model v0.5.0 // indirect
137+
github.com/prometheus/common v0.45.0 // indirect
138+
github.com/prometheus/procfs v0.12.0 // indirect
127139
github.com/rancher/lasso v0.0.0-20210616224652-fc3ebd901c08 // indirect
128140
github.com/renier/xmlrpc v0.0.0-20170708154548-ce4a1a486c03 // indirect
129-
github.com/russross/blackfriday/v2 v2.0.1 // indirect
130-
github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect
141+
github.com/russross/blackfriday/v2 v2.1.0 // indirect
131142
github.com/softlayer/softlayer-go v0.0.0-20180806151055-260589d94c7d // indirect
132143
github.com/spf13/pflag v1.0.5 // indirect
133144
github.com/tencentcloud/tencentcloud-sdk-go v3.0.83+incompatible // indirect
134145
github.com/urfave/cli v1.22.4 // indirect
135146
github.com/vmware/govmomi v0.26.0 // indirect
136-
go.opencensus.io v0.23.0 // indirect
137-
golang.org/x/net v0.0.0-20210503060351-7fd8e65b6420 // indirect
138-
golang.org/x/oauth2 v0.0.0-20210805134026-6f1e6394065a // indirect
139-
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
140-
golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069 // indirect
141-
golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d // indirect
142-
golang.org/x/text v0.3.6 // indirect
143-
golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba // indirect
144-
gomodules.xyz/jsonpatch/v2 v2.1.0 // indirect
145-
google.golang.org/api v0.54.0 // indirect
146-
google.golang.org/appengine v1.6.7 // indirect
147-
google.golang.org/genproto v0.0.0-20210821163610-241b8fcbd6c8 // indirect
148-
google.golang.org/grpc v1.40.0 // indirect
149-
google.golang.org/protobuf v1.27.1 // indirect
147+
go.opencensus.io v0.24.0 // indirect
148+
golang.org/x/net v0.17.0 // indirect
149+
golang.org/x/oauth2 v0.13.0 // indirect
150+
golang.org/x/sync v0.3.0 // indirect
151+
golang.org/x/sys v0.13.0 // indirect
152+
golang.org/x/term v0.13.0 // indirect
153+
golang.org/x/text v0.13.0 // indirect
154+
golang.org/x/time v0.3.0 // indirect
155+
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
156+
google.golang.org/api v0.128.0 // indirect
157+
google.golang.org/appengine v1.6.8 // indirect
158+
google.golang.org/genproto/googleapis/api v0.0.0-20231012201019-e917dd12ba7a // indirect
159+
google.golang.org/genproto/googleapis/rpc v0.0.0-20231030173426-d783a09b4405 // indirect
160+
google.golang.org/grpc v1.59.0 // indirect
161+
google.golang.org/protobuf v1.31.0 // indirect
150162
gopkg.in/inf.v0 v0.9.1 // indirect
151163
gopkg.in/resty.v1 v1.12.0 // indirect
152-
k8s.io/apiextensions-apiserver v0.21.0 // indirect
153-
k8s.io/component-base v0.21.0 // indirect
164+
k8s.io/apiextensions-apiserver v0.28.3 // indirect
165+
k8s.io/apiserver v0.28.3 // indirect
166+
k8s.io/component-base v0.28.3 // indirect
154167
k8s.io/klog v1.0.0 // indirect
155-
k8s.io/klog/v2 v2.8.0 // indirect
156-
k8s.io/kube-openapi v0.0.0-20210305001622-591a79e4bda7 // indirect
168+
k8s.io/klog/v2 v2.100.1 // indirect
169+
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect
157170
k8s.io/kubelet v0.0.0 // indirect
158171
k8s.io/kubernetes v1.21.0 // indirect
159-
k8s.io/utils v0.0.0-20210305010621-2afb4311ab10 // indirect
172+
k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
160173
sigs.k8s.io/cluster-api v0.3.11-0.20210430180359-45b6080c2764 // indirect
161-
sigs.k8s.io/controller-runtime v0.9.0-beta.0 // indirect
162-
sigs.k8s.io/structured-merge-diff/v4 v4.1.0 // indirect
174+
sigs.k8s.io/controller-runtime v0.16.3 // indirect
175+
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
176+
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
163177
)

0 commit comments

Comments
 (0)