mirror of
https://github.com/wahyd4/charts.git
synced 2026-08-27 22:17:07 +10:00
[bitnami/thanos] Modify autogenerate support to fix existingSecret (#6670)
This commit is contained in:
alvneiayu
@@ -28,4 +28,4 @@ name: thanos
|
||||
sources:
|
||||
- https://github.com/bitnami/bitnami-docker-thanos
|
||||
- https://thanos.io
|
||||
version: 3.18.0
|
||||
version: 3.18.1
|
||||
|
||||
@@ -335,78 +335,3 @@ Return true if a TLS secret object should be created
|
||||
{{- true -}}
|
||||
{{- end -}}
|
||||
{{- end -}}
|
||||
|
||||
{{/*
|
||||
Return the secret containing Thanos Server TLS certificates
|
||||
*/}}
|
||||
{{- define "thanos.server.tlsSecretName" -}}
|
||||
{{- $secretName := .Values.query.grpcTLS.server.existingSecret -}}
|
||||
{{- if $secretName -}}
|
||||
{{- printf "%s" (tpl $secretName.name $) -}}
|
||||
{{- else -}}
|
||||
{{- if and .Values.query.grpcTLS.server.secure .Values.query.grpcTLS.server.autoGenerated }}
|
||||
{{- printf "%s-crt" (include "common.names.fullname" .) -}}
|
||||
{{- end -}}
|
||||
{{- end -}}
|
||||
{{- end -}}
|
||||
|
||||
{{/*
|
||||
Return the secret containing Thanos Client TLS certificates
|
||||
*/}}
|
||||
{{- define "thanos.client.tlsSecretName" -}}
|
||||
{{- $secretName := .Values.query.grpcTLS.client.existingSecret -}}
|
||||
{{- if $secretName -}}
|
||||
{{- printf "%s" (tpl $secretName.name $) -}}
|
||||
{{- else -}}
|
||||
{{- if and .Values.query.grpcTLS.client.secure .Values.query.grpcTLS.client.autoGenerated }}
|
||||
{{- printf "%s-crt" (include "common.names.fullname" .) -}}
|
||||
{{- end -}}
|
||||
{{- end -}}
|
||||
{{- end -}}
|
||||
|
||||
{{/*
|
||||
Return the secret containing Thanos Client TLS certificates
|
||||
*/}}
|
||||
{{- define "thanos.storegateway.tlsSecretName" -}}
|
||||
{{- $secretName := .Values.storegateway.grpc.tls.existingSecret -}}
|
||||
{{- if $secretName -}}
|
||||
{{- printf "%s" (tpl $secretName.name $) -}}
|
||||
{{- else -}}
|
||||
{{- if and .Values.storegateway.grpc.tls.enabled .Values.storegateway.grpc.tls.autoGenerated }}
|
||||
{{- printf "%s-crt" (include "common.names.fullname" .) -}}
|
||||
{{- end -}}
|
||||
{{- end -}}
|
||||
{{- end -}}
|
||||
|
||||
{{/*
|
||||
Return the tlscert extension
|
||||
*/}}
|
||||
{{- define "thanos.tlscert.extension" -}}
|
||||
{{- if or .Values.query.grpcTLS.server.autoGenerated .Values.storegateway.grpc.tls.autoGenerated .Values.query.grpcTLS.client.autoGenerated }}
|
||||
{{- printf "tls.crt" -}}
|
||||
{{- else -}}
|
||||
{{- printf "tls-cert" -}}
|
||||
{{- end -}}
|
||||
{{- end -}}
|
||||
|
||||
{{/*
|
||||
Return the tlskey extension
|
||||
*/}}
|
||||
{{- define "thanos.tlskey.extension" -}}
|
||||
{{- if or .Values.query.grpcTLS.server.autoGenerated .Values.storegateway.grpc.tls.autoGenerated .Values.query.grpcTLS.client.autoGenerated }}
|
||||
{{- printf "tls.key" -}}
|
||||
{{- else -}}
|
||||
{{- printf "tls-key" -}}
|
||||
{{- end -}}
|
||||
{{- end -}}
|
||||
|
||||
{{/*
|
||||
Return the ca extension
|
||||
*/}}
|
||||
{{- define "thanos.cacert.extension" -}}
|
||||
{{- if or .Values.query.grpcTLS.server.autoGenerated .Values.storegateway.grpc.tls.autoGenerated .Values.query.grpcTLS.client.autoGenerated }}
|
||||
{{- printf "ca.crt" -}}
|
||||
{{- else -}}
|
||||
{{- printf "ca-cert" -}}
|
||||
{{- end -}}
|
||||
{{- end -}}
|
||||
|
||||
@@ -98,23 +98,36 @@ spec:
|
||||
{{- range $query.stores }}
|
||||
- --store={{ . }}
|
||||
{{- end }}
|
||||
{{- if or $query.grpcTLS.server.secure $query.grpcTLS.server.existingSecret $query.grpcTLS.server.autoGenerated }}
|
||||
- --grpc-server-tls-cert=/tls/server/{{ include "common.secrets.key" (dict "existingSecret" (include "thanos.server.tlsSecretName" .) "key" (include "thanos.tlscert.extension" .)) }}
|
||||
- --grpc-server-tls-key=/tls/server/{{ include "common.secrets.key" (dict "existingSecret" (include "thanos.server.tlsSecretName" .) "key" (include "thanos.tlskey.extension" .)) }}
|
||||
{{- if or $query.grpcTLS.server.ca $query.grpcTLS.server.existingSecret $query.grpcTLS.server.autoGenerated }}
|
||||
- --grpc-server-tls-client-ca=/tls/server/{{ include "common.secrets.key" (dict "existingSecret" (include "thanos.server.tlsSecretName" .) "key" (include "thanos.cacert.extension" .)) }}
|
||||
{{- if $query.grpcTLS.server.autoGenerated }}
|
||||
- --grpc-server-tls-cert=/tls/server/tls.crt
|
||||
- --grpc-server-tls-key=/tls/server/tls.key
|
||||
- --grpc-server-tls-client-ca=/tls/server/ca.crt
|
||||
{{- else }}
|
||||
{{- if or $query.grpcTLS.server.secure $query.grpcTLS.server.existingSecret}}
|
||||
- --grpc-server-tls-cert=/tls/server/{{ include "common.secrets.key" (dict "existingSecret" .Values.query.grpcTLS.server.existingSecret "key" "tls-cert") }}
|
||||
- --grpc-server-tls-key=/tls/server/{{ include "common.secrets.key" (dict "existingSecret" .Values.query.grpcTLS.server.existingSecret "key" "tls-key") }}
|
||||
{{- if or $query.grpcTLS.server.ca $query.grpcTLS.server.existingSecret }}
|
||||
- --grpc-server-tls-client-ca=/tls/server/{{ include "common.secrets.key" (dict "existingSecret" .Values.query.grpcTLS.server.existingSecret "key" "ca-cert") }}
|
||||
{{- end }}
|
||||
{{- end }}
|
||||
{{- if or $query.grpcTLS.client.secure $query.grpcTLS.client.existingSecret $query.grpcTLS.client.autoGenerated }}
|
||||
{{- end }}
|
||||
{{- if $query.grpcTLS.client.autoGenerated }}
|
||||
- --grpc-client-tls-secure
|
||||
{{- if or $query.grpcTLS.client.cert $query.grpcTLS.client.existingSecret $query.grpcTLS.client.autoGenerated }}
|
||||
- --grpc-client-tls-cert=/tls/client/{{ include "common.secrets.key" (dict "existingSecret" (include "thanos.client.tlsSecretName" .) "key" (include "thanos.tlscert.extension" .)) }}
|
||||
- --grpc-client-tls-cert=/tls/client/tls.crt
|
||||
- --grpc-client-tls-key=/tls/client/tls.key
|
||||
- --grpc-client-tls-ca=/tls/client/ca.crt
|
||||
{{- else }}
|
||||
{{- if or $query.grpcTLS.client.secure $query.grpcTLS.client.existingSecret }}
|
||||
- --grpc-client-tls-secure
|
||||
{{- if or $query.grpcTLS.client.cert $query.grpcTLS.client.existingSecret }}
|
||||
- --grpc-client-tls-cert=/tls/client/{{ include "common.secrets.key" (dict "existingSecret" .Values.query.grpcTLS.client.existingSecret "key" "tls-cert") }}
|
||||
{{- end }}
|
||||
{{- if or $query.grpcTLS.client.key $query.grpcTLS.client.existingSecret $query.grpcTLS.client.autoGenerated }}
|
||||
- --grpc-client-tls-key=/tls/client/{{ include "common.secrets.key" (dict "existingSecret" (include "thanos.client.tlsSecretName" .) "key" (include "thanos.tlskey.extension" .)) }}
|
||||
{{- if or $query.grpcTLS.client.key $query.grpcTLS.client.existingSecret }}
|
||||
- --grpc-client-tls-key=/tls/client/{{ include "common.secrets.key" (dict "existingSecret" .Values.query.grpcTLS.client.existingSecret "key" "tls-key") }}
|
||||
{{- end }}
|
||||
{{- if or $query.grpcTLS.client.ca $query.grpcTLS.client.existingSecret }}
|
||||
- --grpc-client-tls-ca=/tls/client/{{ include "common.secrets.key" (dict "existingSecret" .Values.query.grpcTLS.client.existingSecret "key" "ca-cert") }}
|
||||
{{- end }}
|
||||
{{- if or $query.grpcTLS.client.ca $query.grpcTLS.client.existingSecret $query.grpcTLS.client.autoGenerated }}
|
||||
- --grpc-client-tls-ca=/tls/client/{{ include "common.secrets.key" (dict "existingSecret" (include "thanos.client.tlsSecretName" .) "key" (include "thanos.cacert.extension" .)) }}
|
||||
{{- end }}
|
||||
{{- end }}
|
||||
{{- if $query.grpcTLS.client.servername }}
|
||||
@@ -169,12 +182,20 @@ spec:
|
||||
{{- if or $query.grpcTLS.server.secure $query.grpcTLS.server.existingSecret $query.grpcTLS.server.autoGenerated }}
|
||||
- name: tls-server
|
||||
secret:
|
||||
secretName: {{ include "common.secrets.name" (dict "existingSecret" (include "thanos.server.tlsSecretName" . ) "defaultNameSuffix" "query-tls-server" "context" $) }}
|
||||
{{- if $query.grpcTLS.server.autoGenerated }}
|
||||
secretName: {{ printf "%s-crt" (include "common.names.fullname" .) }}
|
||||
{{- else }}
|
||||
secretName: {{ include "common.secrets.name" (dict "existingSecret" .Values.query.grpcTLS.server.existingSecret "defaultNameSuffix" "query-tls-server" "context" $) }}
|
||||
{{- end }}
|
||||
{{- end }}
|
||||
{{- if or $query.grpcTLS.client.secure $query.grpcTLS.client.existingSecret $query.grpcTLS.client.autoGenerated }}
|
||||
- name: tls-client
|
||||
secret:
|
||||
secretName: {{ include "common.secrets.name" (dict "existingSecret" (include "thanos.client.tlsSecretName" . ) "defaultNameSuffix" "query-tls-client" "context" $) }}
|
||||
{{- if $query.grpcTLS.client.autoGenerated }}
|
||||
secretName: {{ printf "%s-crt" (include "common.names.fullname" .) }}
|
||||
{{- else }}
|
||||
secretName: {{ include "common.secrets.name" (dict "existingSecret" .Values.query.grpcTLS.client.existingSecret "defaultNameSuffix" "query-tls-client" "context" $) }}
|
||||
{{- end }}
|
||||
{{- end }}
|
||||
{{- if .Values.query.extraVolumes }}
|
||||
{{- include "common.tplvalues.render" (dict "value" .Values.query.extraVolumes "context" $) | nindent 8 }}
|
||||
|
||||
@@ -101,10 +101,16 @@ spec:
|
||||
{{- if or .Values.storegateway.config .Values.storegateway.existingConfigmap }}
|
||||
- --index-cache.config-file=/conf/cache/config.yml
|
||||
{{- end }}
|
||||
{{- if or .Values.storegateway.grpc.tls.enabled .Values.storegateway.grpc.tls.existingSecret .Values.storegateway.grpc.tls.autoGenerated }}
|
||||
- --grpc-server-tls-cert=/certs/{{ include "common.secrets.key" (dict "existingSecret" (include "thanos.storegateway.tlsSecretName" .) "key" (include "thanos.tlscert.extension" .)) }}
|
||||
- --grpc-server-tls-key=/certs/{{ include "common.secrets.key" (dict "existingSecret" (include "thanos.storegateway.tlsSecretName" .) "key" (include "thanos.tlskey.extension" .)) }}
|
||||
- --grpc-server-tls-client-ca=/certs/{{ include "common.secrets.key" (dict "existingSecret" (include "thanos.storegateway.tlsSecretName" .) "key" (include "thanos.cacert.extension" .)) }}
|
||||
{{- if .Values.storegateway.grpc.tls.autoGenerated }}
|
||||
- --grpc-server-tls-cert=/certs/tls.crt
|
||||
- --grpc-server-tls-key=/certs/tls.key
|
||||
- --grpc-server-tls-client-ca=/certs/ca.crt
|
||||
{{- else }}
|
||||
{{- if or .Values.storegateway.grpc.tls.enabled .Values.storegateway.grpc.tls.existingSecret }}
|
||||
- --grpc-server-tls-cert=/certs/{{ include "common.secrets.key" (dict "existingSecret" .Values.storegateway.grpc.tls.existingSecret "key" "tls-cert") }}
|
||||
- --grpc-server-tls-key=/certs/{{ include "common.secrets.key" (dict "existingSecret" .Values.storegateway.grpc.tls.existingSecret "key" "tls-key") }}
|
||||
- --grpc-server-tls-client-ca=/certs/{{ include "common.secrets.key" (dict "existingSecret" .Values.storegateway.grpc.tls.existingSecret "key" "ca-cert") }}
|
||||
{{- end }}
|
||||
{{- end }}
|
||||
{{- if .Values.storegateway.extraFlags }}
|
||||
{{- .Values.storegateway.extraFlags | toYaml | nindent 12 }}
|
||||
@@ -163,7 +169,11 @@ spec:
|
||||
{{- if .Values.storegateway.grpc.tls.enabled }}
|
||||
- name: tls-server
|
||||
secret:
|
||||
secretName: {{ include "common.secrets.name" (dict "existingSecret" (include "thanos.storegateway.tlsSecretName" . ) "defaultNameSuffix" "store-tls-server" "context" $) }}
|
||||
{{- if .Values.storegateway.grpc.tls.autoGenerated }}
|
||||
secretName: {{ printf "%s-crt" (include "common.names.fullname" .) }}
|
||||
{{- else }}
|
||||
secretName: {{ include "common.secrets.name" (dict "existingSecret" .Values.storegateway.grpc.tls.existingSecret "defaultNameSuffix" "store-tls-server" "context" $) }}
|
||||
{{- end }}
|
||||
{{- end }}
|
||||
{{- if and .Values.storegateway.persistence.enabled .Values.storegateway.persistence.existingClaim }}
|
||||
- name: data
|
||||
|
||||
Reference in New Issue
Block a user