Skip to content

Commit 61063cf

Browse files
authored
Merge pull request #11 from comet-ml/CRThaze/dev
Fix Values case and adjust README format
2 parents 0e02b4e + c24b86d commit 61063cf

File tree

6 files changed

+52
-29
lines changed

6 files changed

+52
-29
lines changed

charts/s3proxy/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ type: application
1515
# This is the chart version. This version number should be incremented each time you make changes
1616
# to the chart and its templates, including the app version.
1717
# Versions are expected to follow Semantic Versioning (https://semver.org/)
18-
version: 0.0.4
18+
version: 0.0.5
1919

2020
# This is the version number of the application being deployed. This version number should be
2121
# incremented each time you make changes to the application. Versions are not expected to

charts/s3proxy/README.md.gotmpl

Lines changed: 37 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -21,30 +21,53 @@
2121

2222
## Installation
2323

24-
### Add the repository (if published)
25-
26-
```bash
27-
helm repo add s3proxy <REPO_URL>
28-
helm repo update
29-
```
30-
3124
### Install the chart
3225

3326
```bash
3427
# Install with default values (filesystem backend)
35-
helm install my-s3proxy ./{{ template "chart.name" . }}
28+
helm install my-s3proxy oci://ghcr.io/comet-ml/{{ template "chart.name" . }}
3629

3730
# Install with custom values
38-
helm install my-s3proxy ./{{ template "chart.name" . }} -f my-values.yaml
31+
helm install my-s3proxy oci://ghcr.io/comet-ml/{{ template "chart.name" . }} -f override-values.yaml
3932
```
4033

4134
## Configuration
4235

4336
The following section lists the configurable parameters of the {{ template "chart.name" . }} chart and their default values.
4437

45-
### General Parameters
46-
47-
{{ template "chart.valuesSection" . }}
38+
{{- define "renderMarkdownLine" }}
39+
{{- $code := (mustRegexReplaceAll "\x60([^\x60]*)\x60" . "<code>${1}</code>") }}
40+
{{- $italStar := (mustRegexReplaceAll `([^\*]|\*\*)\*([^ \*].*[^ \*]|[^ \*])\*([^\*]|\*\*)` $code "${1}<i>${2}</i>${3}") }}
41+
{{- $italScore := (mustRegexReplaceAll "( |__)_([^ _].*[^ _]|[^ _])_( |__)" $italStar "${1}<i>${2}</i>${3}") }}
42+
{{- $boldStar := (mustRegexReplaceAll `\*\*([^ \*].*[^ \*]|[^ \*])\*\*` $italScore "<b>${1}</b>") }}
43+
{{- $boldScore := (mustRegexReplaceAll "__([^ _].*[^ _]|[^ _])__" $boldStar "<b>${1}</b>") }}
44+
{{- $boldScore }}
45+
{{- end -}}
46+
47+
{{- define "chart.valuesTableHtml" }}
48+
*Scroll sideways to see all columns.*
49+
50+
<table>
51+
<thead>
52+
<th>Key</th>
53+
<th>Description</th>
54+
<th>Type</th>
55+
<th>Default</th>
56+
</thead>
57+
<tbody>
58+
{{- range .Values }}
59+
<tr>
60+
<td><code>{{ .Key }}</code></td>
61+
<td>{{ template "renderMarkdownLine" (default .AutoDescription .Description) }}</td>
62+
<td><code>{{ .Type }}</code></td>
63+
<td>{{ template "renderMarkdownLine" (default .AutoDefault .Default) }}</td>
64+
</tr>
65+
{{- end }}
66+
</tbody>
67+
</table>
68+
{{- end }}
69+
70+
{{ template "chart.valuesSectionHtml" . }}
4871

4972
## Usage Examples
5073

@@ -87,7 +110,7 @@ config:
87110
provider: "aws-s3"
88111
awsS3:
89112
region: "us-west-2"
90-
accessKeyId: "aws-access-key-id" # For s3proxy to connect to AWS
113+
accessKeyID: "aws-access-key-id" # For s3proxy to connect to AWS
91114
secretAccessKey: "aws-secret-access-key"
92115

93116
persistence:
@@ -135,7 +158,7 @@ config:
135158
backend:
136159
provider: "google-cloud-storage"
137160
googleCloudStorage:
138-
projectId: "my-project"
161+
projectID: "my-project"
139162
clientEmail: "[email protected]"
140163
privateKey: |
141164
-----BEGIN RSA PRIVATE KEY-----

charts/s3proxy/override-values.example.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ config:
6666
aws: true # Set to true for AWS S3 (aws-s3 provider), false for generic S3
6767
region: "us-west-2"
6868
# endpoint: "https://s3.amazonaws.com" # Optional custom endpoint (e.g., MinIO, Ceph)
69-
accessKeyId: "AKIAIOSFODNN7EXAMPLE"
69+
accessKeyID: "AKIAIOSFODNN7EXAMPLE"
7070
secretAccessKey: "wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY"
7171

7272
# Azure Blob Storage backend
@@ -81,7 +81,7 @@ config:
8181
# Google Cloud Storage backend
8282
googleCloudStorage:
8383
enabled: false # Set to true to use GCS backend
84-
projectId: "my-project"
84+
projectID: "my-project"
8585

8686
# Service account email or user email (required for both authentication methods)
8787
clientEmail: "[email protected]"
@@ -122,7 +122,7 @@ config:
122122
# OpenStack Swift backend
123123
openstackSwift:
124124
enabled: false # Set to true to use Swift backend
125-
authUrl: "https://auth.cloud.com/v2.0"
125+
authURL: "https://auth.cloud.com/v2.0"
126126
tenantName: "my-tenant"
127127
userName: "my-user"
128128
password: "my-password"

charts/s3proxy/templates/configmap.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -133,8 +133,8 @@ data:
133133

134134
# Google Cloud Storage backend configuration
135135
jclouds.provider=google-cloud-storage
136-
{{- if .Values.config.backends.googleCloudStorage.projectId }}
137-
jclouds.project-id={{ .Values.config.backends.googleCloudStorage.projectId }}
136+
{{- if .Values.config.backends.googleCloudStorage.projectID }}
137+
jclouds.project-id={{ .Values.config.backends.googleCloudStorage.projectID }}
138138
{{- end }}
139139
# Credentials will be merged from the secret properties file
140140
# jclouds.identity and jclouds.credential will be provided by the secret
@@ -156,8 +156,8 @@ data:
156156

157157
# OpenStack Swift backend configuration
158158
jclouds.provider=openstack-swift
159-
{{- if .Values.config.backends.openstackSwift.authUrl }}
160-
jclouds.keystone.auth-url={{ .Values.config.backends.openstackSwift.authUrl }}
159+
{{- if .Values.config.backends.openstackSwift.authURL }}
160+
jclouds.keystone.auth-url={{ .Values.config.backends.openstackSwift.authURL }}
161161
{{- end }}
162162
{{- if .Values.config.backends.openstackSwift.region }}
163163
jclouds.region={{ .Values.config.backends.openstackSwift.region }}
@@ -178,4 +178,4 @@ data:
178178
{{- end }}
179179
# Credentials will be merged from the secret properties file
180180
# jclouds.identity and jclouds.credential will be provided by the secret
181-
{{- end }}
181+
{{- end }}

charts/s3proxy/templates/secret.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ stringData:
1717

1818
{{- if .Values.config.backends.s3.enabled }}
1919
# S3 backend credentials
20-
{{- if .Values.config.backends.s3.accessKeyId }}
21-
jclouds.identity={{ .Values.config.backends.s3.accessKeyId }}
20+
{{- if .Values.config.backends.s3.accessKeyID }}
21+
jclouds.identity={{ .Values.config.backends.s3.accessKeyID }}
2222
{{- end }}
2323
{{- if .Values.config.backends.s3.secretAccessKey }}
2424
jclouds.credential={{ .Values.config.backends.s3.secretAccessKey }}
@@ -74,4 +74,4 @@ stringData:
7474
{{- if .Values.config.backends.rackspaceCloudfiles.apiKey }}
7575
jclouds.credential={{ .Values.config.backends.rackspaceCloudfiles.apiKey }}
7676
{{- end }}
77-
{{- end }}
77+
{{- end }}

charts/s3proxy/values.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ config:
182182
# -- S3 endpoint
183183
endpoint: ""
184184
# -- S3 Access Key ID for backend
185-
accessKeyId: ""
185+
accessKeyID: ""
186186
# -- S3 Secret Access Key for backend
187187
secretAccessKey: ""
188188

@@ -204,7 +204,7 @@ config:
204204
# -- Enable Google Cloud Storage backend
205205
enabled: false
206206
# -- GCP project ID
207-
projectId: ""
207+
projectID: ""
208208
# -- Private key (only used when jsonCredentials.enabled is false)
209209
privateKey: ""
210210
# -- Service account email or user email (used with both privateKey and jsonCredentials methods)
@@ -232,7 +232,7 @@ config:
232232
# -- Enable OpenStack Swift backend
233233
enabled: false
234234
# -- Authentication URL
235-
authUrl: ""
235+
authURL: ""
236236
# -- Tenant name
237237
tenantName: ""
238238
# -- Username

0 commit comments

Comments
 (0)