feat(status): status clusterName and autoscalerArn for aws-auth confi…

…gmap (#5) * feat(status): add cluster-name for status Signed-off-by: Christopher Haar <christopher.haar@upbound.io> * feat(status): add autoscalerArn Signed-off-by: Christopher Haar <christopher.haar@upbound.io> * feat(uxp): set uxp-version Signed-off-by: Christopher Haar <christopher.haar@upbound.io> * feat(submodule): update submodule to specify UXP_VERSION Signed-off-by: Christopher Haar <christopher.haar@upbound.io> * feat(configuration): set static versions Signed-off-by: Christopher Haar <christopher.haar@upbound.io> --------- Signed-off-by: Christopher Haar <christopher.haar@upbound.io>
upbound · Nov 28, 2023 · bb4f5b3 · bb4f5b3
1 parent 5121a72
commit bb4f5b3
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 4 deletions.
diff --git a/Makefile b/Makefile
@@ -11,6 +11,8 @@ PLATFORMS ?= linux_amd64
 # ====================================================================================
 # Setup Kubernetes tools
 
+# set UXP_VERSION because of https://github.com/crossplane/crossplane/issues/5055
+UXP_VERSION = 1.13.2-up.2
 UP_VERSION = v0.19.1
 UP_CHANNEL = stable
 UPTEST_VERSION = v0.6.1

diff --git a/apis/composition.yaml b/apis/composition.yaml
@@ -132,6 +132,11 @@ spec:
           toFieldPath: status.eks.clusterSecurityGroupId
           policy:
             fromFieldPath: Optional
+        - type: ToCompositeFieldPath
+          fromFieldPath: metadata.annotations[crossplane.io/external-name]
+          toFieldPath: status.eks.clusterName
+          policy:
+            fromFieldPath: Optional
     - name: clusterSecurityGroupTag
       base:
         apiVersion: ec2.aws.upbound.io/v1beta1
@@ -455,10 +460,16 @@ spec:
           combine:
             variables:
               - fromFieldPath: status.eks.nodeGroupRoleArn
+              - fromFieldPath: spec.parameters.iam.autoscalerArn
               - fromFieldPath: spec.parameters.iam.roleArn
             strategy: string
             string:
               fmt: |
+                - groups:
+                  - system:bootstrappers
+                  - system:nodes
+                  rolearn: %s
+                  username: system:node:{{EC2PrivateDNSName}}
                 - groups:
                   - system:bootstrappers
                   - system:nodes

diff --git a/apis/definition.yaml b/apis/definition.yaml
@@ -42,6 +42,10 @@ spec:
                         description: The IAM User ARN to connect as ClusterAdmin.
                         type: string
                         default: userArn
+                      autoscalerArn:
+                        description: The AutoScaler Role ARN to connect as ClusterAdmin.
+                        type: string
+                        default: autoscalerArn
                   deletionPolicy:
                     description: Delete the external resources when the Claim/XR is deleted. Defaults to Delete
                     enum:

diff --git a/build b/build
diff --git a/crossplane.yaml b/crossplane.yaml
@@ -11,11 +11,11 @@ spec:
     version: ">=v1.13.2-0"
   dependsOn:
     - configuration: xpkg.upbound.io/upbound/configuration-aws-network
-      version: ">=v0.1.0"
+      version: "v0.3.0"
     - provider: xpkg.upbound.io/crossplane-contrib/provider-helm
-      version: ">=v0.15.0"
+      version: "v0.15.0"
     - provider: xpkg.upbound.io/crossplane-contrib/provider-kubernetes
-      version: ">=v0.9.0"
+      version: "v0.9.0"
     - provider: xpkg.upbound.io/upbound/provider-aws-ec2
       version: "v0.43.0"
     - provider: xpkg.upbound.io/upbound/provider-aws-eks