Skip to content

Commit

Permalink
Merge pull request #56 from haarchri/feature/tocompositefieldpath-oidc
Browse files Browse the repository at this point in the history
feat(oidc): tocompositefieldpath with OpenIDConnectProvider
  • Loading branch information
jbw976 authored Nov 12, 2021
2 parents 63e724f + 668d9fc commit 457a057
Show file tree
Hide file tree
Showing 4 changed files with 30 additions and 2 deletions.
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -275,6 +275,7 @@ rm /usr/local/bin/kubectl-crossplane*
* `NodeGroup`
* `IAMRole`
* `IAMRolePolicyAttachment`
* `OpenIDConnectProvider`
* `HelmReleases` for Prometheus and other cluster services.
* `Network` - fabric for a `Cluster` to securely connect to Data Services and
the Internet.
Expand Down
21 changes: 20 additions & 1 deletion cluster/eks/composition.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ spec:
resourcesVpcConfig:
endpointPrivateAccess: true
endpointPublicAccess: true
version: "1.16"
version: "1.21"
patches:
- fromFieldPath: metadata.annotations[crossplane.io/external-name]
toFieldPath: metadata.annotations[crossplane.io/external-name]
Expand All @@ -74,6 +74,11 @@ spec:
toFieldPath: spec.forProvider.resourcesVpcConfig.securityGroupIdSelector.matchLabels[networks.aws.platformref.crossplane.io/network-id]
- fromFieldPath: "spec.parameters.networkRef.id"
toFieldPath: spec.forProvider.resourcesVpcConfig.subnetIdSelector.matchLabels[networks.aws.platformref.crossplane.io/network-id]
- type: ToCompositeFieldPath
fromFieldPath: status.atProvider.identity.oidc.issuer
toFieldPath: status.eks.oidc
policy:
fromFieldPath: Optional
connectionDetails:
- fromConnectionSecretKey: kubeconfig
- base:
Expand Down Expand Up @@ -167,6 +172,20 @@ spec:
large: t3.large
- fromFieldPath: "spec.parameters.networkRef.id"
toFieldPath: spec.forProvider.subnetSelector.matchLabels[networks.aws.platformref.crossplane.io/network-id]
- base:
apiVersion: identity.aws.crossplane.io/v1alpha1
kind: OpenIDConnectProvider
spec:
forProvider:
clientIDList:
- sts.amazonaws.com
thumbprintList:
- "9e99a48a9960b14926bb7f3b02e22da2b0ab7280"
patches:
- fromFieldPath: status.eks.oidc
toFieldPath: spec.forProvider.url
policy:
fromFieldPath: Required
- base:
apiVersion: helm.crossplane.io/v1beta1
kind: ProviderConfig
Expand Down
8 changes: 8 additions & 0 deletions cluster/eks/definition.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -59,3 +59,11 @@ spec:
- networkRef
required:
- parameters
status:
description: A Status represents the observed state
properties:
eks:
description: Freeform field containing status information for eks
type: object
x-kubernetes-preserve-unknown-fields: true
type: object
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.14.0-0"
version: ">=v0.19.0-0"
- provider: registry.upbound.io/crossplane/provider-helm
version: ">=v0.3.6-0"

0 comments on commit 457a057

Please sign in to comment.