K3S-Cluster/home-cluster-ops
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #895 from 3dwardch3ng/app/ec-config-server

Browse Source 
update chart template for ec-config-server
This commit is contained in:
Edward Cheng
2024-08-31 01:12:38 +10:00
committed by GitHub
parent 95dbef7b19 d5f78da216
commit 421723d8f0
9 changed files with 41 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/ec-config-server/env/k3s-cluster/Chart.yaml vendored
View File

@@ -20,4 +20,4 @@ version: 1.0.0
# This is the version number of the application being deployed. This version number should be
# 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.
appVersion: "1.0.3"
appVersion: "1.0.4"

24
apps/ec-config-server/env/k3s-cluster/templates/_helpers.tpl vendored
View File

@@ -1,26 +1,30 @@
{{- define "mr-config-server.chart" -}}
{{- define "ec-config-server.chart" -}}
{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
{{- end }}
{{- define "mr-config-server.name" -}}
{{- define "ec-config-server.name" -}}
{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
{{- end }}
{{- define "mr-config-server.selectorLabels" -}}
app.kubernetes.io/name: {{ include "mr-config-server.name" . }}
{{- define "ec-config-server.namespace" -}}
{{- default .Release.Namespace .Values.namespaceOverride | trunc 63 | trimSuffix "-" }}
{{- end }}
{{- define "ec-config-server.selectorLabels" -}}
app.kubernetes.io/name: {{ include "ec-config-server.name" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
{{- end }}
{{- define "mr-config-server.labels" -}}
helm.sh/chart: {{ include "mr-config-server.chart" . }}
{{ include "mr-config-server.selectorLabels" . }}
{{- define "ec-config-server.labels" -}}
helm.sh/chart: {{ include "ec-config-server.chart" . }}
{{ include "ec-config-server.selectorLabels" . }}
{{- if .Chart.AppVersion }}
app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
{{- end }}
app.kubernetes.io/managed-by: {{ .Release.Service }}
{{- end }}
{{- define "mr-config-server.fullname" -}}
{{- define "ec-config-server.fullname" -}}
{{- if .Values.fullnameOverride }}
{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}
{{- else }}
@@ -33,9 +37,9 @@ app.kubernetes.io/managed-by: {{ .Release.Service }}
{{- end }}
{{- end }}
{{- define "mr-config-server.serviceAccountName" -}}
{{- define "ec-config-server.serviceAccountName" -}}
{{- if .Values.serviceAccount.create }}
{{- default (include "mr-config-server.fullname" .) .Values.serviceAccount.name }}
{{- default (include "ec-config-server.fullname" .) .Values.serviceAccount.name }}
{{- else }}
{{- default "default" .Values.serviceAccount.name }}
{{- end }}

5
apps/ec-config-server/env/k3s-cluster/templates/configmap.yaml vendored
View File

@@ -1,9 +1,10 @@
apiVersion: v1
kind: ConfigMap
metadata:
name: {{ include "mr-config-server.fullname" . }}
name: {{ include "ec-config-server.fullname" . }}
namespace: {{ include "ec-config-server.namespace" . }}
labels:
{{- include "mr-config-server.labels" . | nindent 4 }}
{{- include "ec-config-server.labels" . | nindent 4 }}
data:
SPRING_PROFILES_ACTIVE: {{ .Values.spring.activeprofile }}
{{- if .Values.environment }}

13
apps/ec-config-server/env/k3s-cluster/templates/deployment.yaml vendored
View File

@@ -1,9 +1,10 @@
apiVersion: apps/v1
kind: Deployment
metadata:
name: {{ include "mr-config-server.fullname" . }}
name: {{ include "ec-config-server.fullname" . }}
namespace: {{ include "ec-config-server.namespace" . }}
labels:
{{- include "mr-config-server.labels" . | nindent 4 }}
{{- include "ec-config-server.labels" . | nindent 4 }}
spec:
strategy:
type: RollingUpdate
@@ -15,7 +16,7 @@ spec:
{{- end }}
selector:
matchLabels:
{{- include "mr-config-server.selectorLabels" . | nindent 6 }}
{{- include "ec-config-server.selectorLabels" . | nindent 6 }}
template:
metadata:
{{- with .Values.podAnnotations }}
@@ -23,20 +24,20 @@ spec:
{{- toYaml . | nindent 8 }}
{{- end }}
labels:
{{- include "mr-config-server.selectorLabels" . | nindent 8 }}
{{- include "ec-config-server.selectorLabels" . | nindent 8 }}
spec:
{{- with .Values.imagePullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 8 }}
{{- end }}
serviceAccountName: {{ include "mr-config-server.serviceAccountName" . }}
serviceAccountName: {{ include "ec-config-server.serviceAccountName" . }}
securityContext:
{{- toYaml .Values.podSecurityContext | nindent 8 }}
containers:
- name: {{ .Chart.Name }}
envFrom:
- configMapRef:
name: {{ include "mr-config-server.fullname" . }}
name: {{ include "ec-config-server.fullname" . }}
securityContext:
{{- toYaml .Values.securityContext | nindent 12 }}
image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"

7
apps/ec-config-server/env/k3s-cluster/templates/horizontal-pod-autoscaler.yaml vendored
View File

@@ -2,14 +2,15 @@
apiVersion: autoscaling/v2
kind: HorizontalPodAutoscaler
metadata:
name: {{ include "mr-config-server.fullname" . }}
name: {{ include "ec-config-server.fullname" . }}
namespace: {{ include "ec-config-server.namespace" . }}
labels:
{{- include "mr-config-server.labels" . | nindent 4 }}
{{- include "ec-config-server.labels" . | nindent 4 }}
spec:
scaleTargetRef:
apiVersion: apps/v1
kind: Deployment
name: {{ include "mr-config-server.fullname" . }}
name: {{ include "ec-config-server.fullname" . }}
minReplicas: {{ .Values.autoscaling.minReplicas }}
maxReplicas: {{ .Values.autoscaling.maxReplicas }}
metrics:

3
apps/ec-config-server/env/k3s-cluster/templates/pod-disruption-budget.yaml vendored
View File

@@ -3,9 +3,10 @@ apiVersion: policy/v1
kind: PodDisruptionBudget
metadata:
name: {{ .Chart.Name }}
namespace: {{ include "ec-config-server.namespace" . }}
spec:
minAvailable: {{ .Values.pdb.minAvailable }}
selector:
matchLabels:
app.kubernetes.io/name: {{ include "mr-config-server.name" . }}
app.kubernetes.io/name: {{ include "ec-config-server.name" . }}
{{- end }}

8
apps/ec-config-server/env/k3s-cluster/templates/service-account.yaml vendored
View File

@@ -2,9 +2,10 @@
apiVersion: v1
kind: ServiceAccount
metadata:
name: {{ include "mr-config-server.serviceAccountName" . }}
name: {{ include "ec-config-server.serviceAccountName" . }}
namespace: {{ include "ec-config-server.namespace" . }}
labels:
{{- include "mr-config-server.labels" . | nindent 4 }}
{{- include "ec-config-server.labels" . | nindent 4 }}
{{- with .Values.serviceAccount.annotations }}
annotations:
{{- toYaml . | nindent 4 }}
@@ -14,9 +15,10 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
metadata:
name: {{ .Release.Namespace }}-config-reader-binding
namespace: {{ include "ec-config-server.namespace" . }}
subjects:
- kind: ServiceAccount
name: {{ include "mr-config-server.serviceAccountName" . }}
name: {{ include "ec-config-server.serviceAccountName" . }}
apiGroup: ""
namespace: {{ .Release.Namespace }}
roleRef:

7
apps/ec-config-server/env/k3s-cluster/templates/service.yaml vendored
View File

@@ -1,12 +1,13 @@
apiVersion: v1
kind: Service
metadata:
name: {{ include "mr-config-server.fullname" . }}
name: {{ include "ec-config-server.fullname" . }}
namespace: {{ include "ec-config-server.namespace" . }}
annotations:
service.beta.kubernetes.io/aws-load-balancer-internal: 0.0.0.0/0
service.beta.kubernetes.io/aws-load-balancer-type: "elb"
labels:
{{- include "mr-config-server.labels" . | nindent 4 }}
{{- include "ec-config-server.labels" . | nindent 4 }}
spring-boot: "{{ .Values.labels.springboot }}"
spec:
type: {{ .Values.service.type }}
@@ -16,4 +17,4 @@ spec:
protocol: TCP
name: http
selector:
{{- include "mr-config-server.selectorLabels" . | nindent 4 }}
{{- include "ec-config-server.selectorLabels" . | nindent 4 }}

2
apps/ec-config-server/env/k3s-cluster/values.yaml vendored
View File

@@ -12,7 +12,7 @@ affinity:
- key: app.kubernetes.io/name
operator: In
values:
- mr-config-servver
- ec-config-server
topologyKey: kubernetes.io/hostname
autoscaling: