Skip to content

Commit

Permalink
Merge pull request #59 from haarchri/feature/provider-aws-v0.22.0
Browse files Browse the repository at this point in the history
feat(provider-aws): changes for provider-aws v0.22.0
  • Loading branch information
jbw976 authored Feb 2, 2022
2 parents f32861c + 1c72b02 commit 71cfa5f
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 16 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -273,8 +273,8 @@ rm /usr/local/bin/kubectl-crossplane*
* [composition.yaml](cluster/composition.yaml) includes (transitively):
* `EKSCluster`
* `NodeGroup`
* `IAMRole`
* `IAMRolePolicyAttachment`
* `Role`
* `RolePolicyAttachment`
* `OpenIDConnectProvider`
* `HelmReleases` for Prometheus and other cluster services.
* `Network` - fabric for a `Cluster` to securely connect to Data Services and
Expand Down
26 changes: 13 additions & 13 deletions cluster/eks/composition.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ spec:
kind: EKS
resources:
- base:
apiVersion: identity.aws.crossplane.io/v1beta1
kind: IAMRole
apiVersion: iam.aws.crossplane.io/v1beta1
kind: Role
metadata:
labels:
role: controlplane
Expand All @@ -36,8 +36,8 @@ spec:
]
}
- base:
apiVersion: identity.aws.crossplane.io/v1beta1
kind: IAMRolePolicyAttachment
apiVersion: iam.aws.crossplane.io/v1beta1
kind: RolePolicyAttachment
spec:
forProvider:
policyArn: arn:aws:iam::aws:policy/AmazonEKSClusterPolicy
Expand Down Expand Up @@ -82,8 +82,8 @@ spec:
connectionDetails:
- fromConnectionSecretKey: kubeconfig
- base:
apiVersion: identity.aws.crossplane.io/v1beta1
kind: IAMRole
apiVersion: iam.aws.crossplane.io/v1beta1
kind: Role
metadata:
labels:
role: nodegroup
Expand All @@ -107,8 +107,8 @@ spec:
]
}
- base:
apiVersion: identity.aws.crossplane.io/v1beta1
kind: IAMRolePolicyAttachment
apiVersion: iam.aws.crossplane.io/v1beta1
kind: RolePolicyAttachment
spec:
forProvider:
policyArn: arn:aws:iam::aws:policy/AmazonEKSWorkerNodePolicy
Expand All @@ -117,8 +117,8 @@ spec:
matchLabels:
role: nodegroup
- base:
apiVersion: identity.aws.crossplane.io/v1beta1
kind: IAMRolePolicyAttachment
apiVersion: iam.aws.crossplane.io/v1beta1
kind: RolePolicyAttachment
spec:
forProvider:
policyArn: arn:aws:iam::aws:policy/AmazonEKS_CNI_Policy
Expand All @@ -127,8 +127,8 @@ spec:
matchLabels:
role: nodegroup
- base:
apiVersion: identity.aws.crossplane.io/v1beta1
kind: IAMRolePolicyAttachment
apiVersion: iam.aws.crossplane.io/v1beta1
kind: RolePolicyAttachment
spec:
forProvider:
policyArn: arn:aws:iam::aws:policy/AmazonEC2ContainerRegistryReadOnly
Expand Down Expand Up @@ -173,7 +173,7 @@ spec:
- fromFieldPath: "spec.parameters.networkRef.id"
toFieldPath: spec.forProvider.subnetSelector.matchLabels[networks.aws.platformref.crossplane.io/network-id]
- base:
apiVersion: identity.aws.crossplane.io/v1alpha1
apiVersion: iam.aws.crossplane.io/v1beta1
kind: OpenIDConnectProvider
spec:
forProvider:
Expand Down
2 changes: 1 addition & 1 deletion crossplane.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,6 @@ spec:
version: ">=v1.0.0-0"
dependsOn:
- provider: registry.upbound.io/crossplane/provider-aws
version: ">=v0.19.0-0"
version: ">=v0.22.0-0"
- provider: registry.upbound.io/crossplane/provider-helm
version: ">=v0.3.6-0"

0 comments on commit 71cfa5f

Please sign in to comment.