From e49f57d33a0d4163b619b20460670f10206ebccb Mon Sep 17 00:00:00 2001 From: Havrileck Alexandre Date: Mon, 5 Jul 2021 23:17:04 +0200 Subject: [PATCH] feat: Add s3-proxy chart 2.2.1 --- charts/s3-proxy/Chart.yaml | 4 ++-- charts/s3-proxy/README.md | 18 +++++++++--------- charts/s3-proxy/values.yaml | 10 +++++----- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/charts/s3-proxy/Chart.yaml b/charts/s3-proxy/Chart.yaml index ad8a5c5..c6f370c 100755 --- a/charts/s3-proxy/Chart.yaml +++ b/charts/s3-proxy/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v1 -appVersion: 3.2.0 +appVersion: 3.3.0 description: A Helm chart for Kubernetes to deploy S3-Proxy home: https://github.com/oxyno-zeta/s3-proxy icon: https://raw.githubusercontent.com/oxyno-zeta/s3-proxy/master/docs/logo/logo.png @@ -18,4 +18,4 @@ maintainers: name: s3-proxy sources: - https://github.com/oxyno-zeta/s3-proxy -version: 2.2.0 +version: 2.2.1 diff --git a/charts/s3-proxy/README.md b/charts/s3-proxy/README.md index 1b648d1..2aaf8e7 100755 --- a/charts/s3-proxy/README.md +++ b/charts/s3-proxy/README.md @@ -56,11 +56,11 @@ The following table lists the configurable parameters of the s3-proxy chart and | `ingress.annotations` | Ingress annotations | `{}` | | `ingress.hosts` | Ingress accepted hostnames | `[]` | | `ingress.tls` | Ingress TLS configuration | `[]` | -| `customTemplates` | S3 Proxy custom templates files (mounted in /custom-templates) | `{}` | +| `customTemplates` | S3 Proxy custom templates files (mounted in /proxy/custom-templates) | `{}` | | `existingSecret` | Existing secret (instead of secretFiles) | `""` | -| `secretFiles` | Secret files for secrets declaration and usage | `{}` | +| `secretFiles` | Secret files for secrets declaration and usage (mounted in /proxy/secret-files) | `{}` | | `env` | Environment variables | `{}` | -| `configFiles` | [S3 proxy configuration](https://oxyno-zeta.github.io/s3-proxy/#configuration) files) | Example of configuration | +| `configFiles` | [S3 proxy configuration](https://oxyno-zeta.github.io/s3-proxy/#configuration) files) | Example of configuration | | `resources` | CPU/Memory resource requests/limits. | `{}` | | `nodeSelector` | Node labels for pod assignment | `{}` | | `tolerations` | List of node taints to tolerate (requires Kubernetes >= 1.6) | `[]` | @@ -76,12 +76,12 @@ The following table lists the configurable parameters of the s3-proxy chart and | `prometheus.serviceMonitor.metricRelabelings` | Metric relabelings | `[]` | | `prometheus.serviceMonitor.relabelings` | Relabelings | `[]` | | `podAnnotations` | Additional annotations to apply to the pod. | `{}` | -| `grafana.operator.enabled` | If true, create a GrafanaDashboard custom resource using the CRD from [grafana-operator](https://github.com/integr8ly/grafana-operator). | `false` | -| `grafana.operator.namespace` | If set, the GrafanaDashboard will be installed in a different namespace | `""` | -| `grafana.operator.labels` | Extra labels for selector | `{}` | -| `grafana.configmap.enabled` | If true, create a ConfigMap resource compatible with the Grafana sidecar from kiwigrid/k8s-sidecar. | `false` | -| `grafana.configmap.namespace` | If set, the ConfigMap will be installed in a different namespace | `""` | -| `grafana.configmap.labels` | Extra labels for selector | `{}` | +| `grafana.operator.enabled` | If true, create a GrafanaDashboard custom resource using the CRD from [grafana-operator](https://github.com/integr8ly/grafana-operator). | `false` | +| `grafana.operator.namespace` | If set, the GrafanaDashboard will be installed in a different namespace | `""` | +| `grafana.operator.labels` | Extra labels for selector | `{}`  | +| `grafana.configmap.enabled` | If true, create a ConfigMap resource compatible with the Grafana sidecar from kiwigrid/k8s-sidecar. | `false` | +| `grafana.configmap.namespace` | If set, the ConfigMap will be installed in a different namespace | `""` | +| `grafana.configmap.labels` | Extra labels for selector | `{}`  | | `podDisruptionBudget.enabled` | If true, create a pod disruption budget for prometheus pods. The created resource cannot be modified once created - it must be deleted to perform a change | `false` | | `podDisruptionBudget.minAvailable` | Minimum number / percentage of pods that should remain scheduled | `1` | | `podDisruptionBudget.maxUnavailable` | Maximum number / percentage of pods that may be made unavailable | `""` | diff --git a/charts/s3-proxy/values.yaml b/charts/s3-proxy/values.yaml index 06e2e12..22670c4 100755 --- a/charts/s3-proxy/values.yaml +++ b/charts/s3-proxy/values.yaml @@ -6,7 +6,7 @@ replicaCount: 1 image: repository: oxynozeta/s3-proxy - tag: 3.1.0 + tag: 3.3.0 pullPolicy: IfNotPresent nameOverride: "" @@ -36,7 +36,7 @@ ingress: # - chart-example.local # Custom templates declaration -# Will be mounted in /custom-templates +# Will be mounted in /proxy/custom-templates customTemplates: {} # # Bad Request template example # bad-request.tpl: |- @@ -50,13 +50,13 @@ customTemplates: {} # # Add other template files here # Existing secret -# Will be mounted in /secret-files +# Will be mounted in /proxy/secret-files existingSecret: "" # Example # my-awesome-secret # Secret files for secrets declaration -# Will be mounted in /secret-files +# Each key will be mounted in /proxy/secret-files secretFiles: {} # Example # my-syper-secret-file: my-awesome-secret @@ -292,7 +292,7 @@ configFiles: # accessKey: # env: AWS_ACCESS_KEY_ID # secretKey: - # path: secret_key_file + # path: /proxy/secret-files/secret_key_file resources: {} # We usually recommend not to specify default resources and to leave this as a conscious