Merge remote-tracking branch 'origin/main'
This commit is contained in:
@@ -1,78 +1,78 @@
|
|||||||
apiVersion: apps/v1
|
{{/*apiVersion: apps/v1*/}}
|
||||||
kind: Deployment
|
{{/*kind: Deployment*/}}
|
||||||
metadata:
|
{{/*metadata:*/}}
|
||||||
name: {{ include "toutoukan-chart.fullname" . }}
|
{{/* name: {{ include "toutoukan-chart.fullname" . }}*/}}
|
||||||
labels:
|
{{/* labels:*/}}
|
||||||
{{- include "toutoukan-chart.labels" . | nindent 4 }}
|
{{/* {{- include "toutoukan-chart.labels" . | nindent 4 }}*/}}
|
||||||
spec:
|
{{/*spec:*/}}
|
||||||
{{- if not .Values.autoscaling.enabled }}
|
{{/* {{- if not .Values.autoscaling.enabled }}*/}}
|
||||||
replicas: {{ .Values.replicaCount }}
|
{{/* replicas: {{ .Values.replicaCount }}*/}}
|
||||||
{{- end }}
|
{{/* {{- end }}*/}}
|
||||||
selector:
|
{{/* selector:*/}}
|
||||||
matchLabels:
|
{{/* matchLabels:*/}}
|
||||||
{{- include "toutoukan-chart.selectorLabels" . | nindent 6 }}
|
{{/* {{- include "toutoukan-chart.selectorLabels" . | nindent 6 }}*/}}
|
||||||
template:
|
{{/* template:*/}}
|
||||||
metadata:
|
{{/* metadata:*/}}
|
||||||
{{- with .Values.podAnnotations }}
|
{{/* {{- with .Values.podAnnotations }}*/}}
|
||||||
annotations:
|
{{/* annotations:*/}}
|
||||||
{{- toYaml . | nindent 8 }}
|
{{/* {{- toYaml . | nindent 8 }}*/}}
|
||||||
{{- end }}
|
{{/* {{- end }}*/}}
|
||||||
labels:
|
{{/* labels:*/}}
|
||||||
{{- include "toutoukan-chart.labels" . | nindent 8 }}
|
{{/* {{- include "toutoukan-chart.labels" . | nindent 8 }}*/}}
|
||||||
{{- with .Values.podLabels }}
|
{{/* {{- with .Values.podLabels }}*/}}
|
||||||
{{- toYaml . | nindent 8 }}
|
{{/* {{- toYaml . | nindent 8 }}*/}}
|
||||||
{{- end }}
|
{{/* {{- end }}*/}}
|
||||||
spec:
|
{{/* spec:*/}}
|
||||||
{{- with .Values.imagePullSecrets }}
|
{{/* {{- with .Values.imagePullSecrets }}*/}}
|
||||||
imagePullSecrets:
|
{{/* imagePullSecrets:*/}}
|
||||||
{{- toYaml . | nindent 8 }}
|
{{/* {{- toYaml . | nindent 8 }}*/}}
|
||||||
{{- end }}
|
{{/* {{- end }}*/}}
|
||||||
serviceAccountName: {{ include "toutoukan-chart.serviceAccountName" . }}
|
{{/* serviceAccountName: {{ include "toutoukan-chart.serviceAccountName" . }}*/}}
|
||||||
{{- with .Values.podSecurityContext }}
|
{{/* {{- with .Values.podSecurityContext }}*/}}
|
||||||
securityContext:
|
{{/* securityContext:*/}}
|
||||||
{{- toYaml . | nindent 8 }}
|
{{/* {{- toYaml . | nindent 8 }}*/}}
|
||||||
{{- end }}
|
{{/* {{- end }}*/}}
|
||||||
containers:
|
{{/* containers:*/}}
|
||||||
- name: {{ .Chart.Name }}
|
{{/* - name: {{ .Chart.Name }}*/}}
|
||||||
{{- with .Values.securityContext }}
|
{{/* {{- with .Values.securityContext }}*/}}
|
||||||
securityContext:
|
{{/* securityContext:*/}}
|
||||||
{{- toYaml . | nindent 12 }}
|
{{/* {{- toYaml . | nindent 12 }}*/}}
|
||||||
{{- end }}
|
{{/* {{- end }}*/}}
|
||||||
image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
|
{{/* image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"*/}}
|
||||||
imagePullPolicy: {{ .Values.image.pullPolicy }}
|
{{/* imagePullPolicy: {{ .Values.image.pullPolicy }}*/}}
|
||||||
ports:
|
{{/* ports:*/}}
|
||||||
- name: http
|
{{/* - name: http*/}}
|
||||||
containerPort: {{ .Values.service.port }}
|
{{/* containerPort: {{ .Values.service.port }}*/}}
|
||||||
protocol: TCP
|
{{/* protocol: TCP*/}}
|
||||||
{{- with .Values.livenessProbe }}
|
{{/* {{- with .Values.livenessProbe }}*/}}
|
||||||
livenessProbe:
|
{{/* livenessProbe:*/}}
|
||||||
{{- toYaml . | nindent 12 }}
|
{{/* {{- toYaml . | nindent 12 }}*/}}
|
||||||
{{- end }}
|
{{/* {{- end }}*/}}
|
||||||
{{- with .Values.readinessProbe }}
|
{{/* {{- with .Values.readinessProbe }}*/}}
|
||||||
readinessProbe:
|
{{/* readinessProbe:*/}}
|
||||||
{{- toYaml . | nindent 12 }}
|
{{/* {{- toYaml . | nindent 12 }}*/}}
|
||||||
{{- end }}
|
{{/* {{- end }}*/}}
|
||||||
{{- with .Values.resources }}
|
{{/* {{- with .Values.resources }}*/}}
|
||||||
resources:
|
{{/* resources:*/}}
|
||||||
{{- toYaml . | nindent 12 }}
|
{{/* {{- toYaml . | nindent 12 }}*/}}
|
||||||
{{- end }}
|
{{/* {{- end }}*/}}
|
||||||
{{- with .Values.volumeMounts }}
|
{{/* {{- with .Values.volumeMounts }}*/}}
|
||||||
volumeMounts:
|
{{/* volumeMounts:*/}}
|
||||||
{{- toYaml . | nindent 12 }}
|
{{/* {{- toYaml . | nindent 12 }}*/}}
|
||||||
{{- end }}
|
{{/* {{- end }}*/}}
|
||||||
{{- with .Values.volumes }}
|
{{/* {{- with .Values.volumes }}*/}}
|
||||||
volumes:
|
{{/* volumes:*/}}
|
||||||
{{- toYaml . | nindent 8 }}
|
{{/* {{- toYaml . | nindent 8 }}*/}}
|
||||||
{{- end }}
|
{{/* {{- end }}*/}}
|
||||||
{{- with .Values.nodeSelector }}
|
{{/* {{- with .Values.nodeSelector }}*/}}
|
||||||
nodeSelector:
|
{{/* nodeSelector:*/}}
|
||||||
{{- toYaml . | nindent 8 }}
|
{{/* {{- toYaml . | nindent 8 }}*/}}
|
||||||
{{- end }}
|
{{/* {{- end }}*/}}
|
||||||
{{- with .Values.affinity }}
|
{{/* {{- with .Values.affinity }}*/}}
|
||||||
affinity:
|
{{/* affinity:*/}}
|
||||||
{{- toYaml . | nindent 8 }}
|
{{/* {{- toYaml . | nindent 8 }}*/}}
|
||||||
{{- end }}
|
{{/* {{- end }}*/}}
|
||||||
{{- with .Values.tolerations }}
|
{{/* {{- with .Values.tolerations }}*/}}
|
||||||
tolerations:
|
{{/* tolerations:*/}}
|
||||||
{{- toYaml . | nindent 8 }}
|
{{/* {{- toYaml . | nindent 8 }}*/}}
|
||||||
{{- end }}
|
{{/* {{- end }}*/}}
|
||||||
|
|||||||
@@ -1,43 +1,43 @@
|
|||||||
{{- if .Values.ingress.enabled -}}
|
{{/*{{- if .Values.ingress.enabled -}}*/}}
|
||||||
apiVersion: networking.k8s.io/v1
|
{{/*apiVersion: networking.k8s.io/v1*/}}
|
||||||
kind: Ingress
|
{{/*kind: Ingress*/}}
|
||||||
metadata:
|
{{/*metadata:*/}}
|
||||||
name: {{ include "toutoukan-chart.fullname" . }}
|
{{/* name: {{ include "toutoukan-chart.fullname" . }}*/}}
|
||||||
labels:
|
{{/* labels:*/}}
|
||||||
{{- include "toutoukan-chart.labels" . | nindent 4 }}
|
{{/* {{- include "toutoukan-chart.labels" . | nindent 4 }}*/}}
|
||||||
{{- with .Values.ingress.annotations }}
|
{{/* {{- with .Values.ingress.annotations }}*/}}
|
||||||
annotations:
|
{{/* annotations:*/}}
|
||||||
{{- toYaml . | nindent 4 }}
|
{{/* {{- toYaml . | nindent 4 }}*/}}
|
||||||
{{- end }}
|
{{/* {{- end }}*/}}
|
||||||
spec:
|
{{/*spec:*/}}
|
||||||
{{- with .Values.ingress.className }}
|
{{/* {{- with .Values.ingress.className }}*/}}
|
||||||
ingressClassName: {{ . }}
|
{{/* ingressClassName: {{ . }}*/}}
|
||||||
{{- end }}
|
{{/* {{- end }}*/}}
|
||||||
{{- if .Values.ingress.tls }}
|
{{/* {{- if .Values.ingress.tls }}*/}}
|
||||||
tls:
|
{{/* tls:*/}}
|
||||||
{{- range .Values.ingress.tls }}
|
{{/* {{- range .Values.ingress.tls }}*/}}
|
||||||
- hosts:
|
{{/* - hosts:*/}}
|
||||||
{{- range .hosts }}
|
{{/* {{- range .hosts }}*/}}
|
||||||
- {{ . | quote }}
|
{{/* - {{ . | quote }}*/}}
|
||||||
{{- end }}
|
{{/* {{- end }}*/}}
|
||||||
secretName: {{ .secretName }}
|
{{/* secretName: {{ .secretName }}*/}}
|
||||||
{{- end }}
|
{{/* {{- end }}*/}}
|
||||||
{{- end }}
|
{{/* {{- end }}*/}}
|
||||||
rules:
|
{{/* rules:*/}}
|
||||||
{{- range .Values.ingress.hosts }}
|
{{/* {{- range .Values.ingress.hosts }}*/}}
|
||||||
- host: {{ .host | quote }}
|
{{/* - host: {{ .host | quote }}*/}}
|
||||||
http:
|
{{/* http:*/}}
|
||||||
paths:
|
{{/* paths:*/}}
|
||||||
{{- range .paths }}
|
{{/* {{- range .paths }}*/}}
|
||||||
- path: {{ .path }}
|
{{/* - path: {{ .path }}*/}}
|
||||||
{{- with .pathType }}
|
{{/* {{- with .pathType }}*/}}
|
||||||
pathType: {{ . }}
|
{{/* pathType: {{ . }}*/}}
|
||||||
{{- end }}
|
{{/* {{- end }}*/}}
|
||||||
backend:
|
{{/* backend:*/}}
|
||||||
service:
|
{{/* service:*/}}
|
||||||
name: {{ include "toutoukan-chart.fullname" $ }}
|
{{/* name: {{ include "toutoukan-chart.fullname" $ }}*/}}
|
||||||
port:
|
{{/* port:*/}}
|
||||||
number: {{ $.Values.service.port }}
|
{{/* number: {{ $.Values.service.port }}*/}}
|
||||||
{{- end }}
|
{{/* {{- end }}*/}}
|
||||||
{{- end }}
|
{{/* {{- end }}*/}}
|
||||||
{{- end }}
|
{{/*{{- end }}*/}}
|
||||||
|
|||||||
7
micro-service/toutoukan-chart/templates/proxysql.yaml
Normal file
7
micro-service/toutoukan-chart/templates/proxysql.yaml
Normal file
@@ -0,0 +1,7 @@
|
|||||||
|
apiVersion: apps/v1
|
||||||
|
kind: Deployment
|
||||||
|
metadata:
|
||||||
|
name: {{ include "toutoukan-chart.fullname" . }}
|
||||||
|
labels: {{ include "toutoukan-chart.chart.fullname" .}}
|
||||||
|
|
||||||
|
|
||||||
@@ -1,13 +1,13 @@
|
|||||||
{{- if .Values.serviceAccount.create -}}
|
{{/*{{- if .Values.serviceAccount.create -}}*/}}
|
||||||
apiVersion: v1
|
{{/*apiVersion: v1*/}}
|
||||||
kind: ServiceAccount
|
{{/*kind: ServiceAccount*/}}
|
||||||
metadata:
|
{{/*metadata:*/}}
|
||||||
name: {{ include "toutoukan-chart.serviceAccountName" . }}
|
{{/* name: {{ include "toutoukan-chart.serviceAccountName" . }}*/}}
|
||||||
labels:
|
{{/* labels:*/}}
|
||||||
{{- include "toutoukan-chart.labels" . | nindent 4 }}
|
{{/* {{- include "toutoukan-chart.labels" . | nindent 4 }}*/}}
|
||||||
{{- with .Values.serviceAccount.annotations }}
|
{{/* {{- with .Values.serviceAccount.annotations }}*/}}
|
||||||
annotations:
|
{{/* annotations:*/}}
|
||||||
{{- toYaml . | nindent 4 }}
|
{{/* {{- toYaml . | nindent 4 }}*/}}
|
||||||
{{- end }}
|
{{/* {{- end }}*/}}
|
||||||
automountServiceAccountToken: {{ .Values.serviceAccount.automount }}
|
{{/*automountServiceAccountToken: {{ .Values.serviceAccount.automount }}*/}}
|
||||||
{{- end }}
|
{{/*{{- end }}*/}}
|
||||||
|
|||||||
Reference in New Issue
Block a user