Skip to content
This repository was archived by the owner on Apr 11, 2024. It is now read-only.

Commit 5770b04

Browse files
committed
fix: precommit issues
1 parent 54e7685 commit 5770b04

File tree

7 files changed

+38
-9
lines changed

7 files changed

+38
-9
lines changed

api/v1alpha1/nutanix_node_types.go

Lines changed: 20 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -80,16 +80,27 @@ func (NutanixMachineDetails) VariableSchema() clusterv1.VariableSchema {
8080
Description: "memorySize is the memory size (in Quantity format) of the VM eg. 4Gi",
8181
Type: "string",
8282
},
83-
"image": NutanixResourceIdentifier{}.VariableSchema().OpenAPIV3Schema,
84-
"cluster": NutanixResourceIdentifier{}.VariableSchema().OpenAPIV3Schema,
85-
"subnets": NutanixResourceIdentifiers{}.VariableSchema().OpenAPIV3Schema,
86-
"bootType": NutanixBootType(capxv1.NutanixBootTypeLegacy).VariableSchema().OpenAPIV3Schema,
83+
"image": NutanixResourceIdentifier{}.VariableSchema().OpenAPIV3Schema,
84+
"cluster": NutanixResourceIdentifier{}.VariableSchema().OpenAPIV3Schema,
85+
"subnets": NutanixResourceIdentifiers{}.VariableSchema().OpenAPIV3Schema,
86+
"bootType": NutanixBootType(
87+
capxv1.NutanixBootTypeLegacy,
88+
).VariableSchema().
89+
OpenAPIV3Schema,
8790
"systemDiskSize": {
8891
Description: "systemDiskSize is size (in Quantity format) of the system disk of the VM eg. 20Gi",
8992
Type: "string",
9093
},
9194
},
92-
Required: []string{"vcpusPerSocket", "vcpuSockets", "memorySize", "image", "cluster", "subnets", "systemDiskSize"},
95+
Required: []string{
96+
"vcpusPerSocket",
97+
"vcpuSockets",
98+
"memorySize",
99+
"image",
100+
"cluster",
101+
"subnets",
102+
"systemDiskSize",
103+
},
93104
},
94105
}
95106
}
@@ -134,7 +145,10 @@ func (NutanixResourceIdentifier) VariableSchema() clusterv1.VariableSchema {
134145
Description: "Nutanix Resource Identifier",
135146
Type: "object",
136147
Properties: map[string]clusterv1.JSONSchemaProps{
137-
"type": NutanixIdentifierType(capxv1.NutanixIdentifierName).VariableSchema().OpenAPIV3Schema,
148+
"type": NutanixIdentifierType(
149+
capxv1.NutanixIdentifierName,
150+
).VariableSchema().
151+
OpenAPIV3Schema,
138152
"uuid": {
139153
Type: "string",
140154
Description: "uuid is the UUID of the resource in the PC.",

charts/cluster-api-runtime-extensions-nutanix/templates/helm-config.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
# Copyright 2023 D2iQ, Inc. All rights reserved.
2+
# SPDX-License-Identifier: Apache-2.0
3+
14
apiVersion: v1
25
data:
36
aws-ccm-config: |

hack/tools/helm-cm/go.mod

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,15 @@
1+
// Copyright 2023 D2iQ, Inc. All rights reserved.
2+
// SPDX-License-Identifier: Apache-2.0
3+
14
module github.com/d2iq-labs/cluster-api-runtime-extensions-nutanix/hack/tools
25

36
go 1.22.1
47

58
require (
9+
k8s.io/api v0.29.0
610
k8s.io/apimachinery v0.29.3
711
sigs.k8s.io/controller-runtime v0.17.2
12+
sigs.k8s.io/yaml v1.4.0
813
)
914

1015
require (
@@ -52,7 +57,6 @@ require (
5257
gopkg.in/inf.v0 v0.9.1 // indirect
5358
gopkg.in/yaml.v2 v2.4.0 // indirect
5459
gopkg.in/yaml.v3 v3.0.1 // indirect
55-
k8s.io/api v0.29.0 // indirect
5660
k8s.io/apiextensions-apiserver v0.29.0 // indirect
5761
k8s.io/client-go v0.29.0 // indirect
5862
k8s.io/component-base v0.29.0 // indirect
@@ -61,5 +65,4 @@ require (
6165
k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
6266
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
6367
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
64-
sigs.k8s.io/yaml v1.4.0 // indirect
6568
)

hack/tools/helm-cm/main.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
// Copyright 2023 D2iQ, Inc. All rights reserved.
2+
// SPDX-License-Identifier: Apache-2.0
3+
14
package main
25

36
import (

pkg/handlers/generic/lifecycle/config/cm.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
// Copyright 2023 D2iQ, Inc. All rights reserved.
2+
// SPDX-License-Identifier: Apache-2.0
3+
14
package config
25

36
import (

pkg/handlers/generic/lifecycle/options/lifecycle.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
// Copyright 2023 D2iQ, Inc. All rights reserved.
2+
// SPDX-License-Identifier: Apache-2.0
3+
14
package options
25

36
import "github.com/spf13/pflag"

test/helpers/envtest.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ type TestEnvironment struct {
5252
client.Client
5353
Config *rest.Config
5454
env *envtest.Environment
55-
cancel context.CancelFunc
55+
_ context.CancelFunc
5656
}
5757

5858
// Cleanup deletes all the given objects.

0 commit comments

Comments
 (0)