Skip to content

Commit 7b1bb6b

Browse files
authored
vendor kubeadm/v1beta2 rather than directly import this golang file (#1758)
Signed-off-by: zhy76 <958474674@qq.com>
1 parent 0d258bd commit 7b1bb6b

Some content is hidden

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

63 files changed

+6677
-1595
lines changed

go.mod

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ require (
5959
k8s.io/client-go v0.24.2
6060
k8s.io/kube-proxy v0.21.0
6161
k8s.io/kubelet v0.21.0
62+
k8s.io/kubernetes v1.21.0
6263
k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9
6364
sigs.k8s.io/controller-runtime v0.8.1
6465
sigs.k8s.io/yaml v1.3.0
@@ -122,9 +123,11 @@ require (
122123
github.com/google/go-intervals v0.0.2 // indirect
123124
github.com/google/gofuzz v1.2.0 // indirect
124125
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
126+
github.com/googleapis/gnostic v0.5.1 // indirect
125127
github.com/gorilla/mux v1.8.0 // indirect
126128
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
127129
github.com/hashicorp/errwrap v1.1.0 // indirect
130+
github.com/hashicorp/golang-lru v0.5.4 // indirect
128131
github.com/hashicorp/hcl v1.0.0 // indirect
129132
github.com/huandu/xstrings v1.3.2 // indirect
130133
github.com/inconshreveable/mousetrap v1.0.0 // indirect
@@ -224,6 +227,7 @@ require (
224227
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
225228
gopkg.in/warnings.v0 v0.1.2 // indirect
226229
k8s.io/apiextensions-apiserver v0.24.2 // indirect
230+
k8s.io/cluster-bootstrap v0.0.0 // indirect
227231
k8s.io/component-base v0.24.2 // indirect
228232
k8s.io/klog/v2 v2.60.1 // indirect
229233
k8s.io/kube-openapi v0.0.0-20220627174259-011e075b9cb8 // indirect
@@ -239,4 +243,30 @@ replace (
239243
golang.org/x/crypto => golang.org/x/crypto v0.0.0-20210817164053-32db794688a5
240244
golang.org/x/net => golang.org/x/net v0.0.0-20210510120150-4163338589ed
241245
golang.org/x/sys => golang.org/x/sys v0.0.0-20220114195835-da31bd327af9
246+
k8s.io/api => k8s.io/api v0.24.2
247+
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.21.0
248+
k8s.io/apimachinery => k8s.io/apimachinery v0.24.2-rc.0
249+
k8s.io/apiserver => k8s.io/apiserver v0.24.2
250+
k8s.io/cli-runtime => k8s.io/cli-runtime v0.24.2
251+
k8s.io/client-go => k8s.io/client-go v0.24.2
252+
k8s.io/cloud-provider => k8s.io/cloud-provider v0.21.0
253+
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.24.2
254+
k8s.io/code-generator => k8s.io/code-generator v0.21.2-rc.0
255+
k8s.io/component-base => k8s.io/component-base v0.24.2
256+
k8s.io/component-helpers => k8s.io/component-helpers v0.21.0
257+
k8s.io/controller-manager => k8s.io/controller-manager v0.21.0
258+
k8s.io/cri-api => k8s.io/cri-api v0.21.2-rc.0
259+
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.21.0
260+
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.21.0
261+
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.21.0
262+
k8s.io/kube-proxy => k8s.io/kube-proxy v0.21.0
263+
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.21.0
264+
k8s.io/kubectl => k8s.io/kubectl v0.21.0
265+
k8s.io/kubelet => k8s.io/kubelet v0.21.0
266+
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.21.0
267+
k8s.io/metrics => k8s.io/metrics v0.21.0
268+
k8s.io/mount-utils => k8s.io/mount-utils v0.21.1-rc.0
269+
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.21.0
270+
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.21.0
271+
k8s.io/sample-controller => k8s.io/sample-controller v0.21.0
242272
)

go.sum

Lines changed: 185 additions & 0 deletions
Large diffs are not rendered by default.

pkg/clusterfile/decoder.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,14 @@ import (
2323

2424
"github.com/sealerio/sealer/common"
2525
"github.com/sealerio/sealer/pkg/config"
26-
"github.com/sealerio/sealer/pkg/runtime/kubernetes/kubeadm/v1beta2"
2726
v1 "github.com/sealerio/sealer/types/api/v1"
2827
v2 "github.com/sealerio/sealer/types/api/v2"
2928
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
3029
"k8s.io/apimachinery/pkg/runtime"
3130
"k8s.io/apimachinery/pkg/util/yaml"
3231
"k8s.io/kube-proxy/config/v1alpha1"
3332
"k8s.io/kubelet/config/v1beta1"
33+
"k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta2"
3434
)
3535

3636
func decodeClusterFile(reader io.Reader, clusterfile *ClusterFile) error {

pkg/runtime/kubernetes/kubeadm/kubeadm_config.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import (
1818
"fmt"
1919
"io"
2020

21-
"github.com/sealerio/sealer/pkg/runtime/kubernetes/kubeadm/v1beta2"
21+
"k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta2"
2222

2323
"github.com/sealerio/sealer/utils"
2424
osi "github.com/sealerio/sealer/utils/os"
@@ -36,7 +36,7 @@ import (
3636
// https://github.com/kubernetes/kubernetes/blob/master/cmd/kubeadm/app/apis/kubeadm/v1beta2/types.go
3737
// Using map to overwrite Kubeadm configs
3838

39-
//nolint
39+
// nolint
4040
type KubeadmConfig struct {
4141
v1beta2.InitConfiguration
4242
v1beta2.ClusterConfiguration

pkg/runtime/kubernetes/runtime.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,11 @@ import (
3131

3232
"github.com/sealerio/sealer/common"
3333
"github.com/sealerio/sealer/pkg/runtime"
34-
"github.com/sealerio/sealer/pkg/runtime/kubernetes/kubeadm/v1beta2"
3534
v2 "github.com/sealerio/sealer/types/api/v2"
3635
"github.com/sealerio/sealer/utils/platform"
3736
"github.com/sealerio/sealer/utils/ssh"
3837
strUtils "github.com/sealerio/sealer/utils/strings"
38+
"k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta2"
3939

4040
"github.com/sirupsen/logrus"
4141
"golang.org/x/sync/errgroup"
@@ -294,14 +294,14 @@ func (k *Runtime) setAPIServerEndpoint(endpoint string) {
294294
}
295295

296296
func (k *Runtime) setInitAdvertiseAddress(advertiseAddress net.IP) {
297-
k.InitConfiguration.LocalAPIEndpoint.AdvertiseAddress = advertiseAddress
297+
k.InitConfiguration.LocalAPIEndpoint.AdvertiseAddress = string(advertiseAddress)
298298
}
299299

300300
func (k *Runtime) setJoinAdvertiseAddress(advertiseAddress net.IP) {
301301
if k.JoinConfiguration.ControlPlane == nil {
302302
k.JoinConfiguration.ControlPlane = &v1beta2.JoinControlPlane{}
303303
}
304-
k.JoinConfiguration.ControlPlane.LocalAPIEndpoint.AdvertiseAddress = advertiseAddress
304+
k.JoinConfiguration.ControlPlane.LocalAPIEndpoint.AdvertiseAddress = string(advertiseAddress)
305305
}
306306

307307
func (k *Runtime) cleanJoinLocalAPIEndPoint() {

utils/decode.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ import (
3131
"k8s.io/kubelet/config/v1beta1"
3232

3333
"github.com/sealerio/sealer/common"
34-
"github.com/sealerio/sealer/pkg/runtime/kubernetes/kubeadm/v1beta2"
3534
v1 "github.com/sealerio/sealer/types/api/v1"
3635
v2 "github.com/sealerio/sealer/types/api/v2"
36+
"k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta2"
3737
)
3838

3939
const typeV1 = "zlink.aliyun.com/v1alpha1"

vendor/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/deepcopy.go

Lines changed: 0 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/types_jsonschema.go

Lines changed: 0 additions & 74 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1/conversion.go

Lines changed: 4 additions & 21 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1/deepcopy.go

Lines changed: 0 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)