Merge pull request #1195 from sergenyalcin/bump-upjet

[release-0.47] Bump upjet to 1.1.3
crossplane-contrib · Mar 7, 2024 · cae7aab · cae7aab
2 parents 130eefd + 3c243b5
commit cae7aab
Show file tree

Hide file tree

Showing 10 changed files with 30 additions and 6 deletions.
diff --git a/Makefile b/Makefile
@@ -68,6 +68,7 @@ KIND_VERSION = v0.15.0
 UP_VERSION = v0.20.0
 UP_CHANNEL = stable
 UPTEST_VERSION = v0.11.0
+UXP_VERSION = 1.14.6-up.1
 
 export UP_VERSION := $(UP_VERSION)
 export UP_CHANNEL := $(UP_CHANNEL)

diff --git a/apis/elasticache/v1beta1/zz_user_terraformed.go b/apis/elasticache/v1beta1/zz_user_terraformed.go
diff --git a/build b/build
diff --git a/examples/apigateway/integrationresponse.yaml b/examples/apigateway/integrationresponse.yaml
@@ -1,6 +1,8 @@
 apiVersion: apigateway.aws.upbound.io/v1beta1
 kind: RestAPI
 metadata:
+  annotations:
+    meta.upbound.io/example-id: apigateway/v1beta1/integrationresponse
   labels:
     testing.upbound.io/example-name: integration
   name: mydemoapi
@@ -13,6 +15,10 @@ spec:
 apiVersion: apigateway.aws.upbound.io/v1beta1
 kind: IntegrationResponse
 metadata:
+  annotations:
+    # Disabling import step because of the unstable ID
+    uptest.upbound.io/disable-import: "true"
+    meta.upbound.io/example-id: apigateway/v1beta1/integrationresponse
   labels:
     testing.upbound.io/example-name: integration
   name: mydemointegrationresponse
@@ -42,6 +48,9 @@ spec:
 apiVersion: apigateway.aws.upbound.io/v1beta1
 kind: Integration
 metadata:
+  annotations:
+    uptest.upbound.io/disable-import: "true"
+    meta.upbound.io/example-id: apigateway/v1beta1/integrationresponse
   labels:
     testing.upbound.io/example-name: integration
   name: mydemointegration
@@ -62,6 +71,9 @@ spec:
 apiVersion: apigateway.aws.upbound.io/v1beta1
 kind: Method
 metadata:
+  annotations:
+    uptest.upbound.io/disable-import: "true"
+    meta.upbound.io/example-id: apigateway/v1beta1/integrationresponse
   labels:
     testing.upbound.io/example-name: integration
   name: mydemomethod
@@ -80,6 +92,9 @@ spec:
 apiVersion: apigateway.aws.upbound.io/v1beta1
 kind: MethodResponse
 metadata:
+  annotations:
+    uptest.upbound.io/disable-import: "true"
+    meta.upbound.io/example-id: apigateway/v1beta1/integrationresponse
   labels:
     testing.upbound.io/example-name: integration
   name: response-200
@@ -100,6 +115,8 @@ spec:
 apiVersion: apigateway.aws.upbound.io/v1beta1
 kind: Resource
 metadata:
+  annotations:
+    meta.upbound.io/example-id: apigateway/v1beta1/integrationresponse
   labels:
     testing.upbound.io/example-name: integration
   name: mydemoresource
@@ -117,6 +134,8 @@ spec:
 apiVersion: apigateway.aws.upbound.io/v1beta1
 kind: Model
 metadata:
+  annotations:
+    meta.upbound.io/example-id: apigateway/v1beta1/integrationresponse
   labels:
     testing.upbound.io/example-name: integration
   name: mydemomodel

diff --git a/examples/docdb/clusterinstance.yaml b/examples/docdb/clusterinstance.yaml
@@ -8,6 +8,7 @@ metadata:
   name: cluster-instances
 spec:
   forProvider:
+    preferredMaintenanceWindow: sun:10:30-sun:14:30
     clusterIdentifierSelector:
       matchLabels:
         testing.upbound.io/example-name: default
@@ -35,6 +36,7 @@ spec:
       namespace: upbound-system
     masterUsername: foo
     preferredBackupWindow: 07:00-09:00
+    preferredMaintenanceWindow: sun:10:30-sun:14:30
     skipFinalSnapshot: true
 
 ---

diff --git a/examples/elasticache/cluster.yaml b/examples/elasticache/cluster.yaml
@@ -11,6 +11,7 @@ spec:
   forProvider:
     region: us-west-1
     engine: memcached
+    maintenanceWindow: sun:05:00-sun:09:00
     nodeType: cache.t2.micro
     numCacheNodes: 1
     parameterGroupName: default.memcached1.6

diff --git a/examples/elasticache/replicationgroup.yaml b/examples/elasticache/replicationgroup.yaml
@@ -11,6 +11,7 @@ spec:
   forProvider:
     automaticFailoverEnabled: true
     description: example description
+    maintenanceWindow: sun:05:00-sun:09:00
     nodeType: cache.m4.large
     numberCacheClusters: 2
     parameterGroupName: default.redis7

diff --git a/examples/rds/instance.yaml b/examples/rds/instance.yaml
@@ -16,7 +16,7 @@ spec:
     backupRetentionPeriod: 14
     instanceClass: db.t3.micro
     engine: postgres
-    engineVersion: "13.7"
+    engineVersion: "16.1"
     username: adminuser
     autoGeneratePassword: true
     passwordSecretRef:

diff --git a/go.mod b/go.mod
@@ -12,7 +12,7 @@ require (
 	github.com/aws/smithy-go v1.13.5
 	github.com/crossplane/crossplane-runtime v1.16.0-rc.1.0.20240213134610-7fcb8c5cad6f
 	github.com/crossplane/crossplane-tools v0.0.0-20230925130601-628280f8bf79
-	github.com/crossplane/upjet v1.1.1
+	github.com/crossplane/upjet v1.1.3
 	github.com/go-ini/ini v1.46.0
 	github.com/google/go-cmp v0.6.0
 	github.com/hashicorp/terraform-json v0.17.1

diff --git a/go.sum b/go.sum
@@ -176,8 +176,8 @@ github.com/crossplane/crossplane-runtime v1.16.0-rc.1.0.20240213134610-7fcb8c5ca
 github.com/crossplane/crossplane-runtime v1.16.0-rc.1.0.20240213134610-7fcb8c5cad6f/go.mod h1:kRcJjJQmBFrR2n/KhwL8wYS7xNfq3D8eK4JliEScOHI=
 github.com/crossplane/crossplane-tools v0.0.0-20230925130601-628280f8bf79 h1:HigXs5tEQxWz0fcj8hzbU2UAZgEM7wPe0XRFOsrtF8Y=
 github.com/crossplane/crossplane-tools v0.0.0-20230925130601-628280f8bf79/go.mod h1:+e4OaFlOcmr0JvINHl/yvEYBrZawzTgj6pQumOH1SS0=
-github.com/crossplane/upjet v1.1.1 h1:5GBZxDcKf3zOZpb6f3Dfk2ptTVd8F6tuX+HmUXO0Slg=
-github.com/crossplane/upjet v1.1.1/go.mod h1:0bHLtnejZ9bDeyXuBb9MSOQLvKo3+aoTeUBO8N0dGSA=
+github.com/crossplane/upjet v1.1.3 h1:ROHqjES9iTC/rKBdIA5HsZKcG+HJk4Ci5kS8LsQQunA=
+github.com/crossplane/upjet v1.1.3/go.mod h1:0bHLtnejZ9bDeyXuBb9MSOQLvKo3+aoTeUBO8N0dGSA=
 github.com/dave/jennifer v1.4.1 h1:XyqG6cn5RQsTj3qlWQTKlRGAyrTcsk1kUmWdZBzRjDw=
 github.com/dave/jennifer v1.4.1/go.mod h1:7jEdnm+qBcxl8PC0zyp7vxcpSRnzXSt9r39tpTVGlwA=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+3 −3		makelib/controlplane.mk
+25 −0		makelib/k8s_tools.mk
+5 −0		makelib/output.mk