Skip to content

Commit af2a01e

Browse files
hhhhsc701hhhhsc701
authored
feature: milvus pvc支持本地目录 (#105)
feature: milvus pvc支持本地目录
1 parent fb399b7 commit af2a01e

File tree

16 files changed

+756
-47
lines changed

16 files changed

+756
-47
lines changed

‎.github/workflows/docker-image-kuberay.yml‎

Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
name: Kuberay Docker Image CI
2+
3+
on:
4+
push:
5+
branches: [ "main" ]
6+
paths:
7+
- '.github/workflows/docker-image-kuberay.yml'
8+
pull_request:
9+
branches: [ "main" ]
10+
paths:
11+
- '.github/workflows/docker-image-kuberay.yml'
12+
workflow_dispatch:
13+
workflow_call:
14+
15+
jobs:
16+
kuberay-push-amd:
17+
name: Pull & Push Kuberay AMD Image
18+
runs-on: ubuntu-latest
19+
if: github.event_name != 'pull_request'
20+
steps:
21+
- name: Login to GitHub Container Registry
22+
uses: docker/login-action@v3
23+
with:
24+
registry: ghcr.io
25+
username: ${{ github.actor }}
26+
password: ${{ secrets.GITHUB_TOKEN }}
27+
28+
- name: pull & push
29+
run: |
30+
LOWERCASE_REPO=$(echo "${{ github.repository_owner }}" | tr '[:upper:]' '[:lower:]')
31+
docker pull quay.io/kuberay/operator:v1.4.2
32+
docker tag quay.io/kuberay/operator:v1.4.2 ghcr.io/$LOWERCASE_REPO/quay.io/kuberay/operator:v1.4.2-amd64
33+
docker push ghcr.io/$LOWERCASE_REPO/quay.io/kuberay/operator:v1.4.2-amd64
34+
35+
kuberay-push-arm:
36+
name: Pull & Push Kuberay ARM Image
37+
runs-on: ubuntu-24.04-arm
38+
if: github.event_name != 'pull_request'
39+
steps:
40+
- name: Login to GitHub Container Registry
41+
uses: docker/login-action@v3
42+
with:
43+
registry: ghcr.io
44+
username: ${{ github.actor }}
45+
password: ${{ secrets.GITHUB_TOKEN }}
46+
47+
- name: pull & push
48+
run: |
49+
LOWERCASE_REPO=$(echo "${{ github.repository_owner }}" | tr '[:upper:]' '[:lower:]')
50+
docker pull quay.io/kuberay/operator:v1.4.2
51+
docker tag quay.io/kuberay/operator:v1.4.2 ghcr.io/$LOWERCASE_REPO/quay.io/kuberay/operator:v1.4.2-arm64
52+
docker push ghcr.io/$LOWERCASE_REPO/quay.io/kuberay/operator:v1.4.2-arm64
53+
54+
kuberay-manifest:
55+
runs-on: ubuntu-latest
56+
if: github.event_name != 'pull_request'
57+
steps:
58+
- name: Login to GitHub Container Registry
59+
uses: docker/login-action@v3
60+
with:
61+
registry: ghcr.io
62+
username: ${{ github.actor }}
63+
password: ${{ secrets.GITHUB_TOKEN }}
64+
65+
- name: pull & push
66+
run: |
67+
LOWERCASE_REPO=$(echo "${{ github.repository_owner }}" | tr '[:upper:]' '[:lower:]')
68+
docker manifest create ghcr.io/$LOWERCASE_REPO/quay.io/kuberay/operator:v1.4.2 \
69+
ghcr.io/$LOWERCASE_REPO/quay.io/kuberay/operator:v1.4.2-arm64 \
70+
ghcr.io/$LOWERCASE_REPO/quay.io/kuberay/operator:v1.4.2-amd64
71+
docker manifest push ghcr.io/$LOWERCASE_REPO/quay.io/kuberay/operator:v1.4.2

‎deployment/helm/datamate/charts/kuberay-operator/templates/_helpers.tpl‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -320,3 +320,16 @@ rules:
320320
- watch
321321
{{- end -}}
322322
{{- end -}}
323+
324+
{{/*
325+
Name of image
326+
*/}}
327+
{{- define "kuberay.image" -}}
328+
{{- $name := .Values.image.repository }}
329+
{{- $tag := .Values.image.tag }}
330+
{{- if .Values.global.image.repository }}
331+
{{- .Values.global.image.repository | trimSuffix "/" }}/{{ $name }}:{{ $tag }}
332+
{{- else }}
333+
{{- $name }}:{{ $tag }}
334+
{{- end }}
335+
{{- end }}

‎deployment/helm/datamate/charts/kuberay-operator/templates/deployment.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ spec:
5555
securityContext:
5656
{{- toYaml . | nindent 12 }}
5757
{{- end }}
58-
image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
58+
image: "{{ include "kuberay.image" . }}"
5959
{{- with .Values.image.pullPolicy }}
6060
imagePullPolicy: {{ . }}
6161
{{- end }}

‎deployment/helm/milvus/Chart.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
apiVersion: v1
2-
appVersion: 2.6.4
2+
appVersion: 2.6.5
33
description: Milvus is an open-source vector database built to power AI applications
44
and vector similarity search.
55
home: https://milvus.io/
@@ -18,4 +18,4 @@ maintainers:
1818
name: milvus
1919
sources:
2020
- https://github.com/zilliztech/milvus
21-
version: 5.0.6
21+
version: 5.0.7

‎deployment/helm/milvus/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,7 @@ The following table lists the configurable parameters of the Milvus Service and
335335
| `route.annotations` | Route annotations | `{}` |
336336
| `route.labels` | Route labels | `{}` |
337337
| `image.all.repository` | Image repository | `milvusdb/milvus` |
338-
| `image.all.tag` | Image tag | `v2.6.4` |
338+
| `image.all.tag` | Image tag | `v2.6.5` |
339339
| `image.all.pullPolicy` | Image pull policy | `IfNotPresent` |
340340
| `image.all.pullSecrets` | Image pull secrets | `{}` |
341341
| `image.tools.repository` | Config image repository | `milvusdb/milvus-config-tool` |

‎deployment/helm/milvus/charts/etcd/charts/common/templates/_storage.tpl‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,9 @@ Return the proper Storage Class
1414

1515
{{- if $storageClass -}}
1616
{{- if (eq "-" $storageClass) -}}
17+
{{- /*
1718
{{- printf "storageClassName: \"\"" -}}
19+
*/}}
1820
{{- else }}
1921
{{- printf "storageClassName: %s" $storageClass -}}
2022
{{- end -}}

0 commit comments

Comments
 (0)