Merge remote-tracking branch 'origin/main'

micro-service/toutoukan-chart/templates/deployment.yaml

@@ -1,78 +1,78 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: {{ include "toutoukan-chart.fullname" . }}
-  labels:
-    {{- include "toutoukan-chart.labels" . | nindent 4 }}
-spec:
-  {{- if not .Values.autoscaling.enabled }}
-  replicas: {{ .Values.replicaCount }}
-  {{- end }}
-  selector:
-    matchLabels:
-      {{- include "toutoukan-chart.selectorLabels" . | nindent 6 }}
-  template:
-    metadata:
-      {{- with .Values.podAnnotations }}
-      annotations:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      labels:
-        {{- include "toutoukan-chart.labels" . | nindent 8 }}
-        {{- with .Values.podLabels }}
-        {{- toYaml . | nindent 8 }}
-        {{- end }}
-    spec:
-      {{- with .Values.imagePullSecrets }}
-      imagePullSecrets:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      serviceAccountName: {{ include "toutoukan-chart.serviceAccountName" . }}
-      {{- with .Values.podSecurityContext }}
-      securityContext:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      containers:
-        - name: {{ .Chart.Name }}
-          {{- with .Values.securityContext }}
-          securityContext:
-            {{- toYaml . | nindent 12 }}
-          {{- end }}
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
-          ports:
-            - name: http
-              containerPort: {{ .Values.service.port }}
-              protocol: TCP
-          {{- with .Values.livenessProbe }}
-          livenessProbe:
-            {{- toYaml . | nindent 12 }}
-          {{- end }}
-          {{- with .Values.readinessProbe }}
-          readinessProbe:
-            {{- toYaml . | nindent 12 }}
-          {{- end }}
-          {{- with .Values.resources }}
-          resources:
-            {{- toYaml . | nindent 12 }}
-          {{- end }}
-          {{- with .Values.volumeMounts }}
-          volumeMounts:
-            {{- toYaml . | nindent 12 }}
-          {{- end }}
-      {{- with .Values.volumes }}
-      volumes:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- with .Values.nodeSelector }}
-      nodeSelector:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- with .Values.affinity }}
-      affinity:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- with .Values.tolerations }}
-      tolerations:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
+{{/*apiVersion: apps/v1*/}}
+{{/*kind: Deployment*/}}
+{{/*metadata:*/}}
+{{/*  name: {{ include "toutoukan-chart.fullname" . }}*/}}
+{{/*  labels:*/}}
+{{/*    {{- include "toutoukan-chart.labels" . | nindent 4 }}*/}}
+{{/*spec:*/}}
+{{/*  {{- if not .Values.autoscaling.enabled }}*/}}
+{{/*  replicas: {{ .Values.replicaCount }}*/}}
+{{/*  {{- end }}*/}}
+{{/*  selector:*/}}
+{{/*    matchLabels:*/}}
+{{/*      {{- include "toutoukan-chart.selectorLabels" . | nindent 6 }}*/}}
+{{/*  template:*/}}
+{{/*    metadata:*/}}
+{{/*      {{- with .Values.podAnnotations }}*/}}
+{{/*      annotations:*/}}
+{{/*        {{- toYaml . | nindent 8 }}*/}}
+{{/*      {{- end }}*/}}
+{{/*      labels:*/}}
+{{/*        {{- include "toutoukan-chart.labels" . | nindent 8 }}*/}}
+{{/*        {{- with .Values.podLabels }}*/}}
+{{/*        {{- toYaml . | nindent 8 }}*/}}
+{{/*        {{- end }}*/}}
+{{/*    spec:*/}}
+{{/*      {{- with .Values.imagePullSecrets }}*/}}
+{{/*      imagePullSecrets:*/}}
+{{/*        {{- toYaml . | nindent 8 }}*/}}
+{{/*      {{- end }}*/}}
+{{/*      serviceAccountName: {{ include "toutoukan-chart.serviceAccountName" . }}*/}}
+{{/*      {{- with .Values.podSecurityContext }}*/}}
+{{/*      securityContext:*/}}
+{{/*        {{- toYaml . | nindent 8 }}*/}}
+{{/*      {{- end }}*/}}
+{{/*      containers:*/}}
+{{/*        - name: {{ .Chart.Name }}*/}}
+{{/*          {{- with .Values.securityContext }}*/}}
+{{/*          securityContext:*/}}
+{{/*            {{- toYaml . | nindent 12 }}*/}}
+{{/*          {{- end }}*/}}
+{{/*          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"*/}}
+{{/*          imagePullPolicy: {{ .Values.image.pullPolicy }}*/}}
+{{/*          ports:*/}}
+{{/*            - name: http*/}}
+{{/*              containerPort: {{ .Values.service.port }}*/}}
+{{/*              protocol: TCP*/}}
+{{/*          {{- with .Values.livenessProbe }}*/}}
+{{/*          livenessProbe:*/}}
+{{/*            {{- toYaml . | nindent 12 }}*/}}
+{{/*          {{- end }}*/}}
+{{/*          {{- with .Values.readinessProbe }}*/}}
+{{/*          readinessProbe:*/}}
+{{/*            {{- toYaml . | nindent 12 }}*/}}
+{{/*          {{- end }}*/}}
+{{/*          {{- with .Values.resources }}*/}}
+{{/*          resources:*/}}
+{{/*            {{- toYaml . | nindent 12 }}*/}}
+{{/*          {{- end }}*/}}
+{{/*          {{- with .Values.volumeMounts }}*/}}
+{{/*          volumeMounts:*/}}
+{{/*            {{- toYaml . | nindent 12 }}*/}}
+{{/*          {{- end }}*/}}
+{{/*      {{- with .Values.volumes }}*/}}
+{{/*      volumes:*/}}
+{{/*        {{- toYaml . | nindent 8 }}*/}}
+{{/*      {{- end }}*/}}
+{{/*      {{- with .Values.nodeSelector }}*/}}
+{{/*      nodeSelector:*/}}
+{{/*        {{- toYaml . | nindent 8 }}*/}}
+{{/*      {{- end }}*/}}
+{{/*      {{- with .Values.affinity }}*/}}
+{{/*      affinity:*/}}
+{{/*        {{- toYaml . | nindent 8 }}*/}}
+{{/*      {{- end }}*/}}
+{{/*      {{- with .Values.tolerations }}*/}}
+{{/*      tolerations:*/}}
+{{/*        {{- toYaml . | nindent 8 }}*/}}
+{{/*      {{- end }}*/}}

micro-service/toutoukan-chart/templates/ingress.yaml

@@ -1,43 +1,43 @@
-{{- if .Values.ingress.enabled -}}
-apiVersion: networking.k8s.io/v1
-kind: Ingress
-metadata:
-  name: {{ include "toutoukan-chart.fullname" . }}
-  labels:
-    {{- include "toutoukan-chart.labels" . | nindent 4 }}
-  {{- with .Values.ingress.annotations }}
-  annotations:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
-spec:
-  {{- with .Values.ingress.className }}
-  ingressClassName: {{ . }}
-  {{- end }}
-  {{- if .Values.ingress.tls }}
-  tls:
-    {{- range .Values.ingress.tls }}
-    - hosts:
-        {{- range .hosts }}
-        - {{ . | quote }}
-        {{- end }}
-      secretName: {{ .secretName }}
-    {{- end }}
-  {{- end }}
-  rules:
-    {{- range .Values.ingress.hosts }}
-    - host: {{ .host | quote }}
-      http:
-        paths:
-          {{- range .paths }}
-          - path: {{ .path }}
-            {{- with .pathType }}
-            pathType: {{ . }}
-            {{- end }}
-            backend:
-              service:
-                name: {{ include "toutoukan-chart.fullname" $ }}
-                port:
-                  number: {{ $.Values.service.port }}
-          {{- end }}
-    {{- end }}
-{{- end }}
+{{/*{{- if .Values.ingress.enabled -}}*/}}
+{{/*apiVersion: networking.k8s.io/v1*/}}
+{{/*kind: Ingress*/}}
+{{/*metadata:*/}}
+{{/*  name: {{ include "toutoukan-chart.fullname" . }}*/}}
+{{/*  labels:*/}}
+{{/*    {{- include "toutoukan-chart.labels" . | nindent 4 }}*/}}
+{{/*  {{- with .Values.ingress.annotations }}*/}}
+{{/*  annotations:*/}}
+{{/*    {{- toYaml . | nindent 4 }}*/}}
+{{/*  {{- end }}*/}}
+{{/*spec:*/}}
+{{/*  {{- with .Values.ingress.className }}*/}}
+{{/*  ingressClassName: {{ . }}*/}}
+{{/*  {{- end }}*/}}
+{{/*  {{- if .Values.ingress.tls }}*/}}
+{{/*  tls:*/}}
+{{/*    {{- range .Values.ingress.tls }}*/}}
+{{/*    - hosts:*/}}
+{{/*        {{- range .hosts }}*/}}
+{{/*        - {{ . | quote }}*/}}
+{{/*        {{- end }}*/}}
+{{/*      secretName: {{ .secretName }}*/}}
+{{/*    {{- end }}*/}}
+{{/*  {{- end }}*/}}
+{{/*  rules:*/}}
+{{/*    {{- range .Values.ingress.hosts }}*/}}
+{{/*    - host: {{ .host | quote }}*/}}
+{{/*      http:*/}}
+{{/*        paths:*/}}
+{{/*          {{- range .paths }}*/}}
+{{/*          - path: {{ .path }}*/}}
+{{/*            {{- with .pathType }}*/}}
+{{/*            pathType: {{ . }}*/}}
+{{/*            {{- end }}*/}}
+{{/*            backend:*/}}
+{{/*              service:*/}}
+{{/*                name: {{ include "toutoukan-chart.fullname" $ }}*/}}
+{{/*                port:*/}}
+{{/*                  number: {{ $.Values.service.port }}*/}}
+{{/*          {{- end }}*/}}
+{{/*    {{- end }}*/}}
+{{/*{{- end }}*/}}

micro-service/toutoukan-chart/templates/proxysql.yaml

@@ -0,0 +1,7 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: {{ include "toutoukan-chart.fullname" . }}
+  labels: {{ include "toutoukan-chart.chart.fullname" .}}
+
+

micro-service/toutoukan-chart/templates/serviceaccount.yaml

@@ -1,13 +1,13 @@
-{{- if .Values.serviceAccount.create -}}
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: {{ include "toutoukan-chart.serviceAccountName" . }}
-  labels:
-    {{- include "toutoukan-chart.labels" . | nindent 4 }}
-  {{- with .Values.serviceAccount.annotations }}
-  annotations:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
-automountServiceAccountToken: {{ .Values.serviceAccount.automount }}
-{{- end }}
+{{/*{{- if .Values.serviceAccount.create -}}*/}}
+{{/*apiVersion: v1*/}}
+{{/*kind: ServiceAccount*/}}
+{{/*metadata:*/}}
+{{/*  name: {{ include "toutoukan-chart.serviceAccountName" . }}*/}}
+{{/*  labels:*/}}
+{{/*    {{- include "toutoukan-chart.labels" . | nindent 4 }}*/}}
+{{/*  {{- with .Values.serviceAccount.annotations }}*/}}
+{{/*  annotations:*/}}
+{{/*    {{- toYaml . | nindent 4 }}*/}}
+{{/*  {{- end }}*/}}
+{{/*automountServiceAccountToken: {{ .Values.serviceAccount.automount }}*/}}
+{{/*{{- end }}*/}}