Skip to content

Commit bc9c62d

Browse files
committed
pkg/types/azure: remove SystemAssignedID docs
For the Azure identity API, the installer makes use directly of the CAPZ API, but we do add validation to not support SystemAssigned identities. SystemAssigned identities were removed in 11f006d but I missed updating the godoc text which is pulled in from CAPZ. This PR updates the godoc text and kubebuilder annotations so that the explain command will not show SystemAssigned identities as a valid choice.
1 parent 7ad0e35 commit bc9c62d

File tree

2 files changed

+3
-14
lines changed

2 files changed

+3
-14
lines changed

data/data/install.openshift.io_installconfigs.yaml

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -252,8 +252,6 @@ spec:
252252
default: None
253253
description: |-
254254
Identity is the type of identity used for the virtual machine.
255-
The type 'SystemAssigned' is an implicitly created identity.
256-
The generated identity will be assigned a Subscription contributor role.
257255
The type 'UserAssigned' is a standalone Azure resource provided by the user
258256
and assigned to the VM
259257
Identity can only be set for control-plane nodes.
@@ -263,7 +261,6 @@ spec:
263261
used.
264262
enum:
265263
- None
266-
- SystemAssigned
267264
- UserAssigned
268265
type: string
269266
userAssignedIdentities:
@@ -1574,8 +1571,6 @@ spec:
15741571
default: None
15751572
description: |-
15761573
Identity is the type of identity used for the virtual machine.
1577-
The type 'SystemAssigned' is an implicitly created identity.
1578-
The generated identity will be assigned a Subscription contributor role.
15791574
The type 'UserAssigned' is a standalone Azure resource provided by the user
15801575
and assigned to the VM
15811576
Identity can only be set for control-plane nodes.
@@ -1585,7 +1580,6 @@ spec:
15851580
be used.
15861581
enum:
15871582
- None
1588-
- SystemAssigned
15891583
- UserAssigned
15901584
type: string
15911585
userAssignedIdentities:
@@ -2835,8 +2829,6 @@ spec:
28352829
default: None
28362830
description: |-
28372831
Identity is the type of identity used for the virtual machine.
2838-
The type 'SystemAssigned' is an implicitly created identity.
2839-
The generated identity will be assigned a Subscription contributor role.
28402832
The type 'UserAssigned' is a standalone Azure resource provided by the user
28412833
and assigned to the VM
28422834
Identity can only be set for control-plane nodes.
@@ -2846,7 +2838,6 @@ spec:
28462838
used.
28472839
enum:
28482840
- None
2849-
- SystemAssigned
28502841
- UserAssigned
28512842
type: string
28522843
userAssignedIdentities:
@@ -4570,8 +4561,6 @@ spec:
45704561
default: None
45714562
description: |-
45724563
Identity is the type of identity used for the virtual machine.
4573-
The type 'SystemAssigned' is an implicitly created identity.
4574-
The generated identity will be assigned a Subscription contributor role.
45754564
The type 'UserAssigned' is a standalone Azure resource provided by the user
45764565
and assigned to the VM
45774566
Identity can only be set for control-plane nodes.
@@ -4581,7 +4570,6 @@ spec:
45814570
used.
45824571
enum:
45834572
- None
4584-
- SystemAssigned
45854573
- UserAssigned
45864574
type: string
45874575
userAssignedIdentities:

pkg/types/azure/machinepool.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,6 @@ type MachinePool struct {
7272
Settings *SecuritySettings `json:"settings,omitempty"`
7373

7474
// Identity is the type of identity used for the virtual machine.
75-
// The type 'SystemAssigned' is an implicitly created identity.
76-
// The generated identity will be assigned a Subscription contributor role.
7775
// The type 'UserAssigned' is a standalone Azure resource provided by the user
7876
// and assigned to the VM
7977
// Identity can only be set for control-plane nodes.
@@ -264,6 +262,9 @@ type OSImage struct {
264262
// VMIdentity configures the identity attached to the VM.
265263
type VMIdentity struct {
266264
// Type specifies the type of identity to be used.
265+
// +kubebuilder:validation:Schemaless
266+
// +kubebuilder:validation:Type=string
267+
// +kubebuilder:validation:Enum=None;UserAssigned
267268
Type capz.VMIdentity `json:"type"`
268269

269270
// UserAssignedIdentities is a list of identities to be attached to a node.

0 commit comments

Comments
 (0)