Add example manifests for the converted singleton list API versions #1334

ulucinar · 2024-05-30T10:10:40Z

Description of your changes

Depends on:

Convert all singleton lists in the MR APIs to embedded objects #1332
Fix singleton list example conversion if there's no annotation crossplane/upjet#410: soft dependency, this can be merged without the dependency being merged first)
Convert all singleton lists in the MR APIs to embedded objects #1332

This PR introduces the example manifests for the converted singleton list API versions. It also:

Refactors some catch-all manifests into individual unit test manifests.
Adds the missing example-id annotations for some manifests. However, there are still over 100 manifests with missing annotations.

An example conversion is as follows:
The old (v1beta1) NodeGroup.eks API:

apiVersion: eks.aws.upbound.io/v1beta1
kind: NodeGroup
metadata:
  name: sample-eks-ng
spec:
  forProvider:
    region: us-west-1
    clusterNameRef: 
      name: sample-eks-cluster
    nodeRoleArnRef:
      name: sample-node-role
    subnetIdRefs:
      - name: sample-subnet1
      - name: sample-subnet2
    scalingConfig:
      - minSize: 1
        maxSize: 1
        desiredSize: 1

The new v1beta2 API for this resource:

apiVersion: eks.aws.upbound.io/v1beta2
kind: NodeGroup
metadata:
  annotations:
    meta.upbound.io/example-id: eks/v1beta2/nodegroup
  name: sample-eks-ng
spec:
  forProvider:
    region: us-west-1
    clusterNameRef:
      name: sample-eks-cluster
    nodeRoleArnRef:
      name: sample-node-role
    subnetIdRefs:
      - name: sample-subnet1
      - name: sample-subnet2
    scalingConfig:
      minSize: 1
      maxSize: 1
      desiredSize: 1

Please note the converted singleton list spec.forProvider.scalingConfig as usual. The converted versions have been converted using upjet's example manifest singleton list conversion utility. See crossplane/upjet#397 for further details.

I have:

Read and followed Crossplane's contribution process.
Run make reviewable to ensure this PR is ready for review.
Added backport release-x.y labels to auto-backport this PR if necessary.

How has this code been tested

examples/opensearchserverless/v1beta1/security_config => https://github.com/crossplane-contrib/provider-upjet-aws/actions/runs/9314611172
examples/apigateway/v1beta2/stage.yaml => https://github.com/crossplane-contrib/provider-upjet-aws/actions/runs/9451025216 (import step disabled)
examples/apigateway/v1beta2/usageplan.yaml => https://github.com/crossplane-contrib/provider-upjet-aws/actions/runs/9454049761 (import step disabled for Stage resources)
examples/apigateway/v1beta2/methodsettings.yaml => https://github.com/crossplane-contrib/provider-upjet-aws/actions/runs/9454319970 (import step disabled)
examples/autoscaling/v1beta2/attachment.yaml => https://github.com/crossplane-contrib/provider-upjet-aws/actions/runs/9318575157
examples/backup/v1beta2/plan.yaml => https://github.com/crossplane-contrib/provider-upjet-aws/actions/runs/9318291621
examples/cloudfront/v1beta2/fieldlevelencryptionprofile.yaml => https://github.com/crossplane-contrib/provider-upjet-aws/actions/runs/9322292877
examples/cloudfront/v1beta2/fieldlevelencryptionconfig.yaml => https://github.com/crossplane-contrib/provider-upjet-aws/actions/runs/9322409856
examples/connect/v1beta2/routingprofile.yaml => Uptest fails because the quota of the instance resource-dependent to this resource has been reached.

    message: 'async create failed: failed to create the resource: [{0 creating Connect
      Instance: ServiceQuotaExceededException: Quota limit reached for number of instance
      for account:153891904029. Please request service limit increase before retrying.  []}]'

examples/glue/v1beta2/job.yaml => https://github.com/crossplane-contrib/provider-upjet-aws/actions/runs/9318566047
examples/ec2/v1beta2/vpcendpoint.yaml => https://github.com/crossplane-contrib/provider-upjet-aws/actions/runs/9314608095
examples/ec2/v1beta2/route.yaml => https://github.com/crossplane-contrib/provider-upjet-aws/actions/runs/9318561886
examples/eks/v1beta2/nodegroup.yaml => https://github.com/crossplane-contrib/provider-upjet-aws/actions/runs/9314605490
examples/elasticache/v1beta2/replicationgroup.yaml => https://github.com/crossplane-contrib/provider-upjet-aws/actions/runs/9318556431
examples/transfer/v1beta1/connector.yaml => https://github.com/crossplane-contrib/provider-upjet-aws/actions/runs/9449697628
examples/transfer/v1beta2/connector.yaml => https://github.com/crossplane-contrib/provider-upjet-aws/actions/runs/9450123203
examples/ec2/v1beta2/instance.yaml => https://github.com/crossplane-contrib/provider-upjet-aws/actions/runs/9454636081
examples/elasticsearch/v1beta2/domain.yaml => https://github.com/crossplane-contrib/provider-upjet-aws/actions/runs/9455074123
examples/firehose/v1beta2/deliverystream.yaml => https://github.com/crossplane-contrib/provider-upjet-aws/actions/runs/9454952112
examples/fis/v1beta2/experimenttemplate.yaml => https://github.com/crossplane-contrib/provider-upjet-aws/actions/runs/9455012117
examples/elasticbeanstalk/v1beta1/application.yaml => https://github.com/crossplane-contrib/provider-upjet-aws/actions/runs/9455853818
examples/elasticbeanstalk/v1beta2/application.yaml => Uptest failed due to the following issue:

case.go:363: conversion webhook for elasticbeanstalk.aws.upbound.io/v1beta2, Kind=Application failed: Post "https://provider-aws-elasticbeanstalk.upbound-system.svc:9443/convert?timeout=30s": dial tcp 10.96.123.137:9443: connect: connection refused

Manually tested:

> kubectl get application.v1beta2.elasticbeanstalk.aws.upbound.io/first-app-test-qwerty-test -o yaml | yq '.status.conditions'

- lastTransitionTime: "2024-06-10T21:54:26Z"
  reason: Available
  status: "True"
  type: Ready
- lastTransitionTime: "2024-06-10T21:54:23Z"
  reason: ReconcileSuccess
  status: "True"
  type: Synced
- lastTransitionTime: "2024-06-10T21:54:25Z"
  reason: Success
  status: "True"
  type: LastAsyncOperation
- lastTransitionTime: "2024-06-10T21:55:11Z"
  reason: UpToDate
  status: "True"
  type: Test

ulucinar · 2024-05-30T11:07:38Z

/test-examples="examples/opensearchserverless/v1beta1/securityconfig.yaml"

ulucinar · 2024-05-30T11:14:17Z

/test-examples="examples/eks/v1beta2/nodegroup.yaml"

ulucinar · 2024-05-30T11:15:45Z

/test-examples="examples/ec2/v1beta2/vpcendpoint.yaml"

ulucinar · 2024-05-31T07:32:34Z

/test-examples="examples/eks/v1beta2/nodegroup.yaml"

ulucinar · 2024-05-31T07:32:50Z

/test-examples="examples/ec2/v1beta2/vpcendpoint.yaml"

ulucinar · 2024-05-31T07:33:06Z

/test-examples="examples/opensearchserverless/v1beta1/securityconfig.yaml"

turkenf · 2024-05-31T12:39:02Z

/test-examples="examples/backup/v1beta2/plan.yaml"

turkenf · 2024-05-31T12:39:39Z

/test-examples="examples/cloudfront/v1beta2/fieldlevelencryptionconfig.yaml"

turkenf · 2024-05-31T12:58:41Z

/test-examples="examples/elasticache/v1beta2/replicationgroup.yaml"

turkenf · 2024-05-31T12:58:54Z

/test-examples="examples/eks/v1beta2/nodepool.yaml"

turkenf · 2024-05-31T12:59:05Z

/test-examples="examples/ec2/v1beta2/route.yaml"

turkenf · 2024-05-31T12:59:22Z

/test-examples="examples/glue/v1beta2/job.yaml"

turkenf · 2024-05-31T12:59:36Z

/test-examples="examples/connect/v1beta2/routingprofile.yaml"

turkenf · 2024-05-31T12:59:48Z

/test-examples="examples/cloudfront/v1beta2/fieldlevelencryptionprofile.yaml"

turkenf · 2024-05-31T13:00:00Z

/test-examples="examples/autoscaling/v1beta2/attachment.yaml"

turkenf · 2024-05-31T13:00:12Z

/test-examples="examples/apigateway/v1beta2/stage.yaml"

turkenf · 2024-05-31T15:29:22Z

/test-examples="examples/apigateway/v1beta2/usageplan.yaml"

turkenf · 2024-05-31T16:43:43Z

/test-examples="examples/apigateway/v1beta2/stage.yaml"

turkenf · 2024-05-31T17:54:09Z

/test-examples="examples/cloudfront/v1beta2/fieldlevelencryptionprofile.yaml"

turkenf · 2024-05-31T18:04:36Z

/test-examples="examples/cloudfront/v1beta2/fieldlevelencryptionconfig.yaml"

turkenf · 2024-06-10T20:15:41Z

/test-examples="examples/elasticbeanstalk/v1beta2/application.yaml"

turkenf · 2024-06-10T20:16:30Z

/test-examples="examples/firehose/v1beta2/deliverystream.yaml"

turkenf · 2024-06-10T20:21:11Z

/test-examples="examples/fis/v1beta2/experimenttemplate.yaml"

turkenf · 2024-06-10T20:26:11Z

/test-examples="examples/elasticsearch/v1beta2/domain.yaml"

turkenf · 2024-06-10T21:33:34Z

/test-examples="examples/elasticbeanstalk/v1beta1/application.yaml"

turkenf · 2024-06-10T21:44:43Z

/test-examples="examples/elasticbeanstalk/v1beta2/application.yaml"

turkenf · 2024-06-11T14:05:49Z

/test-examples="examples/autoscaling/v1beta2/attachment.yaml"

turkenf · 2024-06-11T14:05:59Z

/test-examples="examples/elasticache/v1beta2/replicationgroup.yaml"

turkenf · 2024-06-11T14:06:09Z

/test-examples="examples/cloudfront/v1beta2/fieldlevelencryptionconfig.yaml"

turkenf · 2024-06-11T14:06:14Z

/test-examples="examples/backup/v1beta2/plan.yaml"

ulucinar · 2024-06-12T19:00:08Z

/test-examples="examples/eks/v1beta2/nodepool.yaml"

ulucinar · 2024-06-12T19:00:49Z

/test-examples="examples/firehose/v1beta2/deliverystream.yaml"

ulucinar · 2024-06-12T19:03:54Z

/test-examples="examples/eks/v1beta2/nodegroup.yaml"

turkenf · 2024-06-13T10:34:29Z

/test-examples="examples/cloudfront/v1beta2/fieldlevelencryptionprofile.yaml"

turkenf · 2024-06-13T10:34:35Z

/test-examples="examples/ec2/v1beta2/instance.yaml"

turkenf

Thank you @ulucinar, LGTM.

Signed-off-by: Alper Rifat Ulucinar <ulucinar@users.noreply.github.com>

…conversion for the samlOptions field as its schema is already a single nested block. - saml_options is thus already generated as an embedded object and not a singleton list. Signed-off-by: Alper Rifat Ulucinar <ulucinar@users.noreply.github.com>

- Also refactor some catch-all manifests into individual unit test manifests. - Add the missing example-id annotations for some manifests. There are still over 100 manifests with missing annotations. Signed-off-by: Alper Rifat Ulucinar <ulucinar@users.noreply.github.com>

- examples/apigateway/v1beta2/stage.yaml - examples/apigateway/v1beta2/usageplan.yaml - examples/apigateway/v1beta2/methodsettings.yaml Signed-off-by: Fatih Türken <turkenf@gmail.com>

- examples/cloudfront/v1beta2/fieldlevelencryptionprofile.yaml - examples/cloudfront/v1beta2/fieldlevelencryptionconfig.yaml Signed-off-by: Fatih Türken <turkenf@gmail.com>

Signed-off-by: Fatih Türken <turkenf@gmail.com>

…ources Signed-off-by: Fatih Türken <turkenf@gmail.com>

ulucinar · 2024-06-13T11:02:10Z

/test-examples="examples/ec2/v1beta2/instance.yaml"

ulucinar · 2024-06-13T11:02:30Z

/test-examples="examples/opensearchserverless/v1beta1/securityconfig.yaml"

ulucinar requested review from sergenyalcin, turkenf and mbbush as code owners May 30, 2024 10:10

ulucinar force-pushed the converted-examples branch from 0cb506c to 17e6b24 Compare May 30, 2024 11:10

ulucinar force-pushed the converted-examples branch from 17e6b24 to 9085bbd Compare May 31, 2024 07:32

ulucinar mentioned this pull request May 31, 2024

Convert all singleton lists in the MR APIs to embedded objects #1332

Merged

9 tasks

turkenf force-pushed the converted-examples branch from c75424b to 1cc1210 Compare May 31, 2024 15:28

turkenf force-pushed the converted-examples branch from 1cc1210 to 32431d7 Compare May 31, 2024 16:42

turkenf force-pushed the converted-examples branch from 5b97c53 to 310ceaa Compare May 31, 2024 18:04

mbbush mentioned this pull request Jun 10, 2024

Make SSO examples uptestable #1350

Closed

3 tasks

ulucinar force-pushed the converted-examples branch from 760d823 to db9a7ce Compare June 12, 2024 18:59

turkenf approved these changes Jun 13, 2024

View reviewed changes

ulucinar and others added 7 commits June 13, 2024 13:59

Run "make generate"

8c42cc8

Signed-off-by: Alper Rifat Ulucinar <ulucinar@users.noreply.github.com>

Add examples for v1beta2 versions of the following resources:

158e1f0

- examples/apigateway/v1beta2/stage.yaml - examples/apigateway/v1beta2/usageplan.yaml - examples/apigateway/v1beta2/methodsettings.yaml Signed-off-by: Fatih Türken <turkenf@gmail.com>

Fix examples for v1beta2 versions of the following resources:

e70c784

- examples/cloudfront/v1beta2/fieldlevelencryptionprofile.yaml - examples/cloudfront/v1beta2/fieldlevelencryptionconfig.yaml Signed-off-by: Fatih Türken <turkenf@gmail.com>

Add v1beta2 example for Connector.transfer

1bae919

Signed-off-by: Fatih Türken <turkenf@gmail.com>

Disable import for Stage.apigateway and MethodSettings.apigateway res…

3113f08

…ources Signed-off-by: Fatih Türken <turkenf@gmail.com>

ulucinar force-pushed the converted-examples branch from db9a7ce to 3113f08 Compare June 13, 2024 11:00

ulucinar merged commit 57c34f2 into crossplane-contrib:main Jun 13, 2024
13 checks passed

ulucinar deleted the converted-examples branch June 13, 2024 11:59

mergenci mentioned this pull request Dec 12, 2024

Fix empty TypeMeta while running API conversions #1422

Merged

3 tasks

Add example manifests for the converted singleton list API versions #1334

Add example manifests for the converted singleton list API versions #1334

Conversation

ulucinar commented May 30, 2024 • edited Loading

Description of your changes

How has this code been tested

ulucinar commented May 30, 2024

ulucinar commented May 30, 2024

ulucinar commented May 30, 2024

ulucinar commented May 31, 2024

ulucinar commented May 31, 2024

ulucinar commented May 31, 2024

turkenf commented May 31, 2024

turkenf commented May 31, 2024

turkenf commented May 31, 2024

turkenf commented May 31, 2024

turkenf commented May 31, 2024

turkenf commented May 31, 2024

turkenf commented May 31, 2024

turkenf commented May 31, 2024

turkenf commented May 31, 2024

turkenf commented May 31, 2024

turkenf commented May 31, 2024

turkenf commented May 31, 2024

turkenf commented May 31, 2024

turkenf commented May 31, 2024

turkenf commented Jun 10, 2024

turkenf commented Jun 10, 2024

turkenf commented Jun 10, 2024

turkenf commented Jun 10, 2024

turkenf commented Jun 10, 2024

turkenf commented Jun 10, 2024

turkenf commented Jun 11, 2024

turkenf commented Jun 11, 2024

turkenf commented Jun 11, 2024

turkenf commented Jun 11, 2024

ulucinar commented Jun 12, 2024

ulucinar commented Jun 12, 2024

ulucinar commented Jun 12, 2024

turkenf commented Jun 13, 2024

turkenf commented Jun 13, 2024

turkenf left a comment

Choose a reason for hiding this comment

ulucinar commented Jun 13, 2024

ulucinar commented Jun 13, 2024

ulucinar commented May 30, 2024 •

edited

Loading