Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: clusterpedia-io/clusterpedia-helm
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 6463ed9bdc257ed6d81632349ad74a6b54bfe402
Choose a base ref
..
head repository: clusterpedia-io/clusterpedia-helm
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 7171f6b2518f8d544ea03ac789e945c8a13a9745
Choose a head ref
25 changes: 0 additions & 25 deletions charts/clusterpedia/templates/_helpers.tpl
Original file line number Diff line number Diff line change
@@ -388,29 +388,4 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
- name: OTEL_RESOURCE_ATTRIBUTES
value: 'k8s.namespace.name=$(OTEL_K8S_NAMESPACE),k8s.node.name=$(OTEL_RESOURCE_ATTRIBUTES_NODE_NAME),k8s.pod.name=$(OTEL_RESOURCE_ATTRIBUTES_POD_NAME)'
{{- end -}}
{{- end -}}

{{- define "clusterpedia.storage.secret" -}}
type: {{ include "clusterpedia.storage.type" . | quote }}
dsn: {{ include "clusterpedia.storage.dsn" . | quote }}
host: {{ include "clusterpedia.storage.host" . | quote }}
port: {{ include "clusterpedia.storage.port" . }}
user: {{ include "clusterpedia.storage.user" . }}
password: {{ include "clusterpedia.storage.password" . }}
database: {{ include "clusterpedia.storage.database" . }}
{{ if .Values.storageConfig.log.enabled }}
log:
stdout: {{ .Values.storageConfig.log.stdout }}
level: {{ .Values.storageConfig.log.level | default "Warn" | quote }}
slowThreshold: {{ .Values.storageConfig.log.slowThreshold }}
ignoreRecordNotFoundError: {{ .Values.storageConfig.log.ignoreRecordNotFoundError }}
logger:
filename: {{ .Values.storageConfig.log.logger.filename }}
maxsize: {{ .Values.storageConfig.log.logger.maxsize }}
maxbackups: {{ .Values.storageConfig.log.logger.maxbackups }}
{{ end }}
connPool:
maxIdleConns: {{ .Values.storageConfig.connPool.maxIdleConns | int }}
maxOpenConns: {{ .Values.storageConfig.connPool.maxOpenConns | int }}
connMaxLifetime: {{ .Values.storageConfig.connPool.connMaxLifetime }}
{{- end -}}
3 changes: 3 additions & 0 deletions charts/clusterpedia/templates/apiserver-deployment.yaml
Original file line number Diff line number Diff line change
@@ -145,6 +145,9 @@ spec:
{{- end }}
volumes:
- name: internalstorage-config
configMap:
name: {{ include "clusterpedia.internalstorage.fullname" . }}
- name: internalstorage-connection-config
secret:
secretName: {{ include "clusterpedia.internalstorage.fullname" . }}
- name: scripts
23 changes: 23 additions & 0 deletions charts/clusterpedia/templates/internalstorage-configmap.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
apiVersion: v1
kind: ConfigMap
metadata:
name: {{ include "clusterpedia.internalstorage.fullname" . }}
namespace: {{ .Release.Namespace }}
labels: {{- include "common.labels.standard" . | nindent 4 }}
data:
internalstorage-config.yaml: |-
{{ if .Values.storageConfig.log.enabled }}
log:
stdout: {{ .Values.storageConfig.log.stdout }}
level: {{ .Values.storageConfig.log.level | default "Warn" | quote }}
slowThreshold: {{ .Values.storageConfig.log.slowThreshold }}
ignoreRecordNotFoundError: {{ .Values.storageConfig.log.ignoreRecordNotFoundError }}
logger:
filename: {{ .Values.storageConfig.log.logger.filename }}
maxsize: {{ .Values.storageConfig.log.logger.maxsize }}
maxbackups: {{ .Values.storageConfig.log.logger.maxbackups }}
{{ end }}
connPool:
maxIdleConns: {{ .Values.storageConfig.connPool.maxIdleConns | int }}
maxOpenConns: {{ .Values.storageConfig.connPool.maxOpenConns | int }}
connMaxLifetime: {{ .Values.storageConfig.connPool.connMaxLifetime }}
8 changes: 7 additions & 1 deletion charts/clusterpedia/templates/internalstorage-secret.yaml
Original file line number Diff line number Diff line change
@@ -7,4 +7,10 @@ metadata:
app: {{ include "clusterpedia.internalstorage.fullname" . }}
internalstorage.clusterpedia.io/type: {{ include "clusterpedia.storage.type" . }}
data:
internalstorage-config.yaml: {{ include "clusterpedia.storage.secret" .| b64enc | quote }}
type: {{ include "clusterpedia.storage.type" . | quote }}
dsn: {{ include "clusterpedia.storage.dsn" . | quote }}
host: {{ include "clusterpedia.storage.host" . | quote }}
port: {{ include "clusterpedia.storage.port" . }}
user: {{ include "clusterpedia.storage.user" . }}
password: {{ include "clusterpedia.storage.password" . }}
database: {{ include "clusterpedia.storage.database" . }}