Skip to content
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

Jump to bottom

[nethgate] fix in migrator and image tag #122

Merged
merged 14 commits into from
May 14, 2024
Merged

[nethgate] fix in migrator and image tag #122

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
17e5e7f
fix nethgate migrator entry point
gehlotanish May 1, 2024
afd962e
fix nethgate migrator entry point
gehlotanish May 1, 2024
c7e350c
fix bug in selector
gehlotanish May 3, 2024
0c8f942
fix bug in selector
gehlotanish May 3, 2024
a84f292
fix bug in selector
gehlotanish May 3, 2024
64c4280
fix bug in selector
gehlotanish May 3, 2024
4129ef2
fix bug in selector
gehlotanish May 3, 2024
e00a92e
fix image tag for nethgate and migrator
gehlotanish May 10, 2024
665b393
fix image tag for nethgate and migrator
gehlotanish May 10, 2024
6b097d0
fix: chart version and doc
gehlotanish May 14, 2024
5d65c70
fix: chart version and doc
gehlotanish May 14, 2024
66920fd
segregate nethgate ENV from kong
gehlotanish May 14, 2024
d353cd1
segregate nethgate ENV from kong
gehlotanish May 14, 2024
8c8989a
segregate nethgate ENV from kong
gehlotanish May 14, 2024
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
16 changes: 16 additions & 0 deletions charts/nethgate/templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,22 @@ app.kubernetes.io/component: app
app.kubernetes.io/instance: "{{ .Release.Name }}"
{{- end -}}

{{- define "kong.nethagateMetaLabels" -}}
app.kubernetes.io/app: nethgate
{{- end -}}

{{- define "kong.nethagateSelectorLabels" -}}
app.kubernetes.io/app: nethgate
{{- end -}}

{{- define "kong.migratorMetaLabels" -}}
app.kubernetes.io/app: migrator
{{- end -}}

{{- define "kong.migratorSelectorLabels" -}}
app.kubernetes.io/app: migrator
{{- end -}}

{{- define "kong.postgresql.fullname" -}}
{{- $name := default "postgresql" .Values.postgresql.nameOverride -}}
{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
Expand Down
17 changes: 5 additions & 12 deletions charts/nethgate/templates/migrator_deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@ metadata:
name: {{ template "kong.fullname" . }}-migrator
namespace: {{ template "kong.namespace" . }}
labels:
{{- include "kong.metaLabels" . | nindent 4 }}
app.kubernetes.io/component: app
{{- include "kong.migratorMetaLabels" . | nindent 4 }}
{{- if .Values.deploymentAnnotations }}
annotations:
{{- range $key, $value := .Values.deploymentAnnotations }}
Expand All @@ -17,7 +16,7 @@ spec:
replicas: {{ .Values.replicaCount }}
selector:
matchLabels:
{{- include "kong.selectorLabels" . | nindent 6 }}
{{- include "kong.migratorSelectorLabels" . | nindent 6 }}
template:
metadata:
annotations:
Expand All @@ -27,13 +26,7 @@ spec:
{{- end }}
{{- end }}
labels:
{{- include "kong.metaLabels" . | nindent 8 }}
app.kubernetes.io/component: app
app: {{ template "kong.fullname" . }}
version: {{ .Chart.AppVersion | quote }}
{{- if .Values.podLabels }}
{{ include "kong.renderTpl" (dict "value" .Values.podLabels "context" $) | nindent 8 }}
{{- end }}
{{- include "kong.migratorMetaLabels" . | nindent 8 }}
spec:
{{- if .Values.deployment.voyager_migrator.image.pullSecrets }}
imagePullSecrets:
Expand All @@ -44,13 +37,13 @@ spec:
{{- if .Values.deployment.kong.enabled }}
containers:
- name: {{ template "kong.fullname" . }}-migrator
image: {{ .Values.deployment.voyager_migrator.image.repository }}:{{ .Values.deployment.voyager_migrator.image.tag }}
image: {{ .Values.deployment.voyager_migrator.image.repository }}:{{ .Values.deployment.voyager_migrator.image.migrator_tag }}
imagePullPolicy: {{ .Values.deployment.voyager_migrator.image.pullPolicy }}
securityContext:
{{ toYaml .Values.containerSecurityContext | nindent 10 }}
env:
{{- include "kong.no_daemon_env" . | nindent 8 }}
command: [{{ .Values.deployment.dvoyager_migrator.CMD | quote }}]
command: ["voyager_migrator", "migrate"]
volumeMounts:
{{- include "kong.volumeMounts" . | nindent 10 }}
{{- include "kong.userDefinedVolumeMounts" .Values.deployment | nindent 10 }}
Expand Down
17 changes: 5 additions & 12 deletions charts/nethgate/templates/nethgate_deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@ metadata:
name: {{ template "kong.fullname" . }}-nethgate
namespace: {{ template "kong.namespace" . }}
labels:
{{- include "kong.metaLabels" . | nindent 4 }}
app.kubernetes.io/component: app
{{- include "kong.nethagateMetaLabels" . | nindent 4 }}
{{- if .Values.deploymentAnnotations }}
annotations:
{{- range $key, $value := .Values.deploymentAnnotations }}
Expand All @@ -17,7 +16,7 @@ spec:
replicas: {{ .Values.replicaCount }}
selector:
matchLabels:
{{- include "kong.selectorLabels" . | nindent 6 }}
{{- include "kong.nethagateSelectorLabels" . | nindent 6 }}
template:
metadata:
annotations:
Expand All @@ -27,24 +26,18 @@ spec:
{{- end }}
{{- end }}
labels:
{{- include "kong.metaLabels" . | nindent 8 }}
app.kubernetes.io/component: app
app: {{ template "kong.fullname" . }}
version: {{ .Chart.AppVersion | quote }}
{{- if .Values.podLabels }}
{{ include "kong.renderTpl" (dict "value" .Values.podLabels "context" $) | nindent 8 }}
{{- end }}
{{- include "kong.nethagateMetaLabels" . | nindent 8 }}
spec:
{{- if .Values.image.pullSecrets }}
imagePullSecrets:
{{- range .Values.image.pullSecrets }}
{{- range .Values.deployment.nethgate.image.pullSecrets }}
- name: {{ . }}
{{- end }}
{{- end }}
{{- if .Values.deployment.kong.enabled }}
containers:
- name: {{ template "kong.fullname" . }}-nethgate
image: {{ include "kong.getRepoTag" .Values.image }}
image: {{ .Values.deployment.nethgate.image.repository }}:{{ .Values.deployment.nethgate.image.nethgate_tag }}
imagePullPolicy: {{ .Values.image.pullPolicy }}
securityContext:
{{ toYaml .Values.containerSecurityContext | nindent 10 }}
Expand Down
7 changes: 2 additions & 5 deletions charts/nethgate/templates/service-nethgate.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@ metadata:
{{- end }}
{{- end }}
labels:
{{- include "kong.metaLabels" . | nindent 4 }}
app.kubernetes.io/component: app
{{- include "kong.nethagateMetaLabels" . | nindent 4 }}
spec:
{{- if .Values.deployment.nethgate.svc.loadBalancerIP }}
loadBalancerIP: {{ .Values.deployment.nethgate.svc.loadBalancerIP }}
Expand All @@ -23,8 +22,6 @@ spec:
port: {{ .Values.deployment.nethgate.port }}
targetPort: {{ .Values.deployment.nethgate.port }}
selector:
app.kubernetes.io/name: {{ template "kong.name" . }}
app.kubernetes.io/component: app
app.kubernetes.io/instance: "{{ .Release.Name }}"
{{- include "kong.nethagateSelectorLabels" . | nindent 6 }}
type: {{ .Values.deployment.nethgate.svc.type }}
{{- end -}}
10 changes: 8 additions & 2 deletions charts/nethgate/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,12 @@ deployment:
enabled: true
nethgate:
enabled: false
image:
repository: nethermindeth/nethgate
nethgate_tag: 0.0.1-dev102
pullPolicy: "IfNotPresent"
pullSecrets:
- "regcred"
port: "8080"
svc:
# annotations: {}
Expand All @@ -30,10 +36,10 @@ deployment:
enabled: false
image:
repository: nethermindeth/voyager_migrator
tag: 0.0.1-dev102
migrator_tag: 0.0.1-dev102
pullPolicy: "IfNotPresent"
pullSecrets:
- "regcred"
CMD: voyager_migrator

## Minimum number of seconds for which a newly created pod should be ready without any of its container crashing,
## for it to be considered available.
Expand Down
Loading