Skip to content

Commit 74f4964

Browse files
authored
refactor: Use separate types for provider cluster configs (#537)
**What problem does this PR solve?**: This commit also switches to using controller-gen generated CRDs for the OpenAPI schema for the variable definitions. A lot of this commit is refactoring tests. The mechanism for defining the variable schema changes with this PR, meaning that a developer now defines variable with standard CRD mechanisms and kubebuilder annotations, rather than defining the manually constructed `VariableSchema` functions for each type previously. **Which issue(s) this PR fixes**: Fixes # **How Has This Been Tested?**: <!-- Please describe the tests that you ran to verify your changes. Provide output from the tests and any manual steps needed to replicate the tests. --> **Special notes for your reviewer**: <!-- Use this to provide any additional information to the reviewers. This may include: - Best way to review the PR. - Where the author wants the most review attention on. - etc. --> Depends on #536.
1 parent 2c20fea commit 74f4964

File tree

87 files changed

+2841
-2252
lines changed

Some content is hidden

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

87 files changed

+2841
-2252
lines changed

api/go.mod

+31-2
Original file line numberDiff line numberDiff line change
@@ -7,43 +7,72 @@ go 1.21
77

88
toolchain go1.22.2
99

10+
replace github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common => ../common
11+
1012
require (
13+
github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common v0.7.0
1114
github.com/nutanix-cloud-native/prism-go-client v0.3.4
1215
github.com/onsi/gomega v1.33.0
1316
k8s.io/api v0.29.3
1417
k8s.io/apiextensions-apiserver v0.29.3
1518
k8s.io/apimachinery v0.29.3
16-
k8s.io/utils v0.0.0-20231127182322-b307cd553661
1719
sigs.k8s.io/cluster-api v1.7.0
1820
sigs.k8s.io/controller-runtime v0.17.3
1921
)
2022

2123
require (
24+
github.com/beorn7/perks v1.0.1 // indirect
2225
github.com/blang/semver/v4 v4.0.0 // indirect
23-
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
26+
github.com/cespare/xxhash/v2 v2.2.0 // indirect
27+
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
28+
github.com/emicklei/go-restful/v3 v3.12.0 // indirect
29+
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
30+
github.com/fsnotify/fsnotify v1.7.0 // indirect
2431
github.com/go-logr/logr v1.4.1 // indirect
2532
github.com/go-openapi/jsonpointer v0.19.6 // indirect
2633
github.com/go-openapi/jsonreference v0.20.2 // indirect
2734
github.com/go-openapi/swag v0.22.3 // indirect
2835
github.com/gogo/protobuf v1.3.2 // indirect
36+
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
2937
github.com/golang/protobuf v1.5.4 // indirect
3038
github.com/google/gnostic-models v0.6.8 // indirect
3139
github.com/google/go-cmp v0.6.0 // indirect
3240
github.com/google/gofuzz v1.2.0 // indirect
41+
github.com/google/uuid v1.4.0 // indirect
42+
github.com/imdario/mergo v0.3.13 // indirect
3343
github.com/josharian/intern v1.0.0 // indirect
3444
github.com/json-iterator/go v1.1.12 // indirect
3545
github.com/mailru/easyjson v0.7.7 // indirect
46+
github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
3647
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
3748
github.com/modern-go/reflect2 v1.0.2 // indirect
49+
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
3850
github.com/pkg/errors v0.9.1 // indirect
51+
github.com/prometheus/client_golang v1.18.0 // indirect
52+
github.com/prometheus/client_model v0.5.0 // indirect
53+
github.com/prometheus/common v0.45.0 // indirect
54+
github.com/prometheus/procfs v0.12.0 // indirect
55+
github.com/spf13/pflag v1.0.5 // indirect
56+
github.com/valyala/fastjson v1.6.4 // indirect
57+
golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect
3958
golang.org/x/net v0.24.0 // indirect
59+
golang.org/x/oauth2 v0.18.0 // indirect
60+
golang.org/x/sys v0.19.0 // indirect
61+
golang.org/x/term v0.19.0 // indirect
4062
golang.org/x/text v0.14.0 // indirect
63+
golang.org/x/time v0.5.0 // indirect
64+
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
65+
google.golang.org/appengine v1.6.8 // indirect
4166
google.golang.org/protobuf v1.33.0 // indirect
4267
gopkg.in/inf.v0 v0.9.1 // indirect
4368
gopkg.in/yaml.v2 v2.4.0 // indirect
4469
gopkg.in/yaml.v3 v3.0.1 // indirect
70+
k8s.io/client-go v0.29.3 // indirect
71+
k8s.io/component-base v0.29.3 // indirect
4572
k8s.io/klog/v2 v2.120.1 // indirect
4673
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect
74+
k8s.io/utils v0.0.0-20231127182322-b307cd553661 // indirect
4775
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
4876
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
77+
sigs.k8s.io/yaml v1.4.0 // indirect
4978
)

api/go.sum

+69-4
Large diffs are not rendered by default.

api/openapi/patterns/anchored.go

-12
This file was deleted.

api/openapi/patterns/distribution.go

-24
This file was deleted.

api/openapi/patterns/dns1123.go

-12
This file was deleted.

api/openapi/patterns/generic.go

-9
This file was deleted.

api/openapi/patterns/net.go

-20
This file was deleted.

0 commit comments

Comments
 (0)