Rename tunnel to service, LightHouse to Lighthouse

ironcore-dev · Nov 2, 2021 · 89aece6 · 89aece6
1 parent 1644253
commit 89aece6
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 18 deletions.
diff --git a/apis/compute/v1alpha1/console_types.go b/apis/compute/v1alpha1/console_types.go
@@ -28,8 +28,8 @@ type ConsoleSpec struct {
 	Type ConsoleType `json:"type"`
 	// MachineRef references the machine to open a console to.
 	MachineRef corev1.LocalObjectReference `json:"machineRef"`
-	// LightHouseClientConfig is the ConsoleClientConfig for the machine to connect to a common lighthouse.
-	LightHouseClientConfig *ConsoleClientConfig `json:"lightHouseClientConfig,omitempty"`
+	// LighthouseClientConfig is the ConsoleClientConfig for the machine to connect to a common lighthouse.
+	LighthouseClientConfig *ConsoleClientConfig `json:"lighthouseClientConfig,omitempty"`
 }
 
 type ConsoleClientConfig struct {
@@ -58,11 +58,13 @@ type ServiceReference struct {
 	Port *int32 `json:"port,omitempty"`
 }
 
+// ConsoleType represents the type of console.
+// +kubebuilder:validation:Enum=Service;Lighthouse
 type ConsoleType string
 
 const (
-	ConsoleTypeTunnel     ConsoleType = "Tunnel"
-	ConsoleTypeLightHouse ConsoleType = "LightHouse"
+	ConsoleTypeService    ConsoleType = "Service"
+	ConsoleTypeLightHouse ConsoleType = "Lighthouse"
 )
 
 type ConsoleState string
@@ -75,8 +77,8 @@ const (
 
 // ConsoleStatus defines the observed state of Console
 type ConsoleStatus struct {
-	State              ConsoleState         `json:"state,omitempty"`
-	TunnelClientConfig *ConsoleClientConfig `json:"tunnelClientConfig,omitempty"`
+	State               ConsoleState         `json:"state,omitempty"`
+	ServiceClientConfig *ConsoleClientConfig `json:"serviceClientConfig,omitempty"`
 }
 
 //+kubebuilder:object:root=true

diff --git a/apis/compute/v1alpha1/zz_generated.deepcopy.go b/apis/compute/v1alpha1/zz_generated.deepcopy.go
diff --git a/config/crd/bases/compute.onmetal.de_consoles.yaml b/config/crd/bases/compute.onmetal.de_consoles.yaml
@@ -36,8 +36,8 @@ spec:
           spec:
             description: ConsoleSpec defines the desired state of Console
             properties:
-              lightHouseClientConfig:
-                description: LightHouseClientConfig is the ConsoleClientConfig for
+              lighthouseClientConfig:
+                description: LighthouseClientConfig is the ConsoleClientConfig for
                   the machine to connect to a common lighthouse.
                 properties:
                   caBundle:
@@ -93,6 +93,9 @@ spec:
                 type: object
               type:
                 description: Type is the ConsoleType to use.
+                enum:
+                - Service
+                - Lighthouse
                 type: string
             required:
             - machineRef
@@ -101,9 +104,7 @@ spec:
           status:
             description: ConsoleStatus defines the observed state of Console
             properties:
-              state:
-                type: string
-              tunnelClientConfig:
+              serviceClientConfig:
                 properties:
                   caBundle:
                     description: CABundle is a PEM encoded CA bundle which will be
@@ -148,6 +149,8 @@ spec:
                     description: URL is the url to connect to.
                     type: string
                 type: object
+              state:
+                type: string
             type: object
         type: object
     served: true

diff --git a/config/samples/compute_v1alpha1_console.yaml b/config/samples/compute_v1alpha1_console.yaml
@@ -4,7 +4,7 @@ kind: Console
 metadata:
   name: console-sample
 spec:
-  type: Tunnel
+  type: Service
   machineRef:
     name: my-machine
 #status:
@@ -19,10 +19,10 @@ kind: Console
 metadata:
   name: console-sample
 spec:
-  type: LightHouse
+  type: Lighthouse
   machineRef:
     name: my-machine
-  lightHouseClientConfig:
+  lighthouseClientConfig:
     url: https://my-lighthouse.example.org
     caBundle: |
       my-ca-bundle