Skip to content

Commit bb4f5b3

Browse files
authored
feat(status): status clusterName and autoscalerArn for aws-auth configmap (#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>
1 parent 5121a72 commit bb4f5b3

File tree

5 files changed

+21
-4
lines changed

5 files changed

+21
-4
lines changed

Makefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ PLATFORMS ?= linux_amd64
1111
# ====================================================================================
1212
# Setup Kubernetes tools
1313

14+
# set UXP_VERSION because of https://github.com/crossplane/crossplane/issues/5055
15+
UXP_VERSION = 1.13.2-up.2
1416
UP_VERSION = v0.19.1
1517
UP_CHANNEL = stable
1618
UPTEST_VERSION = v0.6.1

apis/composition.yaml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,11 @@ spec:
132132
toFieldPath: status.eks.clusterSecurityGroupId
133133
policy:
134134
fromFieldPath: Optional
135+
- type: ToCompositeFieldPath
136+
fromFieldPath: metadata.annotations[crossplane.io/external-name]
137+
toFieldPath: status.eks.clusterName
138+
policy:
139+
fromFieldPath: Optional
135140
- name: clusterSecurityGroupTag
136141
base:
137142
apiVersion: ec2.aws.upbound.io/v1beta1
@@ -455,10 +460,16 @@ spec:
455460
combine:
456461
variables:
457462
- fromFieldPath: status.eks.nodeGroupRoleArn
463+
- fromFieldPath: spec.parameters.iam.autoscalerArn
458464
- fromFieldPath: spec.parameters.iam.roleArn
459465
strategy: string
460466
string:
461467
fmt: |
468+
- groups:
469+
- system:bootstrappers
470+
- system:nodes
471+
rolearn: %s
472+
username: system:node:{{EC2PrivateDNSName}}
462473
- groups:
463474
- system:bootstrappers
464475
- system:nodes

apis/definition.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,10 @@ spec:
4242
description: The IAM User ARN to connect as ClusterAdmin.
4343
type: string
4444
default: userArn
45+
autoscalerArn:
46+
description: The AutoScaler Role ARN to connect as ClusterAdmin.
47+
type: string
48+
default: autoscalerArn
4549
deletionPolicy:
4650
description: Delete the external resources when the Claim/XR is deleted. Defaults to Delete
4751
enum:

build

crossplane.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ spec:
1111
version: ">=v1.13.2-0"
1212
dependsOn:
1313
- configuration: xpkg.upbound.io/upbound/configuration-aws-network
14-
version: ">=v0.1.0"
14+
version: "v0.3.0"
1515
- provider: xpkg.upbound.io/crossplane-contrib/provider-helm
16-
version: ">=v0.15.0"
16+
version: "v0.15.0"
1717
- provider: xpkg.upbound.io/crossplane-contrib/provider-kubernetes
18-
version: ">=v0.9.0"
18+
version: "v0.9.0"
1919
- provider: xpkg.upbound.io/upbound/provider-aws-ec2
2020
version: "v0.43.0"
2121
- provider: xpkg.upbound.io/upbound/provider-aws-eks

0 commit comments

Comments
 (0)