Skip to content

chore: customize helm deploy configs #34

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lanmaoxinqing wants to merge 1 commit into
base: main
Choose a base branch
from
+67 −19
Open

chore: customize helm deploy configs #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions deploy/api-service/templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,9 @@ helm.sh/chart: {{ include "api-service.chart" . }}
{{- if .Chart.AppVersion }}
app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
{{- end }}
{{- with .Values.global.labels }}
{{ toYaml . }}
{{- end }}
{{- end }}

{{/*
Expand Down
7 changes: 5 additions & 2 deletions deploy/api-service/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ spec:
securityContext:
{{ toYaml .Values.securityContext | nindent 12 }}
image: {{ .Values.image }}
imagePullPolicy: IfNotPresent
imagePullPolicy: {{ .Values.imagePullPolicy }}
args:
- --backend-addr
- {{ include "api-service.backendAddr" . }}
Expand Down Expand Up @@ -64,7 +64,10 @@ spec:
affinity:
{{ toYaml . | nindent 8 }}
{{ end }}
{{ with .Values.tolerations }}
{{ with .Values.global.tolerations }}
tolerations:
{{ toYaml . | nindent 8 }}
{{ end }}
{{ with .Values.global.dns }}
{{ toYaml . | nindent 6 }}
{{ end }}
4 changes: 3 additions & 1 deletion deploy/api-service/templates/service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@ metadata:
{{ include "api-service.labels" . | nindent 4 }}
spec:
type: {{ .Values.service.type }}
#clusterIP: None
{{ if .Values.service.clusterIP }}
clusterIP: {{ .Values.service.clusterIP }}
{{ end }}
ports:
- port: {{ .Values.service.port }}
targetPort: http
Expand Down
3 changes: 3 additions & 0 deletions deploy/controller/templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,9 @@ helm.sh/chart: {{ include "controller.chart" . }}
{{- if .Chart.AppVersion }}
app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
{{- end }}
{{- with .Values.global.labels }}
{{ toYaml . }}
{{- end }}
{{- end }}

{{/*
Expand Down
7 changes: 5 additions & 2 deletions deploy/controller/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ spec:
securityContext:
{{ toYaml .Values.securityContext | nindent 12 }}
image: {{ .Values.image }}
imagePullPolicy: IfNotPresent
imagePullPolicy: {{ .Values.imagePullPolicy }}
{{- if .Values.command }}
command:
{{- toYaml .Values.command | nindent 12 }}
Expand Down Expand Up @@ -82,7 +82,10 @@ spec:
affinity:
{{ toYaml . | nindent 8 }}
{{ end }}
{{ with .Values.tolerations }}
{{ with .Values.global.tolerations }}
tolerations:
{{ toYaml . | nindent 8 }}
{{ end }}
{{ with .Values.global.dns }}
{{ toYaml . | nindent 6 }}
{{ end }}
0 rolebinding.yaml → deploy/controller/templates/rolebinding.yaml
View file
Open in desktop
File renamed without changes.
4 changes: 3 additions & 1 deletion deploy/controller/templates/service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@ metadata:
{{ include "controller.labels" . | nindent 4 }}
spec:
type: {{ .Values.service.type }}
#clusterIP: None
{{ if .Values.service.clusterIP }}
clusterIP: {{ .Values.service.clusterIP }}
{{ end }}
ports:
- port: {{ .Values.service.port }}
targetPort: http
Expand Down
11 changes: 11 additions & 0 deletions deploy/envhub/templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,9 @@ helm.sh/chart: {{ include "envhub.chart" . }}
{{- if .Chart.AppVersion }}
app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
{{- end }}
{{- with .Values.global.labels }}
{{ toYaml . }}
{{- end }}
{{- end }}

{{/*
Expand All @@ -29,3 +32,11 @@ Selector labels
{{- define "envhub.selectorLabels" -}}
app.kubernetes.io/name: {{ .Values.name }}
{{- end }}

{{- define "envhub.redisAddr" -}}
{{ if .Values.redisAddr }}
{{- .Values.redisAddr -}}
{{ else }}
{{- printf "redis.%s.svc.cluster.local:6379" .Values.metadata.namespace -}}
{{ end }}
{{ end }}
9 changes: 6 additions & 3 deletions deploy/envhub/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ spec:
securityContext:
{{ toYaml .Values.securityContext | nindent 12 }}
image: {{ .Values.image }}
imagePullPolicy: IfNotPresent
imagePullPolicy: {{.Values.imagePullPolicy }}
env:
- name: ACI_ACCESS
valueFrom:
Expand Down Expand Up @@ -72,7 +72,7 @@ spec:
- --storage-backend
- redis
- --redis-addr
- redis.aenv.svc.cluster.local:6379
- {{ include "envhub.redisAddr" . }}
- --redis-key-prefix
- env
- --port
Expand Down Expand Up @@ -104,7 +104,10 @@ spec:
affinity:
{{ toYaml . | nindent 8 }}
{{ end }}
{{ with .Values.tolerations }}
{{ with .Values.global.tolerations }}
tolerations:
{{ toYaml . | nindent 8 }}
{{ end }}
{{ with .Values.global.dns }}
{{ toYaml . | nindent 6 }}
{{ end }}
4 changes: 3 additions & 1 deletion deploy/envhub/templates/service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@ metadata:
{{ include "envhub.labels" . | nindent 4 }}
spec:
type: {{ .Values.service.type }}
#clusterIP: None
{{ if .Values.service.clusterIP }}
clusterIP: {{ .Values.service.clusterIP }}
{{ end }}
ports:
- port: {{ .Values.service.port }}
targetPort: http
Expand Down
3 changes: 3 additions & 0 deletions deploy/redis/templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@
helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
app.kubernetes.io/name: {{ include "redis.name" . }}
app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
{{- with .Values.global.labels }}
{{ toYaml . }}
{{- end }}
{{- end }}

{{- define "redis.selectorLabels" -}}
Expand Down
15 changes: 9 additions & 6 deletions deploy/redis/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ spec:
{{- end }}
containers:
- name: {{ include "redis.name" . }}
image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
imagePullPolicy: {{ .Values.image.pullPolicy }}
image: "{{ .Values.image }}"
imagePullPolicy: {{ .Values.imagePullPolicy }}
ports:
- name: redis
containerPort: 6379
Expand Down Expand Up @@ -58,13 +58,16 @@ spec:
affinity:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- with .Values.tolerations }}
tolerations:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- if .Values.persistence.enabled }}
volumes:
- name: redis-data
persistentVolumeClaim:
claimName: {{ include "redis.fullname" . }}
{{- end }}
{{ with .Values.global.tolerations }}
tolerations:
{{ toYaml . | nindent 8 }}
{{ end }}
{{ with .Values.global.dns }}
{{ toYaml . | nindent 6 }}
{{ end }}
3 changes: 3 additions & 0 deletions deploy/redis/templates/service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@ metadata:
{{- include "redis.labels" . | nindent 4 }}
spec:
type: {{ .Values.service.type }}
{{ if .Values.service.clusterIP }}
clusterIP: {{ .Values.service.clusterIP }}
{{ end }}
ports:
- port: {{ .Values.service.port }}
targetPort: redis
Expand Down
13 changes: 10 additions & 3 deletions deploy/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ controller:
namespace:
create: true
image: aenvironment/controller:0.1.0
imagePullPolicy: IfNotPresent
service:
type: LoadBalancer
port: 8080
Expand All @@ -39,16 +40,20 @@ redis:
namespace: aenv
namespace:
create: false
image:
repository: redis
tag: "7.2.4"
image: redis:7.2.4
imagePullPolicy: IfNotPresent
service:
type: LoadBalancer
port: 6379
resources:
limits:
cpu: "1"
memory: "2Gi"
ephemeral-storage: 10Gi
requests:
cpu: "0.5"
memory: "1Gi"
ephemeral-storage: 10Gi
configmap:
enabled: false
clusterEnabled: "no"
Expand All @@ -65,6 +70,7 @@ envhub:
namespace:
create: false
image: aenvironment/envhub:0.1.0
imagePullPolicy: IfNotPresent
service:
type: LoadBalancer
port: 8083
Expand All @@ -89,6 +95,7 @@ api-service:
namespace:
create: false
image: aenvironment/api-service:0.1.0
imagePullPolicy: IfNotPresent
service:
type: LoadBalancer
port: 8080
Expand Down
Loading