Rollback registry to filesystem

OpenCSGs · Jan 15, 2025 · d44bcf3 · d44bcf3
1 parent eeba033
commit d44bcf3
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 33 deletions.
diff --git a/helm-chart/charts/csghub/charts/registry/templates/configmap.yaml b/helm-chart/charts/csghub/charts/registry/templates/configmap.yaml
@@ -20,30 +20,30 @@ data:
   REGISTRY_AUTH: "htpasswd"
   REGISTRY_AUTH_HTPASSWD_REALM: "Registry Realm"
   REGISTRY_AUTH_HTPASSWD_PATH: "/auth/htpasswd"
-  REGISTRY_STORAGE: s3
-  {{- if .Values.global.minio.enabled }}
-  {{- if .Values.global.ingress.tls.enabled }}
-  REGISTRY_STORAGE_S3_ENCRYPT: "true"
-  REGISTRY_STORAGE_S3_SECURE: "true"
-  {{- else }}
-  REGISTRY_STORAGE_S3_ENCRYPT: "false"
-  REGISTRY_STORAGE_S3_SECURE: "false"
-  {{- end }}
-  REGISTRY_STORAGE_S3_SECURE: "false"
-  REGISTRY_STORAGE_S3_REGIONENDPOINT: {{ include "minio.external.endpoint" . }} # used to generate download links for lfs files
-  REGISTRY_STORAGE_S3_BUCKET: "csghub-git"
-  REGISTRY_STORAGE_S3_REGION: "cn-north-1"
-  REGISTRY_STORAGE_S3_FORCEPATHSTYLE: "true"
-  {{- else }}
-  {{- with $conf.objectStore }}
-  REGISTRY_STORAGE_S3_REGIONENDPOINT: {{ .endpoint }}
-  REGISTRY_STORAGE_S3_ACCESSKEY: {{ .accessKey }}
-  REGISTRY_STORAGE_S3_SECRETKEY: {{ .accessSecret }}
-  REGISTRY_STORAGE_S3_BUCKET: {{ .bucket }}
-  REGISTRY_STORAGE_S3_REGION: {{ .region }}
-  REGISTRY_STORAGE_S3_ENCRYPT: {{ .encrypt }}
-  REGISTRY_STORAGE_S3_SECURE: {{ .secure }}
-  REGISTRY_STORAGE_S3_FORCEPATHSTYLE: {{ .pathStyle }}
-  {{- end }}
-  {{- end }}
+  REGISTRY_STORAGE: filesystem
+{{/*  {{- if .Values.global.minio.enabled }}*/}}
+{{/*  {{- if .Values.global.ingress.tls.enabled }}*/}}
+{{/*  REGISTRY_STORAGE_S3_ENCRYPT: "true"*/}}
+{{/*  REGISTRY_STORAGE_S3_SECURE: "true"*/}}
+{{/*  {{- else }}*/}}
+{{/*  REGISTRY_STORAGE_S3_ENCRYPT: "false"*/}}
+{{/*  REGISTRY_STORAGE_S3_SECURE: "false"*/}}
+{{/*  {{- end }}*/}}
+{{/*  REGISTRY_STORAGE_S3_SECURE: "false"*/}}
+{{/*  REGISTRY_STORAGE_S3_REGIONENDPOINT: {{ include "minio.external.endpoint" . }} # used to generate download links for lfs files*/}}
+{{/*  REGISTRY_STORAGE_S3_BUCKET: "csghub-git"*/}}
+{{/*  REGISTRY_STORAGE_S3_REGION: "cn-north-1"*/}}
+{{/*  REGISTRY_STORAGE_S3_FORCEPATHSTYLE: "true"*/}}
+{{/*  {{- else }}*/}}
+{{/*  {{- with $conf.objectStore }}*/}}
+{{/*  REGISTRY_STORAGE_S3_REGIONENDPOINT: {{ .endpoint }}*/}}
+{{/*  REGISTRY_STORAGE_S3_ACCESSKEY: {{ .accessKey }}*/}}
+{{/*  REGISTRY_STORAGE_S3_SECRETKEY: {{ .accessSecret }}*/}}
+{{/*  REGISTRY_STORAGE_S3_BUCKET: {{ .bucket }}*/}}
+{{/*  REGISTRY_STORAGE_S3_REGION: {{ .region }}*/}}
+{{/*  REGISTRY_STORAGE_S3_ENCRYPT: {{ .encrypt }}*/}}
+{{/*  REGISTRY_STORAGE_S3_SECURE: {{ .secure }}*/}}
+{{/*  REGISTRY_STORAGE_S3_FORCEPATHSTYLE: {{ .pathStyle }}*/}}
+{{/*  {{- end }}*/}}
+{{/*  {{- end }}*/}}
 {{- end }}
diff --git a/helm-chart/charts/csghub/charts/registry/templates/statefulset.yaml b/helm-chart/charts/csghub/charts/registry/templates/statefulset.yaml
@@ -67,12 +67,12 @@ spec:
             - name: REGISTRY_HTTP_TLS_KEY
               value: "/opt/certs/x509/tls.key"
           {{- end }}
-          {{- if .Values.global.minio.enabled }}
-            - name: REGISTRY_STORAGE_S3_ACCESSKEY
-              value: "$(MINIO_ROOT_USER)"
-            - name: REGISTRY_STORAGE_S3_SECRETKEY
-              value: "$(MINIO_ROOT_PASSWORD)"
-          {{- end }}
+{{/*          {{- if .Values.global.minio.enabled }}*/}}
+{{/*            - name: REGISTRY_STORAGE_S3_ACCESSKEY*/}}
+{{/*              value: "$(MINIO_ROOT_USER)"*/}}
+{{/*            - name: REGISTRY_STORAGE_S3_SECRETKEY*/}}
+{{/*              value: "$(MINIO_ROOT_PASSWORD)"*/}}
+{{/*          {{- end }}*/}}
           {{- with $conf.environments }}
             {{- range $key, $value := . }}
             - name: {{ $key }}

diff --git a/helm-chart/charts/csghub/values.yaml b/helm-chart/charts/csghub/values.yaml
@@ -101,7 +101,7 @@ global:
       ## TLS settings for ingress.
       tls:
         ## Enable or disable TLS.
-        enabled: false
+        enabled: true
         ## Determines if TLS certificates are auto-generated.
         ## When set to false, it implies that you will provide your own certificates.
         autoGenerated: false