From 98d525fed5fa279ed7bf42bf0dd37e8a18f07562 Mon Sep 17 00:00:00 2001 From: devad Date: Wed, 26 Apr 2023 14:46:13 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0pcm-ceph=E5=AE=B9?= =?UTF-8?q?=E5=99=A8=E8=AF=9D=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: devad --- Makefile | 20 ++++++--- adaptor/PCM-STORAGE/PCM-CEPH/rpc/Dockerfile | 20 +++++++++ adaptor/PCM-STORAGE/PCM-CEPH/rpc/Makefile | 2 + .../PCM-STORAGE/PCM-CEPH/rpc/etc/pcmceph.yaml | 2 +- deploy/README.md | 21 ++++----- deploy/pcm-ceph-rpc-deployment.yaml | 44 +++++++++++++++++++ deploy/pcm-ceph-rpc-service.yaml | 16 +++++++ 7 files changed, 107 insertions(+), 18 deletions(-) create mode 100644 adaptor/PCM-STORAGE/PCM-CEPH/rpc/Dockerfile create mode 100644 adaptor/PCM-STORAGE/PCM-CEPH/rpc/Makefile create mode 100644 deploy/pcm-ceph-rpc-deployment.yaml create mode 100644 deploy/pcm-ceph-rpc-service.yaml diff --git a/Makefile b/Makefile index f0bf7c5b..bbbb7e0c 100644 --- a/Makefile +++ b/Makefile @@ -1,15 +1,21 @@ -pcm-core: - CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o pcm-core adaptor/PCM-CORE/api/pcm.go +pcm-core-api: + CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o pcm-core-api adaptor/PCM-CORE/api/pcm.go -pcm-ac: +pcm-core-rpc: + CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o pcm-core-rpc adaptor/PCM-CORE/rpc/pcmcore.go + +pcm-ac-rpc: CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o pcm-ac adaptor/PCM-HPC/PCM-AC/rpc/hpcac.go -pcm-kubeNative: +pcm-kubenative-rpc: CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o pcm-kubenative adaptor/PCM-K8S/PCM-K8S-NATIVE/rpc/pcmkubenative.go -pcm-modelarts: +pcm-modelarts-rpc: CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o pcm-modelarts adaptor/PCM-AI/PCM-MODELARTS/rpc/pcmmodelarts.go -all-build: pcm-core pcm-ac pcm-kubeNative pcm-modelarts +pcm-ceph-rpc: + CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o pcm-ceph adaptor/PCM-STORAGE/PCM-CEPH/rpc/pcmceph.go -.PHONY: pcm-core pcm-ac pcm-kubeNative pcm-modelarts \ No newline at end of file +all-build: pcm-core-rpc pcm-core-api pcm-ac-rpc pcm-kubenative-rpc pcm-modelarts-rpc pcm-ceph-rpc + +.PHONY: pcm-core-rpc pcm-core-api pcm-ac-rpc pcm-kubenative-rpc pcm-modelarts-rpc pcm-ceph-rpc \ No newline at end of file diff --git a/adaptor/PCM-STORAGE/PCM-CEPH/rpc/Dockerfile b/adaptor/PCM-STORAGE/PCM-CEPH/rpc/Dockerfile new file mode 100644 index 00000000..69f534b1 --- /dev/null +++ b/adaptor/PCM-STORAGE/PCM-CEPH/rpc/Dockerfile @@ -0,0 +1,20 @@ +FROM alpine:3.16.2 +WORKDIR /home + +# 修改alpine源为上海交通大学 +RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.sjtug.sjtu.edu.cn/g' /etc/apk/repositories && \ + apk update && \ + apk upgrade && \ + apk add --no-cache ca-certificates && update-ca-certificates && \ + apk add --update tzdata && \ + rm -rf /var/cache/apk/* + + +COPY pcm-ceph /home/ +COPY etc/pcmceph.yaml /home/ + +ENV TZ=Asia/Shanghai + +EXPOSE 2008 + +ENTRYPOINT ./pcm-ceph-rpc -f pcmceph.yaml \ No newline at end of file diff --git a/adaptor/PCM-STORAGE/PCM-CEPH/rpc/Makefile b/adaptor/PCM-STORAGE/PCM-CEPH/rpc/Makefile new file mode 100644 index 00000000..ca998c42 --- /dev/null +++ b/adaptor/PCM-STORAGE/PCM-CEPH/rpc/Makefile @@ -0,0 +1,2 @@ +rpc-gen: + goctl rpc protoc ./pb/*.proto --go_out=./ --go-grpc_out=./ --zrpc_out=. \ No newline at end of file diff --git a/adaptor/PCM-STORAGE/PCM-CEPH/rpc/etc/pcmceph.yaml b/adaptor/PCM-STORAGE/PCM-CEPH/rpc/etc/pcmceph.yaml index cbe5e68d..824b0566 100644 --- a/adaptor/PCM-STORAGE/PCM-CEPH/rpc/etc/pcmceph.yaml +++ b/adaptor/PCM-STORAGE/PCM-CEPH/rpc/etc/pcmceph.yaml @@ -7,7 +7,7 @@ NacosConfig: - IpAddr: 10.101.15.7 Port: 8848 ClientConfig: - NamespaceId: storage + NamespaceId: test TimeoutMs: 5000 NotLoadCacheAtStart: true LogDir: diff --git a/deploy/README.md b/deploy/README.md index 52a73576..3286d641 100644 --- a/deploy/README.md +++ b/deploy/README.md @@ -1,10 +1,11 @@ -| 服务名 | 端口号 | -| ------------------ | ------ | -| pcm-core-api | 8999 | -| pcm-ac-rpc | 2001 | -| pcm-modelarts-rpc | 2002 | -| pcm-kubenative-rpc | 2003 | -| pcm-core-rpc | 2004 | -| pcm-hanwuji-rpc | 2005 | -| pcm-octopus-rpc | 2006 | -| pcm-th-rpc | 2007 | \ No newline at end of file +| 服务名 | 端口号 | +|--------------------|------| +| pcm-core-api | 8999 | +| pcm-ac-rpc | 2001 | +| pcm-modelarts-rpc | 2002 | +| pcm-kubenative-rpc | 2003 | +| pcm-core-rpc | 2004 | +| pcm-hanwuji-rpc | 2005 | +| pcm-octopus-rpc | 2006 | +| pcm-th-rpc | 2007 | +| pcm-ceph-rpc | 2008 | \ No newline at end of file diff --git a/deploy/pcm-ceph-rpc-deployment.yaml b/deploy/pcm-ceph-rpc-deployment.yaml new file mode 100644 index 00000000..a4fbc8e0 --- /dev/null +++ b/deploy/pcm-ceph-rpc-deployment.yaml @@ -0,0 +1,44 @@ +kind: Deployment +apiVersion: apps/v1 +metadata: + name: pcm-ceph-rpc-deployment + namespace: jcce-system + labels: + k8s-app: pcm-ceph-rpc +spec: + replicas: 1 + selector: + matchLabels: + k8s-app: pcm-ceph-rpc + template: + metadata: + name: pcm-ceph-rpc + labels: + k8s-app: pcm-ceph-rpc + spec: + imagePullSecrets: + - name: SECRET_NAME + containers: + - name: pcm-ceph-rpc + image: IMAGE_NAME + resources: {} + imagePullPolicy: Always + securityContext: + privileged: false + procMount: Default + ports: + - containerPort: 80 + volumeMounts: [] + volumes: [] + restartPolicy: Always + terminationGracePeriodSeconds: 30 + dnsPolicy: ClusterFirst + securityContext: {} + schedulerName: default-scheduler + strategy: + type: RollingUpdate + rollingUpdate: + maxUnavailable: 25% + maxSurge: 25% + revisionHistoryLimit: 10 + progressDeadlineSeconds: 600 diff --git a/deploy/pcm-ceph-rpc-service.yaml b/deploy/pcm-ceph-rpc-service.yaml new file mode 100644 index 00000000..d549fb1e --- /dev/null +++ b/deploy/pcm-ceph-rpc-service.yaml @@ -0,0 +1,16 @@ +apiVersion: v1 +kind: Service +metadata: + namespace: jcce-system + name: pcm-ceph-rpc-service + labels: + k8s-service: pcm-ceph-rpc +spec: + selector: + k8s-app: pcm-ceph-rpc + ports: + - name: web + protocol: TCP + port: 2008 + targetPort: 2008 + type: ClusterIP \ No newline at end of file