minor fixes

Signed-off-by: Arvind Thirumurugan <arvindth@microsoft.com>

Author: Arvind Thirumurugan

approval-controller-metric-collector/README.md

@@ -236,6 +236,10 @@ proemetheus-crp   1     True        1               True        1
 ```bash
 # Apply ClusterStagedUpdateRun to start the staged rollout
 kubectl apply -f ./examples/updateRun/example-csur.yaml
+
+```bash
+# Check the staged update run status
+kubectl get csur -A
 ```
 
 ```bash

approval-controller-metric-collector/approval-request-controller/charts/approval-request-controller/templates/rbac.yaml

@@ -11,36 +11,36 @@ rules:
     resources: ["customresourcedefinitions"]
     verbs: ["get", "list"]
 
-  # ApprovalRequest and ClusterApprovalRequest
-  - apiGroups: ["metric.kubernetes-fleet.io"]
+  # ApprovalRequest and ClusterApprovalRequest (KubeFleet resources)
+  - apiGroups: ["placement.kubernetes-fleet.io"]
     resources: ["approvalrequests", "clusterapprovalrequests"]
     verbs: ["get", "list", "watch", "update", "patch"]
-  - apiGroups: ["metric.kubernetes-fleet.io"]
+  - apiGroups: ["placement.kubernetes-fleet.io"]
     resources: ["approvalrequests/status", "clusterapprovalrequests/status"]
     verbs: ["update", "patch"]
-  - apiGroups: ["metric.kubernetes-fleet.io"]
+  - apiGroups: ["placement.kubernetes-fleet.io"]
     resources: ["approvalrequests/finalizers", "clusterapprovalrequests/finalizers"]
     verbs: ["update"]
 
-  # MetricCollector and MetricCollectorReport
+  # MetricCollector and MetricCollectorReport (our custom resources)
   - apiGroups: ["metric.kubernetes-fleet.io"]
     resources: ["metriccollectors", "metriccollectorreports"]
     verbs: ["get", "list", "watch", "create", "update", "patch", "delete"]
   - apiGroups: ["metric.kubernetes-fleet.io"]
     resources: ["metriccollectors/status", "metriccollectorreports/status"]
     verbs: ["update", "patch"]
 
-  # ClusterResourcePlacement and ClusterResourceOverride
-  - apiGroups: ["metric.kubernetes-fleet.io"]
+  # ClusterResourcePlacement and ClusterResourceOverride (KubeFleet resources)
+  - apiGroups: ["placement.kubernetes-fleet.io"]
     resources: ["clusterresourceplacements", "clusterresourceoverrides"]
     verbs: ["get", "list", "watch", "create", "update", "patch", "delete"]
 
-  # UpdateRuns
-  - apiGroups: ["metric.kubernetes-fleet.io"]
+  # UpdateRuns (KubeFleet resources)
+  - apiGroups: ["placement.kubernetes-fleet.io"]
     resources: ["stagedupdateruns", "clusterstagedupdateruns"]
     verbs: ["get", "list", "watch"]
 
-  # WorkloadTracker
+  # WorkloadTracker (our custom resource)
   - apiGroups: ["metric.kubernetes-fleet.io"]
     resources: ["workloadtrackers"]
     verbs: ["get", "list", "watch"]

approval-controller-metric-collector/approval-request-controller/examples/workloadtracker/workloadtracker.yaml

@@ -1,4 +1,4 @@
-apiVersion: metric.kubernetes-fleet.io/v1beta1
+apiVersion: metric.kubernetes-fleet.io/v1alpha1
 kind: WorkloadTracker
 metadata:
   name: sample-workload-tracker

approval-controller-metric-collector/metric-collector/docker/metric-app.Dockerfile

@@ -1,13 +1,17 @@
 # Build stage
 FROM golang:1.24-alpine AS builder
 WORKDIR /workspace
-# Copy go mod files
-COPY go.mod go.sum ./
-RUN go mod download
+
+# Initialize go module for metric-app
+RUN go mod init metric-app && \
+    go get github.com/prometheus/client_golang/prometheus@latest && \
+    go get github.com/prometheus/client_golang/prometheus/promhttp@latest
+
 # Copy source code
-COPY cmd/metriccollector/metric-app/ ./cmd/metriccollector/metric-app/
+COPY metric-collector/cmd/metriccollector/metric-app/ ./
+
 # Build the application
-RUN CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -o metric-app ./cmd/metriccollector/metric-app/main.go
+RUN CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -o metric-app main.go
 
 # Run stage
 FROM alpine:3.18

approval-controller-metric-collector/metric-collector/docker/metric-collector.Dockerfile

@@ -1,14 +1,17 @@
 FROM golang:1.24 AS builder
 WORKDIR /workspace
 
+# Copy approval-request-controller (for APIs)
+COPY approval-request-controller/ approval-request-controller/
+
 # Copy go mod files
-COPY go.mod go.sum* ./
+COPY metric-collector/go.mod metric-collector/go.sum* metric-collector/
+WORKDIR /workspace/metric-collector
 RUN go mod download
 
 # Copy source code
-COPY apis/ apis/
-COPY cmd/ cmd/
-COPY pkg/ pkg/
+COPY metric-collector/cmd/ cmd/
+COPY metric-collector/pkg/ pkg/
 
 # Build
 RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build \

approval-controller-metric-collector/metric-collector/examples/metriccollector-example.yaml

@@ -1,4 +1,4 @@
-apiVersion: metric.kubernetes-fleet.io/v1beta1
+apiVersion: metric.kubernetes-fleet.io/v1alpha1
 kind: MetricCollector
 metadata:
   name: mc-example-run-staging

approval-controller-metric-collector/metric-collector/install-on-member.sh

@@ -22,9 +22,10 @@ echo ""
 # Step 0: Build and load Docker images (once for all clusters)
 echo "Step 0: Building Docker images..."
 
-# Build metric-collector image
+# Build metric-collector image from parent directory (needs approval-request-controller)
+cd ..
 docker buildx build \
-  --file docker/metric-collector.Dockerfile \
+  --file metric-collector/docker/metric-collector.Dockerfile \
   --output=type=docker \
   --platform=linux/$(uname -m | sed 's/x86_64/amd64/;s/aarch64/arm64/') \
   --tag ${IMAGE_NAME}:${IMAGE_TAG} \
@@ -33,14 +34,17 @@ docker buildx build \
   .
 echo "✓ Metric collector image built"
 
-# Build metric-app image
+# Build metric-app image (still in parent directory)
 docker buildx build \
-  --file docker/metric-app.Dockerfile \
+  --file metric-collector/docker/metric-app.Dockerfile \
   --output=type=docker \
   --platform=linux/$(uname -m | sed 's/x86_64/amd64/;s/aarch64/arm64/') \
   --tag ${METRIC_APP_IMAGE_NAME}:${METRIC_APP_IMAGE_TAG} \
   .
 echo "✓ Metric app image built"
+
+# Return to metric-collector directory
+cd metric-collector
 echo ""
 
 # Install on each member cluster