Merge pull request #1964 from k8s-infra-cherrypick-robot/cherry-pick-1948-to-release-1.1

k8s-ci-robot · web-flow · commit 3cf5da0a7a1e · 2022-01-12T18:47:07.000-08:00
[release-1.1] Add ManualServicePrincipal to validation string
diff --git a/api/v1beta1/types.go b/api/v1beta1/types.go
@@ -426,7 +426,7 @@ const (
 )
 
 // IdentityType represents different types of identities.
-// +kubebuilder:validation:Enum=ServicePrincipal;UserAssignedMSI
+// +kubebuilder:validation:Enum=ServicePrincipal;ManualServicePrincipal;UserAssignedMSI
 type IdentityType string
 
 const (
diff --git a/config/crd/bases/infrastructure.cluster.x-k8s.io_azureclusteridentities.yaml b/config/crd/bases/infrastructure.cluster.x-k8s.io_azureclusteridentities.yaml
@@ -428,6 +428,7 @@ spec:
                 description: UserAssignedMSI or Service Principal
                 enum:
                 - ServicePrincipal
+                - ManualServicePrincipal
                 - UserAssignedMSI
                 type: string
             required:

Original file line number	Diff line number	Diff line change
`@@ -426,7 +426,7 @@ const (`
`426`	`426`	`)`
`427`	`427`
`428`	`428`	`// IdentityType represents different types of identities.`
`429`		`-// +kubebuilder:validation:Enum=ServicePrincipal;UserAssignedMSI`
	`429`	`+// +kubebuilder:validation:Enum=ServicePrincipal;ManualServicePrincipal;UserAssignedMSI`
`430`	`430`	`type IdentityType string`
`431`	`431`
`432`	`432`	`const (`