Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
  • Loading branch information
njuCZ committed Apr 27, 2021
1 parent aa1116f commit ae52a40
Showing 1 changed file with 16 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -251,6 +251,13 @@ func expandKubernetesPodIdentities(ctx context.Context, userAssignedIdentitiesCl
result := make([]containerservice.ManagedClusterPodIdentity, 0)
for _, raw := range input {
v := raw.(map[string]interface{})

name := v["name"].(string)
namespace := v["namespace"].(string)
if name == "" || namespace == "" {
continue
}

identityId, err := msiParse.UserAssignedIdentityID(v["identity_id"].(string))
if err != nil {
return nil, err
Expand All @@ -265,8 +272,8 @@ func expandKubernetesPodIdentities(ctx context.Context, userAssignedIdentitiesCl
return nil, fmt.Errorf("clientId or principalId is nil for %s", identityId)
}
result = append(result, containerservice.ManagedClusterPodIdentity{
Name: utils.String(v["name"].(string)),
Namespace: utils.String(v["namespace"].(string)),
Name: utils.String(name),
Namespace: utils.String(namespace),
Identity: &containerservice.UserAssignedIdentity{
ResourceID: utils.String(identityId.ID()),
ClientID: utils.String(resp.UserAssignedIdentityProperties.ClientID.String()),
Expand All @@ -284,9 +291,14 @@ func expandKubernetesPodIdentityExceptions(input []interface{}) *[]containerserv
result := make([]containerservice.ManagedClusterPodIdentityException, 0)
for _, raw := range input {
v := raw.(map[string]interface{})
name := v["name"].(string)
namespace := v["namespace"].(string)
if name == "" || namespace == "" {
continue
}
result = append(result, containerservice.ManagedClusterPodIdentityException{
Name: utils.String(v["name"].(string)),
Namespace: utils.String(v["namespace"].(string)),
Name: utils.String(name),
Namespace: utils.String(namespace),
PodLabels: utils.ExpandMapStringPtrString(v["pod_labels"].(map[string]interface{})),
})
}
Expand Down

0 comments on commit ae52a40

Please sign in to comment.