Merge pull request #29 from s3proxy-distro/next

Next

README.md

@@ -1,6 +1,6 @@
 # s3proxy
 
-![Version: 1.3.1](https://img.shields.io/badge/Version-1.3.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v2.1.1_1.1.2](https://img.shields.io/badge/AppVersion-v2.1.1_1.1.2-informational?style=flat-square)
+![Version: 1.4.0-next.4](https://img.shields.io/badge/Version-1.4.0--next.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v2.1.1_1.1.3](https://img.shields.io/badge/AppVersion-v2.1.1_1.1.3-informational?style=flat-square)
 
 [![Main CI](https://github.com/s3proxy-distro/helm-s3proxy/actions/workflows/ci-main.yml/badge.svg)](https://github.com/s3proxy-distro/helm-s3proxy/actions/workflows/ci-main.yml)
 
@@ -40,10 +40,17 @@ helm upgrade --install releasname -f values s3proxy/s3proxy
 | Key | Type | Default | Description |
 |-----|------|---------|-------------|
 | affinity | object | `{}` |  |
+| args[0] | string | `"-Ds3proxy.identity=$(S3PROXY_IDENTITY)"` |  |
+| args[1] | string | `"-Ds3proxy.credential=$(S3PROXY_CREDENTIAL)"` |  |
+| args[2] | string | `"-jar"` |  |
+| args[3] | string | `"/opt/s3proxy/s3proxy"` |  |
+| args[4] | string | `"--properties"` |  |
+| args[5] | string | `"/etc/s3proxy/s3proxy.properties"` |  |
 | autoscaling.enabled | bool | `false` |  |
 | autoscaling.maxReplicas | int | `100` |  |
 | autoscaling.minReplicas | int | `1` |  |
 | autoscaling.targetCPUUtilizationPercentage | int | `80` |  |
+| command[0] | string | `"java"` |  |
 | config.env | list | `[]` |  |
 | config.jclouds.filesystem.baseDir | string | `"/data"` |  |
 | config.jclouds.filesystem.tmpSize | string | `"500Mi"` |  |
@@ -52,6 +59,7 @@ helm upgrade --install releasname -f values s3proxy/s3proxy
 | config.s3proxy.ignoreUnknownHeaders | bool | `false` |  |
 | config.s3proxy.readOnlyBlobStore | bool | `false` |  |
 | config.s3proxy.v4MaxNonChunkedRequestSize | string | `"33554432"` |  |
+| csiSecret | object | `{}` |  |
 | fullnameOverride | string | `""` |  |
 | image.pullPolicy | string | `"IfNotPresent"` |  |
 | image.repository | string | `"ghcr.io/s3proxy-distro/containers/container-s3proxy-eclipse-temurin-11"` |  |
@@ -64,9 +72,11 @@ helm upgrade --install releasname -f values s3proxy/s3proxy
 | ingress.hosts[0].paths[0].path | string | `"/"` |  |
 | ingress.hosts[0].paths[0].pathType | string | `"ImplementationSpecific"` |  |
 | ingress.tls | list | `[]` |  |
+| labels | object | `{}` |  |
 | nameOverride | string | `""` |  |
 | nodeSelector | object | `{}` |  |
 | podAnnotations | object | `{}` |  |
+| podLabels.test | string | `"true"` |  |
 | podSecurityContext.fsGroup | int | `10001` |  |
 | podSecurityContext.fsGroupChangePolicy | string | `"OnRootMismatch"` |  |
 | podSecurityContext.runAsGroup | int | `10001` |  |
@@ -84,6 +94,7 @@ helm upgrade --install releasname -f values s3proxy/s3proxy
 | serviceAccount.create | bool | `true` |  |
 | serviceAccount.name | string | `""` |  |
 | tolerations | list | `[]` |  |
+| topologySpreadConstraints | object | `{}` |  |
 
 ----------------------------------------------
-Autogenerated from chart metadata using [helm-docs v1.11.3](https://github.com/norwoodj/helm-docs/releases/v1.11.3)
+Autogenerated from chart metadata using [helm-docs v1.12.0](https://github.com/norwoodj/helm-docs/releases/v1.12.0)

charts/s3proxy/Chart.yaml

@@ -42,7 +42,7 @@ version: 1.2.0
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "v2.1.1_1.1.2"
+appVersion: "v2.1.1_1.1.3"
 sources:
   - https://github.com/s3proxy-distro/s3proxy
   - https://github.com/s3proxy-distro/helm-s3proxy

charts/s3proxy/templates/_helpers.tpl

@@ -48,6 +48,12 @@ Selector labels
 {{- define "s3proxy.selectorLabels" -}}
 app.kubernetes.io/name: {{ include "s3proxy.name" . }}
 app.kubernetes.io/instance: {{ .Release.Name }}
+{{- with .Values.labels -}}
+{{ toYaml . | nindent 0 }}
+{{- end }}
+{{- end }}
+
+{{/*
 {{- end }}
 
 {{/*

charts/s3proxy/templates/_secret.tpl

@@ -1,4 +1,5 @@
 {{- define "s3proxy.properties" -}}
+{{- if and (not .Values.existingPropertiesSecret) (not .Values.csiSecret.enabled) }}
 LOG_LEVEL={{ .Values.logLevel | default "info" }}
 #General config
 s3proxy.authorization={{ .Values.config.s3proxy.authorization }}
@@ -44,3 +45,4 @@ jclouds.credential={{ .Values.config.jclouds.azureblob.secretValue }}
 {{- end }}
 jclouds.region=us-east-1
 {{- end }}
+{{- end }}

charts/s3proxy/templates/deployment.yaml

@@ -21,6 +21,9 @@ spec:
       {{- end }}
       labels:
         {{- include "s3proxy.selectorLabels" . | nindent 8 }}
+        {{- with .Values.podLabels -}}
+        {{ toYaml . | nindent 8 }}
+        {{- end }}
     spec:
       {{- with .Values.imagePullSecrets }}
       imagePullSecrets:
@@ -94,8 +97,20 @@ spec:
           sizeLimit: {{ .Values.config.jclouds.filesystem.tmpSize }}
       {{- end }}
       - name: secret-volume
+        {{- if .Values.csiSecret.enabled }}
+        csi:
+          driver: {{ .Values.csiSecret.driver | default "secrets-store.csi.k8s.io" }}
+          readOnly: {{ .Values.csiSecret.readOnly | default true }}
+          volumeAttributes:
+            secretProviderClass: {{ .Values.csiSecret.class }}
+        {{ else }}
         secret:
+      {{- if .Values.existingPropertiesSecret }}
+          secretName: {{ .Values.existingPropertiesSecret }}
+      {{ else }}
           secretName: {{ include "s3proxy.fullname" . }}
+      {{- end }}
+      {{- end }}
       {{- with .Values.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}
@@ -108,3 +123,7 @@ spec:
       tolerations:
         {{- toYaml . | nindent 8 }}
       {{- end }}
+      {{- with .Values.topologySpreadConstraints }}
+      topologySpreadConstraints:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}

charts/s3proxy/templates/secret.yaml

@@ -1,7 +1,9 @@
+{{- if and (not .Values.existingPropertiesSecret) (not .Values.csiSecret.enabled) }}
 apiVersion: v1
 kind: Secret
 metadata:
   name: {{ include "s3proxy.fullname" . }}
 type: Opaque
 data:
   s3proxy.properties: {{ (include "s3proxy.properties" .) | b64enc }}
+{{- end }}

charts/s3proxy/values.yaml

@@ -3,7 +3,8 @@
 # Declare variables to be passed into your templates.
 
 replicaCount: 1
-
+labels: {}
+podLabels: {}
 image:
   repository: ghcr.io/s3proxy-distro/containers/container-s3proxy-eclipse-temurin-11
   pullPolicy: IfNotPresent
@@ -20,6 +21,7 @@ args:
   - --properties
   - /etc/s3proxy/s3proxy.properties
 
+csiSecret: {}
 config:
   env: []
   s3proxy:
@@ -112,3 +114,5 @@ nodeSelector: {}
 tolerations: []
 
 affinity: {}
+
+topologySpreadConstraints: {}