Skip to content

fix: support multi-mount OSS secret projections in jindo #5778

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
CAICAIIs wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

fix: support multi-mount OSS secret projections in jindo #5778

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions .github/scripts/build-all-images.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ function get_image_tag() {
}

function build_images() {
minio_e2e_img=local/minio-e2e:latest
oss_emulator_img=${IMG_REPO}/oss-emulator:e2e
images=(
${IMG_REPO}/dataset-controller:${IMAGE_TAG}
${IMG_REPO}/application-controller:${IMAGE_TAG}
Expand All @@ -24,9 +26,18 @@ function build_images() {
${IMG_REPO}/fluid-csi:${IMAGE_TAG}
${IMG_REPO}/fluid-webhook:${IMAGE_TAG}
${IMG_REPO}/fluid-crd-upgrader:${IMAGE_TAG}
${minio_e2e_img}
${oss_emulator_img}
)

make docker-build-all
tmpdir=$(mktemp -d)
cat > ${tmpdir}/Dockerfile <<'EOF'
FROM minio/minio:latest
EOF
docker build -t ${minio_e2e_img} ${tmpdir}
rm -rf ${tmpdir}
docker build -t ${oss_emulator_img} test/gha-e2e/jindo/oss-emulator

for img in ${images[@]}; do
echo "Loading image $img to kind cluster..."
Expand Down
2 changes: 1 addition & 1 deletion charts/jindocache/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
apiVersion: v2
appVersion: 6.2.0
version: 1.0.4
version: 1.0.5
description: FileSystem on the cloud based on Aliyun Object Storage aimed for data
acceleration.
home: https://help.aliyun.com/document_detail/164207.html
Expand Down
27 changes: 26 additions & 1 deletion charts/jindocache/templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,32 @@ Distribute credential key and values with secret volume mounting on Jindo's pods
Distribute credential key and values with secret volumes
*/}}
{{- define "jindofs.cred.secret.volumes" -}}
{{- if .Values.UseStsToken }}
{{- if .Values.secretProjections }}
- name: jindofs-secret-token
projected:
sources:
{{- if and .Values.UseStsToken .Values.secret }}
- secret:
name: {{ .Values.secret }}
{{- else if .Values.secret }}
- secret:
name: {{ .Values.secret }}
items:
- key: {{ .Values.secretKey }}
path: AccessKeyId
- key: {{ .Values.secretValue }}
path: AccessKeySecret
Comment thread
CAICAIIs marked this conversation as resolved.
{{- end }}
{{- range .Values.secretProjections }}
- secret:
name: {{ .name }}
items:
{{- range .items }}
- key: {{ .key }}
path: {{ .path }}
{{- end }}
Comment thread
CAICAIIs marked this conversation as resolved.
{{- end }}
{{- else if .Values.UseStsToken }}
- name: jindofs-secret-token
secret:
secretName: {{ .Values.secret }}
Expand Down
4 changes: 2 additions & 2 deletions charts/jindocache/templates/fuse/daemonset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ spec:
subPath: hdfs-site.xml
{{- end }}
{{- end }}
{{- if .Values.secret }}
{{- if or .Values.secret .Values.secretProjections }}
{{ include "jindofs.cred.secret.volumeMounts" . | nindent 12 }}
{{- end }}
{{- if .Values.ufsVolumes }}
Expand Down Expand Up @@ -188,7 +188,7 @@ spec:
hostPath:
path: /dev/fuse
type: CharDevice
{{- if .Values.secret }}
{{- if or .Values.secret .Values.secretProjections }}
{{ include "jindofs.cred.secret.volumes" . | nindent 8 }}
{{- end }}
{{- if .Values.ufsVolumes }}
Expand Down
4 changes: 2 additions & 2 deletions charts/jindocache/templates/master/statefulset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ spec:
subPath: hdfs-site.xml
{{- end }}
{{- end }}
{{- if .Values.secret }}
{{- if or .Values.secret .Values.secretProjections }}
{{ include "jindofs.cred.secret.volumeMounts" . | nindent 12 }}
{{- end }}
{{- if .Values.ufsVolumes }}
Expand Down Expand Up @@ -237,7 +237,7 @@ spec:
name: {{ .Values.hadoopConfig.configMap }}
{{- end }}
{{- end }}
{{- if .Values.secret }}
{{- if or .Values.secret .Values.secretProjections }}
{{ include "jindofs.cred.secret.volumes" . | nindent 8 }}
{{- end }}
{{- if .Values.master.volumes }}
Expand Down
4 changes: 2 additions & 2 deletions charts/jindocache/templates/worker/statefulset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ spec:
subPath: hdfs-site.xml
{{- end }}
{{- end }}
{{- if .Values.secret }}
{{- if or .Values.secret .Values.secretProjections }}
{{ include "jindofs.cred.secret.volumeMounts" . | nindent 12 }}
{{- end }}
{{- if .Values.ufsVolumes }}
Comment thread
CAICAIIs marked this conversation as resolved.
Expand Down Expand Up @@ -222,7 +222,7 @@ spec:
name: {{ .Values.hadoopConfig.configMap }}
{{- end }}
{{- end }}
{{- if .Values.secret }}
{{- if or .Values.secret .Values.secretProjections }}
{{ include "jindofs.cred.secret.volumes" . | nindent 8 }}
{{- end }}
- name: bigboot-config
Expand Down
2 changes: 1 addition & 1 deletion charts/jindofsx/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
apiVersion: v2
appVersion: 4.6.8
version: 1.0.4
version: 1.0.5
description: FileSystem on the cloud based on Aliyun Object Storage aimed for data
acceleration.
home: https://help.aliyun.com/document_detail/164207.html
Expand Down
27 changes: 26 additions & 1 deletion charts/jindofsx/templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,32 @@ Distribute credential key and values with secret volume mounting on Jindo's pods
Distribute credential key and values with secret volumes
*/}}
{{- define "jindofs.cred.secret.volumes" -}}
{{- if .Values.UseStsToken }}
{{- if .Values.secretProjections }}
- name: jindofs-secret-token
projected:
sources:
{{- if and .Values.UseStsToken .Values.secret }}
- secret:
name: {{ .Values.secret }}
{{- else if .Values.secret }}
- secret:
name: {{ .Values.secret }}
items:
- key: {{ .Values.secretKey }}
path: AccessKeyId
- key: {{ .Values.secretValue }}
path: AccessKeySecret
Comment thread
CAICAIIs marked this conversation as resolved.
{{- end }}
{{- range .Values.secretProjections }}
- secret:
name: {{ .name }}
items:
{{- range .items }}
- key: {{ .key }}
path: {{ .path }}
{{- end }}
{{- end }}
{{- else if .Values.UseStsToken }}
- name: jindofs-secret-token
secret:
secretName: {{ .Values.secret }}
Expand Down
4 changes: 2 additions & 2 deletions charts/jindofsx/templates/fuse/daemonset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ spec:
subPath: hdfs-site.xml
{{- end }}
{{- end }}
{{- if .Values.secret }}
{{- if or .Values.secret .Values.secretProjections }}
{{ include "jindofs.cred.secret.volumeMounts" . | nindent 12 }}
{{- end }}
{{- if .Values.ufsVolumes }}
Expand Down Expand Up @@ -200,7 +200,7 @@ spec:
hostPath:
path: /dev/fuse
type: CharDevice
{{- if .Values.secret }}
{{- if or .Values.secret .Values.secretProjections }}
{{ include "jindofs.cred.secret.volumes" . | nindent 8 }}
{{- end }}
{{- if .Values.ufsVolumes }}
Expand Down
4 changes: 2 additions & 2 deletions charts/jindofsx/templates/master/statefulset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ spec:
subPath: hdfs-site.xml
{{- end }}
{{- end }}
{{- if .Values.secret }}
{{- if or .Values.secret .Values.secretProjections }}
{{ include "jindofs.cred.secret.volumeMounts" . | nindent 12 }}
{{- end }}
{{- if .Values.ufsVolumes }}
Expand Down Expand Up @@ -249,7 +249,7 @@ spec:
name: {{ .Values.hadoopConfig.configMap }}
{{- end }}
{{- end }}
{{- if .Values.secret }}
{{- if or .Values.secret .Values.secretProjections }}
{{ include "jindofs.cred.secret.volumes" . | nindent 8 }}
{{- end }}
{{- if .Values.master.volumes }}
Expand Down
4 changes: 2 additions & 2 deletions charts/jindofsx/templates/worker/statefulset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ spec:
subPath: hdfs-site.xml
{{- end }}
{{- end }}
{{- if .Values.secret }}
{{- if or .Values.secret .Values.secretProjections }}
{{ include "jindofs.cred.secret.volumeMounts" . | nindent 12 }}
{{- end }}
{{- if .Values.ufsVolumes }}
Expand Down Expand Up @@ -234,7 +234,7 @@ spec:
name: {{ .Values.hadoopConfig.configMap }}
{{- end }}
{{- end }}
{{- if .Values.secret }}
{{- if or .Values.secret .Values.secretProjections }}
{{ include "jindofs.cred.secret.volumes" . | nindent 8 }}
{{- end }}
- name: bigboot-config
Expand Down
Loading
Loading