fix apis

liqotech · Oct 10, 2023 · 835cefb · 835cefb
1 parent 4695feb
commit 835cefb
Show file tree

Hide file tree

Showing 15 changed files with 2,568 additions and 24 deletions.
diff --git a/apis/networking/v1alpha1/gatewayclient_types.go b/apis/networking/v1alpha1/gatewayclient_types.go
@@ -42,7 +42,7 @@ type GatewayClientSpec struct {
 	// MTU specifies the MTU of the tunnel.
 	MTU int `json:"mtu,omitempty"`
 	// Endpoint specifies the endpoint of the tunnel.
-	Endpoint Endpoint `json:"endpoint,omitempty"`
+	Endpoint EndpointStatus `json:"endpoint,omitempty"`
 }
 
 // GatewayClientStatus defines the observed state of GatewayClient.

diff --git a/apis/networking/v1alpha1/wggatewayclient_types.go b/apis/networking/v1alpha1/wggatewayclient_types.go
@@ -39,6 +39,8 @@ var WgGatewayClientGroupVersionResource = GroupVersion.WithResource(WgGatewayCli
 type WgGatewayClientSpec struct {
 	// Deployment specifies the deployment template for the client.
 	Deployment DeploymentTemplate `json:"deployment"`
+	// Metrics specifies the metrics configuration for the client.
+	Metrics *Metrics `json:"metrics,omitempty"`
 }
 
 // WgGatewayClientStatus defines the observed state of WgGatewayClient.

diff --git a/apis/networking/v1alpha1/wggatewayserver_types.go b/apis/networking/v1alpha1/wggatewayserver_types.go
@@ -15,6 +15,7 @@
 package v1alpha1
 
 import (
+	monitoringv1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1"
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -52,12 +53,31 @@ type DeploymentTemplate struct {
 	Spec appsv1.DeploymentSpec `json:"spec,omitempty"`
 }
 
+type ServiceMonitorTemplate struct {
+	// Metadata of the service monitor.
+	Metadata metav1.ObjectMeta `json:"metadata,omitempty"`
+	// Spec of the service monitor.
+	Spec monitoringv1.ServiceMonitorSpec `json:"spec,omitempty"`
+}
+
+// Metrics defines the metrics configuration.
+type Metrics struct {
+	// Enabled specifies whether the metrics are enabled.
+	Enabled bool `json:"enabled"`
+	// Service specifies the service template for the metrics.
+	Service *ServiceTemplate `json:"service,omitempty"`
+	// ServiceMonitor specifies the service monitor template for the metrics.
+	ServiceMonitor *ServiceMonitorTemplate `json:"serviceMonitor,omitempty"`
+}
+
 // WgGatewayServerSpec defines the desired state of WgGatewayServer.
 type WgGatewayServerSpec struct {
 	// Service specifies the service template for the server.
 	Service ServiceTemplate `json:"service"`
 	// Deployment specifies the deployment template for the server.
 	Deployment DeploymentTemplate `json:"deployment"`
+	// Metrics specifies the metrics configuration for the server.
+	Metrics *Metrics `json:"metrics,omitempty"`
 }
 
 // WgGatewayServerStatus defines the observed state of WgGatewayServer.

diff --git a/apis/networking/v1alpha1/zz_generated.deepcopy.go b/apis/networking/v1alpha1/zz_generated.deepcopy.go
diff --git a/deployments/liqo/charts/liqo-crds/crds/networking.liqo.io_gatewayclients.yaml b/deployments/liqo/charts/liqo-crds/crds/networking.liqo.io_gatewayclients.yaml
@@ -78,18 +78,21 @@ spec:
               endpoint:
                 description: Endpoint specifies the endpoint of the tunnel.
                 properties:
+                  addresses:
+                    description: Addresses specifies the addresses of the endpoint.
+                    items:
+                      type: string
+                    type: array
                   port:
                     description: Port specifies the port of the endpoint.
                     format: int32
                     type: integer
-                  serviceType:
-                    default: ClusterIP
-                    description: ServiceType specifies the type of the service.
+                  protocol:
+                    default: TCP
+                    description: Protocol specifies the protocol of the endpoint.
                     enum:
-                    - ClusterIP
-                    - NodePort
-                    - LoadBalancer
-                    - ExternalName
+                    - TCP
+                    - UDP
                     type: string
                 type: object
               mtu: