Skip to content

Commit aad2b9c

Browse files
authored
Merge pull request #60 from 0ekk/worker_add
Support add worker node by creating MachineDeployment
2 parents 6d086fd + 7553085 commit aad2b9c

File tree

5 files changed

+134
-71
lines changed

5 files changed

+134
-71
lines changed

docs/tilt.md

-3
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,6 @@ kustomize_substitutions:
4949

5050
ECS_IMAGE_ID: "a9f5cc27-0d50-4864-a45e-d8eead734a3f"
5151

52-
KUBE_IMAGE_REPO: "registry.cn-hangzhou.aliyuncs.com/google_containers"
53-
KUBE_DNS_IMAGE_REPO: "registry.cn-hangzhou.aliyuncs.com/google_containers"
54-
ETCD_IMAGE_REPO: "registry.cn-hangzhou.aliyuncs.com/google_containers"
5552
```
5653

5754
**Note:** Please ensure that the values for `CLOUD_SDK_AK` and `CLOUD_SDK_SK` are base64 encoded.

go.mod

+21-21
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,20 @@
11
module github.com/HuaweiCloudDeveloper/cluster-api-provider-huawei
22

33
go 1.22.0
4-
toolchain go1.23.6
54

65
require (
76
github.com/go-logr/logr v1.4.2
8-
github.com/huaweicloud/huaweicloud-sdk-go-v3 v0.1.136
9-
github.com/onsi/ginkgo/v2 v2.22.2
10-
github.com/onsi/gomega v1.36.2
7+
github.com/huaweicloud/huaweicloud-sdk-go-v3 v0.1.130
8+
github.com/onsi/ginkgo/v2 v2.22.0
9+
github.com/onsi/gomega v1.36.0
1110
github.com/pkg/errors v0.9.1
12-
k8s.io/api v0.32.2
13-
k8s.io/apimachinery v0.32.2
14-
k8s.io/client-go v0.32.2
11+
k8s.io/api v0.31.3
12+
k8s.io/apimachinery v0.31.3
13+
k8s.io/client-go v0.31.3
1514
k8s.io/klog/v2 v2.130.1
16-
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738
17-
sigs.k8s.io/cluster-api v1.9.4
18-
sigs.k8s.io/controller-runtime v0.19.4
15+
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8
16+
sigs.k8s.io/cluster-api v1.9.3
17+
sigs.k8s.io/controller-runtime v0.19.3
1918
)
2019

2120
require (
@@ -33,20 +32,22 @@ require (
3332
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
3433
github.com/go-logr/stdr v1.2.2 // indirect
3534
github.com/go-logr/zapr v1.3.0 // indirect
36-
github.com/go-openapi/jsonpointer v0.21.0 // indirect
35+
github.com/go-openapi/jsonpointer v0.19.6 // indirect
3736
github.com/go-openapi/jsonreference v0.20.2 // indirect
38-
github.com/go-openapi/swag v0.23.0 // indirect
37+
github.com/go-openapi/swag v0.22.4 // indirect
3938
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
4039
github.com/gobuffalo/flect v1.0.3 // indirect
4140
github.com/gogo/protobuf v1.3.2 // indirect
41+
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
4242
github.com/golang/protobuf v1.5.4 // indirect
4343
github.com/google/cel-go v0.20.1 // indirect
4444
github.com/google/gnostic-models v0.6.8 // indirect
4545
github.com/google/go-cmp v0.6.0 // indirect
4646
github.com/google/gofuzz v1.2.0 // indirect
47-
github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad // indirect
47+
github.com/google/pprof v0.0.0-20241029153458-d1b30febd7db // indirect
4848
github.com/google/uuid v1.6.0 // indirect
4949
github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 // indirect
50+
github.com/imdario/mergo v0.3.13 // indirect
5051
github.com/inconshreveable/mousetrap v1.1.0 // indirect
5152
github.com/josharian/intern v1.0.0 // indirect
5253
github.com/json-iterator/go v1.1.12 // indirect
@@ -63,7 +64,7 @@ require (
6364
github.com/stoewer/go-strcase v1.2.0 // indirect
6465
github.com/tjfoc/gmsm v1.4.1 // indirect
6566
github.com/x448/float16 v0.8.4 // indirect
66-
go.mongodb.org/mongo-driver v1.13.1 // indirect
67+
go.mongodb.org/mongo-driver v1.12.0 // indirect
6768
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect
6869
go.opentelemetry.io/otel v1.28.0 // indirect
6970
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0 // indirect
@@ -82,24 +83,23 @@ require (
8283
golang.org/x/sys v0.28.0 // indirect
8384
golang.org/x/term v0.27.0 // indirect
8485
golang.org/x/text v0.21.0 // indirect
85-
golang.org/x/time v0.7.0 // indirect
86-
golang.org/x/tools v0.28.0 // indirect
86+
golang.org/x/time v0.5.0 // indirect
87+
golang.org/x/tools v0.26.0 // indirect
8788
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
8889
google.golang.org/genproto/googleapis/api v0.0.0-20240528184218-531527333157 // indirect
8990
google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // indirect
9091
google.golang.org/grpc v1.65.1 // indirect
91-
google.golang.org/protobuf v1.36.1 // indirect
92-
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
92+
google.golang.org/protobuf v1.35.1 // indirect
9393
gopkg.in/inf.v0 v0.9.1 // indirect
9494
gopkg.in/ini.v1 v1.67.0 // indirect
9595
gopkg.in/yaml.v2 v2.4.0 // indirect
9696
gopkg.in/yaml.v3 v3.0.1 // indirect
9797
k8s.io/apiextensions-apiserver v0.31.3 // indirect
9898
k8s.io/apiserver v0.31.3 // indirect
9999
k8s.io/component-base v0.31.3 // indirect
100-
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect
100+
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
101101
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3 // indirect
102-
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
103-
sigs.k8s.io/structured-merge-diff/v4 v4.4.2 // indirect
102+
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
103+
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
104104
sigs.k8s.io/yaml v1.4.0 // indirect
105105
)

0 commit comments

Comments
 (0)