Skip to content

Commit e193de5

Browse files
authored
Merge pull request #65 from Spground/feature/public-update-k8s-readme-docs
chore(k8s): update readme & makefile
2 parents a438789 + 0babe41 commit e193de5

4 files changed

Lines changed: 8 additions & 6 deletions

File tree

kubernetes/Dockerfile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
# limitations under the License.
1414

1515
# Build the manager binary
16-
FROM golang:1.25 AS builder
16+
FROM golang:1.24 AS builder
1717
ARG TARGETOS
1818
ARG TARGETARCH
1919

@@ -36,12 +36,13 @@ COPY internal/ internal/
3636
# was called. For example, if we call make docker-build in a local env which has the Apple Silicon M1 SO
3737
# the docker BUILDPLATFORM arg will be linux/arm64 when for Apple x86 it will be linux/amd64. Therefore,
3838
# by leaving it empty we can ensure that the container and binary shipped on it will have the same platform.
39+
RUN echo "Building for $TARGETOS/$TARGETARCH"
3940
ARG PACKAGE=cmd/controller/main.go
4041
RUN CGO_ENABLED=0 GOOS=${TARGETOS:-linux} GOARCH=${TARGETARCH} go build -a -o server ${PACKAGE}
4142

4243
# Use golang image as base to ensure nsenter (util-linux) is available
4344
# distroless does not contain shell or nsenter
44-
FROM golang:1.25
45+
FROM golang:1.24
4546
ARG USERID=65532
4647
WORKDIR /workspace
4748
COPY --from=builder /workspace/server .

kubernetes/Makefile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,7 @@ test: manifests generate fmt vet setup-envtest ## Run tests.
122122
# To use a different vendor for e2e tests, modify the setup under 'tests/e2e'.
123123
# The default setup assumes Kind is pre-installed and builds/loads the Manager Docker image locally.
124124
KIND_CLUSTER ?= sandbox-k8s-test-e2e
125+
KIND_K8S_VERSION ?= v1.22.4
125126
GINKGO_ARGS ?=
126127

127128
.PHONY: install-kind
@@ -140,8 +141,8 @@ setup-test-e2e: install-kind ## Set up a Kind cluster for e2e tests if it does n
140141
*"$(KIND_CLUSTER)"*) \
141142
echo "Kind cluster '$(KIND_CLUSTER)' already exists. Skipping creation." ;; \
142143
*) \
143-
echo "Creating Kind cluster '$(KIND_CLUSTER)'..."; \
144-
$(KIND) create cluster --name $(KIND_CLUSTER) ;; \
144+
echo "Creating Kind cluster '$(KIND_CLUSTER)' with Kubernetes version $(KIND_K8S_VERSION)..."; \
145+
$(KIND) create cluster --name $(KIND_CLUSTER) --image kindest/node:$(KIND_K8S_VERSION) ;; \
145146
esac
146147

147148
.PHONY: test-e2e

kubernetes/README-ZH.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ Pool自定义资源维护一个预热的计算资源池,以实现快速沙箱
4848
- go版本v1.24.0+
4949
- docker版本17.03+。
5050
- kubectl版本v1.11.3+。
51-
- 访问Kubernetes v1.33.1+集群。
51+
- 访问Kubernetes v1.22.4+集群。
5252

5353
如果您没有Kubernetes集群的访问权限,可以使用[kind](https://kind.sigs.k8s.io/)创建一个本地Kubernetes集群进行测试。Kind在Docker容器中运行Kubernetes节点,使得设置本地开发环境变得容易。
5454

kubernetes/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ Intelligent resource management features:
4848
- go version v1.24.0+
4949
- docker version 17.03+.
5050
- kubectl version v1.11.3+.
51-
- Access to a Kubernetes v1.33.1+ cluster.
51+
- Access to a Kubernetes v1.22.4+ cluster.
5252

5353
If you don't have access to a Kubernetes cluster, you can use [kind](https://kind.sigs.k8s.io/) to create a local Kubernetes cluster for testing purposes. Kind runs Kubernetes nodes in Docker containers, making it easy to set up a local development environment.
5454

0 commit comments

Comments
 (0)