add model-server/estimator to KeplerInternal

Signed-off-by: Sunyanan Choochotkaew <[email protected]>
sustainable-computing-io · Dec 8, 2023 · 95bf443 · 95bf443
1 parent 9388ecc
commit 95bf443
Show file tree

Hide file tree

Showing 22 changed files with 2,816 additions and 273 deletions.
diff --git a/bundle/manifests/kepler-operator.clusterserviceversion.yaml b/bundle/manifests/kepler-operator.clusterserviceversion.yaml
@@ -27,7 +27,7 @@ metadata:
     capabilities: Basic Install
     categories: Monitoring
     containerImage: quay.io/sustainable_computing_io/kepler-operator:0.9.2
-    createdAt: "2023-12-04T08:14:16Z"
+    createdAt: "2023-12-08T08:56:48Z"
     description: 'Deploys and Manages Kepler on Kubernetes '
     operators.operatorframework.io/builder: operator-sdk-v1.27.0
     operators.operatorframework.io/internal-objects: |-
@@ -108,6 +108,7 @@ spec:
           - apps
           resources:
           - daemonsets
+          - deployments
           verbs:
           - create
           - delete
@@ -119,6 +120,7 @@ spec:
           - ""
           resources:
           - configmaps
+          - persistentvolumeclaims
           - serviceaccounts
           - services
           verbs:

diff --git a/bundle/manifests/kepler.system.sustainable.computing.io_keplerinternals.yaml b/bundle/manifests/kepler.system.sustainable.computing.io_keplerinternals.yaml
diff --git a/cmd/manager/main.go b/cmd/manager/main.go
@@ -39,7 +39,9 @@ import (
 	securityv1 "github.com/openshift/api/security/v1"
 
 	keplersystemv1alpha1 "github.com/sustainable.computing.io/kepler-operator/pkg/api/v1alpha1"
+	"github.com/sustainable.computing.io/kepler-operator/pkg/components/estimator"
 	"github.com/sustainable.computing.io/kepler-operator/pkg/components/exporter"
+	"github.com/sustainable.computing.io/kepler-operator/pkg/components/modelserver"
 	"github.com/sustainable.computing.io/kepler-operator/pkg/controllers"
 	"github.com/sustainable.computing.io/kepler-operator/pkg/utils/k8s"
 	//+kubebuilder:scaffold:imports
@@ -99,6 +101,9 @@ func main() {
 	flag.StringVar(&controllers.Config.Image, "kepler.image", keplerImage, "kepler image")
 	flag.StringVar(&controllers.Config.ImageLibbpf, "kepler.image.libbpf", keplerImageLibbpf, "kepler libbpf image")
 
+	flag.StringVar(&controllers.InternalConfig.ModelServerImage, "estimator.image", estimator.StableImage, "kepler estimator image")
+	flag.StringVar(&controllers.InternalConfig.EstimatorImage, "model-server.image", modelserver.StableImage, "kepler model server image")
+
 	opts := zap.Options{
 		Development: true,
 	}

diff --git a/config/crd/bases/kepler.system.sustainable.computing.io_keplerinternals.yaml b/config/crd/bases/kepler.system.sustainable.computing.io_keplerinternals.yaml
diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml
@@ -74,7 +74,7 @@ spec:
           - name: RELATED_IMAGE_KEPLER_LIBBPF
             value: '<KEPLER_IMG_LIBBPF>'
         args:
-        # TODO: move --openshift to openshift specific kustomize directory
+        # TODO: move --openshift and deployment-namespace to openshift specific kustomize directory
         - --openshift
         - --leader-elect
         - --kepler.image=$(RELATED_IMAGE_KEPLER)

diff --git a/config/manifests/bases/kepler-operator.clusterserviceversion.yaml b/config/manifests/bases/kepler-operator.clusterserviceversion.yaml
@@ -100,7 +100,6 @@ spec:
           resources:
           - configmaps
           - persistentvolumeclaims
-          - persistentvolumes
           - serviceaccounts
           - services
           verbs:

diff --git a/config/rbac/role.yaml b/config/rbac/role.yaml
@@ -8,6 +8,7 @@ rules:
   - apps
   resources:
   - daemonsets
+  - deployments
   verbs:
   - create
   - delete
@@ -19,6 +20,7 @@ rules:
   - ""
   resources:
   - configmaps
+  - persistentvolumeclaims
   - serviceaccounts
   - services
   verbs: