Merge pull request k0smotron#26 from juanluisvaladas/minor-fixes

Minor fixes
makhov · Apr 21, 2023 · ed91834 · ed91834
2 parents c7886e8 + 0cc614c
commit ed91834
Show file tree

Hide file tree

Showing 5 changed files with 59 additions and 7 deletions.
diff --git a/api/v1beta1/k0smotroncluster_types.go b/api/v1beta1/k0smotroncluster_types.go
@@ -74,10 +74,12 @@ type ServiceSpec struct {
 	// APIPort defines the kubernetes API port. If empty k0smotron
 	// will pick it automatically.
 	//+kubebuilder:validation:Optional
+	//+kubebuilder:default=30443
 	APIPort int `json:"apiPort,omitempty"`
 	// KonnectivityPort defines the konnectivity port. If empty k0smotron
 	// will pick it automatically.
 	//+kubebuilder:validation:Optional
+	//+kubebuilder:default=30132
 	KonnectivityPort int `json:"konnectivityPort,omitempty"`
 }
 

diff --git a/config/crd/bases/k0smotron.io_k0smotronclusters.yaml b/config/crd/bases/k0smotron.io_k0smotronclusters.yaml
@@ -394,10 +394,12 @@ spec:
                 description: Service defines the service configuration.
                 properties:
                   apiPort:
+                    default: 30443
                     description: APIPort defines the kubernetes API port. If empty
                       k0smotron will pick it automatically.
                     type: integer
                   konnectivityPort:
+                    default: 30132
                     description: KonnectivityPort defines the konnectivity port. If
                       empty k0smotron will pick it automatically.
                     type: integer

diff --git a/config/rbac/role.yaml b/config/rbac/role.yaml
@@ -29,6 +29,31 @@ rules:
   - patch
   - update
   - watch
+- apiGroups:
+  - ""
+  resources:
+  - pods
+  verbs:
+  - get
+  - list
+- apiGroups:
+  - ""
+  resources:
+  - pods/exec
+  verbs:
+  - create
+- apiGroups:
+  - ""
+  resources:
+  - secrets
+  verbs:
+  - create
+  - delete
+  - get
+  - list
+  - patch
+  - update
+  - watch
 - apiGroups:
   - ""
   resources:

diff --git a/install.yaml b/install.yaml
@@ -50,6 +50,7 @@ spec:
             description: K0smotronClusterSpec defines the desired state of K0smotronCluster
             properties:
               apiPort:
+                default: 30443
                 description: APIPort defines the kubernetes API port. If empty k0smotron
                   will pick it automatically.
                 type: integer
@@ -64,6 +65,7 @@ spec:
                   empty k0smotron will pick it automatically.
                 type: string
               konnectivityPort:
+                default: 30132
                 description: KonnectivityPort defines the konnectivity port. If empty
                   k0smotron will pick it automatically.
                 type: integer
@@ -511,6 +513,31 @@ rules:
   - patch
   - update
   - watch
+- apiGroups:
+  - ""
+  resources:
+  - pods
+  verbs:
+  - get
+  - list
+- apiGroups:
+  - ""
+  resources:
+  - pods/exec
+  verbs:
+  - create
+- apiGroups:
+  - ""
+  resources:
+  - secrets
+  verbs:
+  - create
+  - delete
+  - get
+  - list
+  - patch
+  - update
+  - watch
 - apiGroups:
   - ""
   resources:

diff --git a/internal/controller/k0smotroncluster_controller.go b/internal/controller/k0smotroncluster_controller.go
@@ -61,7 +61,10 @@ type K0smotronClusterReconciler struct {
 //+kubebuilder:rbac:groups=k0smotron.io,resources=k0smotronclusters/status,verbs=get;update;patch
 //+kubebuilder:rbac:groups=k0smotron.io,resources=k0smotronclusters/finalizers,verbs=update
 // +kubebuilder:rbac:groups=core,resources=configmaps,verbs=get;list;watch;create;update;patch;delete
+// +kubebuilder:rbac:groups=core,resources=secrets,verbs=get;list;watch;create;update;patch;delete
 // +kubebuilder:rbac:groups=core,resources=services,verbs=get;list;watch;create;update;patch;delete
+// +kubebuilder:rbac:groups=core,resources=pods,verbs=get;list
+// +kubebuilder:rbac:groups=core,resources=pods/exec,verbs=create
 // +kubebuilder:rbac:groups=apps,resources=deployments,verbs=get;list;watch;create;update;patch;delete
 
 // Reconcile is part of the main kubernetes reconciliation loop which aims to
@@ -85,13 +88,6 @@ func (r *K0smotronClusterReconciler) Reconcile(ctx context.Context, req ctrl.Req
 		return ctrl.Result{}, client.IgnoreNotFound(err)
 	}
 
-	if kmc.Spec.Service.APIPort == 0 {
-		kmc.Spec.Service.APIPort = defaultAPIPort
-	}
-	if kmc.Spec.Service.KonnectivityPort == 0 {
-		kmc.Spec.Service.APIPort = defaultKonnectivityPort
-	}
-
 	logger.Info("Reconciling")
 
 	logger.Info("Reconciling services")