From d5f78da216499a8a744b354f9fe11d00bdb674bd Mon Sep 17 00:00:00 2001 From: Edward Cheng Date: Sat, 31 Aug 2024 01:12:09 +1000 Subject: [PATCH] update chart template for ec-config-server --- .../env/k3s-cluster/Chart.yaml | 2 +- .../env/k3s-cluster/templates/_helpers.tpl | 24 +++++++++++-------- .../env/k3s-cluster/templates/configmap.yaml | 5 ++-- .../env/k3s-cluster/templates/deployment.yaml | 13 +++++----- .../templates/horizontal-pod-autoscaler.yaml | 7 +++--- .../templates/pod-disruption-budget.yaml | 3 ++- .../templates/service-account.yaml | 8 ++++--- .../env/k3s-cluster/templates/service.yaml | 7 +++--- .../env/k3s-cluster/values.yaml | 2 +- 9 files changed, 41 insertions(+), 30 deletions(-) diff --git a/apps/ec-config-server/env/k3s-cluster/Chart.yaml b/apps/ec-config-server/env/k3s-cluster/Chart.yaml index 8ffdf30..20ca689 100644 --- a/apps/ec-config-server/env/k3s-cluster/Chart.yaml +++ b/apps/ec-config-server/env/k3s-cluster/Chart.yaml @@ -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" diff --git a/apps/ec-config-server/env/k3s-cluster/templates/_helpers.tpl b/apps/ec-config-server/env/k3s-cluster/templates/_helpers.tpl index 85307bb..e06538a 100644 --- a/apps/ec-config-server/env/k3s-cluster/templates/_helpers.tpl +++ b/apps/ec-config-server/env/k3s-cluster/templates/_helpers.tpl @@ -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 }} diff --git a/apps/ec-config-server/env/k3s-cluster/templates/configmap.yaml b/apps/ec-config-server/env/k3s-cluster/templates/configmap.yaml index 4b707af..0a72aa4 100644 --- a/apps/ec-config-server/env/k3s-cluster/templates/configmap.yaml +++ b/apps/ec-config-server/env/k3s-cluster/templates/configmap.yaml @@ -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 }} diff --git a/apps/ec-config-server/env/k3s-cluster/templates/deployment.yaml b/apps/ec-config-server/env/k3s-cluster/templates/deployment.yaml index b71634e..5a2e391 100644 --- a/apps/ec-config-server/env/k3s-cluster/templates/deployment.yaml +++ b/apps/ec-config-server/env/k3s-cluster/templates/deployment.yaml @@ -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 }}" diff --git a/apps/ec-config-server/env/k3s-cluster/templates/horizontal-pod-autoscaler.yaml b/apps/ec-config-server/env/k3s-cluster/templates/horizontal-pod-autoscaler.yaml index 51afb90..6223c6e 100644 --- a/apps/ec-config-server/env/k3s-cluster/templates/horizontal-pod-autoscaler.yaml +++ b/apps/ec-config-server/env/k3s-cluster/templates/horizontal-pod-autoscaler.yaml @@ -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: diff --git a/apps/ec-config-server/env/k3s-cluster/templates/pod-disruption-budget.yaml b/apps/ec-config-server/env/k3s-cluster/templates/pod-disruption-budget.yaml index 0b351bf..24e15e7 100644 --- a/apps/ec-config-server/env/k3s-cluster/templates/pod-disruption-budget.yaml +++ b/apps/ec-config-server/env/k3s-cluster/templates/pod-disruption-budget.yaml @@ -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 }} diff --git a/apps/ec-config-server/env/k3s-cluster/templates/service-account.yaml b/apps/ec-config-server/env/k3s-cluster/templates/service-account.yaml index 97251a2..36b7463 100644 --- a/apps/ec-config-server/env/k3s-cluster/templates/service-account.yaml +++ b/apps/ec-config-server/env/k3s-cluster/templates/service-account.yaml @@ -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: diff --git a/apps/ec-config-server/env/k3s-cluster/templates/service.yaml b/apps/ec-config-server/env/k3s-cluster/templates/service.yaml index ba0572e..300c039 100644 --- a/apps/ec-config-server/env/k3s-cluster/templates/service.yaml +++ b/apps/ec-config-server/env/k3s-cluster/templates/service.yaml @@ -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 }} diff --git a/apps/ec-config-server/env/k3s-cluster/values.yaml b/apps/ec-config-server/env/k3s-cluster/values.yaml index e14bcb3..4ba0ea7 100644 --- a/apps/ec-config-server/env/k3s-cluster/values.yaml +++ b/apps/ec-config-server/env/k3s-cluster/values.yaml @@ -12,7 +12,7 @@ affinity: - key: app.kubernetes.io/name operator: In values: - - mr-config-servver + - ec-config-server topologyKey: kubernetes.io/hostname autoscaling: