chore: Remove deprecated properties from CRs (#154)

api/common/ref.go

@@ -10,11 +10,12 @@ import (
 type RealmRef struct {
 	// Kind specifies the kind of the Keycloak resource.
 	// +kubebuilder:validation:Enum=KeycloakRealm;ClusterKeycloakRealm
+	// +kubebuilder:default=KeycloakRealm
 	// +optional
 	Kind string `json:"kind,omitempty"`
 
 	// Name specifies the name of the Keycloak resource.
-	// +optional
+	// +required
 	Name string `json:"name,omitempty"`
 }
 
@@ -34,11 +35,12 @@ type HasKeycloakRef interface {
 type KeycloakRef struct {
 	// Kind specifies the kind of the Keycloak resource.
 	// +kubebuilder:validation:Enum=Keycloak;ClusterKeycloak
+	// +kubebuilder:default=Keycloak
 	// +optional
 	Kind string `json:"kind,omitempty"`
 
 	// Name specifies the name of the Keycloak resource.
-	// +optional
+	// +required
 	Name string `json:"name,omitempty"`
 }
 

api/v1/keycloakauthflow_types.go

@@ -8,13 +8,8 @@ import (
 
 // KeycloakAuthFlowSpec defines the desired state of KeycloakAuthFlow.
 type KeycloakAuthFlowSpec struct {
-	// Deprecated: use RealmRef instead.
-	// Realm is name of KeycloakRealm custom resource.
-	// +optional
-	Realm string `json:"realm,omitempty"`
-
 	// RealmRef is reference to Realm custom resource.
-	// +optional
+	// +required
 	RealmRef common.RealmRef `json:"realmRef"`
 
 	// Alias is display name for authentication flow.

api/v1/keycloakclient_types.go

@@ -18,15 +18,8 @@ type KeycloakClientSpec struct {
 	// ClientId is a unique keycloak client ID referenced in URI and tokens.
 	ClientId string `json:"clientId"`
 
-	// Deprecated: use RealmRef instead.
-	// TargetRealm is a realm name where client will be created.
-	// It has higher priority than RealmRef for backward compatibility.
-	// If both TargetRealm and RealmRef are specified, TargetRealm will be used for client creation.
-	// +optional
-	TargetRealm string `json:"targetRealm,omitempty"`
-
 	// RealmRef is reference to Realm custom resource.
-	// +optional
+	// +required
 	RealmRef common.RealmRef `json:"realmRef"`
 
 	// Secret is kubernetes secret name where the client's secret will be stored.

api/v1/keycloakclientscope_types.go

@@ -11,13 +11,8 @@ type KeycloakClientScopeSpec struct {
 	// Name of keycloak client scope.
 	Name string `json:"name"`
 
-	// Deprecated: use RealmRef instead.
-	// Realm is name of KeycloakRealm custom resource.
-	// +optional
-	Realm string `json:"realm"`
-
 	// RealmRef is reference to Realm custom resource.
-	// +optional
+	// +required
 	RealmRef common.RealmRef `json:"realmRef"`
 
 	// Protocol is SSO protocol configuration which is being supplied by this client scope.

api/v1/keycloakcomponent_types.go

@@ -11,13 +11,8 @@ type KeycloakComponentSpec struct {
 	// Name of keycloak component.
 	Name string `json:"name"`
 
-	// Deprecated: use RealmRef instead.
-	// Realm is name of KeycloakRealm custom resource.
-	// +optional
-	Realm string `json:"realm"`
-
 	// RealmRef is reference to Realm custom resource.
-	// +optional
+	// +required
 	RealmRef common.RealmRef `json:"realmRef"`
 
 	// ProviderID is a provider ID of component.

api/v1/keycloakrealm_types.go

@@ -11,14 +11,8 @@ type KeycloakRealmSpec struct {
 	// RealmName specifies the name of the realm.
 	RealmName string `json:"realmName"`
 
-	// Deprecated: use KeycloakRef instead.
-	// KeycloakOwner specifies the name of the Keycloak instance that owns the realm.
-	// +nullable
-	// +optional
-	KeycloakOwner string `json:"keycloakOwner,omitempty"`
-
 	// KeycloakRef is reference to Keycloak custom resource.
-	// +optional
+	// +required
 	KeycloakRef common.KeycloakRef `json:"keycloakRef,omitempty"`
 
 	// Users is a list of users to create in the realm.

api/v1/keycloakrealmgroup_types.go

@@ -11,13 +11,8 @@ type KeycloakRealmGroupSpec struct {
 	// Name of keycloak group.
 	Name string `json:"name"`
 
-	// Deprecated: use RealmRef instead.
-	// Realm is name of KeycloakRealm custom resource.
-	// +optional
-	Realm string `json:"realm"`
-
 	// RealmRef is reference to Realm custom resource.
-	// +optional
+	// +required
 	RealmRef common.RealmRef `json:"realmRef"`
 
 	// Path is a group path.

api/v1/keycloakrealmidentityprovider_types.go

@@ -8,13 +8,8 @@ import (
 
 // KeycloakRealmIdentityProviderSpec defines the desired state of KeycloakRealmIdentityProvider.
 type KeycloakRealmIdentityProviderSpec struct {
-	// Deprecated: use RealmRef instead.
-	// Realm is name of KeycloakRealm custom resource.
-	// +optional
-	Realm string `json:"realm"`
-
 	// RealmRef is reference to Realm custom resource.
-	// +optional
+	// +required
 	RealmRef common.RealmRef `json:"realmRef"`
 
 	// ProviderID is a provider ID of identity provider.

api/v1/keycloakrealmrole_types.go

@@ -11,13 +11,8 @@ type KeycloakRealmRoleSpec struct {
 	// Name of keycloak role.
 	Name string `json:"name"`
 
-	// Deprecated: use RealmRef instead.
-	// Realm is name of KeycloakRealm custom resource.
-	// +optional
-	Realm string `json:"realm"`
-
 	// RealmRef is reference to Realm custom resource.
-	// +optional
+	// +required
 	RealmRef common.RealmRef `json:"realmRef"`
 
 	// Description is a role description.

api/v1/keycloakrealmrolebatch_types.go

@@ -10,13 +10,8 @@ import (
 
 // KeycloakRealmRoleBatchSpec defines the desired state of KeycloakRealmRoleBatch.
 type KeycloakRealmRoleBatchSpec struct {
-	// Deprecated: use RealmRef instead.
-	// Realm is name of KeycloakRealm custom resource.
-	// +optional
-	Realm string `json:"realm"`
-
 	// RealmRef is reference to Realm custom resource.
-	// +optional
+	// +required
 	RealmRef common.RealmRef `json:"realmRef"`
 
 	// Roles is a list of roles to be created.

api/v1/keycloakrealmuser_types.go

@@ -8,13 +8,8 @@ import (
 
 // KeycloakRealmUserSpec defines the desired state of KeycloakRealmUser.
 type KeycloakRealmUserSpec struct {
-	// Deprecated: use RealmRef instead.
-	// Realm is name of KeycloakRealm custom resource.
-	// +optional
-	Realm string `json:"realm"`
-
 	// RealmRef is reference to Realm custom resource.
-	// +optional
+	// +required
 	RealmRef common.RealmRef `json:"realmRef"`
 
 	// Username is a username in keycloak.

config/crd/bases/v1.edp.epam.com_keycloakauthflows.yaml

@@ -109,15 +109,11 @@ spec:
                 description: ProviderID for root auth flow and provider for child
                   auth flows.
                 type: string
-              realm:
-                description: |-
-                  Deprecated: use RealmRef instead.
-                  Realm is name of KeycloakRealm custom resource.
-                type: string
               realmRef:
                 description: RealmRef is reference to Realm custom resource.
                 properties:
                   kind:
+                    default: KeycloakRealm
                     description: Kind specifies the kind of the Keycloak resource.
                     enum:
                     - KeycloakRealm
@@ -126,6 +122,8 @@ spec:
                   name:
                     description: Name specifies the name of the Keycloak resource.
                     type: string
+                required:
+                - name
                 type: object
               topLevel:
                 description: TopLevel is true if this is root auth flow.
@@ -134,6 +132,7 @@ spec:
             - alias
             - builtIn
             - providerId
+            - realmRef
             - topLevel
             type: object
           status:

config/crd/bases/v1.edp.epam.com_keycloakclients.yaml

@@ -526,6 +526,7 @@ spec:
                 description: RealmRef is reference to Realm custom resource.
                 properties:
                   kind:
+                    default: KeycloakRealm
                     description: Kind specifies the kind of the Keycloak resource.
                     enum:
                     - KeycloakRealm
@@ -534,6 +535,8 @@ spec:
                   name:
                     description: Name specifies the name of the Keycloak resource.
                     type: string
+                required:
+                - name
                 type: object
               realmRoles:
                 description: RealmRoles is a list of realm roles assigned to client.
@@ -625,13 +628,6 @@ spec:
               surrogateAuthRequired:
                 description: SurrogateAuthRequired is a flag to enable surrogate auth.
                 type: boolean
-              targetRealm:
-                description: |-
-                  Deprecated: use RealmRef instead.
-                  TargetRealm is a realm name where client will be created.
-                  It has higher priority than RealmRef for backward compatibility.
-                  If both TargetRealm and RealmRef are specified, TargetRealm will be used for client creation.
-                type: string
               webOrigins:
                 description: |-
                   WebOrigins is a list of allowed CORS origins.
@@ -649,6 +645,7 @@ spec:
                 type: string
             required:
             - clientId
+            - realmRef
             type: object
           status:
             description: KeycloakClientStatus defines the observed state of KeycloakClient.

config/crd/bases/v1.edp.epam.com_keycloakclientscopes.yaml

@@ -87,15 +87,11 @@ spec:
                   type: object
                 nullable: true
                 type: array
-              realm:
-                description: |-
-                  Deprecated: use RealmRef instead.
-                  Realm is name of KeycloakRealm custom resource.
-                type: string
               realmRef:
                 description: RealmRef is reference to Realm custom resource.
                 properties:
                   kind:
+                    default: KeycloakRealm
                     description: Kind specifies the kind of the Keycloak resource.
                     enum:
                     - KeycloakRealm
@@ -104,10 +100,13 @@ spec:
                   name:
                     description: Name specifies the name of the Keycloak resource.
                     type: string
+                required:
+                - name
                 type: object
             required:
             - name
             - protocol
+            - realmRef
             type: object
           status:
             description: KeycloakClientScopeStatus defines the observed state of KeycloakClientScope.

config/crd/bases/v1.edp.epam.com_keycloakrealmcomponents.yaml

@@ -90,15 +90,11 @@ spec:
               providerType:
                 description: ProviderType is a provider type of component.
                 type: string
-              realm:
-                description: |-
-                  Deprecated: use RealmRef instead.
-                  Realm is name of KeycloakRealm custom resource.
-                type: string
               realmRef:
                 description: RealmRef is reference to Realm custom resource.
                 properties:
                   kind:
+                    default: KeycloakRealm
                     description: Kind specifies the kind of the Keycloak resource.
                     enum:
                     - KeycloakRealm
@@ -107,11 +103,14 @@ spec:
                   name:
                     description: Name specifies the name of the Keycloak resource.
                     type: string
+                required:
+                - name
                 type: object
             required:
             - name
             - providerId
             - providerType
+            - realmRef
             type: object
           status:
             description: KeycloakComponentStatus defines the observed state of KeycloakRealmComponent.

config/crd/bases/v1.edp.epam.com_keycloakrealmgroups.yaml

@@ -83,15 +83,11 @@ spec:
               path:
                 description: Path is a group path.
                 type: string
-              realm:
-                description: |-
-                  Deprecated: use RealmRef instead.
-                  Realm is name of KeycloakRealm custom resource.
-                type: string
               realmRef:
                 description: RealmRef is reference to Realm custom resource.
                 properties:
                   kind:
+                    default: KeycloakRealm
                     description: Kind specifies the kind of the Keycloak resource.
                     enum:
                     - KeycloakRealm
@@ -100,6 +96,8 @@ spec:
                   name:
                     description: Name specifies the name of the Keycloak resource.
                     type: string
+                required:
+                - name
                 type: object
               realmRoles:
                 description: RealmRoles is a list of realm roles assigned to group.
@@ -115,6 +113,7 @@ spec:
                 type: array
             required:
             - name
+            - realmRef
             type: object
           status:
             description: KeycloakRealmGroupStatus defines the observed state of KeycloakRealmGroup.