diff --git a/charts/fauxpilot/Chart.yaml b/charts/fauxpilot/Chart.yaml index 39a64dc..bee3415 100644 --- a/charts/fauxpilot/Chart.yaml +++ b/charts/fauxpilot/Chart.yaml @@ -15,7 +15,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.1.0 +version: 0.1.1 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to diff --git a/charts/fauxpilot/templates/s3-configmap.yaml b/charts/fauxpilot/templates/s3-configmap.yaml deleted file mode 100644 index 30fe83e..0000000 --- a/charts/fauxpilot/templates/s3-configmap.yaml +++ /dev/null @@ -1,39 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: fauxpilot-s3 -data: - config.json: | - { - "version": "10", - "aliases": { - "gcs": { - "url": "https://storage.googleapis.com", - "accessKey": "YOUR-ACCESS-KEY-HERE", - "secretKey": "YOUR-SECRET-KEY-HERE", - "api": "S3v2", - "path": "dns" - }, - "local": { - "url": "http://localhost:9000", - "accessKey": "", - "secretKey": "", - "api": "S3v4", - "path": "auto" - }, - "play": { - "url": "https://play.min.io", - "accessKey": "", - "secretKey": "", - "api": "S3v4", - "path": "auto" - }, - "s3": { - "url": "{{ .Values.s3.endpoint }}", - "accessKey": "{{ .Values.s3.access_key_id }}", - "secretKey": "{{ .Values.s3.secret_access_key }}", - "api": "S3v4", - "path": "dns" - } - } - } diff --git a/charts/fauxpilot/templates/triton-deployment.yaml b/charts/fauxpilot/templates/triton-deployment.yaml index 556b403..9b008c5 100644 --- a/charts/fauxpilot/templates/triton-deployment.yaml +++ b/charts/fauxpilot/templates/triton-deployment.yaml @@ -25,10 +25,6 @@ spec: {{- toYaml . | nindent 8 }} {{- end }} serviceAccountName: {{ include "fauxpilot.serviceAccountName" . }} - volumes: - - name: fauxpilot-s3 - configMap: - name: fauxpilot-s3 securityContext: {{- toYaml .Values.podSecurityContext | nindent 8 }} containers: @@ -37,25 +33,16 @@ spec: {{- toYaml .Values.securityContext | nindent 12 }} image: "{{ .Values.image.triton.repository }}:{{ .Values.image.triton.tag | default .Chart.AppVersion }}" imagePullPolicy: {{ .Values.image.triton.pullPolicy }} - env: - - name: AWS_ACCESS_KEY_ID - value: {{ .Values.s3.access_key_id }} - - name: AWS_SECRET_ACCESS_KEY - value: {{ .Values.s3.secret_access_key }} - - name: S3_ENDPOINT - value: {{ .Values.s3.endpoint }} - - name: AWS_DEFAULT_REGION - value: {{ .Values.s3.region }} - - name: AWS_S3_ENDPOINT - value: {{ .Values.s3.endpoint }} command: - sh - -c - | - wget -q https://dl.min.io/client/mc/release/linux-amd64/mc -O /usr/local/bin/mc && \ - chmod +x /usr/local/bin/mc && \ - mkdir /model && \ - mc cp -r s3/mbenxsalha/diffusion/fauxpilot/{{ .Values.model }}/fastertransformer /model && mc cp -r s3/mbenxsalha/diffusion/fauxpilot/{{ .Values.model }}/huggingface /root/.cache && \ + wget -q https://minio.lab.sspcloud.fr/mbenxsalha/diffusion/fauxpilot/{{ .Values.model }}.zip && \ + apt-get update && apt-get install -y zip && \ + unzip -q {{ .Values.model }}.zip -d ../ && \ + mv /{{ .Values.model }}/huggingface /root/.cache && \ + mv /{{ .Values.model }} /model && \ + rm {{ .Values.model }}.zip && \ CUDA_VISIBLE_DEVICES=0 mpirun -n 1 --allow-run-as-root /opt/tritonserver/bin/tritonserver --model-repository=/model ports: - name: http @@ -77,10 +64,6 @@ spec: initialDelaySeconds: 150 resources: {{- toYaml .Values.resources | nindent 12 }} - volumeMounts: - - name: fauxpilot-s3 - mountPath: /root/.mc/config.json - subPath: config.json {{- with .Values.nodeSelector }} nodeSelector: {{- toYaml . | nindent 8 }} diff --git a/charts/fauxpilot/values.yaml b/charts/fauxpilot/values.yaml index dc3702f..3b3b8ac 100644 --- a/charts/fauxpilot/values.yaml +++ b/charts/fauxpilot/values.yaml @@ -16,11 +16,6 @@ image: pullPolicy: IfNotPresent tag: "main" -s3: - access_key_id: "" - secret_access_key: "" - endpoint: "https://minio.lab.sspcloud.fr" - region: "us-east-1" imagePullSecrets: [] nameOverride: ""