update json tag

Author: stefanmcshane

config/crd/bases/controlplane.cluster.x-k8s.io_awsmanagedcontrolplanes.yaml

@@ -3126,6 +3126,10 @@ spec:
                     which allows the service principal `pods.eks.amazonaws.com` in
                     its trust policy.
                   properties:
+                    roleARN:
+                      description: RoleARN is the ARN of an IAM role which the Service
+                        Account can assume.
+                      type: string
                     serviceAccountName:
                       description: ServiceAccountName is the name of the kubernetes
                         Service Account within the namespace
@@ -3136,10 +3140,6 @@ spec:
                         which the kubernetes Service Account resides in. Defaults
                         to "default" namespace.
                       type: string
-                    serviceAccountRoleARN:
-                      description: RoleARN is the ARN of an IAM role which the Service
-                        Account can assume.
-                      type: string
                   required:
                   - serviceAccountName
                   - serviceAccountNamespace

controlplane/eks/api/v1beta2/types.go

@@ -293,5 +293,5 @@ type PodIdentityAssociation struct {
 	ServiceAccountNamespace string `json:"serviceAccountNamespace"`
 	// RoleARN is the ARN of an IAM role which the Service Account can assume.
 	// +kubebuilder:validation:Required
-	RoleARN string `json:"serviceAccountRoleARN,omitempty"`
+	RoleARN string `json:"roleARN,omitempty"`
 }

docs/book/src/topics/eks/pod-identity-associations.md

@@ -53,14 +53,13 @@ kind: AWSManagedControlPlane
 spec:
   # [...]
   podIdentityAssociations:
-    - serviceAccount:
-        namespace: default
-        name: myserviceaccount
-        roleARN: arn:aws:iam::012345678901:role/capi-test-role
+    - serviceAccountNamespace: default
+      serviceAccountName: myserviceaccount
+      roleARN: arn:aws:iam::012345678901:role/capi-test-role
 ```
 
-- `serviceAccount.namespace` and `serviceAccount.name` refer to the [`ServiceAccount`](https://kubernetes.io/docs/tasks/configure-pod-container/configure-service-account/) object in the Kubernetes cluster
-- `serviceAccount.roleARN` is the AWS ARN for the IAM role you created in step 1 (named `capi-test-role` in this tutorial). Make sure to copy this exactly from your AWS console (`IAM > Roles`).
+- `.serviceAccountNamespace` and `.serviceAccountName` refer to the [`ServiceAccount`](https://kubernetes.io/docs/tasks/configure-pod-container/configure-service-account/) object in the Kubernetes cluster
+- `.roleARN` is the AWS ARN for the IAM role you created in step 1 (named `capi-test-role` in this tutorial). Make sure to copy this exactly from your AWS console (`IAM > Roles`).
 
 To use the same IAM role across multiple service accounts/namespaces, you must create multiple associations.
 
@@ -82,8 +81,8 @@ spec:
   podIdentityAssociations:
     - serviceAccountNamespace: default
       serviceAccountName: myserviceaccount
-      serviceAccountRoleARN: arn:aws:iam::012345678901:role/capi-test-role
+      roleARN: arn:aws:iam::012345678901:role/capi-test-role
     - serviceAccountNamespace: another-namespace
       serviceAccountName: another-service-account
-      serviceAccountRoleARN: arn:aws:iam::012345678901:role/capi-test-role
+      roleARN: arn:aws:iam::012345678901:role/capi-test-role
 ```