Enable conflictingmarkers linter and fix issues

Signed-off-by: Lennart Jern <lennart.jern@est.tech>

Author: lentzi90

.golangci-kal.yml

@@ -16,7 +16,7 @@ linters:
             enable:
             - "commentstart" # Ensure comments start with the serialized version of the field name.
             - "conditions" # Ensure conditions have the correct json tags and markers.
-            # - "conflictingmarkers" # Ensure there are no conflicting markers.
+            - "conflictingmarkers" # Ensure there are no conflicting markers.
             - "duplicatemarkers" # Ensure there are no exact duplicate markers for types and fields.
             # - "forbiddenmarkers" # Ensure that types and fields do not contain any markers that are forbidden.
             - "integers" # Ensure only int32 and int64 are used for integers.

api/v1beta2/identity_types.go

@@ -23,7 +23,7 @@ type OpenStackIdentityReference struct {
 	// type specifies the identity reference type. Defaults to Secret for backward compatibility.
 	// +kubebuilder:validation:Enum=Secret;ClusterIdentity
 	// +kubebuilder:default=Secret
-	// +required
+	// +optional
 	Type string `json:"type,omitempty"`
 
 	// name is the name of a Secret (type=Secret) in the same namespace as the resource being provisioned,

api/v1beta2/types.go

@@ -993,7 +993,7 @@ type APIServerLoadBalancer struct {
 	// API server loadbalancer, omit the APIServerLoadBalancer field in the
 	// cluster spec instead.
 	//
-	// +required
+	// +optional
 	// +kubebuilder:default:=true
 	Enabled *bool `json:"enabled,omitempty"`