Merge pull request #12719 from rifelpet/automated-cherry-pick-of-#127…

…16-origin-release-1.22 Automated cherry pick of #12716: Add missing status fields to IAMIdentityMapping v1 CRD
kubernetes · Nov 12, 2021 · 45f951b · 45f951b
2 parents ebfb37d + 166814a
commit 45f951b
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 1 deletion.
diff --git a/upup/models/cloudup/resources/addons/authentication.aws/k8s-1.12.yaml.template b/upup/models/cloudup/resources/addons/authentication.aws/k8s-1.12.yaml.template
@@ -34,6 +34,13 @@ spec:
                   type: array
                   items:
                     type: string
+            status:
+              type: object
+              properties:
+                canonicalARN:
+                  type: string
+                userID:
+                  type: string
       subresources:
         status: {}
 ---

diff --git a/...loudup/tests/bootstrapchannelbuilder/awsiamauthenticator/authentication.aws-k8s-1.12.yaml b/...loudup/tests/bootstrapchannelbuilder/awsiamauthenticator/authentication.aws-k8s-1.12.yaml
@@ -35,6 +35,13 @@ spec:
             - arn
             - username
             type: object
+          status:
+            properties:
+              canonicalARN:
+                type: string
+              userID:
+                type: string
+            type: object
         type: object
     served: true
     storage: true

diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awsiamauthenticator/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awsiamauthenticator/manifest.yaml
@@ -54,7 +54,7 @@ spec:
     version: 9.99.0
   - id: k8s-1.12
     manifest: authentication.aws/k8s-1.12.yaml
-    manifestHash: bff1ae6a3d5e795e21aa3f417e31ba2afc047ab1410a2c918c1ea69da6e11dea
+    manifestHash: 4e708499c4b354385fbf7c05b1ab2b811f7043c92b9e33457c7591d58d29a0ee
     name: authentication.aws
     selector:
       role.kubernetes.io/authentication: "1"