haarchri
commented
4 months ago the patches are fine for arrays like restoreToPointInTime or scalingConfiguration
we can use the following generator:
group: rds.aws.example.cloud
name: DBCluster
version: v1alpha1
provider:
baseURL: https://raw.githubusercontent.com/upbound/%s/%s/package/crds/%s
name: provider-aws
version: v1.6.0
crd:
file: rds.aws.upbound.io_clusters.yaml
version: v1beta1
ignore: false
usePipeline: true # <-- set pipeline so we can test with crossplane beta render
connectionSecretKeys:
- username
- password
- endpoint
- port
compositions:
- name: compositedbcluster.rds.aws.example.cloud
provider: example
default: truelets use the following example:
apiVersion: rds.aws.example.cloud/v1alpha1
kind: Cluster
metadata:
name: example-db-cluster
namespace: assert-db
spec:
forProvider:
engine: aurora-postgresql
masterPasswordSecretRef:
key: password
name: sample-cluster-password
namespace: upbound-system
masterUsername: cpadmin
region: us-west-1
skipFinalSnapshot: true
scalingConfiguration:
- autoPause: true
maxCapacity: 8
writeConnectionSecretToRef:
name: sample-rds-cluster-secret
namespace: upbound-systemuse crossplane beta render:
crossplane beta render examples/rds/db-cluster.yaml package/RDS-Cluster/composition-compositedbcluster.rds.aws.example.cloud.yaml examples/functions.yaml
---
apiVersion: rds.aws.example.cloud/v1alpha1
kind: Cluster
metadata:
name: example-db-cluster
status:
conditions:
- lastTransitionTime: "2024-01-01T00:00:00Z"
message: 'Unready resources: Cluster'
reason: Creating
status: "False"
type: Ready
---
apiVersion: rds.aws.upbound.io/v1beta1
kind: Cluster
metadata:
annotations:
crossplane.io/composition-resource-name: Cluster
generateName: example-db-cluster-
labels:
commonLabelA: commonLabelAValue
commonLabelB: commonLabelBValue
crossplane.io/composite: example-db-cluster
ownerReferences:
- apiVersion: rds.aws.example.cloud/v1alpha1
blockOwnerDeletion: true
controller: true
kind: Cluster
name: example-db-cluster
uid: ""
spec:
forProvider:
engine: aurora-postgresql
masterPasswordSecretRef:
key: password
name: sample-cluster-password
namespace: upbound-system
masterUsername: cpadmin
region: us-west-1
scalingConfiguration:
- autoPause: true
maxCapacity: 8
skipFinalSnapshot: true
providerConfigRef:
name: default
writeConnectionSecretToRef:
namespace: crossplane-systemso you can see scalingConfiguration is patched correctly
What happened?
After migrating RDS dbcluster to Upbound official provider and update the
generate.yamlfile accordingly, the generated composition had only the object/array name patch for therestoreToPointInTimefield and ignored any nested fields underneathrestoreToPointInTime. Similar behaviour happened with:s3Import,scalingConfiguration, andserverlessv2ScalingConfiguration. Unlike the normal behaviour with the old provider where there're patches for all nested attribute of similar nested fields. Except forscalingConfiguration, the other three are new parameters, or let's say they got restructured with the Upbound provider.How can we reproduce it?
have the
generate.yamlready for Upbound provider and runmake generate:Generate script output
Check the generated Composition e.g for
restoreToPointInTimefieldwhereas we expects patches for the whole new structure
What environment did it happen in?
kubectl version): v1.27.13-eks-3af4770