added new controller for combinedstatus

Signed-off-by: Jarek Cwiklik <[email protected]>

charts/cluster-metrics/templates/operator.yaml

@@ -297,7 +297,7 @@ spec:
         - --metrics-bind-address=127.0.0.1:8080
         - --leader-elect
         - --metrics-name={{.Values.clusterName}}
-        image: ko.local/cluster-metrics:e559205
+        image: ko.local/cluster-metrics:149d115
         livenessProbe:
           httpGet:
             path: /healthz

clustermetrics/config/manager/kustomization.yaml

@@ -5,4 +5,4 @@ kind: Kustomization
 images:
 - name: controller
   newName: ko.local/cluster-metrics
-  newTag: e559205
+  newTag: 149d115

kueue-ks/Dockerfile

@@ -12,7 +12,7 @@ RUN go mod download
 # Copy the go source
 COPY cmd/kueue-ks/main.go main.go
 COPY api/ api/
-COPY controllers/ controllers/
+COPY internal/controller/ controllers/
 
 # Build
 RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -a -o manager main.go

kueue-ks/Makefile

@@ -83,15 +83,11 @@ test: manifests generate fmt vet envtest ## Run tests.
 
 .PHONY: build
 build: generate fmt vet ## Build manager binary.
-	go build -o bin/manager cmd/kueue-ks/main.go
+	go build -o bin/manager cmd/${CMD_NAME}/main.go
 
 .PHONY: run
 run: manifests generate fmt vet ## Run a controller from your host.
-	go run ./cmd/kueue-ks/main.go
-
-.PHONY: run-clusters
-run-clusters: manifests generate fmt vet ## Run a controller from your host.
-	go run ./cmd/clusters/main.go
+	go run ./cmd/${CMD_NAME}/main.go
 
 
 .PHONY: docker-build
@@ -139,6 +135,7 @@ undeploy: ## Undeploy controller from the K8s cluster specified in ~/.kube/confi
 
 .PHONY: ko-local-build
 ko-local-build:
+#	KO_DOCKER_REPO=${KO_DOCKER_REPO} ko build -B ./cmd/${CMD_NAME} -t ${IMAGE_TAG} --platform linux/${ARCH}
 	KO_DOCKER_REPO=${KO_DOCKER_REPO} ko build -B ./cmd/${CMD_NAME} -t ${IMAGE_TAG} --platform linux/${ARCH}
 
 .PHONY: k3d-load-image

kueue-ks/PROJECT

@@ -1,6 +1,10 @@
+# Code generated by tool. DO NOT EDIT.
+# This file is used to track the info used to scaffold your project
+# and allow the plugins properly work.
+# More info: https://book.kubebuilder.io/reference/project-config.html
 domain: galaxy.kubestellar.io
 layout:
-- go.kubebuilder.io/v3
+- go.kubebuilder.io/v4
 projectName: kueue-ks
 repo: kubestellar/galaxy/kueue-ks
 resources:
@@ -24,4 +28,9 @@ resources:
   group: cluster.open-cluster-management.io
   kind: ManagedCluster
   version: v1
+- controller: true
+  domain: galaxy.kubestellar.io
+  group: control.kubestellar.io
+  kind: CombinedStatus
+  version: v1alpha1
 version: "3"