Fix invalid kubebuilder code gen markers (#734)

* Fix invalid kubebuilder code gen markers

* Remove redundant optional markers (#735)

Author: alex-bezek

api/bindings/v1alpha1/boundendpoint_types.go

@@ -64,32 +64,26 @@ type BoundEndpointSpec struct {
 type BoundEndpointStatus struct {
 	// Endpoints is the list of ngrok API endpoint references bound to this BoundEndpoint
 	// All endpoints share the same underlying Kubernetes services
-	// +kubebuilder:validation:Optional
 	Endpoints []BindingEndpoint `json:"endpoints,omitempty"`
 
 	// HashName is the hashed output of the TargetService and TargetNamespace for unique identification
-	// +kubebuilder:validation:Optional
 	HashedName string `json:"hashedName,omitempty"`
 
 	// EndpointsSummary provides a human-readable count of bound endpoints
 	// Format: "N endpoint" or "N endpoints"
 	// Examples: "1 endpoint", "2 endpoints"
-	// +kubebuilder:validation:Optional
 	EndpointsSummary string `json:"endpointsSummary,omitempty"`
 
 	// Conditions represent the latest available observations of the BoundEndpoint's state
-	// +kubebuilder:validation:Optional
 	// +listType=map
 	// +listMapKey=type
 	// +kubebuilder:validation:MaxItems=8
 	Conditions []metav1.Condition `json:"conditions,omitempty"`
 
 	// TargetServiceRef references the created ExternalName Service in the target namespace
-	// +kubebuilder:validation:Optional
 	TargetServiceRef *ngrokv1alpha1.K8sObjectRefOptionalNamespace `json:"targetServiceRef,omitempty"`
 
 	// UpstreamServiceRef references the created ClusterIP Service pointing to pod forwarders
-	// +kubebuilder:validation:Optional
 	UpstreamServiceRef *ngrokv1alpha1.K8sObjectRef `json:"upstreamServiceRef,omitempty"`
 }
 
@@ -114,7 +108,6 @@ type EndpointTarget struct {
 	Port int32 `json:"port"`
 
 	// Metadata is a subset of metav1.ObjectMeta that is added to the Service
-	// +kube:validation:Optional
 	Metadata TargetMetadata `json:"metadata,omitempty"`
 }
 
@@ -125,14 +118,12 @@ type TargetMetadata struct {
 	// (scope and select) objects. May match selectors of replication controllers
 	// and services.
 	// More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels
-	// +kubebuilder:validation:Optional
 	Labels map[string]string `json:"labels,omitempty"`
 
 	// Annotations is an unstructured key value map stored with a resource that may be
 	// set by external tools to store and retrieve arbitrary metadata. They are not
 	// queryable and should be preserved when modifying objects.
 	// More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations
-	// +kubebuilder:validation:Optional
 	Annotations map[string]string `json:"annotations,omitempty"`
 }
 

api/ingress/v1alpha1/domain_types.go

@@ -51,7 +51,6 @@ type DomainSpec struct {
 	Domain string `json:"domain"`
 
 	// Region is the region in which to reserve the domain
-	// +kubebuilder:validation:Optional
 	Region string `json:"region,omitempty"`
 
 	// DomainReclaimPolicy is the policy to use when the domain is deleted

api/ngrok/v1alpha1/agentendpoint_types.go

@@ -88,8 +88,8 @@ type EndpointUpstream struct {
 
 	// Optionally specify the version of proxy protocol to use if the upstream requires it
 	//
-	// +kubebuilder:validation:Optional
 	// +kubebuilder:validation:Enum=1;2
+	// +kubebuilder:validation:Optional
 	ProxyProtocolVersion *commonv1alpha1.ProxyProtocolVersion `json:"proxyProtocolVersion"`
 }
 
@@ -118,8 +118,6 @@ type AgentEndpointSpec struct {
 
 	// Allows configuring a TrafficPolicy to be used with this AgentEndpoint
 	// When configured, the traffic policy is provided inline or as a reference to an NgrokTrafficPolicy resource
-	//
-	// +kubebuilder:validation:Optional
 	TrafficPolicy *TrafficPolicyCfg `json:"trafficPolicy,omitempty"`
 
 	// Human-readable description of this agent endpoint
@@ -135,14 +133,11 @@ type AgentEndpointSpec struct {
 	// List of Binding IDs to associate with the endpoint
 	// Accepted values are "public", "internal", or "kubernetes"
 	//
-	// +kubebuilder:validation:Optional
 	// +kubebuilder:validation:MaxItems=1
-	// +kubebuilder:validation:Items=pattern=`^(public|internal|kubernetes)$`
+	// +kubebuilder:validation:items:Pattern=`^(public|internal|kubernetes)$`
 	Bindings []string `json:"bindings,omitempty"`
 
 	// List of client certificates to present to the upstream when performing a TLS handshake
-	//
-	// +kubebuilder:validation:Optional
 	ClientCertificateRefs []K8sObjectRefOptionalNamespace `json:"clientCertificateRefs,omitempty"`
 }
 
@@ -159,15 +154,12 @@ type TrafficPolicyCfg struct {
 	// Inline definition of a TrafficPolicy to attach to the agent Endpoint
 	// The raw JSON-encoded policy that was applied to the ngrok API
 	//
-	// +kubebuilder:validation:Optional
 	// +kubebuilder:validation:Schemaless
 	// +kubebuilder:pruning:PreserveUnknownFields
 	// +kubebuilder:validation:Type=object
 	Inline json.RawMessage `json:"inline,omitempty"`
 
 	// Reference to a TrafficPolicy resource to attach to the Agent Endpoint
-	//
-	// +kubebuilder:validation:Optional
 	Reference *K8sObjectRef `json:"targetRef,omitempty"`
 }
 
@@ -182,24 +174,19 @@ func (t *TrafficPolicyCfg) Type() TrafficPolicyCfgType {
 type AgentEndpointStatus struct {
 	// The assigned URL. This will either be the user-supplied url, or the generated assigned url
 	// depending on the configuration of spec.url
-	//
-	// +kubebuilder:validation:Optional
 	AssignedURL string `json:"assignedURL,omitempty"`
 
 	// Identifies any traffic policies attached to the AgentEndpoint ("inline", "none", or reference name).
-	//
-	// +kubebuilder:validation:Optional
 	AttachedTrafficPolicy string `json:"trafficPolicy,omitempty"`
 
 	// DomainRef is a reference to the Domain resource associated with this endpoint.
 	// For internal endpoints, this will be nil.
 	// +kubebuilder:validation:Optional
-	// +kubebuilder:validation:Nullable
+	// +nullable
 	DomainRef *K8sObjectRefOptionalNamespace `json:"domainRef"`
 
 	// Conditions describe the current conditions of the AgentEndpoint.
 	//
-	// +kubebuilder:validation:Optional
 	// +listType=map
 	// +listMapKey=type
 	// +kubebuilder:validation:MaxItems=8

api/ngrok/v1alpha1/cloudendpoint_types.go

@@ -47,8 +47,6 @@ type CloudEndpointSpec struct {
 	URL string `json:"url"`
 
 	// Reference to the TrafficPolicy resource to attach to the Cloud Endpoint
-	//
-	// +kubebuilder:validation:Optional
 	TrafficPolicyName string `json:"trafficPolicyName,omitempty"`
 
 	// Controls whether or not the Cloud Endpoint should allow pooling with other
@@ -60,8 +58,6 @@ type CloudEndpointSpec struct {
 	PoolingEnabled bool `json:"poolingEnabled"`
 
 	// Allows inline definition of a TrafficPolicy object
-	//
-	// +kubebuilder:validation:Optional
 	TrafficPolicy *NgrokTrafficPolicySpec `json:"trafficPolicy,omitempty"`
 
 	// Human-readable description of this cloud endpoint
@@ -77,9 +73,8 @@ type CloudEndpointSpec struct {
 	// Bindings is the list of Binding IDs to associate with the endpoint
 	// Accepted values are "public", "internal", or "kubernetes"
 	//
-	// +kubebuilder:validation:Optional
 	// +kubebuilder:validation:MaxItems=1
-	// +kubebuilder:validation:Items=pattern=`^(public|internal|kubernetes)$`
+	// +kubebuilder:validation:items:Pattern=`^(public|internal|kubernetes)$`
 	Bindings []string `json:"bindings,omitempty"`
 }
 
@@ -91,12 +86,11 @@ type CloudEndpointStatus struct {
 	// DomainRef is a reference to the Domain resource associated with this endpoint.
 	// For internal endpoints, this will be nil.
 	// +kubebuilder:validation:Optional
-	// +kubebuilder:validation:Nullable
+	// +nullable
 	DomainRef *K8sObjectRefOptionalNamespace `json:"domainRef"`
 
 	// Conditions describe the current conditions of the AgentEndpoint.
 	//
-	// +kubebuilder:validation:Optional
 	// +listType=map
 	// +listMapKey=type
 	// +kubebuilder:validation:MaxItems=8

api/ngrok/v1alpha1/common_types.go

@@ -43,7 +43,6 @@ type K8sObjectRefOptionalNamespace struct {
 	Name string `json:"name"`
 
 	// The namespace of the Kubernetes resource being referenced
-	// +kubebuilder:validation:Optional
 	Namespace *string `json:"namespace,omitempty"`
 }
 

api/ngrok/v1alpha1/kubernetesoperator_types.go

@@ -46,7 +46,6 @@ type KubernetesOperatorBinding struct {
 	EndpointSelectors []string `json:"endpointSelectors,omitempty"`
 
 	// The public ingress endpoint for this Kubernetes Operator
-	// +kubebuilder:validation:Optional
 	IngressEndpoint *string `json:"ingressEndpoint,omitempty"`
 
 	// TlsSecretName is the name of the k8s secret that contains the TLS private/public keys to use for the ngrok forwarding endpoint
@@ -64,22 +63,19 @@ type KubernetesOperatorStatus struct {
 	URI string `json:"uri,omitempty"`
 
 	// RegistrationStatus is the status of the registration of this Kubernetes Operator with the ngrok API
-	// +kube:validation:Enum=registered;error;pending
+	// +kubebuilder:validation:Enum=registered;error;pending
 	// +kubebuilder:default="pending"
 	RegistrationStatus string `json:"registrationStatus,omitempty"`
 
 	// RegistrationErrorCode is the returned ngrok error code
-	// +kube:validation:Optional
 	// +kubebuilder:validation:Pattern=`^ERR_NGROK_\d+$`
 	RegistrationErrorCode string `json:"registrationErrorCode,omitempty"`
 
 	// RegistrationErrorMessage is a free-form error message if the status is error
-	// +kubebuilder:validation:Optional
 	// +kubebuilder:validation:MaxLength=4096
 	RegistrationErrorMessage string `json:"errorMessage,omitempty"`
 
 	// EnabledFeatures is the string representation of the features enabled for this Kubernetes Operator
-	// +kubebuilder:validation:Optional
 	EnabledFeatures string `json:"enabledFeatures,omitempty"`
 
 	// BindingsIngressEndpoint is the URL that the operator will use to talk
@@ -112,7 +108,6 @@ type KubernetesOperatorSpec struct {
 	Metadata string `json:"metadata,omitempty"`
 
 	// Features enabled for this Kubernetes Operator
-	// +kubebuilder:validation:Optional
 	// +kubebuilder:validation:items:Enum=ingress;gateway;bindings
 	EnabledFeatures []string `json:"enabledFeatures,omitempty"`