Merge pull request #2193 from willswire/patch-1

Update example-iam-policy.json

Author: k8s-ci-robot

docs/example-iam-policy.json

@@ -24,8 +24,8 @@
         "ec2:CreateTags"
       ],
       "Resource": [
-        "arn:aws:ec2:*:*:volume/*",
-        "arn:aws:ec2:*:*:snapshot/*"
+        "arn:*:ec2:*:*:volume/*",
+        "arn:*:ec2:*:*:snapshot/*"
       ]
     },
     {
@@ -34,16 +34,16 @@
         "ec2:DeleteTags"
       ],
       "Resource": [
-        "arn:aws:ec2:*:*:volume/*",
-        "arn:aws:ec2:*:*:snapshot/*"
+        "arn:*:ec2:*:*:volume/*",
+        "arn:*:ec2:*:*:snapshot/*"
       ]
     },
     {
       "Effect": "Allow",
       "Action": [
         "ec2:CreateVolume"
       ],
-      "Resource": "arn:aws:ec2:*:*:volume/*",
+      "Resource": "arn:*:ec2:*:*:volume/*",
       "Condition": {
         "StringLike": {
           "aws:RequestTag/ebs.csi.aws.com/cluster": "true"
@@ -55,7 +55,7 @@
       "Action": [
         "ec2:CreateVolume"
       ],
-      "Resource": "arn:aws:ec2:*:*:volume/*",
+      "Resource": "arn:*:ec2:*:*:volume/*",
       "Condition": {
         "StringLike": {
           "aws:RequestTag/CSIVolumeName": "*"
@@ -67,7 +67,7 @@
       "Action": [
         "ec2:CreateVolume"
       ],
-      "Resource": "arn:aws:ec2:*:*:snapshot/*"
+      "Resource": "arn:*:ec2:*:*:snapshot/*"
     },
     {
       "Effect": "Allow",

hack/e2e/kops/patch-cluster.yaml

@@ -47,8 +47,8 @@ spec:
             "ec2:CreateTags"
           ],
           "Resource": [
-            "arn:aws:ec2:*:*:volume/*",
-            "arn:aws:ec2:*:*:snapshot/*"
+            "arn:*:ec2:*:*:volume/*",
+            "arn:*:ec2:*:*:snapshot/*"
           ]
         },
         {
@@ -57,16 +57,16 @@ spec:
             "ec2:DeleteTags"
           ],
           "Resource": [
-            "arn:aws:ec2:*:*:volume/*",
-            "arn:aws:ec2:*:*:snapshot/*"
+            "arn:*:ec2:*:*:volume/*",
+            "arn:*:ec2:*:*:snapshot/*"
           ]
         },
         {
           "Effect": "Allow",
           "Action": [
             "ec2:CreateVolume"
           ],
-          "Resource": "arn:aws:ec2:*:*:volume/*",
+          "Resource": "arn:*:ec2:*:*:volume/*",
           "Condition": {
             "StringLike": {
               "aws:RequestTag/ebs.csi.aws.com/cluster": "true"
@@ -78,7 +78,7 @@ spec:
           "Action": [
             "ec2:CreateVolume"
           ],
-          "Resource": "arn:aws:ec2:*:*:volume/*",
+          "Resource": "arn:*:ec2:*:*:volume/*",
           "Condition": {
             "StringLike": {
               "aws:RequestTag/CSIVolumeName": "*"
@@ -90,7 +90,7 @@ spec:
           "Action": [
             "ec2:CreateVolume"
           ],
-          "Resource": "arn:aws:ec2:*:*:snapshot/*"
+          "Resource": "arn:*:ec2:*:*:snapshot/*"
         },
         {
           "Effect": "Allow",