Skip to content

Inconsistency in Volume Mounts Between oap-deployment.yaml and oap-job.yaml Causes Init Job to Fail #163

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

Merged
kezhenxu94 merged 2 commits into from
Jul 31, 2025
Merged

Inconsistency in Volume Mounts Between oap-deployment.yaml and oap-job.yaml Causes Init Job to Fail #163

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3e0bef9
Update oap-init.job.yaml
NoodlesWang2024 Jul 31, 2025
b0ab008
Move the volume and volumeMounts into helpers to keep consistent.
NoodlesWang2024 Jul 31, 2025
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
53 changes: 53 additions & 0 deletions chart/skywalking/templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,3 +216,56 @@ Define the banyandb grpc port
{{- .Values.banyandb.cluster.liaison.grpcSvc.port -}}
{{- end -}}
{{- end -}}

{{/*
Define volumeMounts for OAP containers
*/}}
{{- define "skywalking.oap.volumeMounts" -}}
{{- range $path, $config := .Values.oap.config }}
{{- if typeIs "string" $config }}
- name: skywalking-oap-override
mountPath: /skywalking/config/{{ $path }}
subPath: {{ $path }}
{{- else }}
{{- range $subpath, $subconfig := $config }}
{{- if typeIs "string" $subconfig }}
- name: skywalking-oap-override
mountPath: /skywalking/config/{{ $path }}/{{ $subpath }}
subPath: {{ print $path "-" $subpath }}
{{- else }}
{{- range $subsubpath, $subsubconfig := $subconfig }}
- name: skywalking-oap-override
mountPath: /skywalking/config/{{ $path }}/{{ $subpath }}/{{ $subsubpath }}
subPath: {{ print $path "-" $subpath "-" $subsubpath }}
{{- end }}
{{- end }}
{{- end }}
{{- end }}
{{- end }}
{{- range .Values.oap.secretMounts }}
- name: {{ .name }}
mountPath: {{ .path }}
{{- if .subPath }}
subPath: {{ .subPath }}
{{- end }}
{{- end }}
{{- end -}}

{{/*
Define volumes for OAP containers
*/}}
{{- define "skywalking.oap.volumes" -}}
{{- if .Values.oap.config }}
- name: skywalking-oap-override
configMap:
name: {{ template "skywalking.fullname" . }}-oap-cm-override
{{- end }}
{{- range .Values.oap.secretMounts }}
- name: {{ .name }}
secret:
secretName: {{ .secretName }}
{{- if .defaultMode }}
defaultMode: {{ .defaultMode }}
{{- end }}
{{- end }}
{{- end -}}
43 changes: 2 additions & 41 deletions chart/skywalking/templates/oap-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,46 +164,7 @@ spec:
{{- end }}

volumeMounts:
{{- range $path, $config := .Values.oap.config }}
{{- if typeIs "string" $config }}
- name: skywalking-oap-override
mountPath: /skywalking/config/{{ $path }}
subPath: {{ $path }}
{{- else }}
{{- range $subpath, $subconfig := $config }}
{{- if typeIs "string" $subconfig }}
- name: skywalking-oap-override
mountPath: /skywalking/config/{{ $path }}/{{ $subpath }}
subPath: {{ print $path "-" $subpath }}
{{- else }}
{{- range $subsubpath, $subsubconfig := $subconfig }}
- name: skywalking-oap-override
mountPath: /skywalking/config/{{ $path }}/{{ $subpath }}/{{ $subsubpath }}
subPath: {{ print $path "-" $subpath "-" $subsubpath }}
{{- end }}
{{- end }}
{{- end }}
{{- end }}
{{- end }}
{{- range .Values.oap.secretMounts }}
- name: {{ .name }}
mountPath: {{ .path }}
{{- if .subPath }}
subPath: {{ .subPath }}
{{- end }}
{{- end }}
{{- include "skywalking.oap.volumeMounts" . | nindent 8 }}

volumes:
{{- if .Values.oap.config }}
- name: skywalking-oap-override
configMap:
name: {{ template "skywalking.fullname" . }}-oap-cm-override
{{- end }}
{{- range .Values.oap.secretMounts }}
- name: {{ .name }}
secret:
secretName: {{ .secretName }}
{{- if .defaultMode }}
defaultMode: {{ .defaultMode }}
{{- end }}
{{- end }}
{{- include "skywalking.oap.volumes" . | nindent 6 }}
35 changes: 2 additions & 33 deletions chart/skywalking/templates/oap-init.job.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,38 +85,7 @@ spec:
{{- end }}

volumeMounts:
{{- range $path, $config := .Values.oap.config }}
{{- if typeIs "string" $config }}
- name: skywalking-oap-override
mountPath: /skywalking/config/{{ $path }}
subPath: {{ $path }}
{{- else }}
{{- range $subpath, $oalContent := $config }}
- name: skywalking-oap-override
mountPath: /skywalking/config/{{ $path }}/{{ $subpath }}
subPath: {{ print $path "-" $subpath }}
{{- end }}
{{- end }}
{{- end }}
{{- range .Values.oap.secretMounts }}
- name: {{ .name }}
mountPath: {{ .path }}
{{- if .subPath }}
subPath: {{ .subPath }}
{{- end }}
{{- end }}
{{- include "skywalking.oap.volumeMounts" . | nindent 8 }}

volumes:
{{- if .Values.oap.config }}
- name: skywalking-oap-override
configMap:
name: {{ template "skywalking.fullname" . }}-oap-cm-override
{{- end }}
{{- range .Values.oap.secretMounts }}
- name: {{ .name }}
secret:
secretName: {{ .secretName }}
{{- if .defaultMode }}
defaultMode: {{ .defaultMode }}
{{- end }}
{{- end }}
{{- include "skywalking.oap.volumes" . | nindent 6 }}
Loading