From d237dbe2015c1fd175f5912416a51641d94d68f6 Mon Sep 17 00:00:00 2001
From: panshuxiao <panshuxiao@mail.ustc.edu.cn>
Date: Thu, 8 May 2025 19:44:21 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E5=8A=A8Dockerfile.cotroller-manager?=
 =?UTF-8?q?=E4=BD=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

• 添加了controller-manager的README.md
---
 .../k8s/Dockerfile.controller-manager         |  5 ++++-
 modules/k8s/README.md                         | 21 +++++++++++++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)
 rename Dockerfile.controller-manager => modules/k8s/Dockerfile.controller-manager (90%)
 create mode 100644 modules/k8s/README.md

diff --git a/Dockerfile.controller-manager b/modules/k8s/Dockerfile.controller-manager
similarity index 90%
rename from Dockerfile.controller-manager
rename to modules/k8s/Dockerfile.controller-manager
index 2ba6f707de..6f0299033a 100644
--- a/Dockerfile.controller-manager
+++ b/modules/k8s/Dockerfile.controller-manager
@@ -2,6 +2,9 @@ FROM golang:1.23 AS builder
 
 WORKDIR /workspace
 
+# 创建临时目录结构
+RUN mkdir -p modules/k8s
+
 # Copy the Go Modules manifests
 COPY go.mod go.mod
 COPY go.sum go.sum
@@ -17,7 +20,7 @@ ENV GOPROXY=https://goproxy.cn,direct
 RUN go mod download
 
 # Copy the Go source code
-COPY . .
+COPY modules/k8s/ modules/k8s/
 
 # Build the controller-manager binary
 RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o controller-manager modules/k8s/cmd/controller-manager/controller-manager.go
diff --git a/modules/k8s/README.md b/modules/k8s/README.md
new file mode 100644
index 0000000000..e4cac65d7e
--- /dev/null
+++ b/modules/k8s/README.md
@@ -0,0 +1,21 @@
+# DevStar Controller Manager
+
+本目录包含 DevStar Controller Manager 的源代码和构建所需的 Dockerfile。Controller Manager 负责管理 Kubernetes 中的 DevContainer 自定义资源。
+
+## 构建 Docker 镜像
+
+### 构建方法
+
+由于项目结构原因，构建 Docker 镜像必须从项目根目录执行：
+
+```bash
+# 切换到项目根目录
+
+# 构建镜像
+docker build -f modules/k8s/Dockerfile.controller-manager -t beppeb/devstar-controller-manager:[标签] .
+
+# 推送镜像
+docker push beppeb/devstar-controller-manager:[标签]
+```
+
+此镜像由devstar的helm chart的子chart devstar-controller-manager使用，若要使用新的镜像请修改helm chart中的values.yaml