grpc for grow is working!

Signed-off-by: vsoch <[email protected]>

Author: vsoch

api/v1alpha1/ensemble_types.go

@@ -19,18 +19,15 @@ package v1alpha1
 import (
 	"fmt"
 	"reflect"
-	"strings"
 
 	minicluster "github.com/flux-framework/flux-operator/api/v1alpha2"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
 var (
 	defaultSidecarbase = "ghcr.io/converged-computing/ensemble-python:latest"
-	defaultFluxView    = "ghcr.io/converged-computing/flux-view-ubuntu:tag-jammy"
-
-	MiniclusterType = "minicluster"
-	UnknownType     = "unknown"
+	MiniclusterType    = "minicluster"
+	UnknownType        = "unknown"
 )
 
 // EnsembleSpec defines the desired state of Ensemble
@@ -52,6 +49,11 @@ type Member struct {
 	// +optional
 	MiniCluster minicluster.MiniCluster `json:"minicluster,omitempty"`
 
+	// Branch
+	// Instead of pip, install a specific branch of ensemble python
+	// +optional
+	Branch string `json:"branch"`
+
 	// Ensemble yaml (configuration file)
 	Ensemble string `json:"ensemble"`
 }
@@ -65,9 +67,9 @@ type Sidecar struct {
 	// +optional
 	Image string `json:"image"`
 
-	// Always pull the sidecar container (useful for development)
+	// Sidecar image pull policy
 	// +optional
-	PullAlways bool `json:"pullAlways"`
+	ImagePullPolicy string `json:"imagePullPolicy"`
 
 	// +kubebuilder:default="50051"
 	// +default="50051"
@@ -121,17 +123,14 @@ func (e *Ensemble) Validate() error {
 		e.Spec.Sidecar.Image = defaultSidecarbase
 	}
 
-	// If the sidecar has a digest it's OK, but remove for check
-	sidecar := e.Spec.Sidecar.Image
-	if strings.Contains(sidecar, "@") {
-		parts := strings.Split(sidecar, "@")
-		sidecar = parts[0]
-	}
-
 	fmt.Printf("      Ensemble.Sidecar.Image: %s\n", e.Spec.Sidecar.Image)
 	fmt.Printf("      Ensemble.Sidecar.Port: %s\n", e.Spec.Sidecar.Port)
-	fmt.Printf("      Ensemble.Sidecar.PullAlways: %v\n", e.Spec.Sidecar.PullAlways)
+	if e.Spec.Sidecar.ImagePullPolicy != "" {
+		fmt.Printf("      Ensemble.Sidecar.ImagePullPolicy: %v\n", e.Spec.Sidecar.ImagePullPolicy)
+	}
 
+	// TODO stopped here - make interactive cluster with grpc running, shell in, and test
+	// client.
 	count := 0
 	for i, member := range e.Spec.Members {
 

config/crd/bases/ensemble.flux-framework.org_ensembles.yaml

@@ -45,6 +45,11 @@ spec:
                     A member of the ensemble that will run for some number of times,
                     optionally with a maximum or minumum
                   properties:
+                    branch:
+                      description: |-
+                        Branch
+                        Instead of pip, install a specific branch of ensemble python
+                      type: string
                     ensemble:
                       description: Ensemble yaml (configuration file)
                       type: string
@@ -955,12 +960,12 @@ spec:
                       Baseimage for the sidecar that will monitor the queue.
                       Ensure that the operating systems match!
                     type: string
+                  imagePullPolicy:
+                    description: Sidecar image pull policy
+                    type: string
                   port:
                     default: "50051"
                     type: string
-                  pullAlways:
-                    description: Always pull the sidecar container (useful for development)
-                    type: boolean
                   workers:
                     default: 10
                     format: int32

config/rbac/role.yaml

@@ -4,6 +4,42 @@ kind: ClusterRole
 metadata:
   name: manager-role
 rules:
+- apiGroups:
+  - ""
+  resources:
+  - rolebindings
+  verbs:
+  - create
+  - delete
+  - get
+  - list
+  - patch
+  - update
+  - watch
+- apiGroups:
+  - ""
+  resources:
+  - roles
+  verbs:
+  - create
+  - delete
+  - get
+  - list
+  - patch
+  - update
+  - watch
+- apiGroups:
+  - ""
+  resources:
+  - services
+  verbs:
+  - create
+  - delete
+  - get
+  - list
+  - patch
+  - update
+  - watch
 - apiGroups:
   - apps
   resources:
@@ -64,6 +100,18 @@ rules:
   - patch
   - update
   - watch
+- apiGroups:
+  - ""
+  resources:
+  - serviceaccounts
+  verbs:
+  - create
+  - delete
+  - get
+  - list
+  - patch
+  - update
+  - watch
 - apiGroups:
   - ensemble.flux-framework.org
   resources:
@@ -120,3 +168,27 @@ rules:
   - patch
   - update
   - watch
+- apiGroups:
+  - rbac.authorization.k8s.io
+  resources:
+  - rolebindings
+  verbs:
+  - create
+  - delete
+  - get
+  - list
+  - patch
+  - update
+  - watch
+- apiGroups:
+  - rbac.authorization.k8s.io
+  resources:
+  - roles
+  verbs:
+  - create
+  - delete
+  - get
+  - list
+  - patch
+  - update
+  - watch