diff --git a/apis/composition.yaml b/apis/composition.yaml index 07d14c6..e5b952f 100644 --- a/apis/composition.yaml +++ b/apis/composition.yaml @@ -34,14 +34,17 @@ spec: - type: FromCompositeFieldPath fromFieldPath: spec.parameters.providerConfigName toFieldPath: spec.parameters.providerConfigName - - type: FromCompositeFieldPath - fromFieldPath: spec.parameters.networkSelector - toFieldPath: spec.compositionSelector.matchLabels[type] - type: ToCompositeFieldPath fromFieldPath: status.subnetIds policy: fromFieldPath: Required toFieldPath: status.subnetIds + - type: FromCompositeFieldPath + fromFieldPath: spec.parameters.networkConfig.cidrBlock + toFieldPath: spec.parameters.vpcCidrBlock + - type: FromCompositeFieldPath + fromFieldPath: spec.parameters.networkConfig.subnets + toFieldPath: spec.parameters.subnets - name: XEKS condition: observed.composite.resource.spec.parameters.cloud == "aws" diff --git a/apis/definition.yaml b/apis/definition.yaml index 72bdc86..6ac6615 100644 --- a/apis/definition.yaml +++ b/apis/definition.yaml @@ -64,6 +64,46 @@ spec: enum: - basic default: basic + networkConfig: + type: object + description: Network configuration parameters. Only used when provider is AWS. + properties: + cidrBlock: + type: string + description: CIDR block for the Network + default: 192.168.0.0/16 + subnets: + type: array + items: + type: object + properties: + availabilityZone: + type: string + type: + type: string + enum: + - public + - private + cidrBlock: + type: string + description: Subnets to create in the VPC + required: + - availabilityZone + - type + - cidrBlock + default: + - availabilityZone: us-west-2a + type: public + cidrBlock: 192.168.0.0/18 + - availabilityZone: us-west-2b + type: public + cidrBlock: 192.168.64.0/18 + - availabilityZone: us-west-2a + type: private + cidrBlock: 192.168.128.0/18 + - availabilityZone: us-west-2b + type: private + cidrBlock: 192.168.192.0/18 deletionPolicy: description: Delete the external resources when the Claim/XR is deleted. Defaults to Delete enum: diff --git a/crossplane.yaml b/crossplane.yaml index e435189..cc31ad6 100644 --- a/crossplane.yaml +++ b/crossplane.yaml @@ -19,7 +19,7 @@ spec: dependsOn: - configuration: xpkg.upbound.io/upbound/configuration-aws-network # renovate: datasource=github-releases depName=upbound/configuration-aws-network - version: "v0.11.0" + version: "v0.15.0" - configuration: xpkg.upbound.io/upbound/configuration-aws-eks # renovate: datasource=github-releases depName=upbound/configuration-aws-eks version: "v0.9.0"