Browse Source
remove user job since bucket job can now create public buckets, update values.yaml
pull/5049/head
remove user job since bucket job can now create public buckets, update values.yaml
pull/5049/head
Max Roby
1 year ago
committed by
Chris Lu
2 changed files with 3 additions and 99 deletions
@ -1,90 +0,0 @@ |
|||||
{{- if .Values.master.enabled }} |
|
||||
{{- if .Values.filer.s3.enabled }} |
|
||||
{{- if .Values.filer.s3.createUsers}} |
|
||||
--- |
|
||||
apiVersion: batch/v1 |
|
||||
kind: Job |
|
||||
metadata: |
|
||||
name: "{{ $.Release.Name }}-user-hook" |
|
||||
labels: |
|
||||
app.kubernetes.io/managed-by: {{ .Release.Service | quote }} |
|
||||
app.kubernetes.io/instance: {{ .Release.Name | quote }} |
|
||||
annotations: |
|
||||
"helm.sh/hook": post-install |
|
||||
"helm.sh/hook-weight": "-4" |
|
||||
"helm.sh/hook-delete-policy": hook-succeeded |
|
||||
spec: |
|
||||
template: |
|
||||
metadata: |
|
||||
name: "{{ .Release.Name }}" |
|
||||
labels: |
|
||||
app.kubernetes.io/managed-by: {{ .Release.Service | quote }} |
|
||||
app.kubernetes.io/instance: {{ .Release.Name | quote }} |
|
||||
spec: |
|
||||
restartPolicy: Never |
|
||||
containers: |
|
||||
- name: post-install-job |
|
||||
image: {{ template "master.image" . }} |
|
||||
env: |
|
||||
- name: WEED_CLUSTER_DEFAULT |
|
||||
value: "sw" |
|
||||
- name: WEED_CLUSTER_SW_MASTER |
|
||||
value: "{{ template "seaweedfs.name" . }}-master.{{ .Release.Namespace }}:9333" |
|
||||
- name: WEED_CLUSTER_SW_FILER |
|
||||
value: "{{ template "seaweedfs.name" . }}-filer-client.{{ .Release.Namespace }}:8888" |
|
||||
- name: POD_IP |
|
||||
valueFrom: |
|
||||
fieldRef: |
|
||||
fieldPath: status.podIP |
|
||||
- name: POD_NAME |
|
||||
valueFrom: |
|
||||
fieldRef: |
|
||||
fieldPath: metadata.name |
|
||||
- name: NAMESPACE |
|
||||
valueFrom: |
|
||||
fieldRef: |
|
||||
fieldPath: metadata.namespace |
|
||||
- name: SEAWEEDFS_FULLNAME |
|
||||
value: "{{ template "seaweedfs.name" . }}" |
|
||||
{{- range $reg, $props := $.Values.filer.s3.createUsers }} |
|
||||
- name: {{ $props.name | upper }}_ACCESS_KEY_ID |
|
||||
valueFrom: |
|
||||
secretKeyRef: |
|
||||
name: {{ $props.secretName }} |
|
||||
key: ACCESS_KEY_ID |
|
||||
- name: {{ $props.name | upper }}_SECRET_ACCESS_KEY |
|
||||
valueFrom: |
|
||||
secretKeyRef: |
|
||||
name: {{ $props.secretName }} |
|
||||
key: ACCESS_SECRET_KEY |
|
||||
{{- end }} |
|
||||
command: |
|
||||
- "/bin/sh" |
|
||||
- "-ec" |
|
||||
- | |
|
||||
{{- range $reg, $props := $.Values.filer.s3.createUsers }} |
|
||||
exec /bin/echo \ |
|
||||
"s3.configure --user {{ $props.name }} \ |
|
||||
--buckets {{ $props.buckets }} \ |
|
||||
--actions {{ $props.actions }} \ |
|
||||
--access_key ${{ $props.name | upper }}_ACCESS_KEY_ID \ |
|
||||
--secret_key ${{ $props.name | upper }}_SECRET_ACCESS_KEY \ |
|
||||
--apply true" |\ |
|
||||
/usr/bin/weed shell |
|
||||
{{- end }} |
|
||||
ports: |
|
||||
- containerPort: {{ .Values.master.port }} |
|
||||
name: swfs-master |
|
||||
{{- if and .Values.global.monitoring.enabled .Values.master.metricsPort }} |
|
||||
- containerPort: {{ .Values.master.metricsPort }} |
|
||||
name: metrics |
|
||||
{{- end }} |
|
||||
- containerPort: {{ .Values.master.grpcPort }} |
|
||||
#name: swfs-master-grpc |
|
||||
{{- if .Values.master.readinessProbe.enabled }} |
|
||||
{{- $hostpath_exists := include "master.hostpath_exists" . -}} |
|
||||
{{- $existing_claims := include "master.existing_claims" . -}} |
|
||||
{{- end }} |
|
||||
{{- end }} |
|
||||
{{- end }} |
|
||||
{{- end }} |
|
Write
Preview
Loading…
Cancel
Save
Reference in new issue