Skip to content

Commit bcffb38

Browse files
bryan-coxbryan-cox
committed
fix(controllers): only warn about SP credentials when actually using Service Principal
The VMIdentityNone warning was incorrectly shown for clusters using WorkloadIdentity, UserAssignedMSI, or other non-SP authentication methods. This caused confusing warnings about "Service Principal credentials being written to disk" when no such credentials exist. Add isUsingSPCredentials helper to check the AzureClusterIdentity type before emitting the warning. Only ServicePrincipal, ManualServicePrincipal, and ServicePrincipalCertificate identity types now trigger the warning. Signed-off-by: Bryan Cox <[email protected]>
1 parent e695d87 commit bcffb38

File tree

5 files changed

+190
-4
lines changed

5 files changed

+190
-4
lines changed

‎controllers/azurejson_machine_controller.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ func (r *AzureJSONMachineReconciler) Reconcile(ctx context.Context, req ctrl.Req
235235
}
236236
}
237237

238-
if azureMachine.Spec.Identity == infrav1.VMIdentityNone {
238+
if azureMachine.Spec.Identity == infrav1.VMIdentityNone && isUsingSPCredentials(ctx, r.Client, azureCluster) {
239239
log.Info(fmt.Sprintf("WARNING, %s", spIdentityWarning))
240240
r.Recorder.Eventf(azureMachine, corev1.EventTypeWarning, "VMIdentityNone", spIdentityWarning)
241241
}

‎controllers/azurejson_machinepool_controller.go‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -177,8 +177,10 @@ func (r *AzureJSONMachinePoolReconciler) Reconcile(ctx context.Context, req ctrl
177177
}
178178

179179
if azureMachinePool.Spec.Identity == infrav1.VMIdentityNone {
180-
log.Info(fmt.Sprintf("WARNING, %s", spIdentityWarning))
181-
r.Recorder.Eventf(azureMachinePool, corev1.EventTypeWarning, "VMIdentityNone", spIdentityWarning)
180+
if azureCluster := getAzureClusterFromCluster(ctx, r.Client, cluster); azureCluster != nil && isUsingSPCredentials(ctx, r.Client, azureCluster) {
181+
log.Info(fmt.Sprintf("WARNING, %s", spIdentityWarning))
182+
r.Recorder.Eventf(azureMachinePool, corev1.EventTypeWarning, "VMIdentityNone", spIdentityWarning)
183+
}
182184
}
183185

184186
newSecret, err := GetCloudProviderSecret(

‎controllers/azurejson_machinetemplate_controller.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ func (r *AzureJSONTemplateReconciler) Reconcile(ctx context.Context, req ctrl.Re
195195
}
196196
}
197197

198-
if azureMachineTemplate.Spec.Template.Spec.Identity == infrav1.VMIdentityNone {
198+
if azureMachineTemplate.Spec.Template.Spec.Identity == infrav1.VMIdentityNone && isUsingSPCredentials(ctx, r.Client, azureCluster) {
199199
log.Info(fmt.Sprintf("WARNING, %s", spIdentityWarning))
200200
r.Recorder.Eventf(azureMachineTemplate, corev1.EventTypeWarning, "VMIdentityNone", spIdentityWarning)
201201
}

‎controllers/helpers.go‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1152,3 +1152,43 @@ func RemoveBlockMoveAnnotation(obj metav1.Object) {
11521152
delete(azClusterAnnotations, clusterctlv1.BlockMoveAnnotation)
11531153
obj.SetAnnotations(azClusterAnnotations)
11541154
}
1155+
1156+
// getAzureClusterFromCluster returns the AzureCluster for a Cluster if the infraRef is an AzureCluster.
1157+
// Returns nil if the infraRef is not an AzureCluster or if the AzureCluster cannot be fetched.
1158+
func getAzureClusterFromCluster(ctx context.Context, c client.Client, cluster *clusterv1.Cluster) *infrav1.AzureCluster {
1159+
if cluster.Spec.InfrastructureRef == nil || cluster.Spec.InfrastructureRef.Kind != infrav1.AzureClusterKind {
1160+
return nil
1161+
}
1162+
azureCluster := &infrav1.AzureCluster{}
1163+
key := client.ObjectKey{
1164+
Namespace: cluster.Spec.InfrastructureRef.Namespace,
1165+
Name: cluster.Spec.InfrastructureRef.Name,
1166+
}
1167+
if err := c.Get(ctx, key, azureCluster); err != nil {
1168+
return nil
1169+
}
1170+
return azureCluster
1171+
}
1172+
1173+
// isUsingSPCredentials checks if the cluster is using Service Principal credentials.
1174+
func isUsingSPCredentials(ctx context.Context, c client.Client, azureCluster *infrav1.AzureCluster) bool {
1175+
if azureCluster.Spec.IdentityRef == nil {
1176+
return false
1177+
}
1178+
identity := &infrav1.AzureClusterIdentity{}
1179+
key := client.ObjectKey{
1180+
Name: azureCluster.Spec.IdentityRef.Name,
1181+
Namespace: azureCluster.Spec.IdentityRef.Namespace,
1182+
}
1183+
if key.Namespace == "" {
1184+
key.Namespace = azureCluster.Namespace
1185+
}
1186+
if err := c.Get(ctx, key, identity); err != nil {
1187+
return false
1188+
}
1189+
switch identity.Spec.Type {
1190+
case infrav1.ServicePrincipal, infrav1.ManualServicePrincipal, infrav1.ServicePrincipalCertificate:
1191+
return true
1192+
}
1193+
return false
1194+
}

‎controllers/helpers_test.go‎

Lines changed: 144 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1655,3 +1655,147 @@ func TestRemoveBlockMoveAnnotation(t *testing.T) {
16551655
})
16561656
}
16571657
}
1658+
1659+
func TestIsUsingSPCredentials(t *testing.T) {
1660+
tests := []struct {
1661+
name string
1662+
azureCluster *infrav1.AzureCluster
1663+
identity *infrav1.AzureClusterIdentity
1664+
expected bool
1665+
}{
1666+
{
1667+
name: "ServicePrincipal returns true",
1668+
azureCluster: &infrav1.AzureCluster{
1669+
ObjectMeta: metav1.ObjectMeta{Name: "cluster", Namespace: "default"},
1670+
Spec: infrav1.AzureClusterSpec{
1671+
AzureClusterClassSpec: infrav1.AzureClusterClassSpec{
1672+
IdentityRef: &corev1.ObjectReference{Name: "identity", Namespace: "default"},
1673+
},
1674+
},
1675+
},
1676+
identity: &infrav1.AzureClusterIdentity{
1677+
ObjectMeta: metav1.ObjectMeta{Name: "identity", Namespace: "default"},
1678+
Spec: infrav1.AzureClusterIdentitySpec{Type: infrav1.ServicePrincipal},
1679+
},
1680+
expected: true,
1681+
},
1682+
{
1683+
name: "ManualServicePrincipal returns true",
1684+
azureCluster: &infrav1.AzureCluster{
1685+
ObjectMeta: metav1.ObjectMeta{Name: "cluster", Namespace: "default"},
1686+
Spec: infrav1.AzureClusterSpec{
1687+
AzureClusterClassSpec: infrav1.AzureClusterClassSpec{
1688+
IdentityRef: &corev1.ObjectReference{Name: "identity", Namespace: "default"},
1689+
},
1690+
},
1691+
},
1692+
identity: &infrav1.AzureClusterIdentity{
1693+
ObjectMeta: metav1.ObjectMeta{Name: "identity", Namespace: "default"},
1694+
Spec: infrav1.AzureClusterIdentitySpec{Type: infrav1.ManualServicePrincipal},
1695+
},
1696+
expected: true,
1697+
},
1698+
{
1699+
name: "ServicePrincipalCertificate returns true",
1700+
azureCluster: &infrav1.AzureCluster{
1701+
ObjectMeta: metav1.ObjectMeta{Name: "cluster", Namespace: "default"},
1702+
Spec: infrav1.AzureClusterSpec{
1703+
AzureClusterClassSpec: infrav1.AzureClusterClassSpec{
1704+
IdentityRef: &corev1.ObjectReference{Name: "identity", Namespace: "default"},
1705+
},
1706+
},
1707+
},
1708+
identity: &infrav1.AzureClusterIdentity{
1709+
ObjectMeta: metav1.ObjectMeta{Name: "identity", Namespace: "default"},
1710+
Spec: infrav1.AzureClusterIdentitySpec{Type: infrav1.ServicePrincipalCertificate},
1711+
},
1712+
expected: true,
1713+
},
1714+
{
1715+
name: "WorkloadIdentity returns false",
1716+
azureCluster: &infrav1.AzureCluster{
1717+
ObjectMeta: metav1.ObjectMeta{Name: "cluster", Namespace: "default"},
1718+
Spec: infrav1.AzureClusterSpec{
1719+
AzureClusterClassSpec: infrav1.AzureClusterClassSpec{
1720+
IdentityRef: &corev1.ObjectReference{Name: "identity", Namespace: "default"},
1721+
},
1722+
},
1723+
},
1724+
identity: &infrav1.AzureClusterIdentity{
1725+
ObjectMeta: metav1.ObjectMeta{Name: "identity", Namespace: "default"},
1726+
Spec: infrav1.AzureClusterIdentitySpec{Type: infrav1.WorkloadIdentity},
1727+
},
1728+
expected: false,
1729+
},
1730+
{
1731+
name: "UserAssignedMSI returns false",
1732+
azureCluster: &infrav1.AzureCluster{
1733+
ObjectMeta: metav1.ObjectMeta{Name: "cluster", Namespace: "default"},
1734+
Spec: infrav1.AzureClusterSpec{
1735+
AzureClusterClassSpec: infrav1.AzureClusterClassSpec{
1736+
IdentityRef: &corev1.ObjectReference{Name: "identity", Namespace: "default"},
1737+
},
1738+
},
1739+
},
1740+
identity: &infrav1.AzureClusterIdentity{
1741+
ObjectMeta: metav1.ObjectMeta{Name: "identity", Namespace: "default"},
1742+
Spec: infrav1.AzureClusterIdentitySpec{Type: infrav1.UserAssignedMSI},
1743+
},
1744+
expected: false,
1745+
},
1746+
{
1747+
name: "UserAssignedIdentityCredential returns false",
1748+
azureCluster: &infrav1.AzureCluster{
1749+
ObjectMeta: metav1.ObjectMeta{Name: "cluster", Namespace: "default"},
1750+
Spec: infrav1.AzureClusterSpec{
1751+
AzureClusterClassSpec: infrav1.AzureClusterClassSpec{
1752+
IdentityRef: &corev1.ObjectReference{Name: "identity", Namespace: "default"},
1753+
},
1754+
},
1755+
},
1756+
identity: &infrav1.AzureClusterIdentity{
1757+
ObjectMeta: metav1.ObjectMeta{Name: "identity", Namespace: "default"},
1758+
Spec: infrav1.AzureClusterIdentitySpec{Type: infrav1.UserAssignedIdentityCredential},
1759+
},
1760+
expected: false,
1761+
},
1762+
{
1763+
name: "nil IdentityRef returns false",
1764+
azureCluster: &infrav1.AzureCluster{
1765+
ObjectMeta: metav1.ObjectMeta{Name: "cluster", Namespace: "default"},
1766+
Spec: infrav1.AzureClusterSpec{},
1767+
},
1768+
identity: nil,
1769+
expected: false,
1770+
},
1771+
{
1772+
name: "identity not found returns false",
1773+
azureCluster: &infrav1.AzureCluster{
1774+
ObjectMeta: metav1.ObjectMeta{Name: "cluster", Namespace: "default"},
1775+
Spec: infrav1.AzureClusterSpec{
1776+
AzureClusterClassSpec: infrav1.AzureClusterClassSpec{
1777+
IdentityRef: &corev1.ObjectReference{Name: "missing-identity", Namespace: "default"},
1778+
},
1779+
},
1780+
},
1781+
identity: nil,
1782+
expected: false,
1783+
},
1784+
}
1785+
1786+
for _, tc := range tests {
1787+
t.Run(tc.name, func(t *testing.T) {
1788+
g := NewWithT(t)
1789+
scheme := setupScheme(g)
1790+
1791+
var initObjects []runtime.Object
1792+
if tc.identity != nil {
1793+
initObjects = append(initObjects, tc.identity)
1794+
}
1795+
1796+
fakeClient := fake.NewClientBuilder().WithScheme(scheme).WithRuntimeObjects(initObjects...).Build()
1797+
result := isUsingSPCredentials(t.Context(), fakeClient, tc.azureCluster)
1798+
g.Expect(result).To(Equal(tc.expected))
1799+
})
1800+
}
1801+
}

0 commit comments

Comments
 (0)