diff --git a/apis/applications/v1beta2/zz_application_types.go b/apis/applications/v1beta2/zz_application_types.go index dd6d13f..b494ba5 100755 --- a/apis/applications/v1beta2/zz_application_types.go +++ b/apis/applications/v1beta2/zz_application_types.go @@ -1178,7 +1178,6 @@ type ApplicationStatus struct { // +kubebuilder:object:root=true // +kubebuilder:subresource:status -// +kubebuilder:storageversion // Application is the Schema for the Applications API. // +kubebuilder:printcolumn:name="SYNCED",type="string",JSONPath=".status.conditions[?(@.type=='Synced')].status" diff --git a/apis/conditionalaccess/v1beta2/zz_accesspolicy_types.go b/apis/conditionalaccess/v1beta2/zz_accesspolicy_types.go index f4c8c11..38de4f5 100755 --- a/apis/conditionalaccess/v1beta2/zz_accesspolicy_types.go +++ b/apis/conditionalaccess/v1beta2/zz_accesspolicy_types.go @@ -736,7 +736,6 @@ type AccessPolicyStatus struct { // +kubebuilder:object:root=true // +kubebuilder:subresource:status -// +kubebuilder:storageversion // AccessPolicy is the Schema for the AccessPolicys API. // +kubebuilder:printcolumn:name="SYNCED",type="string",JSONPath=".status.conditions[?(@.type=='Synced')].status" diff --git a/apis/conditionalaccess/v1beta2/zz_location_types.go b/apis/conditionalaccess/v1beta2/zz_location_types.go index 173d0d3..fbf2d40 100755 --- a/apis/conditionalaccess/v1beta2/zz_location_types.go +++ b/apis/conditionalaccess/v1beta2/zz_location_types.go @@ -138,7 +138,6 @@ type LocationStatus struct { // +kubebuilder:object:root=true // +kubebuilder:subresource:status -// +kubebuilder:storageversion // Location is the Schema for the Locations API. // +kubebuilder:printcolumn:name="SYNCED",type="string",JSONPath=".status.conditions[?(@.type=='Synced')].status" diff --git a/apis/groups/v1beta2/zz_group_types.go b/apis/groups/v1beta2/zz_group_types.go index ba069a8..4a5e923 100755 --- a/apis/groups/v1beta2/zz_group_types.go +++ b/apis/groups/v1beta2/zz_group_types.go @@ -421,7 +421,6 @@ type GroupStatus struct { // +kubebuilder:object:root=true // +kubebuilder:subresource:status -// +kubebuilder:storageversion // Group is the Schema for the Groups API. // +kubebuilder:printcolumn:name="SYNCED",type="string",JSONPath=".status.conditions[?(@.type=='Synced')].status" diff --git a/apis/invitations/v1beta2/zz_invitation_types.go b/apis/invitations/v1beta2/zz_invitation_types.go index c07e2f3..0c5282f 100755 --- a/apis/invitations/v1beta2/zz_invitation_types.go +++ b/apis/invitations/v1beta2/zz_invitation_types.go @@ -169,7 +169,6 @@ type InvitationStatus struct { // +kubebuilder:object:root=true // +kubebuilder:subresource:status -// +kubebuilder:storageversion // Invitation is the Schema for the Invitations API. // +kubebuilder:printcolumn:name="SYNCED",type="string",JSONPath=".status.conditions[?(@.type=='Synced')].status" diff --git a/apis/serviceprincipals/v1beta2/zz_principal_types.go b/apis/serviceprincipals/v1beta2/zz_principal_types.go index c8c1d8b..a7805cc 100755 --- a/apis/serviceprincipals/v1beta2/zz_principal_types.go +++ b/apis/serviceprincipals/v1beta2/zz_principal_types.go @@ -496,7 +496,6 @@ type PrincipalStatus struct { // +kubebuilder:object:root=true // +kubebuilder:subresource:status -// +kubebuilder:storageversion // Principal is the Schema for the Principals API. // +kubebuilder:printcolumn:name="SYNCED",type="string",JSONPath=".status.conditions[?(@.type=='Synced')].status" diff --git a/config/provider.go b/config/provider.go index e744aeb..f4dac4d 100644 --- 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 index ee89751..33bf411 100644 --- 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 index 51389bb..47cc9fc 100644 --- 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 index 3495a35..ee17e28 100644 --- 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 index 25626d5..87e4990 100644 --- 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 index b5f87eb..4d597cb 100644 --- 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 index 35783c8..27840b8 100644 --- 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 index cea9a56..0f4c1cf 100644 --- 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 index 91689fb..87fd3f8 100644 --- 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: {}