From 24694a64a7724109fd49e2e4801170da4de55818 Mon Sep 17 00:00:00 2001 From: Breee Date: Sat, 1 Jun 2024 17:47:24 +0200 Subject: [PATCH] chore(deps): bump github.com/crossplane/upjet to v1.4.0 --- .../v1alpha1/zz_protocolmapper_types.go | 2 +- apis/client/v1alpha1/zz_rolemapper_types.go | 2 +- .../v1alpha1/zz_defaultgroups_types.go | 2 +- apis/defaults/v1alpha1/zz_roles_types.go | 2 +- apis/group/v1alpha1/zz_group_types.go | 2 +- apis/group/v1alpha1/zz_memberships_types.go | 2 +- apis/group/v1alpha1/zz_permissions_types.go | 2 +- apis/group/v1alpha1/zz_roles_types.go | 2 +- .../zz_identityprovidermapper_types.go | 2 +- apis/ldap/v1alpha1/zz_custommapper_types.go | 2 +- apis/ldap/v1alpha1/zz_fullnamemapper_types.go | 2 +- apis/ldap/v1alpha1/zz_generated.deepcopy.go | 5 ++ apis/ldap/v1alpha1/zz_groupmapper_types.go | 2 +- .../zz_hardcodedattributemapper_types.go | 2 +- .../v1alpha1/zz_hardcodedgroupmapper_types.go | 2 +- .../v1alpha1/zz_hardcodedrolemapper_types.go | 2 +- ...z_msadldsuseraccountcontrolmapper_types.go | 2 +- .../zz_msaduseraccountcontrolmapper_types.go | 2 +- apis/ldap/v1alpha1/zz_rolemapper_types.go | 2 +- .../v1alpha1/zz_userattributemapper_types.go | 2 +- .../v1alpha1/zz_userfederation_terraformed.go | 2 +- apis/ldap/v1alpha1/zz_userfederation_types.go | 6 ++- apis/oidc/v1alpha1/zz_generated.deepcopy.go | 1 + .../zz_identityprovider_terraformed.go | 2 +- .../v1alpha1/zz_identityprovider_types.go | 6 ++- .../v1alpha1/zz_client_terraformed.go | 2 +- apis/openidclient/v1alpha1/zz_client_types.go | 5 +- .../v1alpha1/zz_clientclientpolicy_types.go | 2 +- .../v1alpha1/zz_clientdefaultscopes_types.go | 2 +- .../v1alpha1/zz_clientgrouppolicy_types.go | 2 +- .../v1alpha1/zz_clientpermissions_types.go | 2 +- .../v1alpha1/zz_clientrolepolicy_types.go | 2 +- .../v1alpha1/zz_clientscope_types.go | 2 +- .../zz_clientserviceaccountrealmrole_types.go | 2 +- .../zz_clientserviceaccountrole_types.go | 2 +- .../v1alpha1/zz_clientuserpolicy_types.go | 2 +- .../v1alpha1/zz_generated.deepcopy.go | 5 ++ .../zz_groupmembershipprotocolmapper_types.go | 2 +- .../v1alpha1/zz_generated.conversion_hubs.go | 4 +- apis/realm/v1alpha1/zz_generated.deepcopy.go | 3 ++ .../v1alpha1/zz_keystorersa_terraformed.go | 2 +- apis/realm/v1alpha1/zz_keystorersa_types.go | 10 +++- apis/realm/v1alpha1/zz_realm_terraformed.go | 2 +- apis/realm/v1alpha1/zz_realm_types.go | 7 ++- .../realm/v1alpha1/zz_requiredaction_types.go | 2 +- apis/role/v1alpha1/zz_role_types.go | 2 +- .../v1alpha1/zz_identityprovider_types.go | 2 +- apis/samlclient/v1alpha1/zz_client_types.go | 2 +- .../v1alpha1/zz_clientdefaultscopes_types.go | 2 +- .../v1alpha1/zz_clientscope_types.go | 2 +- .../v1alpha1/zz_generated.conversion_hubs.go | 6 +-- apis/user/v1alpha1/zz_generated.deepcopy.go | 1 + apis/user/v1alpha1/zz_groups_types.go | 2 +- apis/user/v1alpha1/zz_permissions_types.go | 2 +- apis/user/v1alpha1/zz_user_terraformed.go | 2 +- apis/user/v1alpha1/zz_user_types.go | 7 ++- go.mod | 2 +- go.sum | 4 +- .../client/protocolmapper/zz_controller.go | 13 +++++ .../client/rolemapper/zz_controller.go | 13 +++++ .../defaults/defaultgroups/zz_controller.go | 13 +++++ .../defaults/roles/zz_controller.go | 13 +++++ .../controller/group/group/zz_controller.go | 13 +++++ .../group/memberships/zz_controller.go | 13 +++++ .../group/permissions/zz_controller.go | 13 +++++ .../controller/group/roles/zz_controller.go | 13 +++++ .../identityprovidermapper/zz_controller.go | 13 +++++ .../ldap/custommapper/zz_controller.go | 13 +++++ .../ldap/fullnamemapper/zz_controller.go | 13 +++++ .../ldap/groupmapper/zz_controller.go | 13 +++++ .../hardcodedattributemapper/zz_controller.go | 13 +++++ .../hardcodedgroupmapper/zz_controller.go | 13 +++++ .../ldap/hardcodedrolemapper/zz_controller.go | 13 +++++ .../zz_controller.go | 13 +++++ .../zz_controller.go | 13 +++++ .../ldap/rolemapper/zz_controller.go | 13 +++++ .../ldap/userattributemapper/zz_controller.go | 13 +++++ .../ldap/userfederation/zz_controller.go | 13 +++++ .../oidc/identityprovider/zz_controller.go | 13 +++++ .../openidclient/client/zz_controller.go | 13 +++++ .../clientclientpolicy/zz_controller.go | 13 +++++ .../clientdefaultscopes/zz_controller.go | 13 +++++ .../clientgrouppolicy/zz_controller.go | 13 +++++ .../clientpermissions/zz_controller.go | 13 +++++ .../clientrolepolicy/zz_controller.go | 13 +++++ .../openidclient/clientscope/zz_controller.go | 13 +++++ .../zz_controller.go | 13 +++++ .../clientserviceaccountrole/zz_controller.go | 13 +++++ .../clientuserpolicy/zz_controller.go | 13 +++++ .../zz_controller.go | 13 +++++ .../realm/keystorersa/zz_controller.go | 13 +++++ .../controller/realm/realm/zz_controller.go | 13 +++++ .../realm/requiredaction/zz_controller.go | 13 +++++ .../controller/role/role/zz_controller.go | 13 +++++ .../saml/identityprovider/zz_controller.go | 13 +++++ .../samlclient/client/zz_controller.go | 13 +++++ .../clientdefaultscopes/zz_controller.go | 13 +++++ .../samlclient/clientscope/zz_controller.go | 13 +++++ .../controller/user/groups/zz_controller.go | 13 +++++ .../user/permissions/zz_controller.go | 13 +++++ .../controller/user/user/zz_controller.go | 13 +++++ ...eycloak.crossplane.io_protocolmappers.yaml | 6 +-- ...nt.keycloak.crossplane.io_rolemappers.yaml | 6 +-- ....keycloak.crossplane.io_defaultgroups.yaml | 6 +-- ...defaults.keycloak.crossplane.io_roles.yaml | 6 +-- .../group.keycloak.crossplane.io_groups.yaml | 6 +-- ...up.keycloak.crossplane.io_memberships.yaml | 6 +-- ...up.keycloak.crossplane.io_permissions.yaml | 6 +-- .../group.keycloak.crossplane.io_roles.yaml | 6 +-- ...crossplane.io_identityprovidermappers.yaml | 6 +-- ....keycloak.crossplane.io_custommappers.yaml | 6 +-- ...eycloak.crossplane.io_fullnamemappers.yaml | 6 +-- ...p.keycloak.crossplane.io_groupmappers.yaml | 6 +-- ...ossplane.io_hardcodedattributemappers.yaml | 6 +-- ...k.crossplane.io_hardcodedgroupmappers.yaml | 6 +-- ...ak.crossplane.io_hardcodedrolemappers.yaml | 6 +-- ...e.io_msadldsuseraccountcontrolmappers.yaml | 6 +-- ...lane.io_msaduseraccountcontrolmappers.yaml | 6 +-- ...ap.keycloak.crossplane.io_rolemappers.yaml | 6 +-- ...ak.crossplane.io_userattributemappers.yaml | 6 +-- ...eycloak.crossplane.io_userfederations.yaml | 25 ++++++++-- ...cloak.crossplane.io_identityproviders.yaml | 27 +++++++++-- ...ak.crossplane.io_clientclientpolicies.yaml | 6 +-- ...oak.crossplane.io_clientdefaultscopes.yaml | 6 +-- ...oak.crossplane.io_clientgrouppolicies.yaml | 6 +-- ...cloak.crossplane.io_clientpermissions.yaml | 6 +-- ...loak.crossplane.io_clientrolepolicies.yaml | 6 +-- ...client.keycloak.crossplane.io_clients.yaml | 26 ++++++++-- ...t.keycloak.crossplane.io_clientscopes.yaml | 6 +-- ...ane.io_clientserviceaccountrealmroles.yaml | 6 +-- ...ossplane.io_clientserviceaccountroles.yaml | 6 +-- ...loak.crossplane.io_clientuserpolicies.yaml | 6 +-- ...ane.io_groupmembershipprotocolmappers.yaml | 6 +-- ...m.keycloak.crossplane.io_keystorersas.yaml | 47 +++++++++++++++++-- .../realm.keycloak.crossplane.io_realms.yaml | 27 +++++++++-- ...eycloak.crossplane.io_requiredactions.yaml | 6 +-- .../role.keycloak.crossplane.io_roles.yaml | 6 +-- ...cloak.crossplane.io_identityproviders.yaml | 6 +-- ...oak.crossplane.io_clientdefaultscopes.yaml | 6 +-- ...client.keycloak.crossplane.io_clients.yaml | 6 +-- ...t.keycloak.crossplane.io_clientscopes.yaml | 6 +-- .../user.keycloak.crossplane.io_groups.yaml | 6 +-- ...er.keycloak.crossplane.io_permissions.yaml | 6 +-- .../user.keycloak.crossplane.io_users.yaml | 27 +++++++++-- 144 files changed, 926 insertions(+), 192 deletions(-) diff --git a/apis/client/v1alpha1/zz_protocolmapper_types.go b/apis/client/v1alpha1/zz_protocolmapper_types.go index 1895626..3701081 100755 --- a/apis/client/v1alpha1/zz_protocolmapper_types.go +++ b/apis/client/v1alpha1/zz_protocolmapper_types.go @@ -197,8 +197,8 @@ type ProtocolMapperStatus struct { // +kubebuilder:storageversion // ProtocolMapper is the Schema for the ProtocolMappers API. -// +kubebuilder:printcolumn:name="READY",type="string",JSONPath=".status.conditions[?(@.type=='Ready')].status" // +kubebuilder:printcolumn:name="SYNCED",type="string",JSONPath=".status.conditions[?(@.type=='Synced')].status" +// +kubebuilder:printcolumn:name="READY",type="string",JSONPath=".status.conditions[?(@.type=='Ready')].status" // +kubebuilder:printcolumn:name="EXTERNAL-NAME",type="string",JSONPath=".metadata.annotations.crossplane\\.io/external-name" // +kubebuilder:printcolumn:name="AGE",type="date",JSONPath=".metadata.creationTimestamp" // +kubebuilder:resource:scope=Cluster,categories={crossplane,managed,keycloak} diff --git a/apis/client/v1alpha1/zz_rolemapper_types.go b/apis/client/v1alpha1/zz_rolemapper_types.go index abbec5a..2689888 100755 --- a/apis/client/v1alpha1/zz_rolemapper_types.go +++ b/apis/client/v1alpha1/zz_rolemapper_types.go @@ -158,8 +158,8 @@ type RoleMapperStatus struct { // +kubebuilder:storageversion // RoleMapper is the Schema for the RoleMappers API. -// +kubebuilder:printcolumn:name="READY",type="string",JSONPath=".status.conditions[?(@.type=='Ready')].status" // +kubebuilder:printcolumn:name="SYNCED",type="string",JSONPath=".status.conditions[?(@.type=='Synced')].status" +// +kubebuilder:printcolumn:name="READY",type="string",JSONPath=".status.conditions[?(@.type=='Ready')].status" // +kubebuilder:printcolumn:name="EXTERNAL-NAME",type="string",JSONPath=".metadata.annotations.crossplane\\.io/external-name" // +kubebuilder:printcolumn:name="AGE",type="date",JSONPath=".metadata.creationTimestamp" // +kubebuilder:resource:scope=Cluster,categories={crossplane,managed,keycloak} diff --git a/apis/defaults/v1alpha1/zz_defaultgroups_types.go b/apis/defaults/v1alpha1/zz_defaultgroups_types.go index 016d87a..11f0b53 100755 --- a/apis/defaults/v1alpha1/zz_defaultgroups_types.go +++ b/apis/defaults/v1alpha1/zz_defaultgroups_types.go @@ -111,8 +111,8 @@ type DefaultGroupsStatus struct { // +kubebuilder:storageversion // DefaultGroups is the Schema for the DefaultGroupss API. -// +kubebuilder:printcolumn:name="READY",type="string",JSONPath=".status.conditions[?(@.type=='Ready')].status" // +kubebuilder:printcolumn:name="SYNCED",type="string",JSONPath=".status.conditions[?(@.type=='Synced')].status" +// +kubebuilder:printcolumn:name="READY",type="string",JSONPath=".status.conditions[?(@.type=='Ready')].status" // +kubebuilder:printcolumn:name="EXTERNAL-NAME",type="string",JSONPath=".metadata.annotations.crossplane\\.io/external-name" // +kubebuilder:printcolumn:name="AGE",type="date",JSONPath=".metadata.creationTimestamp" // +kubebuilder:resource:scope=Cluster,categories={crossplane,managed,keycloak} diff --git a/apis/defaults/v1alpha1/zz_roles_types.go b/apis/defaults/v1alpha1/zz_roles_types.go index 08c2846..985f0ec 100755 --- a/apis/defaults/v1alpha1/zz_roles_types.go +++ b/apis/defaults/v1alpha1/zz_roles_types.go @@ -116,8 +116,8 @@ type RolesStatus struct { // +kubebuilder:storageversion // Roles is the Schema for the Roless API. -// +kubebuilder:printcolumn:name="READY",type="string",JSONPath=".status.conditions[?(@.type=='Ready')].status" // +kubebuilder:printcolumn:name="SYNCED",type="string",JSONPath=".status.conditions[?(@.type=='Synced')].status" +// +kubebuilder:printcolumn:name="READY",type="string",JSONPath=".status.conditions[?(@.type=='Ready')].status" // +kubebuilder:printcolumn:name="EXTERNAL-NAME",type="string",JSONPath=".metadata.annotations.crossplane\\.io/external-name" // +kubebuilder:printcolumn:name="AGE",type="date",JSONPath=".metadata.creationTimestamp" // +kubebuilder:resource:scope=Cluster,categories={crossplane,managed,keycloak} diff --git a/apis/group/v1alpha1/zz_group_types.go b/apis/group/v1alpha1/zz_group_types.go index dbb57c1..7f9ca34 100755 --- a/apis/group/v1alpha1/zz_group_types.go +++ b/apis/group/v1alpha1/zz_group_types.go @@ -134,8 +134,8 @@ type GroupStatus struct { // +kubebuilder:storageversion // Group is the Schema for the Groups API. -// +kubebuilder:printcolumn:name="READY",type="string",JSONPath=".status.conditions[?(@.type=='Ready')].status" // +kubebuilder:printcolumn:name="SYNCED",type="string",JSONPath=".status.conditions[?(@.type=='Synced')].status" +// +kubebuilder:printcolumn:name="READY",type="string",JSONPath=".status.conditions[?(@.type=='Ready')].status" // +kubebuilder:printcolumn:name="EXTERNAL-NAME",type="string",JSONPath=".metadata.annotations.crossplane\\.io/external-name" // +kubebuilder:printcolumn:name="AGE",type="date",JSONPath=".metadata.creationTimestamp" // +kubebuilder:resource:scope=Cluster,categories={crossplane,managed,keycloak} diff --git a/apis/group/v1alpha1/zz_memberships_types.go b/apis/group/v1alpha1/zz_memberships_types.go index 8b5028c..ba01f32 100755 --- a/apis/group/v1alpha1/zz_memberships_types.go +++ b/apis/group/v1alpha1/zz_memberships_types.go @@ -121,8 +121,8 @@ type MembershipsStatus struct { // +kubebuilder:storageversion // Memberships is the Schema for the Membershipss API. -// +kubebuilder:printcolumn:name="READY",type="string",JSONPath=".status.conditions[?(@.type=='Ready')].status" // +kubebuilder:printcolumn:name="SYNCED",type="string",JSONPath=".status.conditions[?(@.type=='Synced')].status" +// +kubebuilder:printcolumn:name="READY",type="string",JSONPath=".status.conditions[?(@.type=='Ready')].status" // +kubebuilder:printcolumn:name="EXTERNAL-NAME",type="string",JSONPath=".metadata.annotations.crossplane\\.io/external-name" // +kubebuilder:printcolumn:name="AGE",type="date",JSONPath=".metadata.creationTimestamp" // +kubebuilder:resource:scope=Cluster,categories={crossplane,managed,keycloak} diff --git a/apis/group/v1alpha1/zz_permissions_types.go b/apis/group/v1alpha1/zz_permissions_types.go index cb899b4..907b628 100755 --- a/apis/group/v1alpha1/zz_permissions_types.go +++ b/apis/group/v1alpha1/zz_permissions_types.go @@ -375,8 +375,8 @@ type PermissionsStatus struct { // +kubebuilder:storageversion // Permissions is the Schema for the Permissionss API. -// +kubebuilder:printcolumn:name="READY",type="string",JSONPath=".status.conditions[?(@.type=='Ready')].status" // +kubebuilder:printcolumn:name="SYNCED",type="string",JSONPath=".status.conditions[?(@.type=='Synced')].status" +// +kubebuilder:printcolumn:name="READY",type="string",JSONPath=".status.conditions[?(@.type=='Ready')].status" // +kubebuilder:printcolumn:name="EXTERNAL-NAME",type="string",JSONPath=".metadata.annotations.crossplane\\.io/external-name" // +kubebuilder:printcolumn:name="AGE",type="date",JSONPath=".metadata.creationTimestamp" // +kubebuilder:resource:scope=Cluster,categories={crossplane,managed,keycloak} diff --git a/apis/group/v1alpha1/zz_roles_types.go b/apis/group/v1alpha1/zz_roles_types.go index 3b28800..0b8affd 100755 --- a/apis/group/v1alpha1/zz_roles_types.go +++ b/apis/group/v1alpha1/zz_roles_types.go @@ -149,8 +149,8 @@ type RolesStatus struct { // +kubebuilder:storageversion // Roles is the Schema for the Roless API. -// +kubebuilder:printcolumn:name="READY",type="string",JSONPath=".status.conditions[?(@.type=='Ready')].status" // +kubebuilder:printcolumn:name="SYNCED",type="string",JSONPath=".status.conditions[?(@.type=='Synced')].status" +// +kubebuilder:printcolumn:name="READY",type="string",JSONPath=".status.conditions[?(@.type=='Ready')].status" // +kubebuilder:printcolumn:name="EXTERNAL-NAME",type="string",JSONPath=".metadata.annotations.crossplane\\.io/external-name" // +kubebuilder:printcolumn:name="AGE",type="date",JSONPath=".metadata.creationTimestamp" // +kubebuilder:resource:scope=Cluster,categories={crossplane,managed,keycloak} diff --git a/apis/identityprovider/v1alpha1/zz_identityprovidermapper_types.go b/apis/identityprovider/v1alpha1/zz_identityprovidermapper_types.go index 3c67b26..a2d70c0 100755 --- a/apis/identityprovider/v1alpha1/zz_identityprovidermapper_types.go +++ b/apis/identityprovider/v1alpha1/zz_identityprovidermapper_types.go @@ -135,8 +135,8 @@ type IdentityProviderMapperStatus struct { // +kubebuilder:storageversion // IdentityProviderMapper is the Schema for the IdentityProviderMappers API. -// +kubebuilder:printcolumn:name="READY",type="string",JSONPath=".status.conditions[?(@.type=='Ready')].status" // +kubebuilder:printcolumn:name="SYNCED",type="string",JSONPath=".status.conditions[?(@.type=='Synced')].status" +// +kubebuilder:printcolumn:name="READY",type="string",JSONPath=".status.conditions[?(@.type=='Ready')].status" // +kubebuilder:printcolumn:name="EXTERNAL-NAME",type="string",JSONPath=".metadata.annotations.crossplane\\.io/external-name" // +kubebuilder:printcolumn:name="AGE",type="date",JSONPath=".metadata.creationTimestamp" // +kubebuilder:resource:scope=Cluster,categories={crossplane,managed,keycloak} diff --git a/apis/ldap/v1alpha1/zz_custommapper_types.go b/apis/ldap/v1alpha1/zz_custommapper_types.go index 5751bce..8b93847 100755 --- a/apis/ldap/v1alpha1/zz_custommapper_types.go +++ b/apis/ldap/v1alpha1/zz_custommapper_types.go @@ -166,8 +166,8 @@ type CustomMapperStatus struct { // +kubebuilder:storageversion // CustomMapper is the Schema for the CustomMappers API. -// +kubebuilder:printcolumn:name="READY",type="string",JSONPath=".status.conditions[?(@.type=='Ready')].status" // +kubebuilder:printcolumn:name="SYNCED",type="string",JSONPath=".status.conditions[?(@.type=='Synced')].status" +// +kubebuilder:printcolumn:name="READY",type="string",JSONPath=".status.conditions[?(@.type=='Ready')].status" // +kubebuilder:printcolumn:name="EXTERNAL-NAME",type="string",JSONPath=".metadata.annotations.crossplane\\.io/external-name" // +kubebuilder:printcolumn:name="AGE",type="date",JSONPath=".metadata.creationTimestamp" // +kubebuilder:resource:scope=Cluster,categories={crossplane,managed,keycloak} diff --git a/apis/ldap/v1alpha1/zz_fullnamemapper_types.go b/apis/ldap/v1alpha1/zz_fullnamemapper_types.go index 4c9fc09..0693da4 100755 --- a/apis/ldap/v1alpha1/zz_fullnamemapper_types.go +++ b/apis/ldap/v1alpha1/zz_fullnamemapper_types.go @@ -156,8 +156,8 @@ type FullNameMapperStatus struct { // +kubebuilder:storageversion // FullNameMapper is the Schema for the FullNameMappers API. -// +kubebuilder:printcolumn:name="READY",type="string",JSONPath=".status.conditions[?(@.type=='Ready')].status" // +kubebuilder:printcolumn:name="SYNCED",type="string",JSONPath=".status.conditions[?(@.type=='Synced')].status" +// +kubebuilder:printcolumn:name="READY",type="string",JSONPath=".status.conditions[?(@.type=='Ready')].status" // +kubebuilder:printcolumn:name="EXTERNAL-NAME",type="string",JSONPath=".metadata.annotations.crossplane\\.io/external-name" // +kubebuilder:printcolumn:name="AGE",type="date",JSONPath=".metadata.creationTimestamp" // +kubebuilder:resource:scope=Cluster,categories={crossplane,managed,keycloak} diff --git a/apis/ldap/v1alpha1/zz_generated.deepcopy.go b/apis/ldap/v1alpha1/zz_generated.deepcopy.go index 9b56db3..5c3d575 100644 --- a/apis/ldap/v1alpha1/zz_generated.deepcopy.go +++ b/apis/ldap/v1alpha1/zz_generated.deepcopy.go @@ -3385,6 +3385,11 @@ func (in *UserFederationInitParameters) DeepCopyInto(out *UserFederationInitPara *out = new(float64) **out = **in } + if in.BindCredentialSecretRef != nil { + in, out := &in.BindCredentialSecretRef, &out.BindCredentialSecretRef + *out = new(v1.SecretKeySelector) + **out = **in + } if in.BindDn != nil { in, out := &in.BindDn, &out.BindDn *out = new(string) diff --git a/apis/ldap/v1alpha1/zz_groupmapper_types.go b/apis/ldap/v1alpha1/zz_groupmapper_types.go index 6ccd56c..ea02829 100755 --- a/apis/ldap/v1alpha1/zz_groupmapper_types.go +++ b/apis/ldap/v1alpha1/zz_groupmapper_types.go @@ -277,8 +277,8 @@ type GroupMapperStatus struct { // +kubebuilder:storageversion // GroupMapper is the Schema for the GroupMappers API. -// +kubebuilder:printcolumn:name="READY",type="string",JSONPath=".status.conditions[?(@.type=='Ready')].status" // +kubebuilder:printcolumn:name="SYNCED",type="string",JSONPath=".status.conditions[?(@.type=='Synced')].status" +// +kubebuilder:printcolumn:name="READY",type="string",JSONPath=".status.conditions[?(@.type=='Ready')].status" // +kubebuilder:printcolumn:name="EXTERNAL-NAME",type="string",JSONPath=".metadata.annotations.crossplane\\.io/external-name" // +kubebuilder:printcolumn:name="AGE",type="date",JSONPath=".metadata.creationTimestamp" // +kubebuilder:resource:scope=Cluster,categories={crossplane,managed,keycloak} diff --git a/apis/ldap/v1alpha1/zz_hardcodedattributemapper_types.go b/apis/ldap/v1alpha1/zz_hardcodedattributemapper_types.go index 5776b11..4e3e71b 100755 --- a/apis/ldap/v1alpha1/zz_hardcodedattributemapper_types.go +++ b/apis/ldap/v1alpha1/zz_hardcodedattributemapper_types.go @@ -153,8 +153,8 @@ type HardcodedAttributeMapperStatus struct { // +kubebuilder:storageversion // HardcodedAttributeMapper is the Schema for the HardcodedAttributeMappers API. -// +kubebuilder:printcolumn:name="READY",type="string",JSONPath=".status.conditions[?(@.type=='Ready')].status" // +kubebuilder:printcolumn:name="SYNCED",type="string",JSONPath=".status.conditions[?(@.type=='Synced')].status" +// +kubebuilder:printcolumn:name="READY",type="string",JSONPath=".status.conditions[?(@.type=='Ready')].status" // +kubebuilder:printcolumn:name="EXTERNAL-NAME",type="string",JSONPath=".metadata.annotations.crossplane\\.io/external-name" // +kubebuilder:printcolumn:name="AGE",type="date",JSONPath=".metadata.creationTimestamp" // +kubebuilder:resource:scope=Cluster,categories={crossplane,managed,keycloak} diff --git a/apis/ldap/v1alpha1/zz_hardcodedgroupmapper_types.go b/apis/ldap/v1alpha1/zz_hardcodedgroupmapper_types.go index 4a09a38..9d56a87 100755 --- a/apis/ldap/v1alpha1/zz_hardcodedgroupmapper_types.go +++ b/apis/ldap/v1alpha1/zz_hardcodedgroupmapper_types.go @@ -160,8 +160,8 @@ type HardcodedGroupMapperStatus struct { // +kubebuilder:storageversion // HardcodedGroupMapper is the Schema for the HardcodedGroupMappers API. -// +kubebuilder:printcolumn:name="READY",type="string",JSONPath=".status.conditions[?(@.type=='Ready')].status" // +kubebuilder:printcolumn:name="SYNCED",type="string",JSONPath=".status.conditions[?(@.type=='Synced')].status" +// +kubebuilder:printcolumn:name="READY",type="string",JSONPath=".status.conditions[?(@.type=='Ready')].status" // +kubebuilder:printcolumn:name="EXTERNAL-NAME",type="string",JSONPath=".metadata.annotations.crossplane\\.io/external-name" // +kubebuilder:printcolumn:name="AGE",type="date",JSONPath=".metadata.creationTimestamp" // +kubebuilder:resource:scope=Cluster,categories={crossplane,managed,keycloak} diff --git a/apis/ldap/v1alpha1/zz_hardcodedrolemapper_types.go b/apis/ldap/v1alpha1/zz_hardcodedrolemapper_types.go index 793e109..9df1c91 100755 --- a/apis/ldap/v1alpha1/zz_hardcodedrolemapper_types.go +++ b/apis/ldap/v1alpha1/zz_hardcodedrolemapper_types.go @@ -159,8 +159,8 @@ type HardcodedRoleMapperStatus struct { // +kubebuilder:storageversion // HardcodedRoleMapper is the Schema for the HardcodedRoleMappers API. -// +kubebuilder:printcolumn:name="READY",type="string",JSONPath=".status.conditions[?(@.type=='Ready')].status" // +kubebuilder:printcolumn:name="SYNCED",type="string",JSONPath=".status.conditions[?(@.type=='Synced')].status" +// +kubebuilder:printcolumn:name="READY",type="string",JSONPath=".status.conditions[?(@.type=='Ready')].status" // +kubebuilder:printcolumn:name="EXTERNAL-NAME",type="string",JSONPath=".metadata.annotations.crossplane\\.io/external-name" // +kubebuilder:printcolumn:name="AGE",type="date",JSONPath=".metadata.creationTimestamp" // +kubebuilder:resource:scope=Cluster,categories={crossplane,managed,keycloak} diff --git a/apis/ldap/v1alpha1/zz_msadldsuseraccountcontrolmapper_types.go b/apis/ldap/v1alpha1/zz_msadldsuseraccountcontrolmapper_types.go index 8fa96d9..65a591d 100755 --- a/apis/ldap/v1alpha1/zz_msadldsuseraccountcontrolmapper_types.go +++ b/apis/ldap/v1alpha1/zz_msadldsuseraccountcontrolmapper_types.go @@ -126,8 +126,8 @@ type MsadLdsUserAccountControlMapperStatus struct { // +kubebuilder:storageversion // MsadLdsUserAccountControlMapper is the Schema for the MsadLdsUserAccountControlMappers API. -// +kubebuilder:printcolumn:name="READY",type="string",JSONPath=".status.conditions[?(@.type=='Ready')].status" // +kubebuilder:printcolumn:name="SYNCED",type="string",JSONPath=".status.conditions[?(@.type=='Synced')].status" +// +kubebuilder:printcolumn:name="READY",type="string",JSONPath=".status.conditions[?(@.type=='Ready')].status" // +kubebuilder:printcolumn:name="EXTERNAL-NAME",type="string",JSONPath=".metadata.annotations.crossplane\\.io/external-name" // +kubebuilder:printcolumn:name="AGE",type="date",JSONPath=".metadata.creationTimestamp" // +kubebuilder:resource:scope=Cluster,categories={crossplane,managed,keycloak} diff --git a/apis/ldap/v1alpha1/zz_msaduseraccountcontrolmapper_types.go b/apis/ldap/v1alpha1/zz_msaduseraccountcontrolmapper_types.go index d7b419f..c14dc9d 100755 --- a/apis/ldap/v1alpha1/zz_msaduseraccountcontrolmapper_types.go +++ b/apis/ldap/v1alpha1/zz_msaduseraccountcontrolmapper_types.go @@ -136,8 +136,8 @@ type MsadUserAccountControlMapperStatus struct { // +kubebuilder:storageversion // MsadUserAccountControlMapper is the Schema for the MsadUserAccountControlMappers API. -// +kubebuilder:printcolumn:name="READY",type="string",JSONPath=".status.conditions[?(@.type=='Ready')].status" // +kubebuilder:printcolumn:name="SYNCED",type="string",JSONPath=".status.conditions[?(@.type=='Synced')].status" +// +kubebuilder:printcolumn:name="READY",type="string",JSONPath=".status.conditions[?(@.type=='Ready')].status" // +kubebuilder:printcolumn:name="EXTERNAL-NAME",type="string",JSONPath=".metadata.annotations.crossplane\\.io/external-name" // +kubebuilder:printcolumn:name="AGE",type="date",JSONPath=".metadata.creationTimestamp" // +kubebuilder:resource:scope=Cluster,categories={crossplane,managed,keycloak} diff --git a/apis/ldap/v1alpha1/zz_rolemapper_types.go b/apis/ldap/v1alpha1/zz_rolemapper_types.go index 956b8fb..233a659 100755 --- a/apis/ldap/v1alpha1/zz_rolemapper_types.go +++ b/apis/ldap/v1alpha1/zz_rolemapper_types.go @@ -265,8 +265,8 @@ type RoleMapperStatus struct { // +kubebuilder:storageversion // RoleMapper is the Schema for the RoleMappers API. -// +kubebuilder:printcolumn:name="READY",type="string",JSONPath=".status.conditions[?(@.type=='Ready')].status" // +kubebuilder:printcolumn:name="SYNCED",type="string",JSONPath=".status.conditions[?(@.type=='Synced')].status" +// +kubebuilder:printcolumn:name="READY",type="string",JSONPath=".status.conditions[?(@.type=='Ready')].status" // +kubebuilder:printcolumn:name="EXTERNAL-NAME",type="string",JSONPath=".metadata.annotations.crossplane\\.io/external-name" // +kubebuilder:printcolumn:name="AGE",type="date",JSONPath=".metadata.creationTimestamp" // +kubebuilder:resource:scope=Cluster,categories={crossplane,managed,keycloak} diff --git a/apis/ldap/v1alpha1/zz_userattributemapper_types.go b/apis/ldap/v1alpha1/zz_userattributemapper_types.go index b4a4bac..8a0b0e6 100755 --- a/apis/ldap/v1alpha1/zz_userattributemapper_types.go +++ b/apis/ldap/v1alpha1/zz_userattributemapper_types.go @@ -218,8 +218,8 @@ type UserAttributeMapperStatus struct { // +kubebuilder:storageversion // UserAttributeMapper is the Schema for the UserAttributeMappers API. -// +kubebuilder:printcolumn:name="READY",type="string",JSONPath=".status.conditions[?(@.type=='Ready')].status" // +kubebuilder:printcolumn:name="SYNCED",type="string",JSONPath=".status.conditions[?(@.type=='Synced')].status" +// +kubebuilder:printcolumn:name="READY",type="string",JSONPath=".status.conditions[?(@.type=='Ready')].status" // +kubebuilder:printcolumn:name="EXTERNAL-NAME",type="string",JSONPath=".metadata.annotations.crossplane\\.io/external-name" // +kubebuilder:printcolumn:name="AGE",type="date",JSONPath=".metadata.creationTimestamp" // +kubebuilder:resource:scope=Cluster,categories={crossplane,managed,keycloak} diff --git a/apis/ldap/v1alpha1/zz_userfederation_terraformed.go b/apis/ldap/v1alpha1/zz_userfederation_terraformed.go index deeb5d3..df3ea49 100755 --- a/apis/ldap/v1alpha1/zz_userfederation_terraformed.go +++ b/apis/ldap/v1alpha1/zz_userfederation_terraformed.go @@ -21,7 +21,7 @@ func (mg *UserFederation) GetTerraformResourceType() string { // GetConnectionDetailsMapping for this UserFederation func (tr *UserFederation) GetConnectionDetailsMapping() map[string]string { - return map[string]string{"bind_credential": "spec.forProvider.bindCredentialSecretRef"} + return map[string]string{"bind_credential": "bindCredentialSecretRef"} } // GetObservation of this UserFederation diff --git a/apis/ldap/v1alpha1/zz_userfederation_types.go b/apis/ldap/v1alpha1/zz_userfederation_types.go index 95203cb..1e3b9ce 100755 --- a/apis/ldap/v1alpha1/zz_userfederation_types.go +++ b/apis/ldap/v1alpha1/zz_userfederation_types.go @@ -151,6 +151,10 @@ type UserFederationInitParameters struct { // The number of users to sync within a single transaction. BatchSizeForSync *float64 `json:"batchSizeForSync,omitempty" tf:"batch_size_for_sync,omitempty"` + // Password of LDAP admin. This attribute must be set if bind_dn is set. + // Password of LDAP admin. + BindCredentialSecretRef *v1.SecretKeySelector `json:"bindCredentialSecretRef,omitempty" tf:"-"` + // DN of LDAP admin, which will be used by Keycloak to access LDAP server. This attribute must be set if bind_credential is set. // DN of LDAP admin, which will be used by Keycloak to access LDAP server. BindDn *string `json:"bindDn,omitempty" tf:"bind_dn,omitempty"` @@ -607,8 +611,8 @@ type UserFederationStatus struct { // +kubebuilder:storageversion // UserFederation is the Schema for the UserFederations API. -// +kubebuilder:printcolumn:name="READY",type="string",JSONPath=".status.conditions[?(@.type=='Ready')].status" // +kubebuilder:printcolumn:name="SYNCED",type="string",JSONPath=".status.conditions[?(@.type=='Synced')].status" +// +kubebuilder:printcolumn:name="READY",type="string",JSONPath=".status.conditions[?(@.type=='Ready')].status" // +kubebuilder:printcolumn:name="EXTERNAL-NAME",type="string",JSONPath=".metadata.annotations.crossplane\\.io/external-name" // +kubebuilder:printcolumn:name="AGE",type="date",JSONPath=".metadata.creationTimestamp" // +kubebuilder:resource:scope=Cluster,categories={crossplane,managed,keycloak} diff --git a/apis/oidc/v1alpha1/zz_generated.deepcopy.go b/apis/oidc/v1alpha1/zz_generated.deepcopy.go index 192337e..0094c01 100644 --- a/apis/oidc/v1alpha1/zz_generated.deepcopy.go +++ b/apis/oidc/v1alpha1/zz_generated.deepcopy.go @@ -88,6 +88,7 @@ func (in *IdentityProviderInitParameters) DeepCopyInto(out *IdentityProviderInit *out = new(v1.Selector) (*in).DeepCopyInto(*out) } + out.ClientSecretSecretRef = in.ClientSecretSecretRef if in.DefaultScopes != nil { in, out := &in.DefaultScopes, &out.DefaultScopes *out = new(string) diff --git a/apis/oidc/v1alpha1/zz_identityprovider_terraformed.go b/apis/oidc/v1alpha1/zz_identityprovider_terraformed.go index 455f24b..535248e 100755 --- a/apis/oidc/v1alpha1/zz_identityprovider_terraformed.go +++ b/apis/oidc/v1alpha1/zz_identityprovider_terraformed.go @@ -21,7 +21,7 @@ func (mg *IdentityProvider) GetTerraformResourceType() string { // GetConnectionDetailsMapping for this IdentityProvider func (tr *IdentityProvider) GetConnectionDetailsMapping() map[string]string { - return map[string]string{"client_secret": "spec.forProvider.clientSecretSecretRef"} + return map[string]string{"client_secret": "clientSecretSecretRef"} } // GetObservation of this IdentityProvider diff --git a/apis/oidc/v1alpha1/zz_identityprovider_types.go b/apis/oidc/v1alpha1/zz_identityprovider_types.go index 00639fc..bc82b57 100755 --- a/apis/oidc/v1alpha1/zz_identityprovider_types.go +++ b/apis/oidc/v1alpha1/zz_identityprovider_types.go @@ -51,6 +51,10 @@ type IdentityProviderInitParameters struct { // +kubebuilder:validation:Optional ClientIDSelector *v1.Selector `json:"clientIdSelector,omitempty" tf:"-"` + // The client or client secret registered within the identity provider. This field is able to obtain its value from vault, use $${vault.ID} format. + // Client Secret. + ClientSecretSecretRef v1.SecretKeySelector `json:"clientSecretSecretRef" tf:"-"` + // The scopes to be sent when asking for authorization. It can be a space-separated list of scopes. Defaults to openid. // The scopes to be sent when asking for authorization. It can be a space-separated list of scopes. Defaults to 'openid'. DefaultScopes *string `json:"defaultScopes,omitempty" tf:"default_scopes,omitempty"` @@ -484,8 +488,8 @@ type IdentityProviderStatus struct { // +kubebuilder:storageversion // IdentityProvider is the Schema for the IdentityProviders API. -// +kubebuilder:printcolumn:name="READY",type="string",JSONPath=".status.conditions[?(@.type=='Ready')].status" // +kubebuilder:printcolumn:name="SYNCED",type="string",JSONPath=".status.conditions[?(@.type=='Synced')].status" +// +kubebuilder:printcolumn:name="READY",type="string",JSONPath=".status.conditions[?(@.type=='Ready')].status" // +kubebuilder:printcolumn:name="EXTERNAL-NAME",type="string",JSONPath=".metadata.annotations.crossplane\\.io/external-name" // +kubebuilder:printcolumn:name="AGE",type="date",JSONPath=".metadata.creationTimestamp" // +kubebuilder:resource:scope=Cluster,categories={crossplane,managed,keycloak} diff --git a/apis/openidclient/v1alpha1/zz_client_terraformed.go b/apis/openidclient/v1alpha1/zz_client_terraformed.go index 8b3d9aa..6a509f1 100755 --- a/apis/openidclient/v1alpha1/zz_client_terraformed.go +++ b/apis/openidclient/v1alpha1/zz_client_terraformed.go @@ -21,7 +21,7 @@ func (mg *Client) GetTerraformResourceType() string { // GetConnectionDetailsMapping for this Client func (tr *Client) GetConnectionDetailsMapping() map[string]string { - return map[string]string{"client_secret": "spec.forProvider.clientSecretSecretRef"} + return map[string]string{"client_secret": "clientSecretSecretRef"} } // GetObservation of this Client diff --git a/apis/openidclient/v1alpha1/zz_client_types.go b/apis/openidclient/v1alpha1/zz_client_types.go index b163d06..b300dd6 100755 --- a/apis/openidclient/v1alpha1/zz_client_types.go +++ b/apis/openidclient/v1alpha1/zz_client_types.go @@ -141,6 +141,9 @@ type ClientInitParameters struct { // Max time before a client session is expired. Tokens are invalidated when a client session is expired. If not set, it uses the standard SSO Session Max value. ClientOfflineSessionMaxLifespan *string `json:"clientOfflineSessionMaxLifespan,omitempty" tf:"client_offline_session_max_lifespan,omitempty"` + // The secret for clients with an access_type of CONFIDENTIAL or BEARER-ONLY. This value is sensitive and should be treated with the same care as a password. If omitted, this will be generated by Keycloak. + ClientSecretSecretRef *v1.SecretKeySelector `json:"clientSecretSecretRef,omitempty" tf:"-"` + // Time a client offline session is allowed to be idle before it expires. Offline tokens are invalidated when a client offline session is expired. If not set it uses the Offline Session Idle value. ClientSessionIdleTimeout *string `json:"clientSessionIdleTimeout,omitempty" tf:"client_session_idle_timeout,omitempty"` @@ -624,8 +627,8 @@ type ClientStatus struct { // +kubebuilder:storageversion // Client is the Schema for the Clients API. -// +kubebuilder:printcolumn:name="READY",type="string",JSONPath=".status.conditions[?(@.type=='Ready')].status" // +kubebuilder:printcolumn:name="SYNCED",type="string",JSONPath=".status.conditions[?(@.type=='Synced')].status" +// +kubebuilder:printcolumn:name="READY",type="string",JSONPath=".status.conditions[?(@.type=='Ready')].status" // +kubebuilder:printcolumn:name="EXTERNAL-NAME",type="string",JSONPath=".metadata.annotations.crossplane\\.io/external-name" // +kubebuilder:printcolumn:name="AGE",type="date",JSONPath=".metadata.creationTimestamp" // +kubebuilder:resource:scope=Cluster,categories={crossplane,managed,keycloak} diff --git a/apis/openidclient/v1alpha1/zz_clientclientpolicy_types.go b/apis/openidclient/v1alpha1/zz_clientclientpolicy_types.go index 60e928e..7d5b640 100755 --- a/apis/openidclient/v1alpha1/zz_clientclientpolicy_types.go +++ b/apis/openidclient/v1alpha1/zz_clientclientpolicy_types.go @@ -143,8 +143,8 @@ type ClientClientPolicyStatus struct { // +kubebuilder:storageversion // ClientClientPolicy is the Schema for the ClientClientPolicys API. -// +kubebuilder:printcolumn:name="READY",type="string",JSONPath=".status.conditions[?(@.type=='Ready')].status" // +kubebuilder:printcolumn:name="SYNCED",type="string",JSONPath=".status.conditions[?(@.type=='Synced')].status" +// +kubebuilder:printcolumn:name="READY",type="string",JSONPath=".status.conditions[?(@.type=='Ready')].status" // +kubebuilder:printcolumn:name="EXTERNAL-NAME",type="string",JSONPath=".metadata.annotations.crossplane\\.io/external-name" // +kubebuilder:printcolumn:name="AGE",type="date",JSONPath=".metadata.creationTimestamp" // +kubebuilder:resource:scope=Cluster,categories={crossplane,managed,keycloak} diff --git a/apis/openidclient/v1alpha1/zz_clientdefaultscopes_types.go b/apis/openidclient/v1alpha1/zz_clientdefaultscopes_types.go index ff5e14a..80b69ea 100755 --- a/apis/openidclient/v1alpha1/zz_clientdefaultscopes_types.go +++ b/apis/openidclient/v1alpha1/zz_clientdefaultscopes_types.go @@ -121,8 +121,8 @@ type ClientDefaultScopesStatus struct { // +kubebuilder:storageversion // ClientDefaultScopes is the Schema for the ClientDefaultScopess API. -// +kubebuilder:printcolumn:name="READY",type="string",JSONPath=".status.conditions[?(@.type=='Ready')].status" // +kubebuilder:printcolumn:name="SYNCED",type="string",JSONPath=".status.conditions[?(@.type=='Synced')].status" +// +kubebuilder:printcolumn:name="READY",type="string",JSONPath=".status.conditions[?(@.type=='Ready')].status" // +kubebuilder:printcolumn:name="EXTERNAL-NAME",type="string",JSONPath=".metadata.annotations.crossplane\\.io/external-name" // +kubebuilder:printcolumn:name="AGE",type="date",JSONPath=".metadata.creationTimestamp" // +kubebuilder:resource:scope=Cluster,categories={crossplane,managed,keycloak} diff --git a/apis/openidclient/v1alpha1/zz_clientgrouppolicy_types.go b/apis/openidclient/v1alpha1/zz_clientgrouppolicy_types.go index 2a878b6..edcc19c 100755 --- a/apis/openidclient/v1alpha1/zz_clientgrouppolicy_types.go +++ b/apis/openidclient/v1alpha1/zz_clientgrouppolicy_types.go @@ -152,8 +152,8 @@ type ClientGroupPolicyStatus struct { // +kubebuilder:storageversion // ClientGroupPolicy is the Schema for the ClientGroupPolicys API. -// +kubebuilder:printcolumn:name="READY",type="string",JSONPath=".status.conditions[?(@.type=='Ready')].status" // +kubebuilder:printcolumn:name="SYNCED",type="string",JSONPath=".status.conditions[?(@.type=='Synced')].status" +// +kubebuilder:printcolumn:name="READY",type="string",JSONPath=".status.conditions[?(@.type=='Ready')].status" // +kubebuilder:printcolumn:name="EXTERNAL-NAME",type="string",JSONPath=".metadata.annotations.crossplane\\.io/external-name" // +kubebuilder:printcolumn:name="AGE",type="date",JSONPath=".metadata.creationTimestamp" // +kubebuilder:resource:scope=Cluster,categories={crossplane,managed,keycloak} diff --git a/apis/openidclient/v1alpha1/zz_clientpermissions_types.go b/apis/openidclient/v1alpha1/zz_clientpermissions_types.go index a6a3c1e..f330492 100755 --- a/apis/openidclient/v1alpha1/zz_clientpermissions_types.go +++ b/apis/openidclient/v1alpha1/zz_clientpermissions_types.go @@ -458,8 +458,8 @@ type ClientPermissionsStatus struct { // +kubebuilder:storageversion // ClientPermissions is the Schema for the ClientPermissionss API. -// +kubebuilder:printcolumn:name="READY",type="string",JSONPath=".status.conditions[?(@.type=='Ready')].status" // +kubebuilder:printcolumn:name="SYNCED",type="string",JSONPath=".status.conditions[?(@.type=='Synced')].status" +// +kubebuilder:printcolumn:name="READY",type="string",JSONPath=".status.conditions[?(@.type=='Ready')].status" // +kubebuilder:printcolumn:name="EXTERNAL-NAME",type="string",JSONPath=".metadata.annotations.crossplane\\.io/external-name" // +kubebuilder:printcolumn:name="AGE",type="date",JSONPath=".metadata.creationTimestamp" // +kubebuilder:resource:scope=Cluster,categories={crossplane,managed,keycloak} diff --git a/apis/openidclient/v1alpha1/zz_clientrolepolicy_types.go b/apis/openidclient/v1alpha1/zz_clientrolepolicy_types.go index dc1786b..8902f55 100755 --- a/apis/openidclient/v1alpha1/zz_clientrolepolicy_types.go +++ b/apis/openidclient/v1alpha1/zz_clientrolepolicy_types.go @@ -145,8 +145,8 @@ type ClientRolePolicyStatus struct { // +kubebuilder:storageversion // ClientRolePolicy is the Schema for the ClientRolePolicys API. -// +kubebuilder:printcolumn:name="READY",type="string",JSONPath=".status.conditions[?(@.type=='Ready')].status" // +kubebuilder:printcolumn:name="SYNCED",type="string",JSONPath=".status.conditions[?(@.type=='Synced')].status" +// +kubebuilder:printcolumn:name="READY",type="string",JSONPath=".status.conditions[?(@.type=='Ready')].status" // +kubebuilder:printcolumn:name="EXTERNAL-NAME",type="string",JSONPath=".metadata.annotations.crossplane\\.io/external-name" // +kubebuilder:printcolumn:name="AGE",type="date",JSONPath=".metadata.creationTimestamp" // +kubebuilder:resource:scope=Cluster,categories={crossplane,managed,keycloak} diff --git a/apis/openidclient/v1alpha1/zz_clientscope_types.go b/apis/openidclient/v1alpha1/zz_clientscope_types.go index 8a48360..025dac3 100755 --- a/apis/openidclient/v1alpha1/zz_clientscope_types.go +++ b/apis/openidclient/v1alpha1/zz_clientscope_types.go @@ -130,8 +130,8 @@ type ClientScopeStatus struct { // +kubebuilder:storageversion // ClientScope is the Schema for the ClientScopes API. -// +kubebuilder:printcolumn:name="READY",type="string",JSONPath=".status.conditions[?(@.type=='Ready')].status" // +kubebuilder:printcolumn:name="SYNCED",type="string",JSONPath=".status.conditions[?(@.type=='Synced')].status" +// +kubebuilder:printcolumn:name="READY",type="string",JSONPath=".status.conditions[?(@.type=='Ready')].status" // +kubebuilder:printcolumn:name="EXTERNAL-NAME",type="string",JSONPath=".metadata.annotations.crossplane\\.io/external-name" // +kubebuilder:printcolumn:name="AGE",type="date",JSONPath=".metadata.creationTimestamp" // +kubebuilder:resource:scope=Cluster,categories={crossplane,managed,keycloak} diff --git a/apis/openidclient/v1alpha1/zz_clientserviceaccountrealmrole_types.go b/apis/openidclient/v1alpha1/zz_clientserviceaccountrealmrole_types.go index 23bdc8c..ce4891f 100755 --- a/apis/openidclient/v1alpha1/zz_clientserviceaccountrealmrole_types.go +++ b/apis/openidclient/v1alpha1/zz_clientserviceaccountrealmrole_types.go @@ -123,8 +123,8 @@ type ClientServiceAccountRealmRoleStatus struct { // +kubebuilder:storageversion // ClientServiceAccountRealmRole is the Schema for the ClientServiceAccountRealmRoles API. -// +kubebuilder:printcolumn:name="READY",type="string",JSONPath=".status.conditions[?(@.type=='Ready')].status" // +kubebuilder:printcolumn:name="SYNCED",type="string",JSONPath=".status.conditions[?(@.type=='Synced')].status" +// +kubebuilder:printcolumn:name="READY",type="string",JSONPath=".status.conditions[?(@.type=='Ready')].status" // +kubebuilder:printcolumn:name="EXTERNAL-NAME",type="string",JSONPath=".metadata.annotations.crossplane\\.io/external-name" // +kubebuilder:printcolumn:name="AGE",type="date",JSONPath=".metadata.creationTimestamp" // +kubebuilder:resource:scope=Cluster,categories={crossplane,managed,keycloak} diff --git a/apis/openidclient/v1alpha1/zz_clientserviceaccountrole_types.go b/apis/openidclient/v1alpha1/zz_clientserviceaccountrole_types.go index e194fe9..7cfe1ee 100755 --- a/apis/openidclient/v1alpha1/zz_clientserviceaccountrole_types.go +++ b/apis/openidclient/v1alpha1/zz_clientserviceaccountrole_types.go @@ -152,8 +152,8 @@ type ClientServiceAccountRoleStatus struct { // +kubebuilder:storageversion // ClientServiceAccountRole is the Schema for the ClientServiceAccountRoles API. -// +kubebuilder:printcolumn:name="READY",type="string",JSONPath=".status.conditions[?(@.type=='Ready')].status" // +kubebuilder:printcolumn:name="SYNCED",type="string",JSONPath=".status.conditions[?(@.type=='Synced')].status" +// +kubebuilder:printcolumn:name="READY",type="string",JSONPath=".status.conditions[?(@.type=='Ready')].status" // +kubebuilder:printcolumn:name="EXTERNAL-NAME",type="string",JSONPath=".metadata.annotations.crossplane\\.io/external-name" // +kubebuilder:printcolumn:name="AGE",type="date",JSONPath=".metadata.creationTimestamp" // +kubebuilder:resource:scope=Cluster,categories={crossplane,managed,keycloak} diff --git a/apis/openidclient/v1alpha1/zz_clientuserpolicy_types.go b/apis/openidclient/v1alpha1/zz_clientuserpolicy_types.go index e315772..4ce193c 100755 --- a/apis/openidclient/v1alpha1/zz_clientuserpolicy_types.go +++ b/apis/openidclient/v1alpha1/zz_clientuserpolicy_types.go @@ -120,8 +120,8 @@ type ClientUserPolicyStatus struct { // +kubebuilder:storageversion // ClientUserPolicy is the Schema for the ClientUserPolicys API. -// +kubebuilder:printcolumn:name="READY",type="string",JSONPath=".status.conditions[?(@.type=='Ready')].status" // +kubebuilder:printcolumn:name="SYNCED",type="string",JSONPath=".status.conditions[?(@.type=='Synced')].status" +// +kubebuilder:printcolumn:name="READY",type="string",JSONPath=".status.conditions[?(@.type=='Ready')].status" // +kubebuilder:printcolumn:name="EXTERNAL-NAME",type="string",JSONPath=".metadata.annotations.crossplane\\.io/external-name" // +kubebuilder:printcolumn:name="AGE",type="date",JSONPath=".metadata.creationTimestamp" // +kubebuilder:resource:scope=Cluster,categories={crossplane,managed,keycloak} diff --git a/apis/openidclient/v1alpha1/zz_generated.deepcopy.go b/apis/openidclient/v1alpha1/zz_generated.deepcopy.go index 8ff10f2..cbbb514 100644 --- a/apis/openidclient/v1alpha1/zz_generated.deepcopy.go +++ b/apis/openidclient/v1alpha1/zz_generated.deepcopy.go @@ -1126,6 +1126,11 @@ func (in *ClientInitParameters) DeepCopyInto(out *ClientInitParameters) { *out = new(string) **out = **in } + if in.ClientSecretSecretRef != nil { + in, out := &in.ClientSecretSecretRef, &out.ClientSecretSecretRef + *out = new(v1.SecretKeySelector) + **out = **in + } if in.ClientSessionIdleTimeout != nil { in, out := &in.ClientSessionIdleTimeout, &out.ClientSessionIdleTimeout *out = new(string) diff --git a/apis/openidgroup/v1alpha1/zz_groupmembershipprotocolmapper_types.go b/apis/openidgroup/v1alpha1/zz_groupmembershipprotocolmapper_types.go index d5333bf..9b1d6b7 100755 --- a/apis/openidgroup/v1alpha1/zz_groupmembershipprotocolmapper_types.go +++ b/apis/openidgroup/v1alpha1/zz_groupmembershipprotocolmapper_types.go @@ -208,8 +208,8 @@ type GroupMembershipProtocolMapperStatus struct { // +kubebuilder:storageversion // GroupMembershipProtocolMapper is the Schema for the GroupMembershipProtocolMappers API. -// +kubebuilder:printcolumn:name="READY",type="string",JSONPath=".status.conditions[?(@.type=='Ready')].status" // +kubebuilder:printcolumn:name="SYNCED",type="string",JSONPath=".status.conditions[?(@.type=='Synced')].status" +// +kubebuilder:printcolumn:name="READY",type="string",JSONPath=".status.conditions[?(@.type=='Ready')].status" // +kubebuilder:printcolumn:name="EXTERNAL-NAME",type="string",JSONPath=".metadata.annotations.crossplane\\.io/external-name" // +kubebuilder:printcolumn:name="AGE",type="date",JSONPath=".metadata.creationTimestamp" // +kubebuilder:resource:scope=Cluster,categories={crossplane,managed,keycloak} diff --git a/apis/realm/v1alpha1/zz_generated.conversion_hubs.go b/apis/realm/v1alpha1/zz_generated.conversion_hubs.go index b716fbd..060751d 100755 --- a/apis/realm/v1alpha1/zz_generated.conversion_hubs.go +++ b/apis/realm/v1alpha1/zz_generated.conversion_hubs.go @@ -7,10 +7,10 @@ Copyright 2022 Upbound Inc. package v1alpha1 // Hub marks this type as a conversion hub. -func (tr *Realm) Hub() {} +func (tr *KeystoreRsa) Hub() {} // Hub marks this type as a conversion hub. -func (tr *KeystoreRsa) Hub() {} +func (tr *Realm) Hub() {} // Hub marks this type as a conversion hub. func (tr *RequiredAction) Hub() {} diff --git a/apis/realm/v1alpha1/zz_generated.deepcopy.go b/apis/realm/v1alpha1/zz_generated.deepcopy.go index 44ed757..5ebcb2d 100644 --- a/apis/realm/v1alpha1/zz_generated.deepcopy.go +++ b/apis/realm/v1alpha1/zz_generated.deepcopy.go @@ -16,6 +16,7 @@ import ( // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *AuthInitParameters) DeepCopyInto(out *AuthInitParameters) { *out = *in + out.PasswordSecretRef = in.PasswordSecretRef if in.Username != nil { in, out := &in.Username, &out.Username *out = new(string) @@ -522,6 +523,7 @@ func (in *KeystoreRsaInitParameters) DeepCopyInto(out *KeystoreRsaInitParameters *out = new(string) **out = **in } + out.CertificateSecretRef = in.CertificateSecretRef if in.Enabled != nil { in, out := &in.Enabled, &out.Enabled *out = new(bool) @@ -537,6 +539,7 @@ func (in *KeystoreRsaInitParameters) DeepCopyInto(out *KeystoreRsaInitParameters *out = new(float64) **out = **in } + out.PrivateKeySecretRef = in.PrivateKeySecretRef if in.ProviderID != nil { in, out := &in.ProviderID, &out.ProviderID *out = new(string) diff --git a/apis/realm/v1alpha1/zz_keystorersa_terraformed.go b/apis/realm/v1alpha1/zz_keystorersa_terraformed.go index 808a693..1aaf0cb 100755 --- a/apis/realm/v1alpha1/zz_keystorersa_terraformed.go +++ b/apis/realm/v1alpha1/zz_keystorersa_terraformed.go @@ -21,7 +21,7 @@ func (mg *KeystoreRsa) GetTerraformResourceType() string { // GetConnectionDetailsMapping for this KeystoreRsa func (tr *KeystoreRsa) GetConnectionDetailsMapping() map[string]string { - return map[string]string{"certificate": "spec.forProvider.certificateSecretRef", "private_key": "spec.forProvider.privateKeySecretRef"} + return map[string]string{"certificate": "certificateSecretRef", "private_key": "privateKeySecretRef"} } // GetObservation of this KeystoreRsa diff --git a/apis/realm/v1alpha1/zz_keystorersa_types.go b/apis/realm/v1alpha1/zz_keystorersa_types.go index 557a9e6..bbe8b35 100755 --- a/apis/realm/v1alpha1/zz_keystorersa_types.go +++ b/apis/realm/v1alpha1/zz_keystorersa_types.go @@ -23,6 +23,10 @@ type KeystoreRsaInitParameters struct { // Intended algorithm for the key Algorithm *string `json:"algorithm,omitempty" tf:"algorithm,omitempty"` + // X509 Certificate encoded in PEM format. + // X509 Certificate encoded in PEM format + CertificateSecretRef v1.SecretKeySelector `json:"certificateSecretRef" tf:"-"` + // When false, key is not accessible in this realm. Defaults to true. // Set if the keys are enabled Enabled *bool `json:"enabled,omitempty" tf:"enabled,omitempty"` @@ -35,6 +39,10 @@ type KeystoreRsaInitParameters struct { // Priority for the provider Priority *float64 `json:"priority,omitempty" tf:"priority,omitempty"` + // Private RSA Key encoded in PEM format. + // Private RSA Key encoded in PEM format + PrivateKeySecretRef v1.SecretKeySelector `json:"privateKeySecretRef" tf:"-"` + // Use rsa for signing keys, rsa-enc for encryption keys // RSA key provider id ProviderID *string `json:"providerId,omitempty" tf:"provider_id,omitempty"` @@ -168,8 +176,8 @@ type KeystoreRsaStatus struct { // +kubebuilder:storageversion // KeystoreRsa is the Schema for the KeystoreRsas API. -// +kubebuilder:printcolumn:name="READY",type="string",JSONPath=".status.conditions[?(@.type=='Ready')].status" // +kubebuilder:printcolumn:name="SYNCED",type="string",JSONPath=".status.conditions[?(@.type=='Synced')].status" +// +kubebuilder:printcolumn:name="READY",type="string",JSONPath=".status.conditions[?(@.type=='Ready')].status" // +kubebuilder:printcolumn:name="EXTERNAL-NAME",type="string",JSONPath=".metadata.annotations.crossplane\\.io/external-name" // +kubebuilder:printcolumn:name="AGE",type="date",JSONPath=".metadata.creationTimestamp" // +kubebuilder:resource:scope=Cluster,categories={crossplane,managed,keycloak} diff --git a/apis/realm/v1alpha1/zz_realm_terraformed.go b/apis/realm/v1alpha1/zz_realm_terraformed.go index 48ad2c2..e08bc3d 100755 --- a/apis/realm/v1alpha1/zz_realm_terraformed.go +++ b/apis/realm/v1alpha1/zz_realm_terraformed.go @@ -21,7 +21,7 @@ func (mg *Realm) GetTerraformResourceType() string { // GetConnectionDetailsMapping for this Realm func (tr *Realm) GetConnectionDetailsMapping() map[string]string { - return map[string]string{"smtp_server[*].auth[*].password": "spec.forProvider.smtpServer[*].auth[*].passwordSecretRef"} + return map[string]string{"smtp_server[*].auth[*].password": "smtpServer[*].auth[*].passwordSecretRef"} } // GetObservation of this Realm diff --git a/apis/realm/v1alpha1/zz_realm_types.go b/apis/realm/v1alpha1/zz_realm_types.go index a020a8f..1a341f9 100755 --- a/apis/realm/v1alpha1/zz_realm_types.go +++ b/apis/realm/v1alpha1/zz_realm_types.go @@ -15,6 +15,9 @@ import ( type AuthInitParameters struct { + // The SMTP server password. + PasswordSecretRef v1.SecretKeySelector `json:"passwordSecretRef" tf:"-"` + // The SMTP server username. Username *string `json:"username,omitempty" tf:"username,omitempty"` } @@ -28,7 +31,7 @@ type AuthObservation struct { type AuthParameters struct { // The SMTP server password. - // +kubebuilder:validation:Required + // +kubebuilder:validation:Optional PasswordSecretRef v1.SecretKeySelector `json:"passwordSecretRef" tf:"-"` // The SMTP server username. @@ -1318,8 +1321,8 @@ type RealmStatus struct { // +kubebuilder:storageversion // Realm is the Schema for the Realms API. -// +kubebuilder:printcolumn:name="READY",type="string",JSONPath=".status.conditions[?(@.type=='Ready')].status" // +kubebuilder:printcolumn:name="SYNCED",type="string",JSONPath=".status.conditions[?(@.type=='Synced')].status" +// +kubebuilder:printcolumn:name="READY",type="string",JSONPath=".status.conditions[?(@.type=='Ready')].status" // +kubebuilder:printcolumn:name="EXTERNAL-NAME",type="string",JSONPath=".metadata.annotations.crossplane\\.io/external-name" // +kubebuilder:printcolumn:name="AGE",type="date",JSONPath=".metadata.creationTimestamp" // +kubebuilder:resource:scope=Cluster,categories={crossplane,managed,keycloak} diff --git a/apis/realm/v1alpha1/zz_requiredaction_types.go b/apis/realm/v1alpha1/zz_requiredaction_types.go index 60f4823..67236e4 100755 --- a/apis/realm/v1alpha1/zz_requiredaction_types.go +++ b/apis/realm/v1alpha1/zz_requiredaction_types.go @@ -130,8 +130,8 @@ type RequiredActionStatus struct { // +kubebuilder:storageversion // RequiredAction is the Schema for the RequiredActions API. -// +kubebuilder:printcolumn:name="READY",type="string",JSONPath=".status.conditions[?(@.type=='Ready')].status" // +kubebuilder:printcolumn:name="SYNCED",type="string",JSONPath=".status.conditions[?(@.type=='Synced')].status" +// +kubebuilder:printcolumn:name="READY",type="string",JSONPath=".status.conditions[?(@.type=='Ready')].status" // +kubebuilder:printcolumn:name="EXTERNAL-NAME",type="string",JSONPath=".metadata.annotations.crossplane\\.io/external-name" // +kubebuilder:printcolumn:name="AGE",type="date",JSONPath=".metadata.creationTimestamp" // +kubebuilder:resource:scope=Cluster,categories={crossplane,managed,keycloak} diff --git a/apis/role/v1alpha1/zz_role_types.go b/apis/role/v1alpha1/zz_role_types.go index 670c0f9..ac913d5 100755 --- a/apis/role/v1alpha1/zz_role_types.go +++ b/apis/role/v1alpha1/zz_role_types.go @@ -172,8 +172,8 @@ type RoleStatus struct { // +kubebuilder:storageversion // Role is the Schema for the Roles API. -// +kubebuilder:printcolumn:name="READY",type="string",JSONPath=".status.conditions[?(@.type=='Ready')].status" // +kubebuilder:printcolumn:name="SYNCED",type="string",JSONPath=".status.conditions[?(@.type=='Synced')].status" +// +kubebuilder:printcolumn:name="READY",type="string",JSONPath=".status.conditions[?(@.type=='Ready')].status" // +kubebuilder:printcolumn:name="EXTERNAL-NAME",type="string",JSONPath=".metadata.annotations.crossplane\\.io/external-name" // +kubebuilder:printcolumn:name="AGE",type="date",JSONPath=".metadata.creationTimestamp" // +kubebuilder:resource:scope=Cluster,categories={crossplane,managed,keycloak} diff --git a/apis/saml/v1alpha1/zz_identityprovider_types.go b/apis/saml/v1alpha1/zz_identityprovider_types.go index bbce23b..18c3aea 100755 --- a/apis/saml/v1alpha1/zz_identityprovider_types.go +++ b/apis/saml/v1alpha1/zz_identityprovider_types.go @@ -551,8 +551,8 @@ type IdentityProviderStatus struct { // +kubebuilder:storageversion // IdentityProvider is the Schema for the IdentityProviders API. -// +kubebuilder:printcolumn:name="READY",type="string",JSONPath=".status.conditions[?(@.type=='Ready')].status" // +kubebuilder:printcolumn:name="SYNCED",type="string",JSONPath=".status.conditions[?(@.type=='Synced')].status" +// +kubebuilder:printcolumn:name="READY",type="string",JSONPath=".status.conditions[?(@.type=='Ready')].status" // +kubebuilder:printcolumn:name="EXTERNAL-NAME",type="string",JSONPath=".metadata.annotations.crossplane\\.io/external-name" // +kubebuilder:printcolumn:name="AGE",type="date",JSONPath=".metadata.creationTimestamp" // +kubebuilder:resource:scope=Cluster,categories={crossplane,managed,keycloak} diff --git a/apis/samlclient/v1alpha1/zz_client_types.go b/apis/samlclient/v1alpha1/zz_client_types.go index f67ab4d..c113c89 100755 --- a/apis/samlclient/v1alpha1/zz_client_types.go +++ b/apis/samlclient/v1alpha1/zz_client_types.go @@ -472,8 +472,8 @@ type ClientStatus struct { // +kubebuilder:storageversion // Client is the Schema for the Clients API. -// +kubebuilder:printcolumn:name="READY",type="string",JSONPath=".status.conditions[?(@.type=='Ready')].status" // +kubebuilder:printcolumn:name="SYNCED",type="string",JSONPath=".status.conditions[?(@.type=='Synced')].status" +// +kubebuilder:printcolumn:name="READY",type="string",JSONPath=".status.conditions[?(@.type=='Ready')].status" // +kubebuilder:printcolumn:name="EXTERNAL-NAME",type="string",JSONPath=".metadata.annotations.crossplane\\.io/external-name" // +kubebuilder:printcolumn:name="AGE",type="date",JSONPath=".metadata.creationTimestamp" // +kubebuilder:resource:scope=Cluster,categories={crossplane,managed,keycloak} diff --git a/apis/samlclient/v1alpha1/zz_clientdefaultscopes_types.go b/apis/samlclient/v1alpha1/zz_clientdefaultscopes_types.go index ff5e14a..80b69ea 100755 --- a/apis/samlclient/v1alpha1/zz_clientdefaultscopes_types.go +++ b/apis/samlclient/v1alpha1/zz_clientdefaultscopes_types.go @@ -121,8 +121,8 @@ type ClientDefaultScopesStatus struct { // +kubebuilder:storageversion // ClientDefaultScopes is the Schema for the ClientDefaultScopess API. -// +kubebuilder:printcolumn:name="READY",type="string",JSONPath=".status.conditions[?(@.type=='Ready')].status" // +kubebuilder:printcolumn:name="SYNCED",type="string",JSONPath=".status.conditions[?(@.type=='Synced')].status" +// +kubebuilder:printcolumn:name="READY",type="string",JSONPath=".status.conditions[?(@.type=='Ready')].status" // +kubebuilder:printcolumn:name="EXTERNAL-NAME",type="string",JSONPath=".metadata.annotations.crossplane\\.io/external-name" // +kubebuilder:printcolumn:name="AGE",type="date",JSONPath=".metadata.creationTimestamp" // +kubebuilder:resource:scope=Cluster,categories={crossplane,managed,keycloak} diff --git a/apis/samlclient/v1alpha1/zz_clientscope_types.go b/apis/samlclient/v1alpha1/zz_clientscope_types.go index 73aef13..3d5eaa9 100755 --- a/apis/samlclient/v1alpha1/zz_clientscope_types.go +++ b/apis/samlclient/v1alpha1/zz_clientscope_types.go @@ -120,8 +120,8 @@ type ClientScopeStatus struct { // +kubebuilder:storageversion // ClientScope is the Schema for the ClientScopes API. -// +kubebuilder:printcolumn:name="READY",type="string",JSONPath=".status.conditions[?(@.type=='Ready')].status" // +kubebuilder:printcolumn:name="SYNCED",type="string",JSONPath=".status.conditions[?(@.type=='Synced')].status" +// +kubebuilder:printcolumn:name="READY",type="string",JSONPath=".status.conditions[?(@.type=='Ready')].status" // +kubebuilder:printcolumn:name="EXTERNAL-NAME",type="string",JSONPath=".metadata.annotations.crossplane\\.io/external-name" // +kubebuilder:printcolumn:name="AGE",type="date",JSONPath=".metadata.creationTimestamp" // +kubebuilder:resource:scope=Cluster,categories={crossplane,managed,keycloak} diff --git a/apis/user/v1alpha1/zz_generated.conversion_hubs.go b/apis/user/v1alpha1/zz_generated.conversion_hubs.go index 031c40e..0761493 100755 --- a/apis/user/v1alpha1/zz_generated.conversion_hubs.go +++ b/apis/user/v1alpha1/zz_generated.conversion_hubs.go @@ -6,11 +6,11 @@ Copyright 2022 Upbound Inc. package v1alpha1 -// Hub marks this type as a conversion hub. -func (tr *User) Hub() {} - // Hub marks this type as a conversion hub. func (tr *Groups) Hub() {} // Hub marks this type as a conversion hub. func (tr *Permissions) Hub() {} + +// Hub marks this type as a conversion hub. +func (tr *User) Hub() {} diff --git a/apis/user/v1alpha1/zz_generated.deepcopy.go b/apis/user/v1alpha1/zz_generated.deepcopy.go index 57a0f5e..4571418 100644 --- a/apis/user/v1alpha1/zz_generated.deepcopy.go +++ b/apis/user/v1alpha1/zz_generated.deepcopy.go @@ -505,6 +505,7 @@ func (in *InitialPasswordInitParameters) DeepCopyInto(out *InitialPasswordInitPa *out = new(bool) **out = **in } + out.ValueSecretRef = in.ValueSecretRef } // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new InitialPasswordInitParameters. diff --git a/apis/user/v1alpha1/zz_groups_types.go b/apis/user/v1alpha1/zz_groups_types.go index e242671..da31bd8 100755 --- a/apis/user/v1alpha1/zz_groups_types.go +++ b/apis/user/v1alpha1/zz_groups_types.go @@ -149,8 +149,8 @@ type GroupsStatus struct { // +kubebuilder:storageversion // Groups is the Schema for the Groupss API. -// +kubebuilder:printcolumn:name="READY",type="string",JSONPath=".status.conditions[?(@.type=='Ready')].status" // +kubebuilder:printcolumn:name="SYNCED",type="string",JSONPath=".status.conditions[?(@.type=='Synced')].status" +// +kubebuilder:printcolumn:name="READY",type="string",JSONPath=".status.conditions[?(@.type=='Ready')].status" // +kubebuilder:printcolumn:name="EXTERNAL-NAME",type="string",JSONPath=".metadata.annotations.crossplane\\.io/external-name" // +kubebuilder:printcolumn:name="AGE",type="date",JSONPath=".metadata.creationTimestamp" // +kubebuilder:resource:scope=Cluster,categories={crossplane,managed,keycloak} diff --git a/apis/user/v1alpha1/zz_permissions_types.go b/apis/user/v1alpha1/zz_permissions_types.go index 411106f..90ba641 100755 --- a/apis/user/v1alpha1/zz_permissions_types.go +++ b/apis/user/v1alpha1/zz_permissions_types.go @@ -399,8 +399,8 @@ type PermissionsStatus struct { // +kubebuilder:storageversion // Permissions is the Schema for the Permissionss API. -// +kubebuilder:printcolumn:name="READY",type="string",JSONPath=".status.conditions[?(@.type=='Ready')].status" // +kubebuilder:printcolumn:name="SYNCED",type="string",JSONPath=".status.conditions[?(@.type=='Synced')].status" +// +kubebuilder:printcolumn:name="READY",type="string",JSONPath=".status.conditions[?(@.type=='Ready')].status" // +kubebuilder:printcolumn:name="EXTERNAL-NAME",type="string",JSONPath=".metadata.annotations.crossplane\\.io/external-name" // +kubebuilder:printcolumn:name="AGE",type="date",JSONPath=".metadata.creationTimestamp" // +kubebuilder:resource:scope=Cluster,categories={crossplane,managed,keycloak} diff --git a/apis/user/v1alpha1/zz_user_terraformed.go b/apis/user/v1alpha1/zz_user_terraformed.go index 4c0d1b3..394e125 100755 --- a/apis/user/v1alpha1/zz_user_terraformed.go +++ b/apis/user/v1alpha1/zz_user_terraformed.go @@ -21,7 +21,7 @@ func (mg *User) GetTerraformResourceType() string { // GetConnectionDetailsMapping for this User func (tr *User) GetConnectionDetailsMapping() map[string]string { - return map[string]string{"initial_password[*].value": "spec.forProvider.initialPassword[*].valueSecretRef"} + return map[string]string{"initial_password[*].value": "initialPassword[*].valueSecretRef"} } // GetObservation of this User diff --git a/apis/user/v1alpha1/zz_user_types.go b/apis/user/v1alpha1/zz_user_types.go index f650878..9d2d3f9 100755 --- a/apis/user/v1alpha1/zz_user_types.go +++ b/apis/user/v1alpha1/zz_user_types.go @@ -56,6 +56,9 @@ type InitialPasswordInitParameters struct { // If set to true, the initial password is set up for renewal on first use. Default to false. Temporary *bool `json:"temporary,omitempty" tf:"temporary,omitempty"` + + // The initial password. + ValueSecretRef v1.SecretKeySelector `json:"valueSecretRef" tf:"-"` } type InitialPasswordObservation struct { @@ -71,7 +74,7 @@ type InitialPasswordParameters struct { Temporary *bool `json:"temporary,omitempty" tf:"temporary,omitempty"` // The initial password. - // +kubebuilder:validation:Required + // +kubebuilder:validation:Optional ValueSecretRef v1.SecretKeySelector `json:"valueSecretRef" tf:"-"` } @@ -248,8 +251,8 @@ type UserStatus struct { // +kubebuilder:storageversion // User is the Schema for the Users API. -// +kubebuilder:printcolumn:name="READY",type="string",JSONPath=".status.conditions[?(@.type=='Ready')].status" // +kubebuilder:printcolumn:name="SYNCED",type="string",JSONPath=".status.conditions[?(@.type=='Synced')].status" +// +kubebuilder:printcolumn:name="READY",type="string",JSONPath=".status.conditions[?(@.type=='Ready')].status" // +kubebuilder:printcolumn:name="EXTERNAL-NAME",type="string",JSONPath=".metadata.annotations.crossplane\\.io/external-name" // +kubebuilder:printcolumn:name="AGE",type="date",JSONPath=".metadata.creationTimestamp" // +kubebuilder:resource:scope=Cluster,categories={crossplane,managed,keycloak} diff --git a/go.mod b/go.mod index d53e4b1..769d519 100644 --- a/go.mod +++ b/go.mod @@ -7,7 +7,7 @@ require ( github.com/alecthomas/kingpin/v2 v2.4.0 github.com/crossplane/crossplane-runtime v1.16.0 github.com/crossplane/crossplane-tools v0.0.0-20230925130601-628280f8bf79 - github.com/crossplane/upjet v1.2.4 + github.com/crossplane/upjet v1.4.0 github.com/pkg/errors v0.9.1 k8s.io/apimachinery v0.29.3 k8s.io/client-go v0.29.3 diff --git a/go.sum b/go.sum index 9e39762..03f2faf 100644 --- a/go.sum +++ b/go.sum @@ -34,8 +34,8 @@ github.com/crossplane/crossplane-runtime v1.16.0 h1:lz+l0wEB3qowdTmN7t0PZkfuNSvf github.com/crossplane/crossplane-runtime v1.16.0/go.mod h1:Pz2tdGVMF6KDGzHZOkvKro0nKc8EzK0sb/nSA7pH4Dc= 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.2.4 h1:JRhj4SaKSxXyM6pOYbBKLc0y7wC2D0/WwcqJdNpfhLw= -github.com/crossplane/upjet v1.2.4/go.mod h1:0bHLtnejZ9bDeyXuBb9MSOQLvKo3+aoTeUBO8N0dGSA= +github.com/crossplane/upjet v1.4.0 h1:twKCU8omU7VAA7E5fpbQkqDHjVnoTb8EXqmB805Q37o= +github.com/crossplane/upjet v1.4.0/go.mod h1:3pDVtCgyBc5f2Zx4K5HEPxxhjndmOc5CHCJNpIivK/g= 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= diff --git a/internal/controller/client/protocolmapper/zz_controller.go b/internal/controller/client/protocolmapper/zz_controller.go index 9f8bad6..a052965 100755 --- a/internal/controller/client/protocolmapper/zz_controller.go +++ b/internal/controller/client/protocolmapper/zz_controller.go @@ -14,6 +14,7 @@ import ( "github.com/crossplane/crossplane-runtime/pkg/ratelimiter" "github.com/crossplane/crossplane-runtime/pkg/reconciler/managed" xpresource "github.com/crossplane/crossplane-runtime/pkg/resource" + "github.com/crossplane/crossplane-runtime/pkg/statemetrics" tjcontroller "github.com/crossplane/upjet/pkg/controller" "github.com/crossplane/upjet/pkg/controller/handler" "github.com/crossplane/upjet/pkg/terraform" @@ -52,6 +53,9 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { if o.Features.Enabled(features.EnableBetaManagementPolicies) { opts = append(opts, managed.WithManagementPolicies()) } + if o.MetricOptions != nil { + opts = append(opts, managed.WithMetricRecorder(o.MetricOptions.MRMetrics)) + } // register webhooks for the kind v1alpha1.ProtocolMapper // if they're enabled. @@ -63,6 +67,15 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { } } + if o.MetricOptions != nil && o.MetricOptions.MRStateMetrics != nil { + stateMetricsRecorder := statemetrics.NewMRStateRecorder( + mgr.GetClient(), o.Logger, o.MetricOptions.MRStateMetrics, &v1alpha1.ProtocolMapperList{}, o.MetricOptions.PollStateMetricInterval, + ) + if err := mgr.Add(stateMetricsRecorder); err != nil { + return errors.Wrap(err, "cannot register MR state metrics recorder for kind v1alpha1.ProtocolMapperList") + } + } + r := managed.NewReconciler(mgr, xpresource.ManagedKind(v1alpha1.ProtocolMapper_GroupVersionKind), opts...) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/client/rolemapper/zz_controller.go b/internal/controller/client/rolemapper/zz_controller.go index d6c8921..fc4ad96 100755 --- a/internal/controller/client/rolemapper/zz_controller.go +++ b/internal/controller/client/rolemapper/zz_controller.go @@ -14,6 +14,7 @@ import ( "github.com/crossplane/crossplane-runtime/pkg/ratelimiter" "github.com/crossplane/crossplane-runtime/pkg/reconciler/managed" xpresource "github.com/crossplane/crossplane-runtime/pkg/resource" + "github.com/crossplane/crossplane-runtime/pkg/statemetrics" tjcontroller "github.com/crossplane/upjet/pkg/controller" "github.com/crossplane/upjet/pkg/controller/handler" "github.com/crossplane/upjet/pkg/terraform" @@ -52,6 +53,9 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { if o.Features.Enabled(features.EnableBetaManagementPolicies) { opts = append(opts, managed.WithManagementPolicies()) } + if o.MetricOptions != nil { + opts = append(opts, managed.WithMetricRecorder(o.MetricOptions.MRMetrics)) + } // register webhooks for the kind v1alpha1.RoleMapper // if they're enabled. @@ -63,6 +67,15 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { } } + if o.MetricOptions != nil && o.MetricOptions.MRStateMetrics != nil { + stateMetricsRecorder := statemetrics.NewMRStateRecorder( + mgr.GetClient(), o.Logger, o.MetricOptions.MRStateMetrics, &v1alpha1.RoleMapperList{}, o.MetricOptions.PollStateMetricInterval, + ) + if err := mgr.Add(stateMetricsRecorder); err != nil { + return errors.Wrap(err, "cannot register MR state metrics recorder for kind v1alpha1.RoleMapperList") + } + } + r := managed.NewReconciler(mgr, xpresource.ManagedKind(v1alpha1.RoleMapper_GroupVersionKind), opts...) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/defaults/defaultgroups/zz_controller.go b/internal/controller/defaults/defaultgroups/zz_controller.go index d4926f1..a659e9c 100755 --- a/internal/controller/defaults/defaultgroups/zz_controller.go +++ b/internal/controller/defaults/defaultgroups/zz_controller.go @@ -14,6 +14,7 @@ import ( "github.com/crossplane/crossplane-runtime/pkg/ratelimiter" "github.com/crossplane/crossplane-runtime/pkg/reconciler/managed" xpresource "github.com/crossplane/crossplane-runtime/pkg/resource" + "github.com/crossplane/crossplane-runtime/pkg/statemetrics" tjcontroller "github.com/crossplane/upjet/pkg/controller" "github.com/crossplane/upjet/pkg/controller/handler" "github.com/crossplane/upjet/pkg/terraform" @@ -52,6 +53,9 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { if o.Features.Enabled(features.EnableBetaManagementPolicies) { opts = append(opts, managed.WithManagementPolicies()) } + if o.MetricOptions != nil { + opts = append(opts, managed.WithMetricRecorder(o.MetricOptions.MRMetrics)) + } // register webhooks for the kind v1alpha1.DefaultGroups // if they're enabled. @@ -63,6 +67,15 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { } } + if o.MetricOptions != nil && o.MetricOptions.MRStateMetrics != nil { + stateMetricsRecorder := statemetrics.NewMRStateRecorder( + mgr.GetClient(), o.Logger, o.MetricOptions.MRStateMetrics, &v1alpha1.DefaultGroupsList{}, o.MetricOptions.PollStateMetricInterval, + ) + if err := mgr.Add(stateMetricsRecorder); err != nil { + return errors.Wrap(err, "cannot register MR state metrics recorder for kind v1alpha1.DefaultGroupsList") + } + } + r := managed.NewReconciler(mgr, xpresource.ManagedKind(v1alpha1.DefaultGroups_GroupVersionKind), opts...) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/defaults/roles/zz_controller.go b/internal/controller/defaults/roles/zz_controller.go index 6ae7a01..0aaf289 100755 --- a/internal/controller/defaults/roles/zz_controller.go +++ b/internal/controller/defaults/roles/zz_controller.go @@ -14,6 +14,7 @@ import ( "github.com/crossplane/crossplane-runtime/pkg/ratelimiter" "github.com/crossplane/crossplane-runtime/pkg/reconciler/managed" xpresource "github.com/crossplane/crossplane-runtime/pkg/resource" + "github.com/crossplane/crossplane-runtime/pkg/statemetrics" tjcontroller "github.com/crossplane/upjet/pkg/controller" "github.com/crossplane/upjet/pkg/controller/handler" "github.com/crossplane/upjet/pkg/terraform" @@ -52,6 +53,9 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { if o.Features.Enabled(features.EnableBetaManagementPolicies) { opts = append(opts, managed.WithManagementPolicies()) } + if o.MetricOptions != nil { + opts = append(opts, managed.WithMetricRecorder(o.MetricOptions.MRMetrics)) + } // register webhooks for the kind v1alpha1.Roles // if they're enabled. @@ -63,6 +67,15 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { } } + if o.MetricOptions != nil && o.MetricOptions.MRStateMetrics != nil { + stateMetricsRecorder := statemetrics.NewMRStateRecorder( + mgr.GetClient(), o.Logger, o.MetricOptions.MRStateMetrics, &v1alpha1.RolesList{}, o.MetricOptions.PollStateMetricInterval, + ) + if err := mgr.Add(stateMetricsRecorder); err != nil { + return errors.Wrap(err, "cannot register MR state metrics recorder for kind v1alpha1.RolesList") + } + } + r := managed.NewReconciler(mgr, xpresource.ManagedKind(v1alpha1.Roles_GroupVersionKind), opts...) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/group/group/zz_controller.go b/internal/controller/group/group/zz_controller.go index bafe3cb..143e145 100755 --- a/internal/controller/group/group/zz_controller.go +++ b/internal/controller/group/group/zz_controller.go @@ -14,6 +14,7 @@ import ( "github.com/crossplane/crossplane-runtime/pkg/ratelimiter" "github.com/crossplane/crossplane-runtime/pkg/reconciler/managed" xpresource "github.com/crossplane/crossplane-runtime/pkg/resource" + "github.com/crossplane/crossplane-runtime/pkg/statemetrics" tjcontroller "github.com/crossplane/upjet/pkg/controller" "github.com/crossplane/upjet/pkg/controller/handler" "github.com/crossplane/upjet/pkg/terraform" @@ -52,6 +53,9 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { if o.Features.Enabled(features.EnableBetaManagementPolicies) { opts = append(opts, managed.WithManagementPolicies()) } + if o.MetricOptions != nil { + opts = append(opts, managed.WithMetricRecorder(o.MetricOptions.MRMetrics)) + } // register webhooks for the kind v1alpha1.Group // if they're enabled. @@ -63,6 +67,15 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { } } + if o.MetricOptions != nil && o.MetricOptions.MRStateMetrics != nil { + stateMetricsRecorder := statemetrics.NewMRStateRecorder( + mgr.GetClient(), o.Logger, o.MetricOptions.MRStateMetrics, &v1alpha1.GroupList{}, o.MetricOptions.PollStateMetricInterval, + ) + if err := mgr.Add(stateMetricsRecorder); err != nil { + return errors.Wrap(err, "cannot register MR state metrics recorder for kind v1alpha1.GroupList") + } + } + r := managed.NewReconciler(mgr, xpresource.ManagedKind(v1alpha1.Group_GroupVersionKind), opts...) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/group/memberships/zz_controller.go b/internal/controller/group/memberships/zz_controller.go index a6f76d6..9c00dee 100755 --- a/internal/controller/group/memberships/zz_controller.go +++ b/internal/controller/group/memberships/zz_controller.go @@ -14,6 +14,7 @@ import ( "github.com/crossplane/crossplane-runtime/pkg/ratelimiter" "github.com/crossplane/crossplane-runtime/pkg/reconciler/managed" xpresource "github.com/crossplane/crossplane-runtime/pkg/resource" + "github.com/crossplane/crossplane-runtime/pkg/statemetrics" tjcontroller "github.com/crossplane/upjet/pkg/controller" "github.com/crossplane/upjet/pkg/controller/handler" "github.com/crossplane/upjet/pkg/terraform" @@ -52,6 +53,9 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { if o.Features.Enabled(features.EnableBetaManagementPolicies) { opts = append(opts, managed.WithManagementPolicies()) } + if o.MetricOptions != nil { + opts = append(opts, managed.WithMetricRecorder(o.MetricOptions.MRMetrics)) + } // register webhooks for the kind v1alpha1.Memberships // if they're enabled. @@ -63,6 +67,15 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { } } + if o.MetricOptions != nil && o.MetricOptions.MRStateMetrics != nil { + stateMetricsRecorder := statemetrics.NewMRStateRecorder( + mgr.GetClient(), o.Logger, o.MetricOptions.MRStateMetrics, &v1alpha1.MembershipsList{}, o.MetricOptions.PollStateMetricInterval, + ) + if err := mgr.Add(stateMetricsRecorder); err != nil { + return errors.Wrap(err, "cannot register MR state metrics recorder for kind v1alpha1.MembershipsList") + } + } + r := managed.NewReconciler(mgr, xpresource.ManagedKind(v1alpha1.Memberships_GroupVersionKind), opts...) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/group/permissions/zz_controller.go b/internal/controller/group/permissions/zz_controller.go index 94abfd9..45fe627 100755 --- a/internal/controller/group/permissions/zz_controller.go +++ b/internal/controller/group/permissions/zz_controller.go @@ -14,6 +14,7 @@ import ( "github.com/crossplane/crossplane-runtime/pkg/ratelimiter" "github.com/crossplane/crossplane-runtime/pkg/reconciler/managed" xpresource "github.com/crossplane/crossplane-runtime/pkg/resource" + "github.com/crossplane/crossplane-runtime/pkg/statemetrics" tjcontroller "github.com/crossplane/upjet/pkg/controller" "github.com/crossplane/upjet/pkg/controller/handler" "github.com/crossplane/upjet/pkg/terraform" @@ -52,6 +53,9 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { if o.Features.Enabled(features.EnableBetaManagementPolicies) { opts = append(opts, managed.WithManagementPolicies()) } + if o.MetricOptions != nil { + opts = append(opts, managed.WithMetricRecorder(o.MetricOptions.MRMetrics)) + } // register webhooks for the kind v1alpha1.Permissions // if they're enabled. @@ -63,6 +67,15 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { } } + if o.MetricOptions != nil && o.MetricOptions.MRStateMetrics != nil { + stateMetricsRecorder := statemetrics.NewMRStateRecorder( + mgr.GetClient(), o.Logger, o.MetricOptions.MRStateMetrics, &v1alpha1.PermissionsList{}, o.MetricOptions.PollStateMetricInterval, + ) + if err := mgr.Add(stateMetricsRecorder); err != nil { + return errors.Wrap(err, "cannot register MR state metrics recorder for kind v1alpha1.PermissionsList") + } + } + r := managed.NewReconciler(mgr, xpresource.ManagedKind(v1alpha1.Permissions_GroupVersionKind), opts...) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/group/roles/zz_controller.go b/internal/controller/group/roles/zz_controller.go index a53ef6f..581d07b 100755 --- a/internal/controller/group/roles/zz_controller.go +++ b/internal/controller/group/roles/zz_controller.go @@ -14,6 +14,7 @@ import ( "github.com/crossplane/crossplane-runtime/pkg/ratelimiter" "github.com/crossplane/crossplane-runtime/pkg/reconciler/managed" xpresource "github.com/crossplane/crossplane-runtime/pkg/resource" + "github.com/crossplane/crossplane-runtime/pkg/statemetrics" tjcontroller "github.com/crossplane/upjet/pkg/controller" "github.com/crossplane/upjet/pkg/controller/handler" "github.com/crossplane/upjet/pkg/terraform" @@ -52,6 +53,9 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { if o.Features.Enabled(features.EnableBetaManagementPolicies) { opts = append(opts, managed.WithManagementPolicies()) } + if o.MetricOptions != nil { + opts = append(opts, managed.WithMetricRecorder(o.MetricOptions.MRMetrics)) + } // register webhooks for the kind v1alpha1.Roles // if they're enabled. @@ -63,6 +67,15 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { } } + if o.MetricOptions != nil && o.MetricOptions.MRStateMetrics != nil { + stateMetricsRecorder := statemetrics.NewMRStateRecorder( + mgr.GetClient(), o.Logger, o.MetricOptions.MRStateMetrics, &v1alpha1.RolesList{}, o.MetricOptions.PollStateMetricInterval, + ) + if err := mgr.Add(stateMetricsRecorder); err != nil { + return errors.Wrap(err, "cannot register MR state metrics recorder for kind v1alpha1.RolesList") + } + } + r := managed.NewReconciler(mgr, xpresource.ManagedKind(v1alpha1.Roles_GroupVersionKind), opts...) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/identityprovider/identityprovidermapper/zz_controller.go b/internal/controller/identityprovider/identityprovidermapper/zz_controller.go index 747a3a4..a4a6e1d 100755 --- a/internal/controller/identityprovider/identityprovidermapper/zz_controller.go +++ b/internal/controller/identityprovider/identityprovidermapper/zz_controller.go @@ -14,6 +14,7 @@ import ( "github.com/crossplane/crossplane-runtime/pkg/ratelimiter" "github.com/crossplane/crossplane-runtime/pkg/reconciler/managed" xpresource "github.com/crossplane/crossplane-runtime/pkg/resource" + "github.com/crossplane/crossplane-runtime/pkg/statemetrics" tjcontroller "github.com/crossplane/upjet/pkg/controller" "github.com/crossplane/upjet/pkg/controller/handler" "github.com/crossplane/upjet/pkg/terraform" @@ -52,6 +53,9 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { if o.Features.Enabled(features.EnableBetaManagementPolicies) { opts = append(opts, managed.WithManagementPolicies()) } + if o.MetricOptions != nil { + opts = append(opts, managed.WithMetricRecorder(o.MetricOptions.MRMetrics)) + } // register webhooks for the kind v1alpha1.IdentityProviderMapper // if they're enabled. @@ -63,6 +67,15 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { } } + if o.MetricOptions != nil && o.MetricOptions.MRStateMetrics != nil { + stateMetricsRecorder := statemetrics.NewMRStateRecorder( + mgr.GetClient(), o.Logger, o.MetricOptions.MRStateMetrics, &v1alpha1.IdentityProviderMapperList{}, o.MetricOptions.PollStateMetricInterval, + ) + if err := mgr.Add(stateMetricsRecorder); err != nil { + return errors.Wrap(err, "cannot register MR state metrics recorder for kind v1alpha1.IdentityProviderMapperList") + } + } + r := managed.NewReconciler(mgr, xpresource.ManagedKind(v1alpha1.IdentityProviderMapper_GroupVersionKind), opts...) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/ldap/custommapper/zz_controller.go b/internal/controller/ldap/custommapper/zz_controller.go index 922057f..df2644b 100755 --- a/internal/controller/ldap/custommapper/zz_controller.go +++ b/internal/controller/ldap/custommapper/zz_controller.go @@ -14,6 +14,7 @@ import ( "github.com/crossplane/crossplane-runtime/pkg/ratelimiter" "github.com/crossplane/crossplane-runtime/pkg/reconciler/managed" xpresource "github.com/crossplane/crossplane-runtime/pkg/resource" + "github.com/crossplane/crossplane-runtime/pkg/statemetrics" tjcontroller "github.com/crossplane/upjet/pkg/controller" "github.com/crossplane/upjet/pkg/controller/handler" "github.com/crossplane/upjet/pkg/terraform" @@ -52,6 +53,9 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { if o.Features.Enabled(features.EnableBetaManagementPolicies) { opts = append(opts, managed.WithManagementPolicies()) } + if o.MetricOptions != nil { + opts = append(opts, managed.WithMetricRecorder(o.MetricOptions.MRMetrics)) + } // register webhooks for the kind v1alpha1.CustomMapper // if they're enabled. @@ -63,6 +67,15 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { } } + if o.MetricOptions != nil && o.MetricOptions.MRStateMetrics != nil { + stateMetricsRecorder := statemetrics.NewMRStateRecorder( + mgr.GetClient(), o.Logger, o.MetricOptions.MRStateMetrics, &v1alpha1.CustomMapperList{}, o.MetricOptions.PollStateMetricInterval, + ) + if err := mgr.Add(stateMetricsRecorder); err != nil { + return errors.Wrap(err, "cannot register MR state metrics recorder for kind v1alpha1.CustomMapperList") + } + } + r := managed.NewReconciler(mgr, xpresource.ManagedKind(v1alpha1.CustomMapper_GroupVersionKind), opts...) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/ldap/fullnamemapper/zz_controller.go b/internal/controller/ldap/fullnamemapper/zz_controller.go index 441e756..5d9faf0 100755 --- a/internal/controller/ldap/fullnamemapper/zz_controller.go +++ b/internal/controller/ldap/fullnamemapper/zz_controller.go @@ -14,6 +14,7 @@ import ( "github.com/crossplane/crossplane-runtime/pkg/ratelimiter" "github.com/crossplane/crossplane-runtime/pkg/reconciler/managed" xpresource "github.com/crossplane/crossplane-runtime/pkg/resource" + "github.com/crossplane/crossplane-runtime/pkg/statemetrics" tjcontroller "github.com/crossplane/upjet/pkg/controller" "github.com/crossplane/upjet/pkg/controller/handler" "github.com/crossplane/upjet/pkg/terraform" @@ -52,6 +53,9 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { if o.Features.Enabled(features.EnableBetaManagementPolicies) { opts = append(opts, managed.WithManagementPolicies()) } + if o.MetricOptions != nil { + opts = append(opts, managed.WithMetricRecorder(o.MetricOptions.MRMetrics)) + } // register webhooks for the kind v1alpha1.FullNameMapper // if they're enabled. @@ -63,6 +67,15 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { } } + if o.MetricOptions != nil && o.MetricOptions.MRStateMetrics != nil { + stateMetricsRecorder := statemetrics.NewMRStateRecorder( + mgr.GetClient(), o.Logger, o.MetricOptions.MRStateMetrics, &v1alpha1.FullNameMapperList{}, o.MetricOptions.PollStateMetricInterval, + ) + if err := mgr.Add(stateMetricsRecorder); err != nil { + return errors.Wrap(err, "cannot register MR state metrics recorder for kind v1alpha1.FullNameMapperList") + } + } + r := managed.NewReconciler(mgr, xpresource.ManagedKind(v1alpha1.FullNameMapper_GroupVersionKind), opts...) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/ldap/groupmapper/zz_controller.go b/internal/controller/ldap/groupmapper/zz_controller.go index 16130d7..bc41018 100755 --- a/internal/controller/ldap/groupmapper/zz_controller.go +++ b/internal/controller/ldap/groupmapper/zz_controller.go @@ -14,6 +14,7 @@ import ( "github.com/crossplane/crossplane-runtime/pkg/ratelimiter" "github.com/crossplane/crossplane-runtime/pkg/reconciler/managed" xpresource "github.com/crossplane/crossplane-runtime/pkg/resource" + "github.com/crossplane/crossplane-runtime/pkg/statemetrics" tjcontroller "github.com/crossplane/upjet/pkg/controller" "github.com/crossplane/upjet/pkg/controller/handler" "github.com/crossplane/upjet/pkg/terraform" @@ -52,6 +53,9 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { if o.Features.Enabled(features.EnableBetaManagementPolicies) { opts = append(opts, managed.WithManagementPolicies()) } + if o.MetricOptions != nil { + opts = append(opts, managed.WithMetricRecorder(o.MetricOptions.MRMetrics)) + } // register webhooks for the kind v1alpha1.GroupMapper // if they're enabled. @@ -63,6 +67,15 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { } } + if o.MetricOptions != nil && o.MetricOptions.MRStateMetrics != nil { + stateMetricsRecorder := statemetrics.NewMRStateRecorder( + mgr.GetClient(), o.Logger, o.MetricOptions.MRStateMetrics, &v1alpha1.GroupMapperList{}, o.MetricOptions.PollStateMetricInterval, + ) + if err := mgr.Add(stateMetricsRecorder); err != nil { + return errors.Wrap(err, "cannot register MR state metrics recorder for kind v1alpha1.GroupMapperList") + } + } + r := managed.NewReconciler(mgr, xpresource.ManagedKind(v1alpha1.GroupMapper_GroupVersionKind), opts...) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/ldap/hardcodedattributemapper/zz_controller.go b/internal/controller/ldap/hardcodedattributemapper/zz_controller.go index 5566ed9..b57faa9 100755 --- a/internal/controller/ldap/hardcodedattributemapper/zz_controller.go +++ b/internal/controller/ldap/hardcodedattributemapper/zz_controller.go @@ -14,6 +14,7 @@ import ( "github.com/crossplane/crossplane-runtime/pkg/ratelimiter" "github.com/crossplane/crossplane-runtime/pkg/reconciler/managed" xpresource "github.com/crossplane/crossplane-runtime/pkg/resource" + "github.com/crossplane/crossplane-runtime/pkg/statemetrics" tjcontroller "github.com/crossplane/upjet/pkg/controller" "github.com/crossplane/upjet/pkg/controller/handler" "github.com/crossplane/upjet/pkg/terraform" @@ -52,6 +53,9 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { if o.Features.Enabled(features.EnableBetaManagementPolicies) { opts = append(opts, managed.WithManagementPolicies()) } + if o.MetricOptions != nil { + opts = append(opts, managed.WithMetricRecorder(o.MetricOptions.MRMetrics)) + } // register webhooks for the kind v1alpha1.HardcodedAttributeMapper // if they're enabled. @@ -63,6 +67,15 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { } } + if o.MetricOptions != nil && o.MetricOptions.MRStateMetrics != nil { + stateMetricsRecorder := statemetrics.NewMRStateRecorder( + mgr.GetClient(), o.Logger, o.MetricOptions.MRStateMetrics, &v1alpha1.HardcodedAttributeMapperList{}, o.MetricOptions.PollStateMetricInterval, + ) + if err := mgr.Add(stateMetricsRecorder); err != nil { + return errors.Wrap(err, "cannot register MR state metrics recorder for kind v1alpha1.HardcodedAttributeMapperList") + } + } + r := managed.NewReconciler(mgr, xpresource.ManagedKind(v1alpha1.HardcodedAttributeMapper_GroupVersionKind), opts...) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/ldap/hardcodedgroupmapper/zz_controller.go b/internal/controller/ldap/hardcodedgroupmapper/zz_controller.go index ae5ce68..3da63c0 100755 --- a/internal/controller/ldap/hardcodedgroupmapper/zz_controller.go +++ b/internal/controller/ldap/hardcodedgroupmapper/zz_controller.go @@ -14,6 +14,7 @@ import ( "github.com/crossplane/crossplane-runtime/pkg/ratelimiter" "github.com/crossplane/crossplane-runtime/pkg/reconciler/managed" xpresource "github.com/crossplane/crossplane-runtime/pkg/resource" + "github.com/crossplane/crossplane-runtime/pkg/statemetrics" tjcontroller "github.com/crossplane/upjet/pkg/controller" "github.com/crossplane/upjet/pkg/controller/handler" "github.com/crossplane/upjet/pkg/terraform" @@ -52,6 +53,9 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { if o.Features.Enabled(features.EnableBetaManagementPolicies) { opts = append(opts, managed.WithManagementPolicies()) } + if o.MetricOptions != nil { + opts = append(opts, managed.WithMetricRecorder(o.MetricOptions.MRMetrics)) + } // register webhooks for the kind v1alpha1.HardcodedGroupMapper // if they're enabled. @@ -63,6 +67,15 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { } } + if o.MetricOptions != nil && o.MetricOptions.MRStateMetrics != nil { + stateMetricsRecorder := statemetrics.NewMRStateRecorder( + mgr.GetClient(), o.Logger, o.MetricOptions.MRStateMetrics, &v1alpha1.HardcodedGroupMapperList{}, o.MetricOptions.PollStateMetricInterval, + ) + if err := mgr.Add(stateMetricsRecorder); err != nil { + return errors.Wrap(err, "cannot register MR state metrics recorder for kind v1alpha1.HardcodedGroupMapperList") + } + } + r := managed.NewReconciler(mgr, xpresource.ManagedKind(v1alpha1.HardcodedGroupMapper_GroupVersionKind), opts...) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/ldap/hardcodedrolemapper/zz_controller.go b/internal/controller/ldap/hardcodedrolemapper/zz_controller.go index 5dc74e2..ad58771 100755 --- a/internal/controller/ldap/hardcodedrolemapper/zz_controller.go +++ b/internal/controller/ldap/hardcodedrolemapper/zz_controller.go @@ -14,6 +14,7 @@ import ( "github.com/crossplane/crossplane-runtime/pkg/ratelimiter" "github.com/crossplane/crossplane-runtime/pkg/reconciler/managed" xpresource "github.com/crossplane/crossplane-runtime/pkg/resource" + "github.com/crossplane/crossplane-runtime/pkg/statemetrics" tjcontroller "github.com/crossplane/upjet/pkg/controller" "github.com/crossplane/upjet/pkg/controller/handler" "github.com/crossplane/upjet/pkg/terraform" @@ -52,6 +53,9 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { if o.Features.Enabled(features.EnableBetaManagementPolicies) { opts = append(opts, managed.WithManagementPolicies()) } + if o.MetricOptions != nil { + opts = append(opts, managed.WithMetricRecorder(o.MetricOptions.MRMetrics)) + } // register webhooks for the kind v1alpha1.HardcodedRoleMapper // if they're enabled. @@ -63,6 +67,15 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { } } + if o.MetricOptions != nil && o.MetricOptions.MRStateMetrics != nil { + stateMetricsRecorder := statemetrics.NewMRStateRecorder( + mgr.GetClient(), o.Logger, o.MetricOptions.MRStateMetrics, &v1alpha1.HardcodedRoleMapperList{}, o.MetricOptions.PollStateMetricInterval, + ) + if err := mgr.Add(stateMetricsRecorder); err != nil { + return errors.Wrap(err, "cannot register MR state metrics recorder for kind v1alpha1.HardcodedRoleMapperList") + } + } + r := managed.NewReconciler(mgr, xpresource.ManagedKind(v1alpha1.HardcodedRoleMapper_GroupVersionKind), opts...) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/ldap/msadldsuseraccountcontrolmapper/zz_controller.go b/internal/controller/ldap/msadldsuseraccountcontrolmapper/zz_controller.go index 3a069ff..b51fb6a 100755 --- a/internal/controller/ldap/msadldsuseraccountcontrolmapper/zz_controller.go +++ b/internal/controller/ldap/msadldsuseraccountcontrolmapper/zz_controller.go @@ -14,6 +14,7 @@ import ( "github.com/crossplane/crossplane-runtime/pkg/ratelimiter" "github.com/crossplane/crossplane-runtime/pkg/reconciler/managed" xpresource "github.com/crossplane/crossplane-runtime/pkg/resource" + "github.com/crossplane/crossplane-runtime/pkg/statemetrics" tjcontroller "github.com/crossplane/upjet/pkg/controller" "github.com/crossplane/upjet/pkg/controller/handler" "github.com/crossplane/upjet/pkg/terraform" @@ -52,6 +53,9 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { if o.Features.Enabled(features.EnableBetaManagementPolicies) { opts = append(opts, managed.WithManagementPolicies()) } + if o.MetricOptions != nil { + opts = append(opts, managed.WithMetricRecorder(o.MetricOptions.MRMetrics)) + } // register webhooks for the kind v1alpha1.MsadLdsUserAccountControlMapper // if they're enabled. @@ -63,6 +67,15 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { } } + if o.MetricOptions != nil && o.MetricOptions.MRStateMetrics != nil { + stateMetricsRecorder := statemetrics.NewMRStateRecorder( + mgr.GetClient(), o.Logger, o.MetricOptions.MRStateMetrics, &v1alpha1.MsadLdsUserAccountControlMapperList{}, o.MetricOptions.PollStateMetricInterval, + ) + if err := mgr.Add(stateMetricsRecorder); err != nil { + return errors.Wrap(err, "cannot register MR state metrics recorder for kind v1alpha1.MsadLdsUserAccountControlMapperList") + } + } + r := managed.NewReconciler(mgr, xpresource.ManagedKind(v1alpha1.MsadLdsUserAccountControlMapper_GroupVersionKind), opts...) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/ldap/msaduseraccountcontrolmapper/zz_controller.go b/internal/controller/ldap/msaduseraccountcontrolmapper/zz_controller.go index 016fce5..6bd1c24 100755 --- a/internal/controller/ldap/msaduseraccountcontrolmapper/zz_controller.go +++ b/internal/controller/ldap/msaduseraccountcontrolmapper/zz_controller.go @@ -14,6 +14,7 @@ import ( "github.com/crossplane/crossplane-runtime/pkg/ratelimiter" "github.com/crossplane/crossplane-runtime/pkg/reconciler/managed" xpresource "github.com/crossplane/crossplane-runtime/pkg/resource" + "github.com/crossplane/crossplane-runtime/pkg/statemetrics" tjcontroller "github.com/crossplane/upjet/pkg/controller" "github.com/crossplane/upjet/pkg/controller/handler" "github.com/crossplane/upjet/pkg/terraform" @@ -52,6 +53,9 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { if o.Features.Enabled(features.EnableBetaManagementPolicies) { opts = append(opts, managed.WithManagementPolicies()) } + if o.MetricOptions != nil { + opts = append(opts, managed.WithMetricRecorder(o.MetricOptions.MRMetrics)) + } // register webhooks for the kind v1alpha1.MsadUserAccountControlMapper // if they're enabled. @@ -63,6 +67,15 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { } } + if o.MetricOptions != nil && o.MetricOptions.MRStateMetrics != nil { + stateMetricsRecorder := statemetrics.NewMRStateRecorder( + mgr.GetClient(), o.Logger, o.MetricOptions.MRStateMetrics, &v1alpha1.MsadUserAccountControlMapperList{}, o.MetricOptions.PollStateMetricInterval, + ) + if err := mgr.Add(stateMetricsRecorder); err != nil { + return errors.Wrap(err, "cannot register MR state metrics recorder for kind v1alpha1.MsadUserAccountControlMapperList") + } + } + r := managed.NewReconciler(mgr, xpresource.ManagedKind(v1alpha1.MsadUserAccountControlMapper_GroupVersionKind), opts...) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/ldap/rolemapper/zz_controller.go b/internal/controller/ldap/rolemapper/zz_controller.go index 991c808..71e29f5 100755 --- a/internal/controller/ldap/rolemapper/zz_controller.go +++ b/internal/controller/ldap/rolemapper/zz_controller.go @@ -14,6 +14,7 @@ import ( "github.com/crossplane/crossplane-runtime/pkg/ratelimiter" "github.com/crossplane/crossplane-runtime/pkg/reconciler/managed" xpresource "github.com/crossplane/crossplane-runtime/pkg/resource" + "github.com/crossplane/crossplane-runtime/pkg/statemetrics" tjcontroller "github.com/crossplane/upjet/pkg/controller" "github.com/crossplane/upjet/pkg/controller/handler" "github.com/crossplane/upjet/pkg/terraform" @@ -52,6 +53,9 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { if o.Features.Enabled(features.EnableBetaManagementPolicies) { opts = append(opts, managed.WithManagementPolicies()) } + if o.MetricOptions != nil { + opts = append(opts, managed.WithMetricRecorder(o.MetricOptions.MRMetrics)) + } // register webhooks for the kind v1alpha1.RoleMapper // if they're enabled. @@ -63,6 +67,15 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { } } + if o.MetricOptions != nil && o.MetricOptions.MRStateMetrics != nil { + stateMetricsRecorder := statemetrics.NewMRStateRecorder( + mgr.GetClient(), o.Logger, o.MetricOptions.MRStateMetrics, &v1alpha1.RoleMapperList{}, o.MetricOptions.PollStateMetricInterval, + ) + if err := mgr.Add(stateMetricsRecorder); err != nil { + return errors.Wrap(err, "cannot register MR state metrics recorder for kind v1alpha1.RoleMapperList") + } + } + r := managed.NewReconciler(mgr, xpresource.ManagedKind(v1alpha1.RoleMapper_GroupVersionKind), opts...) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/ldap/userattributemapper/zz_controller.go b/internal/controller/ldap/userattributemapper/zz_controller.go index d569ceb..5cb0138 100755 --- a/internal/controller/ldap/userattributemapper/zz_controller.go +++ b/internal/controller/ldap/userattributemapper/zz_controller.go @@ -14,6 +14,7 @@ import ( "github.com/crossplane/crossplane-runtime/pkg/ratelimiter" "github.com/crossplane/crossplane-runtime/pkg/reconciler/managed" xpresource "github.com/crossplane/crossplane-runtime/pkg/resource" + "github.com/crossplane/crossplane-runtime/pkg/statemetrics" tjcontroller "github.com/crossplane/upjet/pkg/controller" "github.com/crossplane/upjet/pkg/controller/handler" "github.com/crossplane/upjet/pkg/terraform" @@ -52,6 +53,9 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { if o.Features.Enabled(features.EnableBetaManagementPolicies) { opts = append(opts, managed.WithManagementPolicies()) } + if o.MetricOptions != nil { + opts = append(opts, managed.WithMetricRecorder(o.MetricOptions.MRMetrics)) + } // register webhooks for the kind v1alpha1.UserAttributeMapper // if they're enabled. @@ -63,6 +67,15 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { } } + if o.MetricOptions != nil && o.MetricOptions.MRStateMetrics != nil { + stateMetricsRecorder := statemetrics.NewMRStateRecorder( + mgr.GetClient(), o.Logger, o.MetricOptions.MRStateMetrics, &v1alpha1.UserAttributeMapperList{}, o.MetricOptions.PollStateMetricInterval, + ) + if err := mgr.Add(stateMetricsRecorder); err != nil { + return errors.Wrap(err, "cannot register MR state metrics recorder for kind v1alpha1.UserAttributeMapperList") + } + } + r := managed.NewReconciler(mgr, xpresource.ManagedKind(v1alpha1.UserAttributeMapper_GroupVersionKind), opts...) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/ldap/userfederation/zz_controller.go b/internal/controller/ldap/userfederation/zz_controller.go index b13ef61..13544d7 100755 --- a/internal/controller/ldap/userfederation/zz_controller.go +++ b/internal/controller/ldap/userfederation/zz_controller.go @@ -14,6 +14,7 @@ import ( "github.com/crossplane/crossplane-runtime/pkg/ratelimiter" "github.com/crossplane/crossplane-runtime/pkg/reconciler/managed" xpresource "github.com/crossplane/crossplane-runtime/pkg/resource" + "github.com/crossplane/crossplane-runtime/pkg/statemetrics" tjcontroller "github.com/crossplane/upjet/pkg/controller" "github.com/crossplane/upjet/pkg/controller/handler" "github.com/crossplane/upjet/pkg/terraform" @@ -52,6 +53,9 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { if o.Features.Enabled(features.EnableBetaManagementPolicies) { opts = append(opts, managed.WithManagementPolicies()) } + if o.MetricOptions != nil { + opts = append(opts, managed.WithMetricRecorder(o.MetricOptions.MRMetrics)) + } // register webhooks for the kind v1alpha1.UserFederation // if they're enabled. @@ -63,6 +67,15 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { } } + if o.MetricOptions != nil && o.MetricOptions.MRStateMetrics != nil { + stateMetricsRecorder := statemetrics.NewMRStateRecorder( + mgr.GetClient(), o.Logger, o.MetricOptions.MRStateMetrics, &v1alpha1.UserFederationList{}, o.MetricOptions.PollStateMetricInterval, + ) + if err := mgr.Add(stateMetricsRecorder); err != nil { + return errors.Wrap(err, "cannot register MR state metrics recorder for kind v1alpha1.UserFederationList") + } + } + r := managed.NewReconciler(mgr, xpresource.ManagedKind(v1alpha1.UserFederation_GroupVersionKind), opts...) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/oidc/identityprovider/zz_controller.go b/internal/controller/oidc/identityprovider/zz_controller.go index 108d589..dd69272 100755 --- a/internal/controller/oidc/identityprovider/zz_controller.go +++ b/internal/controller/oidc/identityprovider/zz_controller.go @@ -14,6 +14,7 @@ import ( "github.com/crossplane/crossplane-runtime/pkg/ratelimiter" "github.com/crossplane/crossplane-runtime/pkg/reconciler/managed" xpresource "github.com/crossplane/crossplane-runtime/pkg/resource" + "github.com/crossplane/crossplane-runtime/pkg/statemetrics" tjcontroller "github.com/crossplane/upjet/pkg/controller" "github.com/crossplane/upjet/pkg/controller/handler" "github.com/crossplane/upjet/pkg/terraform" @@ -52,6 +53,9 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { if o.Features.Enabled(features.EnableBetaManagementPolicies) { opts = append(opts, managed.WithManagementPolicies()) } + if o.MetricOptions != nil { + opts = append(opts, managed.WithMetricRecorder(o.MetricOptions.MRMetrics)) + } // register webhooks for the kind v1alpha1.IdentityProvider // if they're enabled. @@ -63,6 +67,15 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { } } + if o.MetricOptions != nil && o.MetricOptions.MRStateMetrics != nil { + stateMetricsRecorder := statemetrics.NewMRStateRecorder( + mgr.GetClient(), o.Logger, o.MetricOptions.MRStateMetrics, &v1alpha1.IdentityProviderList{}, o.MetricOptions.PollStateMetricInterval, + ) + if err := mgr.Add(stateMetricsRecorder); err != nil { + return errors.Wrap(err, "cannot register MR state metrics recorder for kind v1alpha1.IdentityProviderList") + } + } + r := managed.NewReconciler(mgr, xpresource.ManagedKind(v1alpha1.IdentityProvider_GroupVersionKind), opts...) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/openidclient/client/zz_controller.go b/internal/controller/openidclient/client/zz_controller.go index bc00ceb..7b16b83 100755 --- a/internal/controller/openidclient/client/zz_controller.go +++ b/internal/controller/openidclient/client/zz_controller.go @@ -14,6 +14,7 @@ import ( "github.com/crossplane/crossplane-runtime/pkg/ratelimiter" "github.com/crossplane/crossplane-runtime/pkg/reconciler/managed" xpresource "github.com/crossplane/crossplane-runtime/pkg/resource" + "github.com/crossplane/crossplane-runtime/pkg/statemetrics" tjcontroller "github.com/crossplane/upjet/pkg/controller" "github.com/crossplane/upjet/pkg/controller/handler" "github.com/crossplane/upjet/pkg/terraform" @@ -52,6 +53,9 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { if o.Features.Enabled(features.EnableBetaManagementPolicies) { opts = append(opts, managed.WithManagementPolicies()) } + if o.MetricOptions != nil { + opts = append(opts, managed.WithMetricRecorder(o.MetricOptions.MRMetrics)) + } // register webhooks for the kind v1alpha1.Client // if they're enabled. @@ -63,6 +67,15 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { } } + if o.MetricOptions != nil && o.MetricOptions.MRStateMetrics != nil { + stateMetricsRecorder := statemetrics.NewMRStateRecorder( + mgr.GetClient(), o.Logger, o.MetricOptions.MRStateMetrics, &v1alpha1.ClientList{}, o.MetricOptions.PollStateMetricInterval, + ) + if err := mgr.Add(stateMetricsRecorder); err != nil { + return errors.Wrap(err, "cannot register MR state metrics recorder for kind v1alpha1.ClientList") + } + } + r := managed.NewReconciler(mgr, xpresource.ManagedKind(v1alpha1.Client_GroupVersionKind), opts...) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/openidclient/clientclientpolicy/zz_controller.go b/internal/controller/openidclient/clientclientpolicy/zz_controller.go index 4524737..1810b81 100755 --- a/internal/controller/openidclient/clientclientpolicy/zz_controller.go +++ b/internal/controller/openidclient/clientclientpolicy/zz_controller.go @@ -14,6 +14,7 @@ import ( "github.com/crossplane/crossplane-runtime/pkg/ratelimiter" "github.com/crossplane/crossplane-runtime/pkg/reconciler/managed" xpresource "github.com/crossplane/crossplane-runtime/pkg/resource" + "github.com/crossplane/crossplane-runtime/pkg/statemetrics" tjcontroller "github.com/crossplane/upjet/pkg/controller" "github.com/crossplane/upjet/pkg/controller/handler" "github.com/crossplane/upjet/pkg/terraform" @@ -52,6 +53,9 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { if o.Features.Enabled(features.EnableBetaManagementPolicies) { opts = append(opts, managed.WithManagementPolicies()) } + if o.MetricOptions != nil { + opts = append(opts, managed.WithMetricRecorder(o.MetricOptions.MRMetrics)) + } // register webhooks for the kind v1alpha1.ClientClientPolicy // if they're enabled. @@ -63,6 +67,15 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { } } + if o.MetricOptions != nil && o.MetricOptions.MRStateMetrics != nil { + stateMetricsRecorder := statemetrics.NewMRStateRecorder( + mgr.GetClient(), o.Logger, o.MetricOptions.MRStateMetrics, &v1alpha1.ClientClientPolicyList{}, o.MetricOptions.PollStateMetricInterval, + ) + if err := mgr.Add(stateMetricsRecorder); err != nil { + return errors.Wrap(err, "cannot register MR state metrics recorder for kind v1alpha1.ClientClientPolicyList") + } + } + r := managed.NewReconciler(mgr, xpresource.ManagedKind(v1alpha1.ClientClientPolicy_GroupVersionKind), opts...) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/openidclient/clientdefaultscopes/zz_controller.go b/internal/controller/openidclient/clientdefaultscopes/zz_controller.go index 62eb60a..9c523c9 100755 --- a/internal/controller/openidclient/clientdefaultscopes/zz_controller.go +++ b/internal/controller/openidclient/clientdefaultscopes/zz_controller.go @@ -14,6 +14,7 @@ import ( "github.com/crossplane/crossplane-runtime/pkg/ratelimiter" "github.com/crossplane/crossplane-runtime/pkg/reconciler/managed" xpresource "github.com/crossplane/crossplane-runtime/pkg/resource" + "github.com/crossplane/crossplane-runtime/pkg/statemetrics" tjcontroller "github.com/crossplane/upjet/pkg/controller" "github.com/crossplane/upjet/pkg/controller/handler" "github.com/crossplane/upjet/pkg/terraform" @@ -52,6 +53,9 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { if o.Features.Enabled(features.EnableBetaManagementPolicies) { opts = append(opts, managed.WithManagementPolicies()) } + if o.MetricOptions != nil { + opts = append(opts, managed.WithMetricRecorder(o.MetricOptions.MRMetrics)) + } // register webhooks for the kind v1alpha1.ClientDefaultScopes // if they're enabled. @@ -63,6 +67,15 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { } } + if o.MetricOptions != nil && o.MetricOptions.MRStateMetrics != nil { + stateMetricsRecorder := statemetrics.NewMRStateRecorder( + mgr.GetClient(), o.Logger, o.MetricOptions.MRStateMetrics, &v1alpha1.ClientDefaultScopesList{}, o.MetricOptions.PollStateMetricInterval, + ) + if err := mgr.Add(stateMetricsRecorder); err != nil { + return errors.Wrap(err, "cannot register MR state metrics recorder for kind v1alpha1.ClientDefaultScopesList") + } + } + r := managed.NewReconciler(mgr, xpresource.ManagedKind(v1alpha1.ClientDefaultScopes_GroupVersionKind), opts...) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/openidclient/clientgrouppolicy/zz_controller.go b/internal/controller/openidclient/clientgrouppolicy/zz_controller.go index 40eecb0..ee29b58 100755 --- a/internal/controller/openidclient/clientgrouppolicy/zz_controller.go +++ b/internal/controller/openidclient/clientgrouppolicy/zz_controller.go @@ -14,6 +14,7 @@ import ( "github.com/crossplane/crossplane-runtime/pkg/ratelimiter" "github.com/crossplane/crossplane-runtime/pkg/reconciler/managed" xpresource "github.com/crossplane/crossplane-runtime/pkg/resource" + "github.com/crossplane/crossplane-runtime/pkg/statemetrics" tjcontroller "github.com/crossplane/upjet/pkg/controller" "github.com/crossplane/upjet/pkg/controller/handler" "github.com/crossplane/upjet/pkg/terraform" @@ -52,6 +53,9 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { if o.Features.Enabled(features.EnableBetaManagementPolicies) { opts = append(opts, managed.WithManagementPolicies()) } + if o.MetricOptions != nil { + opts = append(opts, managed.WithMetricRecorder(o.MetricOptions.MRMetrics)) + } // register webhooks for the kind v1alpha1.ClientGroupPolicy // if they're enabled. @@ -63,6 +67,15 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { } } + if o.MetricOptions != nil && o.MetricOptions.MRStateMetrics != nil { + stateMetricsRecorder := statemetrics.NewMRStateRecorder( + mgr.GetClient(), o.Logger, o.MetricOptions.MRStateMetrics, &v1alpha1.ClientGroupPolicyList{}, o.MetricOptions.PollStateMetricInterval, + ) + if err := mgr.Add(stateMetricsRecorder); err != nil { + return errors.Wrap(err, "cannot register MR state metrics recorder for kind v1alpha1.ClientGroupPolicyList") + } + } + r := managed.NewReconciler(mgr, xpresource.ManagedKind(v1alpha1.ClientGroupPolicy_GroupVersionKind), opts...) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/openidclient/clientpermissions/zz_controller.go b/internal/controller/openidclient/clientpermissions/zz_controller.go index ba432d3..d3903c0 100755 --- a/internal/controller/openidclient/clientpermissions/zz_controller.go +++ b/internal/controller/openidclient/clientpermissions/zz_controller.go @@ -14,6 +14,7 @@ import ( "github.com/crossplane/crossplane-runtime/pkg/ratelimiter" "github.com/crossplane/crossplane-runtime/pkg/reconciler/managed" xpresource "github.com/crossplane/crossplane-runtime/pkg/resource" + "github.com/crossplane/crossplane-runtime/pkg/statemetrics" tjcontroller "github.com/crossplane/upjet/pkg/controller" "github.com/crossplane/upjet/pkg/controller/handler" "github.com/crossplane/upjet/pkg/terraform" @@ -52,6 +53,9 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { if o.Features.Enabled(features.EnableBetaManagementPolicies) { opts = append(opts, managed.WithManagementPolicies()) } + if o.MetricOptions != nil { + opts = append(opts, managed.WithMetricRecorder(o.MetricOptions.MRMetrics)) + } // register webhooks for the kind v1alpha1.ClientPermissions // if they're enabled. @@ -63,6 +67,15 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { } } + if o.MetricOptions != nil && o.MetricOptions.MRStateMetrics != nil { + stateMetricsRecorder := statemetrics.NewMRStateRecorder( + mgr.GetClient(), o.Logger, o.MetricOptions.MRStateMetrics, &v1alpha1.ClientPermissionsList{}, o.MetricOptions.PollStateMetricInterval, + ) + if err := mgr.Add(stateMetricsRecorder); err != nil { + return errors.Wrap(err, "cannot register MR state metrics recorder for kind v1alpha1.ClientPermissionsList") + } + } + r := managed.NewReconciler(mgr, xpresource.ManagedKind(v1alpha1.ClientPermissions_GroupVersionKind), opts...) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/openidclient/clientrolepolicy/zz_controller.go b/internal/controller/openidclient/clientrolepolicy/zz_controller.go index 2cc310d..8382855 100755 --- a/internal/controller/openidclient/clientrolepolicy/zz_controller.go +++ b/internal/controller/openidclient/clientrolepolicy/zz_controller.go @@ -14,6 +14,7 @@ import ( "github.com/crossplane/crossplane-runtime/pkg/ratelimiter" "github.com/crossplane/crossplane-runtime/pkg/reconciler/managed" xpresource "github.com/crossplane/crossplane-runtime/pkg/resource" + "github.com/crossplane/crossplane-runtime/pkg/statemetrics" tjcontroller "github.com/crossplane/upjet/pkg/controller" "github.com/crossplane/upjet/pkg/controller/handler" "github.com/crossplane/upjet/pkg/terraform" @@ -52,6 +53,9 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { if o.Features.Enabled(features.EnableBetaManagementPolicies) { opts = append(opts, managed.WithManagementPolicies()) } + if o.MetricOptions != nil { + opts = append(opts, managed.WithMetricRecorder(o.MetricOptions.MRMetrics)) + } // register webhooks for the kind v1alpha1.ClientRolePolicy // if they're enabled. @@ -63,6 +67,15 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { } } + if o.MetricOptions != nil && o.MetricOptions.MRStateMetrics != nil { + stateMetricsRecorder := statemetrics.NewMRStateRecorder( + mgr.GetClient(), o.Logger, o.MetricOptions.MRStateMetrics, &v1alpha1.ClientRolePolicyList{}, o.MetricOptions.PollStateMetricInterval, + ) + if err := mgr.Add(stateMetricsRecorder); err != nil { + return errors.Wrap(err, "cannot register MR state metrics recorder for kind v1alpha1.ClientRolePolicyList") + } + } + r := managed.NewReconciler(mgr, xpresource.ManagedKind(v1alpha1.ClientRolePolicy_GroupVersionKind), opts...) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/openidclient/clientscope/zz_controller.go b/internal/controller/openidclient/clientscope/zz_controller.go index a5af57a..6145851 100755 --- a/internal/controller/openidclient/clientscope/zz_controller.go +++ b/internal/controller/openidclient/clientscope/zz_controller.go @@ -14,6 +14,7 @@ import ( "github.com/crossplane/crossplane-runtime/pkg/ratelimiter" "github.com/crossplane/crossplane-runtime/pkg/reconciler/managed" xpresource "github.com/crossplane/crossplane-runtime/pkg/resource" + "github.com/crossplane/crossplane-runtime/pkg/statemetrics" tjcontroller "github.com/crossplane/upjet/pkg/controller" "github.com/crossplane/upjet/pkg/controller/handler" "github.com/crossplane/upjet/pkg/terraform" @@ -52,6 +53,9 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { if o.Features.Enabled(features.EnableBetaManagementPolicies) { opts = append(opts, managed.WithManagementPolicies()) } + if o.MetricOptions != nil { + opts = append(opts, managed.WithMetricRecorder(o.MetricOptions.MRMetrics)) + } // register webhooks for the kind v1alpha1.ClientScope // if they're enabled. @@ -63,6 +67,15 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { } } + if o.MetricOptions != nil && o.MetricOptions.MRStateMetrics != nil { + stateMetricsRecorder := statemetrics.NewMRStateRecorder( + mgr.GetClient(), o.Logger, o.MetricOptions.MRStateMetrics, &v1alpha1.ClientScopeList{}, o.MetricOptions.PollStateMetricInterval, + ) + if err := mgr.Add(stateMetricsRecorder); err != nil { + return errors.Wrap(err, "cannot register MR state metrics recorder for kind v1alpha1.ClientScopeList") + } + } + r := managed.NewReconciler(mgr, xpresource.ManagedKind(v1alpha1.ClientScope_GroupVersionKind), opts...) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/openidclient/clientserviceaccountrealmrole/zz_controller.go b/internal/controller/openidclient/clientserviceaccountrealmrole/zz_controller.go index 64f536e..6a8b18d 100755 --- a/internal/controller/openidclient/clientserviceaccountrealmrole/zz_controller.go +++ b/internal/controller/openidclient/clientserviceaccountrealmrole/zz_controller.go @@ -14,6 +14,7 @@ import ( "github.com/crossplane/crossplane-runtime/pkg/ratelimiter" "github.com/crossplane/crossplane-runtime/pkg/reconciler/managed" xpresource "github.com/crossplane/crossplane-runtime/pkg/resource" + "github.com/crossplane/crossplane-runtime/pkg/statemetrics" tjcontroller "github.com/crossplane/upjet/pkg/controller" "github.com/crossplane/upjet/pkg/controller/handler" "github.com/crossplane/upjet/pkg/terraform" @@ -52,6 +53,9 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { if o.Features.Enabled(features.EnableBetaManagementPolicies) { opts = append(opts, managed.WithManagementPolicies()) } + if o.MetricOptions != nil { + opts = append(opts, managed.WithMetricRecorder(o.MetricOptions.MRMetrics)) + } // register webhooks for the kind v1alpha1.ClientServiceAccountRealmRole // if they're enabled. @@ -63,6 +67,15 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { } } + if o.MetricOptions != nil && o.MetricOptions.MRStateMetrics != nil { + stateMetricsRecorder := statemetrics.NewMRStateRecorder( + mgr.GetClient(), o.Logger, o.MetricOptions.MRStateMetrics, &v1alpha1.ClientServiceAccountRealmRoleList{}, o.MetricOptions.PollStateMetricInterval, + ) + if err := mgr.Add(stateMetricsRecorder); err != nil { + return errors.Wrap(err, "cannot register MR state metrics recorder for kind v1alpha1.ClientServiceAccountRealmRoleList") + } + } + r := managed.NewReconciler(mgr, xpresource.ManagedKind(v1alpha1.ClientServiceAccountRealmRole_GroupVersionKind), opts...) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/openidclient/clientserviceaccountrole/zz_controller.go b/internal/controller/openidclient/clientserviceaccountrole/zz_controller.go index 52dcab6..b47df3a 100755 --- a/internal/controller/openidclient/clientserviceaccountrole/zz_controller.go +++ b/internal/controller/openidclient/clientserviceaccountrole/zz_controller.go @@ -14,6 +14,7 @@ import ( "github.com/crossplane/crossplane-runtime/pkg/ratelimiter" "github.com/crossplane/crossplane-runtime/pkg/reconciler/managed" xpresource "github.com/crossplane/crossplane-runtime/pkg/resource" + "github.com/crossplane/crossplane-runtime/pkg/statemetrics" tjcontroller "github.com/crossplane/upjet/pkg/controller" "github.com/crossplane/upjet/pkg/controller/handler" "github.com/crossplane/upjet/pkg/terraform" @@ -52,6 +53,9 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { if o.Features.Enabled(features.EnableBetaManagementPolicies) { opts = append(opts, managed.WithManagementPolicies()) } + if o.MetricOptions != nil { + opts = append(opts, managed.WithMetricRecorder(o.MetricOptions.MRMetrics)) + } // register webhooks for the kind v1alpha1.ClientServiceAccountRole // if they're enabled. @@ -63,6 +67,15 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { } } + if o.MetricOptions != nil && o.MetricOptions.MRStateMetrics != nil { + stateMetricsRecorder := statemetrics.NewMRStateRecorder( + mgr.GetClient(), o.Logger, o.MetricOptions.MRStateMetrics, &v1alpha1.ClientServiceAccountRoleList{}, o.MetricOptions.PollStateMetricInterval, + ) + if err := mgr.Add(stateMetricsRecorder); err != nil { + return errors.Wrap(err, "cannot register MR state metrics recorder for kind v1alpha1.ClientServiceAccountRoleList") + } + } + r := managed.NewReconciler(mgr, xpresource.ManagedKind(v1alpha1.ClientServiceAccountRole_GroupVersionKind), opts...) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/openidclient/clientuserpolicy/zz_controller.go b/internal/controller/openidclient/clientuserpolicy/zz_controller.go index e3c6b23..37e23d0 100755 --- a/internal/controller/openidclient/clientuserpolicy/zz_controller.go +++ b/internal/controller/openidclient/clientuserpolicy/zz_controller.go @@ -14,6 +14,7 @@ import ( "github.com/crossplane/crossplane-runtime/pkg/ratelimiter" "github.com/crossplane/crossplane-runtime/pkg/reconciler/managed" xpresource "github.com/crossplane/crossplane-runtime/pkg/resource" + "github.com/crossplane/crossplane-runtime/pkg/statemetrics" tjcontroller "github.com/crossplane/upjet/pkg/controller" "github.com/crossplane/upjet/pkg/controller/handler" "github.com/crossplane/upjet/pkg/terraform" @@ -52,6 +53,9 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { if o.Features.Enabled(features.EnableBetaManagementPolicies) { opts = append(opts, managed.WithManagementPolicies()) } + if o.MetricOptions != nil { + opts = append(opts, managed.WithMetricRecorder(o.MetricOptions.MRMetrics)) + } // register webhooks for the kind v1alpha1.ClientUserPolicy // if they're enabled. @@ -63,6 +67,15 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { } } + if o.MetricOptions != nil && o.MetricOptions.MRStateMetrics != nil { + stateMetricsRecorder := statemetrics.NewMRStateRecorder( + mgr.GetClient(), o.Logger, o.MetricOptions.MRStateMetrics, &v1alpha1.ClientUserPolicyList{}, o.MetricOptions.PollStateMetricInterval, + ) + if err := mgr.Add(stateMetricsRecorder); err != nil { + return errors.Wrap(err, "cannot register MR state metrics recorder for kind v1alpha1.ClientUserPolicyList") + } + } + r := managed.NewReconciler(mgr, xpresource.ManagedKind(v1alpha1.ClientUserPolicy_GroupVersionKind), opts...) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/openidgroup/groupmembershipprotocolmapper/zz_controller.go b/internal/controller/openidgroup/groupmembershipprotocolmapper/zz_controller.go index 2479545..a7b31e8 100755 --- a/internal/controller/openidgroup/groupmembershipprotocolmapper/zz_controller.go +++ b/internal/controller/openidgroup/groupmembershipprotocolmapper/zz_controller.go @@ -14,6 +14,7 @@ import ( "github.com/crossplane/crossplane-runtime/pkg/ratelimiter" "github.com/crossplane/crossplane-runtime/pkg/reconciler/managed" xpresource "github.com/crossplane/crossplane-runtime/pkg/resource" + "github.com/crossplane/crossplane-runtime/pkg/statemetrics" tjcontroller "github.com/crossplane/upjet/pkg/controller" "github.com/crossplane/upjet/pkg/controller/handler" "github.com/crossplane/upjet/pkg/terraform" @@ -52,6 +53,9 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { if o.Features.Enabled(features.EnableBetaManagementPolicies) { opts = append(opts, managed.WithManagementPolicies()) } + if o.MetricOptions != nil { + opts = append(opts, managed.WithMetricRecorder(o.MetricOptions.MRMetrics)) + } // register webhooks for the kind v1alpha1.GroupMembershipProtocolMapper // if they're enabled. @@ -63,6 +67,15 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { } } + if o.MetricOptions != nil && o.MetricOptions.MRStateMetrics != nil { + stateMetricsRecorder := statemetrics.NewMRStateRecorder( + mgr.GetClient(), o.Logger, o.MetricOptions.MRStateMetrics, &v1alpha1.GroupMembershipProtocolMapperList{}, o.MetricOptions.PollStateMetricInterval, + ) + if err := mgr.Add(stateMetricsRecorder); err != nil { + return errors.Wrap(err, "cannot register MR state metrics recorder for kind v1alpha1.GroupMembershipProtocolMapperList") + } + } + r := managed.NewReconciler(mgr, xpresource.ManagedKind(v1alpha1.GroupMembershipProtocolMapper_GroupVersionKind), opts...) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/realm/keystorersa/zz_controller.go b/internal/controller/realm/keystorersa/zz_controller.go index 915d1bf..17cd307 100755 --- a/internal/controller/realm/keystorersa/zz_controller.go +++ b/internal/controller/realm/keystorersa/zz_controller.go @@ -14,6 +14,7 @@ import ( "github.com/crossplane/crossplane-runtime/pkg/ratelimiter" "github.com/crossplane/crossplane-runtime/pkg/reconciler/managed" xpresource "github.com/crossplane/crossplane-runtime/pkg/resource" + "github.com/crossplane/crossplane-runtime/pkg/statemetrics" tjcontroller "github.com/crossplane/upjet/pkg/controller" "github.com/crossplane/upjet/pkg/controller/handler" "github.com/crossplane/upjet/pkg/terraform" @@ -52,6 +53,9 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { if o.Features.Enabled(features.EnableBetaManagementPolicies) { opts = append(opts, managed.WithManagementPolicies()) } + if o.MetricOptions != nil { + opts = append(opts, managed.WithMetricRecorder(o.MetricOptions.MRMetrics)) + } // register webhooks for the kind v1alpha1.KeystoreRsa // if they're enabled. @@ -63,6 +67,15 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { } } + if o.MetricOptions != nil && o.MetricOptions.MRStateMetrics != nil { + stateMetricsRecorder := statemetrics.NewMRStateRecorder( + mgr.GetClient(), o.Logger, o.MetricOptions.MRStateMetrics, &v1alpha1.KeystoreRsaList{}, o.MetricOptions.PollStateMetricInterval, + ) + if err := mgr.Add(stateMetricsRecorder); err != nil { + return errors.Wrap(err, "cannot register MR state metrics recorder for kind v1alpha1.KeystoreRsaList") + } + } + r := managed.NewReconciler(mgr, xpresource.ManagedKind(v1alpha1.KeystoreRsa_GroupVersionKind), opts...) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/realm/realm/zz_controller.go b/internal/controller/realm/realm/zz_controller.go index 62b97ad..92f0521 100755 --- a/internal/controller/realm/realm/zz_controller.go +++ b/internal/controller/realm/realm/zz_controller.go @@ -14,6 +14,7 @@ import ( "github.com/crossplane/crossplane-runtime/pkg/ratelimiter" "github.com/crossplane/crossplane-runtime/pkg/reconciler/managed" xpresource "github.com/crossplane/crossplane-runtime/pkg/resource" + "github.com/crossplane/crossplane-runtime/pkg/statemetrics" tjcontroller "github.com/crossplane/upjet/pkg/controller" "github.com/crossplane/upjet/pkg/controller/handler" "github.com/crossplane/upjet/pkg/terraform" @@ -52,6 +53,9 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { if o.Features.Enabled(features.EnableBetaManagementPolicies) { opts = append(opts, managed.WithManagementPolicies()) } + if o.MetricOptions != nil { + opts = append(opts, managed.WithMetricRecorder(o.MetricOptions.MRMetrics)) + } // register webhooks for the kind v1alpha1.Realm // if they're enabled. @@ -63,6 +67,15 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { } } + if o.MetricOptions != nil && o.MetricOptions.MRStateMetrics != nil { + stateMetricsRecorder := statemetrics.NewMRStateRecorder( + mgr.GetClient(), o.Logger, o.MetricOptions.MRStateMetrics, &v1alpha1.RealmList{}, o.MetricOptions.PollStateMetricInterval, + ) + if err := mgr.Add(stateMetricsRecorder); err != nil { + return errors.Wrap(err, "cannot register MR state metrics recorder for kind v1alpha1.RealmList") + } + } + r := managed.NewReconciler(mgr, xpresource.ManagedKind(v1alpha1.Realm_GroupVersionKind), opts...) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/realm/requiredaction/zz_controller.go b/internal/controller/realm/requiredaction/zz_controller.go index 562bfde..916b4f0 100755 --- a/internal/controller/realm/requiredaction/zz_controller.go +++ b/internal/controller/realm/requiredaction/zz_controller.go @@ -14,6 +14,7 @@ import ( "github.com/crossplane/crossplane-runtime/pkg/ratelimiter" "github.com/crossplane/crossplane-runtime/pkg/reconciler/managed" xpresource "github.com/crossplane/crossplane-runtime/pkg/resource" + "github.com/crossplane/crossplane-runtime/pkg/statemetrics" tjcontroller "github.com/crossplane/upjet/pkg/controller" "github.com/crossplane/upjet/pkg/controller/handler" "github.com/crossplane/upjet/pkg/terraform" @@ -52,6 +53,9 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { if o.Features.Enabled(features.EnableBetaManagementPolicies) { opts = append(opts, managed.WithManagementPolicies()) } + if o.MetricOptions != nil { + opts = append(opts, managed.WithMetricRecorder(o.MetricOptions.MRMetrics)) + } // register webhooks for the kind v1alpha1.RequiredAction // if they're enabled. @@ -63,6 +67,15 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { } } + if o.MetricOptions != nil && o.MetricOptions.MRStateMetrics != nil { + stateMetricsRecorder := statemetrics.NewMRStateRecorder( + mgr.GetClient(), o.Logger, o.MetricOptions.MRStateMetrics, &v1alpha1.RequiredActionList{}, o.MetricOptions.PollStateMetricInterval, + ) + if err := mgr.Add(stateMetricsRecorder); err != nil { + return errors.Wrap(err, "cannot register MR state metrics recorder for kind v1alpha1.RequiredActionList") + } + } + r := managed.NewReconciler(mgr, xpresource.ManagedKind(v1alpha1.RequiredAction_GroupVersionKind), opts...) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/role/role/zz_controller.go b/internal/controller/role/role/zz_controller.go index 6f78325..af392ce 100755 --- a/internal/controller/role/role/zz_controller.go +++ b/internal/controller/role/role/zz_controller.go @@ -14,6 +14,7 @@ import ( "github.com/crossplane/crossplane-runtime/pkg/ratelimiter" "github.com/crossplane/crossplane-runtime/pkg/reconciler/managed" xpresource "github.com/crossplane/crossplane-runtime/pkg/resource" + "github.com/crossplane/crossplane-runtime/pkg/statemetrics" tjcontroller "github.com/crossplane/upjet/pkg/controller" "github.com/crossplane/upjet/pkg/controller/handler" "github.com/crossplane/upjet/pkg/terraform" @@ -52,6 +53,9 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { if o.Features.Enabled(features.EnableBetaManagementPolicies) { opts = append(opts, managed.WithManagementPolicies()) } + if o.MetricOptions != nil { + opts = append(opts, managed.WithMetricRecorder(o.MetricOptions.MRMetrics)) + } // register webhooks for the kind v1alpha1.Role // if they're enabled. @@ -63,6 +67,15 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { } } + if o.MetricOptions != nil && o.MetricOptions.MRStateMetrics != nil { + stateMetricsRecorder := statemetrics.NewMRStateRecorder( + mgr.GetClient(), o.Logger, o.MetricOptions.MRStateMetrics, &v1alpha1.RoleList{}, o.MetricOptions.PollStateMetricInterval, + ) + if err := mgr.Add(stateMetricsRecorder); err != nil { + return errors.Wrap(err, "cannot register MR state metrics recorder for kind v1alpha1.RoleList") + } + } + r := managed.NewReconciler(mgr, xpresource.ManagedKind(v1alpha1.Role_GroupVersionKind), opts...) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/saml/identityprovider/zz_controller.go b/internal/controller/saml/identityprovider/zz_controller.go index e3127d4..d41dae1 100755 --- a/internal/controller/saml/identityprovider/zz_controller.go +++ b/internal/controller/saml/identityprovider/zz_controller.go @@ -14,6 +14,7 @@ import ( "github.com/crossplane/crossplane-runtime/pkg/ratelimiter" "github.com/crossplane/crossplane-runtime/pkg/reconciler/managed" xpresource "github.com/crossplane/crossplane-runtime/pkg/resource" + "github.com/crossplane/crossplane-runtime/pkg/statemetrics" tjcontroller "github.com/crossplane/upjet/pkg/controller" "github.com/crossplane/upjet/pkg/controller/handler" "github.com/crossplane/upjet/pkg/terraform" @@ -52,6 +53,9 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { if o.Features.Enabled(features.EnableBetaManagementPolicies) { opts = append(opts, managed.WithManagementPolicies()) } + if o.MetricOptions != nil { + opts = append(opts, managed.WithMetricRecorder(o.MetricOptions.MRMetrics)) + } // register webhooks for the kind v1alpha1.IdentityProvider // if they're enabled. @@ -63,6 +67,15 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { } } + if o.MetricOptions != nil && o.MetricOptions.MRStateMetrics != nil { + stateMetricsRecorder := statemetrics.NewMRStateRecorder( + mgr.GetClient(), o.Logger, o.MetricOptions.MRStateMetrics, &v1alpha1.IdentityProviderList{}, o.MetricOptions.PollStateMetricInterval, + ) + if err := mgr.Add(stateMetricsRecorder); err != nil { + return errors.Wrap(err, "cannot register MR state metrics recorder for kind v1alpha1.IdentityProviderList") + } + } + r := managed.NewReconciler(mgr, xpresource.ManagedKind(v1alpha1.IdentityProvider_GroupVersionKind), opts...) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/samlclient/client/zz_controller.go b/internal/controller/samlclient/client/zz_controller.go index 4b956c1..5a519df 100755 --- a/internal/controller/samlclient/client/zz_controller.go +++ b/internal/controller/samlclient/client/zz_controller.go @@ -14,6 +14,7 @@ import ( "github.com/crossplane/crossplane-runtime/pkg/ratelimiter" "github.com/crossplane/crossplane-runtime/pkg/reconciler/managed" xpresource "github.com/crossplane/crossplane-runtime/pkg/resource" + "github.com/crossplane/crossplane-runtime/pkg/statemetrics" tjcontroller "github.com/crossplane/upjet/pkg/controller" "github.com/crossplane/upjet/pkg/controller/handler" "github.com/crossplane/upjet/pkg/terraform" @@ -52,6 +53,9 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { if o.Features.Enabled(features.EnableBetaManagementPolicies) { opts = append(opts, managed.WithManagementPolicies()) } + if o.MetricOptions != nil { + opts = append(opts, managed.WithMetricRecorder(o.MetricOptions.MRMetrics)) + } // register webhooks for the kind v1alpha1.Client // if they're enabled. @@ -63,6 +67,15 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { } } + if o.MetricOptions != nil && o.MetricOptions.MRStateMetrics != nil { + stateMetricsRecorder := statemetrics.NewMRStateRecorder( + mgr.GetClient(), o.Logger, o.MetricOptions.MRStateMetrics, &v1alpha1.ClientList{}, o.MetricOptions.PollStateMetricInterval, + ) + if err := mgr.Add(stateMetricsRecorder); err != nil { + return errors.Wrap(err, "cannot register MR state metrics recorder for kind v1alpha1.ClientList") + } + } + r := managed.NewReconciler(mgr, xpresource.ManagedKind(v1alpha1.Client_GroupVersionKind), opts...) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/samlclient/clientdefaultscopes/zz_controller.go b/internal/controller/samlclient/clientdefaultscopes/zz_controller.go index 25c19a0..3349c93 100755 --- a/internal/controller/samlclient/clientdefaultscopes/zz_controller.go +++ b/internal/controller/samlclient/clientdefaultscopes/zz_controller.go @@ -14,6 +14,7 @@ import ( "github.com/crossplane/crossplane-runtime/pkg/ratelimiter" "github.com/crossplane/crossplane-runtime/pkg/reconciler/managed" xpresource "github.com/crossplane/crossplane-runtime/pkg/resource" + "github.com/crossplane/crossplane-runtime/pkg/statemetrics" tjcontroller "github.com/crossplane/upjet/pkg/controller" "github.com/crossplane/upjet/pkg/controller/handler" "github.com/crossplane/upjet/pkg/terraform" @@ -52,6 +53,9 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { if o.Features.Enabled(features.EnableBetaManagementPolicies) { opts = append(opts, managed.WithManagementPolicies()) } + if o.MetricOptions != nil { + opts = append(opts, managed.WithMetricRecorder(o.MetricOptions.MRMetrics)) + } // register webhooks for the kind v1alpha1.ClientDefaultScopes // if they're enabled. @@ -63,6 +67,15 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { } } + if o.MetricOptions != nil && o.MetricOptions.MRStateMetrics != nil { + stateMetricsRecorder := statemetrics.NewMRStateRecorder( + mgr.GetClient(), o.Logger, o.MetricOptions.MRStateMetrics, &v1alpha1.ClientDefaultScopesList{}, o.MetricOptions.PollStateMetricInterval, + ) + if err := mgr.Add(stateMetricsRecorder); err != nil { + return errors.Wrap(err, "cannot register MR state metrics recorder for kind v1alpha1.ClientDefaultScopesList") + } + } + r := managed.NewReconciler(mgr, xpresource.ManagedKind(v1alpha1.ClientDefaultScopes_GroupVersionKind), opts...) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/samlclient/clientscope/zz_controller.go b/internal/controller/samlclient/clientscope/zz_controller.go index e9458ac..be6afe3 100755 --- a/internal/controller/samlclient/clientscope/zz_controller.go +++ b/internal/controller/samlclient/clientscope/zz_controller.go @@ -14,6 +14,7 @@ import ( "github.com/crossplane/crossplane-runtime/pkg/ratelimiter" "github.com/crossplane/crossplane-runtime/pkg/reconciler/managed" xpresource "github.com/crossplane/crossplane-runtime/pkg/resource" + "github.com/crossplane/crossplane-runtime/pkg/statemetrics" tjcontroller "github.com/crossplane/upjet/pkg/controller" "github.com/crossplane/upjet/pkg/controller/handler" "github.com/crossplane/upjet/pkg/terraform" @@ -52,6 +53,9 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { if o.Features.Enabled(features.EnableBetaManagementPolicies) { opts = append(opts, managed.WithManagementPolicies()) } + if o.MetricOptions != nil { + opts = append(opts, managed.WithMetricRecorder(o.MetricOptions.MRMetrics)) + } // register webhooks for the kind v1alpha1.ClientScope // if they're enabled. @@ -63,6 +67,15 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { } } + if o.MetricOptions != nil && o.MetricOptions.MRStateMetrics != nil { + stateMetricsRecorder := statemetrics.NewMRStateRecorder( + mgr.GetClient(), o.Logger, o.MetricOptions.MRStateMetrics, &v1alpha1.ClientScopeList{}, o.MetricOptions.PollStateMetricInterval, + ) + if err := mgr.Add(stateMetricsRecorder); err != nil { + return errors.Wrap(err, "cannot register MR state metrics recorder for kind v1alpha1.ClientScopeList") + } + } + r := managed.NewReconciler(mgr, xpresource.ManagedKind(v1alpha1.ClientScope_GroupVersionKind), opts...) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/user/groups/zz_controller.go b/internal/controller/user/groups/zz_controller.go index 1d433d2..6e6faaf 100755 --- a/internal/controller/user/groups/zz_controller.go +++ b/internal/controller/user/groups/zz_controller.go @@ -14,6 +14,7 @@ import ( "github.com/crossplane/crossplane-runtime/pkg/ratelimiter" "github.com/crossplane/crossplane-runtime/pkg/reconciler/managed" xpresource "github.com/crossplane/crossplane-runtime/pkg/resource" + "github.com/crossplane/crossplane-runtime/pkg/statemetrics" tjcontroller "github.com/crossplane/upjet/pkg/controller" "github.com/crossplane/upjet/pkg/controller/handler" "github.com/crossplane/upjet/pkg/terraform" @@ -52,6 +53,9 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { if o.Features.Enabled(features.EnableBetaManagementPolicies) { opts = append(opts, managed.WithManagementPolicies()) } + if o.MetricOptions != nil { + opts = append(opts, managed.WithMetricRecorder(o.MetricOptions.MRMetrics)) + } // register webhooks for the kind v1alpha1.Groups // if they're enabled. @@ -63,6 +67,15 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { } } + if o.MetricOptions != nil && o.MetricOptions.MRStateMetrics != nil { + stateMetricsRecorder := statemetrics.NewMRStateRecorder( + mgr.GetClient(), o.Logger, o.MetricOptions.MRStateMetrics, &v1alpha1.GroupsList{}, o.MetricOptions.PollStateMetricInterval, + ) + if err := mgr.Add(stateMetricsRecorder); err != nil { + return errors.Wrap(err, "cannot register MR state metrics recorder for kind v1alpha1.GroupsList") + } + } + r := managed.NewReconciler(mgr, xpresource.ManagedKind(v1alpha1.Groups_GroupVersionKind), opts...) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/user/permissions/zz_controller.go b/internal/controller/user/permissions/zz_controller.go index 8850b90..8d3fff9 100755 --- a/internal/controller/user/permissions/zz_controller.go +++ b/internal/controller/user/permissions/zz_controller.go @@ -14,6 +14,7 @@ import ( "github.com/crossplane/crossplane-runtime/pkg/ratelimiter" "github.com/crossplane/crossplane-runtime/pkg/reconciler/managed" xpresource "github.com/crossplane/crossplane-runtime/pkg/resource" + "github.com/crossplane/crossplane-runtime/pkg/statemetrics" tjcontroller "github.com/crossplane/upjet/pkg/controller" "github.com/crossplane/upjet/pkg/controller/handler" "github.com/crossplane/upjet/pkg/terraform" @@ -52,6 +53,9 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { if o.Features.Enabled(features.EnableBetaManagementPolicies) { opts = append(opts, managed.WithManagementPolicies()) } + if o.MetricOptions != nil { + opts = append(opts, managed.WithMetricRecorder(o.MetricOptions.MRMetrics)) + } // register webhooks for the kind v1alpha1.Permissions // if they're enabled. @@ -63,6 +67,15 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { } } + if o.MetricOptions != nil && o.MetricOptions.MRStateMetrics != nil { + stateMetricsRecorder := statemetrics.NewMRStateRecorder( + mgr.GetClient(), o.Logger, o.MetricOptions.MRStateMetrics, &v1alpha1.PermissionsList{}, o.MetricOptions.PollStateMetricInterval, + ) + if err := mgr.Add(stateMetricsRecorder); err != nil { + return errors.Wrap(err, "cannot register MR state metrics recorder for kind v1alpha1.PermissionsList") + } + } + r := managed.NewReconciler(mgr, xpresource.ManagedKind(v1alpha1.Permissions_GroupVersionKind), opts...) return ctrl.NewControllerManagedBy(mgr). diff --git a/internal/controller/user/user/zz_controller.go b/internal/controller/user/user/zz_controller.go index 91fb321..eeb41cf 100755 --- a/internal/controller/user/user/zz_controller.go +++ b/internal/controller/user/user/zz_controller.go @@ -14,6 +14,7 @@ import ( "github.com/crossplane/crossplane-runtime/pkg/ratelimiter" "github.com/crossplane/crossplane-runtime/pkg/reconciler/managed" xpresource "github.com/crossplane/crossplane-runtime/pkg/resource" + "github.com/crossplane/crossplane-runtime/pkg/statemetrics" tjcontroller "github.com/crossplane/upjet/pkg/controller" "github.com/crossplane/upjet/pkg/controller/handler" "github.com/crossplane/upjet/pkg/terraform" @@ -52,6 +53,9 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { if o.Features.Enabled(features.EnableBetaManagementPolicies) { opts = append(opts, managed.WithManagementPolicies()) } + if o.MetricOptions != nil { + opts = append(opts, managed.WithMetricRecorder(o.MetricOptions.MRMetrics)) + } // register webhooks for the kind v1alpha1.User // if they're enabled. @@ -63,6 +67,15 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error { } } + if o.MetricOptions != nil && o.MetricOptions.MRStateMetrics != nil { + stateMetricsRecorder := statemetrics.NewMRStateRecorder( + mgr.GetClient(), o.Logger, o.MetricOptions.MRStateMetrics, &v1alpha1.UserList{}, o.MetricOptions.PollStateMetricInterval, + ) + if err := mgr.Add(stateMetricsRecorder); err != nil { + return errors.Wrap(err, "cannot register MR state metrics recorder for kind v1alpha1.UserList") + } + } + r := managed.NewReconciler(mgr, xpresource.ManagedKind(v1alpha1.User_GroupVersionKind), opts...) return ctrl.NewControllerManagedBy(mgr). diff --git a/package/crds/client.keycloak.crossplane.io_protocolmappers.yaml b/package/crds/client.keycloak.crossplane.io_protocolmappers.yaml index fc0cea2..93a0c44 100644 --- a/package/crds/client.keycloak.crossplane.io_protocolmappers.yaml +++ b/package/crds/client.keycloak.crossplane.io_protocolmappers.yaml @@ -19,12 +19,12 @@ spec: scope: Cluster versions: - additionalPrinterColumns: - - jsonPath: .status.conditions[?(@.type=='Ready')].status - name: READY - type: string - jsonPath: .status.conditions[?(@.type=='Synced')].status name: SYNCED type: string + - jsonPath: .status.conditions[?(@.type=='Ready')].status + name: READY + type: string - jsonPath: .metadata.annotations.crossplane\.io/external-name name: EXTERNAL-NAME type: string diff --git a/package/crds/client.keycloak.crossplane.io_rolemappers.yaml b/package/crds/client.keycloak.crossplane.io_rolemappers.yaml index 307c68b..5b47c08 100644 --- a/package/crds/client.keycloak.crossplane.io_rolemappers.yaml +++ b/package/crds/client.keycloak.crossplane.io_rolemappers.yaml @@ -19,12 +19,12 @@ spec: scope: Cluster versions: - additionalPrinterColumns: - - jsonPath: .status.conditions[?(@.type=='Ready')].status - name: READY - type: string - jsonPath: .status.conditions[?(@.type=='Synced')].status name: SYNCED type: string + - jsonPath: .status.conditions[?(@.type=='Ready')].status + name: READY + type: string - jsonPath: .metadata.annotations.crossplane\.io/external-name name: EXTERNAL-NAME type: string diff --git a/package/crds/defaults.keycloak.crossplane.io_defaultgroups.yaml b/package/crds/defaults.keycloak.crossplane.io_defaultgroups.yaml index dc3d080..40f6b4a 100644 --- a/package/crds/defaults.keycloak.crossplane.io_defaultgroups.yaml +++ b/package/crds/defaults.keycloak.crossplane.io_defaultgroups.yaml @@ -19,12 +19,12 @@ spec: scope: Cluster versions: - additionalPrinterColumns: - - jsonPath: .status.conditions[?(@.type=='Ready')].status - name: READY - type: string - jsonPath: .status.conditions[?(@.type=='Synced')].status name: SYNCED type: string + - jsonPath: .status.conditions[?(@.type=='Ready')].status + name: READY + type: string - jsonPath: .metadata.annotations.crossplane\.io/external-name name: EXTERNAL-NAME type: string diff --git a/package/crds/defaults.keycloak.crossplane.io_roles.yaml b/package/crds/defaults.keycloak.crossplane.io_roles.yaml index b88565c..5a33d51 100644 --- a/package/crds/defaults.keycloak.crossplane.io_roles.yaml +++ b/package/crds/defaults.keycloak.crossplane.io_roles.yaml @@ -19,12 +19,12 @@ spec: scope: Cluster versions: - additionalPrinterColumns: - - jsonPath: .status.conditions[?(@.type=='Ready')].status - name: READY - type: string - jsonPath: .status.conditions[?(@.type=='Synced')].status name: SYNCED type: string + - jsonPath: .status.conditions[?(@.type=='Ready')].status + name: READY + type: string - jsonPath: .metadata.annotations.crossplane\.io/external-name name: EXTERNAL-NAME type: string diff --git a/package/crds/group.keycloak.crossplane.io_groups.yaml b/package/crds/group.keycloak.crossplane.io_groups.yaml index 2077bd2..dafa8cb 100644 --- a/package/crds/group.keycloak.crossplane.io_groups.yaml +++ b/package/crds/group.keycloak.crossplane.io_groups.yaml @@ -19,12 +19,12 @@ spec: scope: Cluster versions: - additionalPrinterColumns: - - jsonPath: .status.conditions[?(@.type=='Ready')].status - name: READY - type: string - jsonPath: .status.conditions[?(@.type=='Synced')].status name: SYNCED type: string + - jsonPath: .status.conditions[?(@.type=='Ready')].status + name: READY + type: string - jsonPath: .metadata.annotations.crossplane\.io/external-name name: EXTERNAL-NAME type: string diff --git a/package/crds/group.keycloak.crossplane.io_memberships.yaml b/package/crds/group.keycloak.crossplane.io_memberships.yaml index a31fbc2..b7f05f1 100644 --- a/package/crds/group.keycloak.crossplane.io_memberships.yaml +++ b/package/crds/group.keycloak.crossplane.io_memberships.yaml @@ -19,12 +19,12 @@ spec: scope: Cluster versions: - additionalPrinterColumns: - - jsonPath: .status.conditions[?(@.type=='Ready')].status - name: READY - type: string - jsonPath: .status.conditions[?(@.type=='Synced')].status name: SYNCED type: string + - jsonPath: .status.conditions[?(@.type=='Ready')].status + name: READY + type: string - jsonPath: .metadata.annotations.crossplane\.io/external-name name: EXTERNAL-NAME type: string diff --git a/package/crds/group.keycloak.crossplane.io_permissions.yaml b/package/crds/group.keycloak.crossplane.io_permissions.yaml index 7229951..fa4a753 100644 --- a/package/crds/group.keycloak.crossplane.io_permissions.yaml +++ b/package/crds/group.keycloak.crossplane.io_permissions.yaml @@ -19,12 +19,12 @@ spec: scope: Cluster versions: - additionalPrinterColumns: - - jsonPath: .status.conditions[?(@.type=='Ready')].status - name: READY - type: string - jsonPath: .status.conditions[?(@.type=='Synced')].status name: SYNCED type: string + - jsonPath: .status.conditions[?(@.type=='Ready')].status + name: READY + type: string - jsonPath: .metadata.annotations.crossplane\.io/external-name name: EXTERNAL-NAME type: string diff --git a/package/crds/group.keycloak.crossplane.io_roles.yaml b/package/crds/group.keycloak.crossplane.io_roles.yaml index 965e76f..23eecd8 100644 --- a/package/crds/group.keycloak.crossplane.io_roles.yaml +++ b/package/crds/group.keycloak.crossplane.io_roles.yaml @@ -19,12 +19,12 @@ spec: scope: Cluster versions: - additionalPrinterColumns: - - jsonPath: .status.conditions[?(@.type=='Ready')].status - name: READY - type: string - jsonPath: .status.conditions[?(@.type=='Synced')].status name: SYNCED type: string + - jsonPath: .status.conditions[?(@.type=='Ready')].status + name: READY + type: string - jsonPath: .metadata.annotations.crossplane\.io/external-name name: EXTERNAL-NAME type: string diff --git a/package/crds/identityprovider.keycloak.crossplane.io_identityprovidermappers.yaml b/package/crds/identityprovider.keycloak.crossplane.io_identityprovidermappers.yaml index 3ee49d3..d1b7ef0 100644 --- a/package/crds/identityprovider.keycloak.crossplane.io_identityprovidermappers.yaml +++ b/package/crds/identityprovider.keycloak.crossplane.io_identityprovidermappers.yaml @@ -19,12 +19,12 @@ spec: scope: Cluster versions: - additionalPrinterColumns: - - jsonPath: .status.conditions[?(@.type=='Ready')].status - name: READY - type: string - jsonPath: .status.conditions[?(@.type=='Synced')].status name: SYNCED type: string + - jsonPath: .status.conditions[?(@.type=='Ready')].status + name: READY + type: string - jsonPath: .metadata.annotations.crossplane\.io/external-name name: EXTERNAL-NAME type: string diff --git a/package/crds/ldap.keycloak.crossplane.io_custommappers.yaml b/package/crds/ldap.keycloak.crossplane.io_custommappers.yaml index 39950ee..85f1566 100644 --- a/package/crds/ldap.keycloak.crossplane.io_custommappers.yaml +++ b/package/crds/ldap.keycloak.crossplane.io_custommappers.yaml @@ -19,12 +19,12 @@ spec: scope: Cluster versions: - additionalPrinterColumns: - - jsonPath: .status.conditions[?(@.type=='Ready')].status - name: READY - type: string - jsonPath: .status.conditions[?(@.type=='Synced')].status name: SYNCED type: string + - jsonPath: .status.conditions[?(@.type=='Ready')].status + name: READY + type: string - jsonPath: .metadata.annotations.crossplane\.io/external-name name: EXTERNAL-NAME type: string diff --git a/package/crds/ldap.keycloak.crossplane.io_fullnamemappers.yaml b/package/crds/ldap.keycloak.crossplane.io_fullnamemappers.yaml index c9fca73..0ca781e 100644 --- a/package/crds/ldap.keycloak.crossplane.io_fullnamemappers.yaml +++ b/package/crds/ldap.keycloak.crossplane.io_fullnamemappers.yaml @@ -19,12 +19,12 @@ spec: scope: Cluster versions: - additionalPrinterColumns: - - jsonPath: .status.conditions[?(@.type=='Ready')].status - name: READY - type: string - jsonPath: .status.conditions[?(@.type=='Synced')].status name: SYNCED type: string + - jsonPath: .status.conditions[?(@.type=='Ready')].status + name: READY + type: string - jsonPath: .metadata.annotations.crossplane\.io/external-name name: EXTERNAL-NAME type: string diff --git a/package/crds/ldap.keycloak.crossplane.io_groupmappers.yaml b/package/crds/ldap.keycloak.crossplane.io_groupmappers.yaml index 628ceef..00b3414 100644 --- a/package/crds/ldap.keycloak.crossplane.io_groupmappers.yaml +++ b/package/crds/ldap.keycloak.crossplane.io_groupmappers.yaml @@ -19,12 +19,12 @@ spec: scope: Cluster versions: - additionalPrinterColumns: - - jsonPath: .status.conditions[?(@.type=='Ready')].status - name: READY - type: string - jsonPath: .status.conditions[?(@.type=='Synced')].status name: SYNCED type: string + - jsonPath: .status.conditions[?(@.type=='Ready')].status + name: READY + type: string - jsonPath: .metadata.annotations.crossplane\.io/external-name name: EXTERNAL-NAME type: string diff --git a/package/crds/ldap.keycloak.crossplane.io_hardcodedattributemappers.yaml b/package/crds/ldap.keycloak.crossplane.io_hardcodedattributemappers.yaml index 9e14ac3..b1ee15c 100644 --- a/package/crds/ldap.keycloak.crossplane.io_hardcodedattributemappers.yaml +++ b/package/crds/ldap.keycloak.crossplane.io_hardcodedattributemappers.yaml @@ -19,12 +19,12 @@ spec: scope: Cluster versions: - additionalPrinterColumns: - - jsonPath: .status.conditions[?(@.type=='Ready')].status - name: READY - type: string - jsonPath: .status.conditions[?(@.type=='Synced')].status name: SYNCED type: string + - jsonPath: .status.conditions[?(@.type=='Ready')].status + name: READY + type: string - jsonPath: .metadata.annotations.crossplane\.io/external-name name: EXTERNAL-NAME type: string diff --git a/package/crds/ldap.keycloak.crossplane.io_hardcodedgroupmappers.yaml b/package/crds/ldap.keycloak.crossplane.io_hardcodedgroupmappers.yaml index f843ff9..0b60b82 100644 --- a/package/crds/ldap.keycloak.crossplane.io_hardcodedgroupmappers.yaml +++ b/package/crds/ldap.keycloak.crossplane.io_hardcodedgroupmappers.yaml @@ -19,12 +19,12 @@ spec: scope: Cluster versions: - additionalPrinterColumns: - - jsonPath: .status.conditions[?(@.type=='Ready')].status - name: READY - type: string - jsonPath: .status.conditions[?(@.type=='Synced')].status name: SYNCED type: string + - jsonPath: .status.conditions[?(@.type=='Ready')].status + name: READY + type: string - jsonPath: .metadata.annotations.crossplane\.io/external-name name: EXTERNAL-NAME type: string diff --git a/package/crds/ldap.keycloak.crossplane.io_hardcodedrolemappers.yaml b/package/crds/ldap.keycloak.crossplane.io_hardcodedrolemappers.yaml index 3c529a9..f3cf719 100644 --- a/package/crds/ldap.keycloak.crossplane.io_hardcodedrolemappers.yaml +++ b/package/crds/ldap.keycloak.crossplane.io_hardcodedrolemappers.yaml @@ -19,12 +19,12 @@ spec: scope: Cluster versions: - additionalPrinterColumns: - - jsonPath: .status.conditions[?(@.type=='Ready')].status - name: READY - type: string - jsonPath: .status.conditions[?(@.type=='Synced')].status name: SYNCED type: string + - jsonPath: .status.conditions[?(@.type=='Ready')].status + name: READY + type: string - jsonPath: .metadata.annotations.crossplane\.io/external-name name: EXTERNAL-NAME type: string diff --git a/package/crds/ldap.keycloak.crossplane.io_msadldsuseraccountcontrolmappers.yaml b/package/crds/ldap.keycloak.crossplane.io_msadldsuseraccountcontrolmappers.yaml index 0c880b1..5bd59e0 100644 --- a/package/crds/ldap.keycloak.crossplane.io_msadldsuseraccountcontrolmappers.yaml +++ b/package/crds/ldap.keycloak.crossplane.io_msadldsuseraccountcontrolmappers.yaml @@ -19,12 +19,12 @@ spec: scope: Cluster versions: - additionalPrinterColumns: - - jsonPath: .status.conditions[?(@.type=='Ready')].status - name: READY - type: string - jsonPath: .status.conditions[?(@.type=='Synced')].status name: SYNCED type: string + - jsonPath: .status.conditions[?(@.type=='Ready')].status + name: READY + type: string - jsonPath: .metadata.annotations.crossplane\.io/external-name name: EXTERNAL-NAME type: string diff --git a/package/crds/ldap.keycloak.crossplane.io_msaduseraccountcontrolmappers.yaml b/package/crds/ldap.keycloak.crossplane.io_msaduseraccountcontrolmappers.yaml index b4f3a5b..8da5e0d 100644 --- a/package/crds/ldap.keycloak.crossplane.io_msaduseraccountcontrolmappers.yaml +++ b/package/crds/ldap.keycloak.crossplane.io_msaduseraccountcontrolmappers.yaml @@ -19,12 +19,12 @@ spec: scope: Cluster versions: - additionalPrinterColumns: - - jsonPath: .status.conditions[?(@.type=='Ready')].status - name: READY - type: string - jsonPath: .status.conditions[?(@.type=='Synced')].status name: SYNCED type: string + - jsonPath: .status.conditions[?(@.type=='Ready')].status + name: READY + type: string - jsonPath: .metadata.annotations.crossplane\.io/external-name name: EXTERNAL-NAME type: string diff --git a/package/crds/ldap.keycloak.crossplane.io_rolemappers.yaml b/package/crds/ldap.keycloak.crossplane.io_rolemappers.yaml index 220a5e6..e341773 100644 --- a/package/crds/ldap.keycloak.crossplane.io_rolemappers.yaml +++ b/package/crds/ldap.keycloak.crossplane.io_rolemappers.yaml @@ -19,12 +19,12 @@ spec: scope: Cluster versions: - additionalPrinterColumns: - - jsonPath: .status.conditions[?(@.type=='Ready')].status - name: READY - type: string - jsonPath: .status.conditions[?(@.type=='Synced')].status name: SYNCED type: string + - jsonPath: .status.conditions[?(@.type=='Ready')].status + name: READY + type: string - jsonPath: .metadata.annotations.crossplane\.io/external-name name: EXTERNAL-NAME type: string diff --git a/package/crds/ldap.keycloak.crossplane.io_userattributemappers.yaml b/package/crds/ldap.keycloak.crossplane.io_userattributemappers.yaml index f6bcbed..6653d90 100644 --- a/package/crds/ldap.keycloak.crossplane.io_userattributemappers.yaml +++ b/package/crds/ldap.keycloak.crossplane.io_userattributemappers.yaml @@ -19,12 +19,12 @@ spec: scope: Cluster versions: - additionalPrinterColumns: - - jsonPath: .status.conditions[?(@.type=='Ready')].status - name: READY - type: string - jsonPath: .status.conditions[?(@.type=='Synced')].status name: SYNCED type: string + - jsonPath: .status.conditions[?(@.type=='Ready')].status + name: READY + type: string - jsonPath: .metadata.annotations.crossplane\.io/external-name name: EXTERNAL-NAME type: string diff --git a/package/crds/ldap.keycloak.crossplane.io_userfederations.yaml b/package/crds/ldap.keycloak.crossplane.io_userfederations.yaml index aa4fde3..8843c00 100644 --- a/package/crds/ldap.keycloak.crossplane.io_userfederations.yaml +++ b/package/crds/ldap.keycloak.crossplane.io_userfederations.yaml @@ -19,12 +19,12 @@ spec: scope: Cluster versions: - additionalPrinterColumns: - - jsonPath: .status.conditions[?(@.type=='Ready')].status - name: READY - type: string - jsonPath: .status.conditions[?(@.type=='Synced')].status name: SYNCED type: string + - jsonPath: .status.conditions[?(@.type=='Ready')].status + name: READY + type: string - jsonPath: .metadata.annotations.crossplane\.io/external-name name: EXTERNAL-NAME type: string @@ -389,6 +389,25 @@ spec: The number of users to sync within a single transaction. Defaults to 1000. The number of users to sync within a single transaction. type: number + bindCredentialSecretRef: + description: |- + Password of LDAP admin. This attribute must be set if bind_dn is set. + Password of LDAP admin. + properties: + key: + description: The key to select. + type: string + name: + description: Name of the secret. + type: string + namespace: + description: Namespace of the secret. + type: string + required: + - key + - name + - namespace + type: object bindDn: description: |- DN of LDAP admin, which will be used by Keycloak to access LDAP server. This attribute must be set if bind_credential is set. diff --git a/package/crds/oidc.keycloak.crossplane.io_identityproviders.yaml b/package/crds/oidc.keycloak.crossplane.io_identityproviders.yaml index 30d8605..248b38d 100644 --- a/package/crds/oidc.keycloak.crossplane.io_identityproviders.yaml +++ b/package/crds/oidc.keycloak.crossplane.io_identityproviders.yaml @@ -19,12 +19,12 @@ spec: scope: Cluster versions: - additionalPrinterColumns: - - jsonPath: .status.conditions[?(@.type=='Ready')].status - name: READY - type: string - jsonPath: .status.conditions[?(@.type=='Synced')].status name: SYNCED type: string + - jsonPath: .status.conditions[?(@.type=='Ready')].status + name: READY + type: string - jsonPath: .metadata.annotations.crossplane\.io/external-name name: EXTERNAL-NAME type: string @@ -516,6 +516,25 @@ spec: type: string type: object type: object + clientSecretSecretRef: + description: |- + The client or client secret registered within the identity provider. This field is able to obtain its value from vault, use $${vault.ID} format. + Client Secret. + properties: + key: + description: The key to select. + type: string + name: + description: Name of the secret. + type: string + namespace: + description: Namespace of the secret. + type: string + required: + - key + - name + - namespace + type: object defaultScopes: description: |- The scopes to be sent when asking for authorization. It can be a space-separated list of scopes. Defaults to openid. @@ -709,6 +728,8 @@ spec: Enable/disable signature validation of external IDP signatures. Defaults to false. Enable/disable signature validation of external IDP signatures. type: boolean + required: + - clientSecretSecretRef type: object managementPolicies: default: diff --git a/package/crds/openidclient.keycloak.crossplane.io_clientclientpolicies.yaml b/package/crds/openidclient.keycloak.crossplane.io_clientclientpolicies.yaml index d814d6f..1ee949c 100644 --- a/package/crds/openidclient.keycloak.crossplane.io_clientclientpolicies.yaml +++ b/package/crds/openidclient.keycloak.crossplane.io_clientclientpolicies.yaml @@ -19,12 +19,12 @@ spec: scope: Cluster versions: - additionalPrinterColumns: - - jsonPath: .status.conditions[?(@.type=='Ready')].status - name: READY - type: string - jsonPath: .status.conditions[?(@.type=='Synced')].status name: SYNCED type: string + - jsonPath: .status.conditions[?(@.type=='Ready')].status + name: READY + type: string - jsonPath: .metadata.annotations.crossplane\.io/external-name name: EXTERNAL-NAME type: string diff --git a/package/crds/openidclient.keycloak.crossplane.io_clientdefaultscopes.yaml b/package/crds/openidclient.keycloak.crossplane.io_clientdefaultscopes.yaml index d8a4f23..92b82eb 100644 --- a/package/crds/openidclient.keycloak.crossplane.io_clientdefaultscopes.yaml +++ b/package/crds/openidclient.keycloak.crossplane.io_clientdefaultscopes.yaml @@ -19,12 +19,12 @@ spec: scope: Cluster versions: - additionalPrinterColumns: - - jsonPath: .status.conditions[?(@.type=='Ready')].status - name: READY - type: string - jsonPath: .status.conditions[?(@.type=='Synced')].status name: SYNCED type: string + - jsonPath: .status.conditions[?(@.type=='Ready')].status + name: READY + type: string - jsonPath: .metadata.annotations.crossplane\.io/external-name name: EXTERNAL-NAME type: string diff --git a/package/crds/openidclient.keycloak.crossplane.io_clientgrouppolicies.yaml b/package/crds/openidclient.keycloak.crossplane.io_clientgrouppolicies.yaml index b391a06..38b1490 100644 --- a/package/crds/openidclient.keycloak.crossplane.io_clientgrouppolicies.yaml +++ b/package/crds/openidclient.keycloak.crossplane.io_clientgrouppolicies.yaml @@ -19,12 +19,12 @@ spec: scope: Cluster versions: - additionalPrinterColumns: - - jsonPath: .status.conditions[?(@.type=='Ready')].status - name: READY - type: string - jsonPath: .status.conditions[?(@.type=='Synced')].status name: SYNCED type: string + - jsonPath: .status.conditions[?(@.type=='Ready')].status + name: READY + type: string - jsonPath: .metadata.annotations.crossplane\.io/external-name name: EXTERNAL-NAME type: string diff --git a/package/crds/openidclient.keycloak.crossplane.io_clientpermissions.yaml b/package/crds/openidclient.keycloak.crossplane.io_clientpermissions.yaml index dcf5777..f589db4 100644 --- a/package/crds/openidclient.keycloak.crossplane.io_clientpermissions.yaml +++ b/package/crds/openidclient.keycloak.crossplane.io_clientpermissions.yaml @@ -19,12 +19,12 @@ spec: scope: Cluster versions: - additionalPrinterColumns: - - jsonPath: .status.conditions[?(@.type=='Ready')].status - name: READY - type: string - jsonPath: .status.conditions[?(@.type=='Synced')].status name: SYNCED type: string + - jsonPath: .status.conditions[?(@.type=='Ready')].status + name: READY + type: string - jsonPath: .metadata.annotations.crossplane\.io/external-name name: EXTERNAL-NAME type: string diff --git a/package/crds/openidclient.keycloak.crossplane.io_clientrolepolicies.yaml b/package/crds/openidclient.keycloak.crossplane.io_clientrolepolicies.yaml index 22b4ded..b433f1a 100644 --- a/package/crds/openidclient.keycloak.crossplane.io_clientrolepolicies.yaml +++ b/package/crds/openidclient.keycloak.crossplane.io_clientrolepolicies.yaml @@ -19,12 +19,12 @@ spec: scope: Cluster versions: - additionalPrinterColumns: - - jsonPath: .status.conditions[?(@.type=='Ready')].status - name: READY - type: string - jsonPath: .status.conditions[?(@.type=='Synced')].status name: SYNCED type: string + - jsonPath: .status.conditions[?(@.type=='Ready')].status + name: READY + type: string - jsonPath: .metadata.annotations.crossplane\.io/external-name name: EXTERNAL-NAME type: string diff --git a/package/crds/openidclient.keycloak.crossplane.io_clients.yaml b/package/crds/openidclient.keycloak.crossplane.io_clients.yaml index 3c5df90..6bc596d 100644 --- a/package/crds/openidclient.keycloak.crossplane.io_clients.yaml +++ b/package/crds/openidclient.keycloak.crossplane.io_clients.yaml @@ -19,12 +19,12 @@ spec: scope: Cluster versions: - additionalPrinterColumns: - - jsonPath: .status.conditions[?(@.type=='Ready')].status - name: READY - type: string - jsonPath: .status.conditions[?(@.type=='Synced')].status name: SYNCED type: string + - jsonPath: .status.conditions[?(@.type=='Ready')].status + name: READY + type: string - jsonPath: .metadata.annotations.crossplane\.io/external-name name: EXTERNAL-NAME type: string @@ -670,6 +670,26 @@ spec: are invalidated when a client session is expired. If not set, it uses the standard SSO Session Max value. type: string + clientSecretSecretRef: + description: The secret for clients with an access_type of CONFIDENTIAL + or BEARER-ONLY. This value is sensitive and should be treated + with the same care as a password. If omitted, this will be generated + by Keycloak. + properties: + key: + description: The key to select. + type: string + name: + description: Name of the secret. + type: string + namespace: + description: Namespace of the secret. + type: string + required: + - key + - name + - namespace + type: object clientSessionIdleTimeout: description: Time a client offline session is allowed to be idle before it expires. Offline tokens are invalidated when a client diff --git a/package/crds/openidclient.keycloak.crossplane.io_clientscopes.yaml b/package/crds/openidclient.keycloak.crossplane.io_clientscopes.yaml index 9947612..c4474e7 100644 --- a/package/crds/openidclient.keycloak.crossplane.io_clientscopes.yaml +++ b/package/crds/openidclient.keycloak.crossplane.io_clientscopes.yaml @@ -19,12 +19,12 @@ spec: scope: Cluster versions: - additionalPrinterColumns: - - jsonPath: .status.conditions[?(@.type=='Ready')].status - name: READY - type: string - jsonPath: .status.conditions[?(@.type=='Synced')].status name: SYNCED type: string + - jsonPath: .status.conditions[?(@.type=='Ready')].status + name: READY + type: string - jsonPath: .metadata.annotations.crossplane\.io/external-name name: EXTERNAL-NAME type: string diff --git a/package/crds/openidclient.keycloak.crossplane.io_clientserviceaccountrealmroles.yaml b/package/crds/openidclient.keycloak.crossplane.io_clientserviceaccountrealmroles.yaml index da6136e..f18067c 100644 --- a/package/crds/openidclient.keycloak.crossplane.io_clientserviceaccountrealmroles.yaml +++ b/package/crds/openidclient.keycloak.crossplane.io_clientserviceaccountrealmroles.yaml @@ -19,12 +19,12 @@ spec: scope: Cluster versions: - additionalPrinterColumns: - - jsonPath: .status.conditions[?(@.type=='Ready')].status - name: READY - type: string - jsonPath: .status.conditions[?(@.type=='Synced')].status name: SYNCED type: string + - jsonPath: .status.conditions[?(@.type=='Ready')].status + name: READY + type: string - jsonPath: .metadata.annotations.crossplane\.io/external-name name: EXTERNAL-NAME type: string diff --git a/package/crds/openidclient.keycloak.crossplane.io_clientserviceaccountroles.yaml b/package/crds/openidclient.keycloak.crossplane.io_clientserviceaccountroles.yaml index 2306ccd..bb2f581 100644 --- a/package/crds/openidclient.keycloak.crossplane.io_clientserviceaccountroles.yaml +++ b/package/crds/openidclient.keycloak.crossplane.io_clientserviceaccountroles.yaml @@ -19,12 +19,12 @@ spec: scope: Cluster versions: - additionalPrinterColumns: - - jsonPath: .status.conditions[?(@.type=='Ready')].status - name: READY - type: string - jsonPath: .status.conditions[?(@.type=='Synced')].status name: SYNCED type: string + - jsonPath: .status.conditions[?(@.type=='Ready')].status + name: READY + type: string - jsonPath: .metadata.annotations.crossplane\.io/external-name name: EXTERNAL-NAME type: string diff --git a/package/crds/openidclient.keycloak.crossplane.io_clientuserpolicies.yaml b/package/crds/openidclient.keycloak.crossplane.io_clientuserpolicies.yaml index cbdccdf..606e95b 100644 --- a/package/crds/openidclient.keycloak.crossplane.io_clientuserpolicies.yaml +++ b/package/crds/openidclient.keycloak.crossplane.io_clientuserpolicies.yaml @@ -19,12 +19,12 @@ spec: scope: Cluster versions: - additionalPrinterColumns: - - jsonPath: .status.conditions[?(@.type=='Ready')].status - name: READY - type: string - jsonPath: .status.conditions[?(@.type=='Synced')].status name: SYNCED type: string + - jsonPath: .status.conditions[?(@.type=='Ready')].status + name: READY + type: string - jsonPath: .metadata.annotations.crossplane\.io/external-name name: EXTERNAL-NAME type: string diff --git a/package/crds/openidgroup.keycloak.crossplane.io_groupmembershipprotocolmappers.yaml b/package/crds/openidgroup.keycloak.crossplane.io_groupmembershipprotocolmappers.yaml index e260778..b3e25a4 100644 --- a/package/crds/openidgroup.keycloak.crossplane.io_groupmembershipprotocolmappers.yaml +++ b/package/crds/openidgroup.keycloak.crossplane.io_groupmembershipprotocolmappers.yaml @@ -19,12 +19,12 @@ spec: scope: Cluster versions: - additionalPrinterColumns: - - jsonPath: .status.conditions[?(@.type=='Ready')].status - name: READY - type: string - jsonPath: .status.conditions[?(@.type=='Synced')].status name: SYNCED type: string + - jsonPath: .status.conditions[?(@.type=='Ready')].status + name: READY + type: string - jsonPath: .metadata.annotations.crossplane\.io/external-name name: EXTERNAL-NAME type: string diff --git a/package/crds/realm.keycloak.crossplane.io_keystorersas.yaml b/package/crds/realm.keycloak.crossplane.io_keystorersas.yaml index e255291..8ea375a 100644 --- a/package/crds/realm.keycloak.crossplane.io_keystorersas.yaml +++ b/package/crds/realm.keycloak.crossplane.io_keystorersas.yaml @@ -19,12 +19,12 @@ spec: scope: Cluster versions: - additionalPrinterColumns: - - jsonPath: .status.conditions[?(@.type=='Ready')].status - name: READY - type: string - jsonPath: .status.conditions[?(@.type=='Synced')].status name: SYNCED type: string + - jsonPath: .status.conditions[?(@.type=='Ready')].status + name: READY + type: string - jsonPath: .metadata.annotations.crossplane\.io/external-name name: EXTERNAL-NAME type: string @@ -241,6 +241,25 @@ spec: Intended algorithm for the key. Defaults to RS256. Use RSA-OAEP for encryption keys Intended algorithm for the key type: string + certificateSecretRef: + description: |- + X509 Certificate encoded in PEM format. + X509 Certificate encoded in PEM format + properties: + key: + description: The key to select. + type: string + name: + description: Name of the secret. + type: string + namespace: + description: Namespace of the secret. + type: string + required: + - key + - name + - namespace + type: object enabled: description: |- When false, key is not accessible in this realm. Defaults to true. @@ -256,6 +275,25 @@ spec: Priority for the provider. Defaults to 0 Priority for the provider type: number + privateKeySecretRef: + description: |- + Private RSA Key encoded in PEM format. + Private RSA Key encoded in PEM format + properties: + key: + description: The key to select. + type: string + name: + description: Name of the secret. + type: string + namespace: + description: Namespace of the secret. + type: string + required: + - key + - name + - namespace + type: object providerId: description: |- Use rsa for signing keys, rsa-enc for encryption keys @@ -338,6 +376,9 @@ spec: type: string type: object type: object + required: + - certificateSecretRef + - privateKeySecretRef type: object managementPolicies: default: diff --git a/package/crds/realm.keycloak.crossplane.io_realms.yaml b/package/crds/realm.keycloak.crossplane.io_realms.yaml index 2eeda5d..87896bc 100644 --- a/package/crds/realm.keycloak.crossplane.io_realms.yaml +++ b/package/crds/realm.keycloak.crossplane.io_realms.yaml @@ -19,12 +19,12 @@ spec: scope: Cluster versions: - additionalPrinterColumns: - - jsonPath: .status.conditions[?(@.type=='Ready')].status - name: READY - type: string - jsonPath: .status.conditions[?(@.type=='Synced')].status name: SYNCED type: string + - jsonPath: .status.conditions[?(@.type=='Ready')].status + name: READY + type: string - jsonPath: .metadata.annotations.crossplane\.io/external-name name: EXTERNAL-NAME type: string @@ -413,8 +413,6 @@ spec: username: description: The SMTP server username. type: string - required: - - passwordSecretRef type: object type: array envelopeFrom: @@ -928,9 +926,28 @@ spec: block supports the following arguments:' items: properties: + passwordSecretRef: + description: The SMTP server password. + properties: + key: + description: The key to select. + type: string + name: + description: Name of the secret. + type: string + namespace: + description: Namespace of the secret. + type: string + required: + - key + - name + - namespace + type: object username: description: The SMTP server username. type: string + required: + - passwordSecretRef type: object type: array envelopeFrom: diff --git a/package/crds/realm.keycloak.crossplane.io_requiredactions.yaml b/package/crds/realm.keycloak.crossplane.io_requiredactions.yaml index d99ff21..9aa222f 100644 --- a/package/crds/realm.keycloak.crossplane.io_requiredactions.yaml +++ b/package/crds/realm.keycloak.crossplane.io_requiredactions.yaml @@ -19,12 +19,12 @@ spec: scope: Cluster versions: - additionalPrinterColumns: - - jsonPath: .status.conditions[?(@.type=='Ready')].status - name: READY - type: string - jsonPath: .status.conditions[?(@.type=='Synced')].status name: SYNCED type: string + - jsonPath: .status.conditions[?(@.type=='Ready')].status + name: READY + type: string - jsonPath: .metadata.annotations.crossplane\.io/external-name name: EXTERNAL-NAME type: string diff --git a/package/crds/role.keycloak.crossplane.io_roles.yaml b/package/crds/role.keycloak.crossplane.io_roles.yaml index 9c1d787..d8abfcc 100644 --- a/package/crds/role.keycloak.crossplane.io_roles.yaml +++ b/package/crds/role.keycloak.crossplane.io_roles.yaml @@ -19,12 +19,12 @@ spec: scope: Cluster versions: - additionalPrinterColumns: - - jsonPath: .status.conditions[?(@.type=='Ready')].status - name: READY - type: string - jsonPath: .status.conditions[?(@.type=='Synced')].status name: SYNCED type: string + - jsonPath: .status.conditions[?(@.type=='Ready')].status + name: READY + type: string - jsonPath: .metadata.annotations.crossplane\.io/external-name name: EXTERNAL-NAME type: string diff --git a/package/crds/saml.keycloak.crossplane.io_identityproviders.yaml b/package/crds/saml.keycloak.crossplane.io_identityproviders.yaml index 88df4de..5b9349a 100644 --- a/package/crds/saml.keycloak.crossplane.io_identityproviders.yaml +++ b/package/crds/saml.keycloak.crossplane.io_identityproviders.yaml @@ -19,12 +19,12 @@ spec: scope: Cluster versions: - additionalPrinterColumns: - - jsonPath: .status.conditions[?(@.type=='Ready')].status - name: READY - type: string - jsonPath: .status.conditions[?(@.type=='Synced')].status name: SYNCED type: string + - jsonPath: .status.conditions[?(@.type=='Ready')].status + name: READY + type: string - jsonPath: .metadata.annotations.crossplane\.io/external-name name: EXTERNAL-NAME type: string diff --git a/package/crds/samlclient.keycloak.crossplane.io_clientdefaultscopes.yaml b/package/crds/samlclient.keycloak.crossplane.io_clientdefaultscopes.yaml index 9c1b750..567094c 100644 --- a/package/crds/samlclient.keycloak.crossplane.io_clientdefaultscopes.yaml +++ b/package/crds/samlclient.keycloak.crossplane.io_clientdefaultscopes.yaml @@ -19,12 +19,12 @@ spec: scope: Cluster versions: - additionalPrinterColumns: - - jsonPath: .status.conditions[?(@.type=='Ready')].status - name: READY - type: string - jsonPath: .status.conditions[?(@.type=='Synced')].status name: SYNCED type: string + - jsonPath: .status.conditions[?(@.type=='Ready')].status + name: READY + type: string - jsonPath: .metadata.annotations.crossplane\.io/external-name name: EXTERNAL-NAME type: string diff --git a/package/crds/samlclient.keycloak.crossplane.io_clients.yaml b/package/crds/samlclient.keycloak.crossplane.io_clients.yaml index acdc455..06fbf4b 100644 --- a/package/crds/samlclient.keycloak.crossplane.io_clients.yaml +++ b/package/crds/samlclient.keycloak.crossplane.io_clients.yaml @@ -19,12 +19,12 @@ spec: scope: Cluster versions: - additionalPrinterColumns: - - jsonPath: .status.conditions[?(@.type=='Ready')].status - name: READY - type: string - jsonPath: .status.conditions[?(@.type=='Synced')].status name: SYNCED type: string + - jsonPath: .status.conditions[?(@.type=='Ready')].status + name: READY + type: string - jsonPath: .metadata.annotations.crossplane\.io/external-name name: EXTERNAL-NAME type: string diff --git a/package/crds/samlclient.keycloak.crossplane.io_clientscopes.yaml b/package/crds/samlclient.keycloak.crossplane.io_clientscopes.yaml index 5cb9c85..ba42d48 100644 --- a/package/crds/samlclient.keycloak.crossplane.io_clientscopes.yaml +++ b/package/crds/samlclient.keycloak.crossplane.io_clientscopes.yaml @@ -19,12 +19,12 @@ spec: scope: Cluster versions: - additionalPrinterColumns: - - jsonPath: .status.conditions[?(@.type=='Ready')].status - name: READY - type: string - jsonPath: .status.conditions[?(@.type=='Synced')].status name: SYNCED type: string + - jsonPath: .status.conditions[?(@.type=='Ready')].status + name: READY + type: string - jsonPath: .metadata.annotations.crossplane\.io/external-name name: EXTERNAL-NAME type: string diff --git a/package/crds/user.keycloak.crossplane.io_groups.yaml b/package/crds/user.keycloak.crossplane.io_groups.yaml index a1ad821..9249f6b 100644 --- a/package/crds/user.keycloak.crossplane.io_groups.yaml +++ b/package/crds/user.keycloak.crossplane.io_groups.yaml @@ -19,12 +19,12 @@ spec: scope: Cluster versions: - additionalPrinterColumns: - - jsonPath: .status.conditions[?(@.type=='Ready')].status - name: READY - type: string - jsonPath: .status.conditions[?(@.type=='Synced')].status name: SYNCED type: string + - jsonPath: .status.conditions[?(@.type=='Ready')].status + name: READY + type: string - jsonPath: .metadata.annotations.crossplane\.io/external-name name: EXTERNAL-NAME type: string diff --git a/package/crds/user.keycloak.crossplane.io_permissions.yaml b/package/crds/user.keycloak.crossplane.io_permissions.yaml index cd083af..ef96fd3 100644 --- a/package/crds/user.keycloak.crossplane.io_permissions.yaml +++ b/package/crds/user.keycloak.crossplane.io_permissions.yaml @@ -19,12 +19,12 @@ spec: scope: Cluster versions: - additionalPrinterColumns: - - jsonPath: .status.conditions[?(@.type=='Ready')].status - name: READY - type: string - jsonPath: .status.conditions[?(@.type=='Synced')].status name: SYNCED type: string + - jsonPath: .status.conditions[?(@.type=='Ready')].status + name: READY + type: string - jsonPath: .metadata.annotations.crossplane\.io/external-name name: EXTERNAL-NAME type: string diff --git a/package/crds/user.keycloak.crossplane.io_users.yaml b/package/crds/user.keycloak.crossplane.io_users.yaml index a757436..75f75cb 100644 --- a/package/crds/user.keycloak.crossplane.io_users.yaml +++ b/package/crds/user.keycloak.crossplane.io_users.yaml @@ -19,12 +19,12 @@ spec: scope: Cluster versions: - additionalPrinterColumns: - - jsonPath: .status.conditions[?(@.type=='Ready')].status - name: READY - type: string - jsonPath: .status.conditions[?(@.type=='Synced')].status name: SYNCED type: string + - jsonPath: .status.conditions[?(@.type=='Ready')].status + name: READY + type: string - jsonPath: .metadata.annotations.crossplane\.io/external-name name: EXTERNAL-NAME type: string @@ -139,8 +139,6 @@ spec: - name - namespace type: object - required: - - valueSecretRef type: object type: array lastName: @@ -296,6 +294,25 @@ spec: description: If set to true, the initial password is set up for renewal on first use. Default to false. type: boolean + valueSecretRef: + description: The initial password. + properties: + key: + description: The key to select. + type: string + name: + description: Name of the secret. + type: string + namespace: + description: Namespace of the secret. + type: string + required: + - key + - name + - namespace + type: object + required: + - valueSecretRef type: object type: array lastName: