Merge pull request #349 from makhov/clusterip-svc

ClusterIP service support
k0sproject · Dec 7, 2023 · bd45fbd · bd45fbd
2 parents 5fe172d + 3c3fe55
commit bd45fbd
Show file tree

Hide file tree

Showing 7 changed files with 371 additions and 61 deletions.
diff --git a/api/k0smotron.io/v1beta1/k0smotroncluster_types.go b/api/k0smotron.io/v1beta1/k0smotroncluster_types.go
@@ -49,7 +49,7 @@ type ClusterSpec struct {
 	ExternalAddress string `json:"externalAddress,omitempty"`
 	// Service defines the service configuration.
 	//+kubebuilder:validation:Optional
-	//+kubebuilder:default={}
+	//+kubebuilder:default={"type":"ClusterIP","apiPort":30443,"konnectivityPort":30132}
 	Service ServiceSpec `json:"service,omitempty"`
 	// Persistence defines the persistence configuration. If empty k0smotron
 	// will use emptyDir as a volume.
@@ -97,7 +97,7 @@ type ClusterSpec struct {
 	Resources v1.ResourceRequirements `json:"resources,omitempty"`
 }
 
-// K0smotronClusterStatus defines the observed state of K0smotronCluster
+// ClusterStatus defines the observed state of K0smotronCluster
 type ClusterStatus struct {
 	ReconciliationStatus string `json:"reconciliationStatus"`
 	Ready                bool   `json:"ready,omitempty"`
@@ -119,8 +119,8 @@ type Cluster struct {
 }
 
 type ServiceSpec struct {
-	//+kubebuilder:validation:Enum=NodePort;LoadBalancer
-	//+kubebuilder:default=NodePort
+	//+kubebuilder:validation:Enum=ClusterIP;NodePort;LoadBalancer
+	//+kubebuilder:default=ClusterIP
 	Type v1.ServiceType `json:"type"`
 	// APIPort defines the kubernetes API port. If empty k0smotron
 	// will pick it automatically.
@@ -232,11 +232,15 @@ func (kmc *Cluster) GetConfigMapName() string {
 	return fmt.Sprintf("kmc-%s-config", kmc.Name)
 }
 
-func (kmc *Cluster) GetLoadBalancerName() string {
+func (kmc *Cluster) GetServiceName() string {
+	return fmt.Sprintf("kmc-%s", kmc.Name)
+}
+
+func (kmc *Cluster) GetLoadBalancerServiceName() string {
 	return fmt.Sprintf("kmc-%s-lb", kmc.Name)
 }
 
-func (kmc *Cluster) GetNodePortName() string {
+func (kmc *Cluster) GetNodePortServiceName() string {
 	return fmt.Sprintf("kmc-%s-nodeport", kmc.Name)
 }
 

diff --git a/...g/clusterapi/controlplane/bases/controlplane.cluster.x-k8s.io_k0smotroncontrolplanes.yaml b/...g/clusterapi/controlplane/bases/controlplane.cluster.x-k8s.io_k0smotroncontrolplanes.yaml
@@ -2091,6 +2091,10 @@ spec:
                     type: object
                 type: object
               service:
+                default:
+                  apiPort: 30443
+                  konnectivityPort: 30132
+                  type: ClusterIP
                 description: Service defines the service configuration.
                 properties:
                   annotations:
@@ -2110,10 +2114,11 @@ spec:
                       empty k0smotron will pick it automatically.
                     type: integer
                   type:
-                    default: NodePort
+                    default: ClusterIP
                     description: Service Type string describes ingress methods for
                       a service
                     enum:
+                    - ClusterIP
                     - NodePort
                     - LoadBalancer
                     type: string

diff --git a/config/crd/bases/controlplane.cluster.x-k8s.io_k0smotroncontrolplanes.yaml b/config/crd/bases/controlplane.cluster.x-k8s.io_k0smotroncontrolplanes.yaml
@@ -2091,6 +2091,10 @@ spec:
                     type: object
                 type: object
               service:
+                default:
+                  apiPort: 30443
+                  konnectivityPort: 30132
+                  type: ClusterIP
                 description: Service defines the service configuration.
                 properties:
                   annotations:
@@ -2110,10 +2114,11 @@ spec:
                       empty k0smotron will pick it automatically.
                     type: integer
                   type:
-                    default: NodePort
+                    default: ClusterIP
                     description: Service Type string describes ingress methods for
                       a service
                     enum:
+                    - ClusterIP
                     - NodePort
                     - LoadBalancer
                     type: string

diff --git a/config/crd/bases/k0smotron.io_clusters.yaml b/config/crd/bases/k0smotron.io_clusters.yaml
@@ -2095,6 +2095,10 @@ spec:
                     type: object
                 type: object
               service:
+                default:
+                  apiPort: 30443
+                  konnectivityPort: 30132
+                  type: ClusterIP
                 description: Service defines the service configuration.
                 properties:
                   annotations:
@@ -2114,10 +2118,11 @@ spec:
                       empty k0smotron will pick it automatically.
                     type: integer
                   type:
-                    default: NodePort
+                    default: ClusterIP
                     description: Service Type string describes ingress methods for
                       a service
                     enum:
+                    - ClusterIP
                     - NodePort
                     - LoadBalancer
                     type: string
@@ -2126,7 +2131,7 @@ spec:
                 type: object
             type: object
           status:
-            description: K0smotronClusterStatus defines the observed state of K0smotronCluster
+            description: ClusterStatus defines the observed state of K0smotronCluster
             properties:
               ready:
                 type: boolean