Skip to content

Commit 1765fab

Browse files
authored
Merge pull request kubernetes-sigs#666 from akutz/feature/rm-ntp-ca-fields
Remove vestigial NTP & Trusted CA fields
2 parents 165ea35 + b8f580e commit 1765fab

5 files changed

+14
-57
lines changed

api/v1alpha2/cloudprovider/zz_generated.deepcopy.go

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

api/v1alpha2/vspheremachine_types.go

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -74,15 +74,6 @@ type VSphereMachineSpec struct {
7474
// machine is cloned.
7575
// +optional
7676
DiskGiB int32 `json:"diskGiB,omitempty"`
77-
78-
// TrustedCerts is a list of trusted certificates to add to the machine's VM.
79-
// +optional
80-
TrustedCerts [][]byte `json:"trustedCerts,omitempty"`
81-
82-
// NTPServers is a list of NTP servers to use instead of the machine image's
83-
// default NTP server list.
84-
// +optional
85-
NTPServers []string `json:"ntpServers,omitempty"`
8677
}
8778

8879
// VSphereMachineStatus defines the observed state of VSphereMachine

api/v1alpha2/zz_generated.deepcopy.go

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

config/crd/bases/infrastructure.cluster.x-k8s.io_vspheremachines.yaml

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -175,12 +175,6 @@ spec:
175175
required:
176176
- devices
177177
type: object
178-
ntpServers:
179-
description: NTPServers is a list of NTP servers to use instead of the
180-
machine image's default NTP server list.
181-
items:
182-
type: string
183-
type: array
184178
numCPUs:
185179
description: NumCPUs is the number of virtual processors in a virtual
186180
machine. Defaults to the analogue property value in the template from
@@ -201,13 +195,6 @@ spec:
201195
description: Template is the name, inventory path, or instance UUID
202196
of the template used to clone new machines.
203197
type: string
204-
trustedCerts:
205-
description: TrustedCerts is a list of trusted certificates to add to
206-
the machine's VM.
207-
items:
208-
format: byte
209-
type: string
210-
type: array
211198
required:
212199
- datacenter
213200
- network

config/crd/bases/infrastructure.cluster.x-k8s.io_vspheremachinetemplates.yaml

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -295,12 +295,6 @@ spec:
295295
required:
296296
- devices
297297
type: object
298-
ntpServers:
299-
description: NTPServers is a list of NTP servers to use instead
300-
of the machine image's default NTP server list.
301-
items:
302-
type: string
303-
type: array
304298
numCPUs:
305299
description: NumCPUs is the number of virtual processors in
306300
a virtual machine. Defaults to the analogue property value
@@ -321,13 +315,6 @@ spec:
321315
description: Template is the name, inventory path, or instance
322316
UUID of the template used to clone new machines.
323317
type: string
324-
trustedCerts:
325-
description: TrustedCerts is a list of trusted certificates
326-
to add to the machine's VM.
327-
items:
328-
format: byte
329-
type: string
330-
type: array
331318
required:
332319
- datacenter
333320
- network

0 commit comments

Comments
 (0)