Mark the v1beta1 versions of the generated CRSs as the storage versions

to facilitate downgrades Signed-off-by: Alper Rifat Ulucinar <[email protected]>
crossplane-contrib · Apr 17, 2024 · fb03606 · fb03606
1 parent 81e1d7c
commit fb03606
Show file tree

Hide file tree

Showing 15 changed files with 12 additions and 15 deletions.
diff --git a/apis/applications/v1beta2/zz_application_types.go b/apis/applications/v1beta2/zz_application_types.go
diff --git a/apis/conditionalaccess/v1beta2/zz_accesspolicy_types.go b/apis/conditionalaccess/v1beta2/zz_accesspolicy_types.go
diff --git a/apis/conditionalaccess/v1beta2/zz_location_types.go b/apis/conditionalaccess/v1beta2/zz_location_types.go
diff --git a/apis/groups/v1beta2/zz_group_types.go b/apis/groups/v1beta2/zz_group_types.go
diff --git a/apis/invitations/v1beta2/zz_invitation_types.go b/apis/invitations/v1beta2/zz_invitation_types.go
diff --git a/apis/serviceprincipals/v1beta2/zz_principal_types.go b/apis/serviceprincipals/v1beta2/zz_principal_types.go
diff --git a/config/provider.go b/config/provider.go
@@ -132,5 +132,8 @@ func bumpVersionsWithEmbeddedLists(pc *ujconfig.Provider) {
 			continue
 		}
 		r.Version = "v1beta2"
+		// we would like to set the storage version to v1beta1 to facilitate
+		// downgrades.
+		r.MarkStorageVersion = false
 	}
 }
diff --git a/go.mod b/go.mod
@@ -151,4 +151,4 @@ replace github.com/hashicorp/terraform-provider-azuread => github.com/upbound/te
 
 replace github.com/hashicorp/terraform-plugin-sdk/v2 => github.com/hashicorp/terraform-plugin-sdk/v2 v2.29.0
 
-replace github.com/crossplane/upjet => github.com/ulucinar/upbound-upjet v0.0.0-20240417142031-767b88f554da
+replace github.com/crossplane/upjet => github.com/ulucinar/upbound-upjet v0.0.0-20240417215530-f9c25a526a72
diff --git a/go.sum b/go.sum
@@ -1178,8 +1178,8 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU
 github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
 github.com/tmccombs/hcl2json v0.3.3 h1:+DLNYqpWE0CsOQiEZu+OZm5ZBImake3wtITYxQ8uLFQ=
 github.com/tmccombs/hcl2json v0.3.3/go.mod h1:Y2chtz2x9bAeRTvSibVRVgbLJhLJXKlUeIvjeVdnm4w=
-github.com/ulucinar/upbound-upjet v0.0.0-20240417142031-767b88f554da h1:nr6nMOtHNfuVMn3S+xi5EIl8qUuIQfPugxDQsWibR2Q=
-github.com/ulucinar/upbound-upjet v0.0.0-20240417142031-767b88f554da/go.mod h1:0bHLtnejZ9bDeyXuBb9MSOQLvKo3+aoTeUBO8N0dGSA=
+github.com/ulucinar/upbound-upjet v0.0.0-20240417215530-f9c25a526a72 h1:F966gUbehd+x0JtPjfatWdAUWr5XdMplvH7xiAz5Zcg=
+github.com/ulucinar/upbound-upjet v0.0.0-20240417215530-f9c25a526a72/go.mod h1:0bHLtnejZ9bDeyXuBb9MSOQLvKo3+aoTeUBO8N0dGSA=
 github.com/upbound/terraform-provider-azuread v0.0.0-20240311141618-ce1f46c21020 h1:BP26QEhnXcWxbJpbOT+e4bP+c9FTvqhGbtnkwXerOhA=
 github.com/upbound/terraform-provider-azuread v0.0.0-20240311141618-ce1f46c21020/go.mod h1:iVryf2s08Hi6HLHh4W40fudtInXuK5Y1cWVOM/3szT8=
 github.com/vmihailenco/msgpack v3.3.3+incompatible/go.mod h1:fy3FlTQTDXWkZ7Bh6AcGMlsjHatGryHQYUTf1ShIgkk=

diff --git a/package/crds/applications.azuread.upbound.io_applications.yaml b/package/crds/applications.azuread.upbound.io_applications.yaml
@@ -3329,6 +3329,6 @@ spec:
         - spec
         type: object
     served: true
-    storage: true
+    storage: false
     subresources:
       status: {}
diff --git a/package/crds/conditionalaccess.azuread.upbound.io_accesspolicies.yaml b/package/crds/conditionalaccess.azuread.upbound.io_accesspolicies.yaml
@@ -2698,6 +2698,6 @@ spec:
         - spec
         type: object
     served: true
-    storage: true
+    storage: false
     subresources:
       status: {}
diff --git a/package/crds/conditionalaccess.azuread.upbound.io_locations.yaml b/package/crds/conditionalaccess.azuread.upbound.io_locations.yaml
@@ -831,6 +831,6 @@ spec:
         - spec
         type: object
     served: true
-    storage: true
+    storage: false
     subresources:
       status: {}
diff --git a/package/crds/groups.azuread.upbound.io_groups.yaml b/package/crds/groups.azuread.upbound.io_groups.yaml
@@ -1535,6 +1535,6 @@ spec:
         - spec
         type: object
     served: true
-    storage: true
+    storage: false
     subresources:
       status: {}
diff --git a/package/crds/invitations.azuread.upbound.io_invitations.yaml b/package/crds/invitations.azuread.upbound.io_invitations.yaml
@@ -899,6 +899,6 @@ spec:
         - spec
         type: object
     served: true
-    storage: true
+    storage: false
     subresources:
       status: {}
diff --git a/package/crds/serviceprincipals.azuread.upbound.io_principals.yaml b/package/crds/serviceprincipals.azuread.upbound.io_principals.yaml
@@ -2203,6 +2203,6 @@ spec:
         - spec
         type: object
     served: true
-    storage: true
+    storage: false
     subresources:
       status: {}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -151,4 +151,4 @@ replace github.com/hashicorp/terraform-provider-azuread => github.com/upbound/te

		replace github.com/hashicorp/terraform-plugin-sdk/v2 => github.com/hashicorp/terraform-plugin-sdk/v2 v2.29.0

		replace github.com/crossplane/upjet => github.com/ulucinar/upbound-upjet v0.0.0-20240417142031-767b88f554da
		replace github.com/crossplane/upjet => github.com/ulucinar/upbound-upjet v0.0.0-20240417215530-f9c25a526a72