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

Update onos-e2t chart to ensure SCTP connections can be made #126

Merged
merged 3 commits into from
Oct 28, 2020
Merged

Update onos-e2t chart to ensure SCTP connections can be made #126

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f254abc
Use SCTP protocol in onos-e2t service
kuujo Oct 28, 2020
acf753f
Support image.registry value in onos-e2t chart
kuujo Oct 28, 2020
c383778
Bump version in onos-e2t chart
kuujo Oct 28, 2020
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
2 changes: 1 addition & 1 deletion onos-e2t/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ name: onos-e2t
description: ONOS E2 Termination
kubeVersion: ">=1.17.0"
type: application
version: 0.0.2
version: 0.0.3
appVersion: v0.6.1
keywords:
- onos
Expand Down
17 changes: 17 additions & 0 deletions onos-e2t/templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,3 +50,20 @@ Selector labels
app.kubernetes.io/name: {{ include "onos-e2t.name" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
{{- end -}}

{{/*
onos-e2t image name
*/}}
{{- define "onos-e2t.imagename" -}}
{{- if .Values.global.image.registry -}}
{{- printf "%s/" .Values.global.image.registry -}}
{{- else if .Values.image.registry -}}
{{- printf "%s/" .Values.image.registry -}}
{{- end -}}
{{- printf "%s:" .Values.image.repository -}}
{{- if .Values.global.image.tag -}}
{{- .Values.global.image.tag -}}
{{- else -}}
{{- .Values.image.tag -}}
{{- end -}}
{{- end -}}
9 changes: 4 additions & 5 deletions onos-e2t/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ spec:
resource: {{ template "onos-e2t.fullname" . }}
{{- include "onos-e2t.selectorLabels" . | nindent 8 }}
spec:
serviceAccountName: onos-e2t
securityContext:
{{- toYaml .Values.podSecurityContext | nindent 8 }}
{{- with .Values.imagePullSecrets }}
Expand All @@ -35,18 +34,18 @@ spec:
{{- end }}
containers:
- name: {{ .Chart.Name }}
image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
image: {{ include "onos-e2t.imagename" . | quote }}
imagePullPolicy: {{ .Values.image.pullPolicy }}
args:
- "-caPath=/etc/onos/certs/tls.cacrt"
- "-keyPath=/etc/onos/certs/tls.key"
- "-certPath=/etc/onos/certs/tls.crt"
- "-sctpport={{.Values.sctp.port}}"
- "-sctpport={{ .Values.sctp.port | default 36421 }}"
ports:
- name: sctp
containerPort: {{.Values.sctp.port}}
containerPort: {{ .Values.sctp.port | default 36421 }}
- name: grpc
containerPort: {{.Values.grpc.port}}
containerPort: {{ .Values.grpc.port }}
startupProbe:
exec:
command:
Expand Down
3 changes: 2 additions & 1 deletion onos-e2t/templates/service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@ spec:
{{- include "onos-e2t.selectorLabels" . | nindent 4 }}
ports:
- name: sctp
port: {{.Values.sctp.port}}
port: {{ .Values.sctp.port | default 36421 }}
protocol: SCTP
- name: exporter
port: 7001
- name: grpc
Expand Down
10 changes: 0 additions & 10 deletions onos-e2t/templates/serviceaccount.yaml
View file
Open in desktop

This file was deleted.

6 changes: 6 additions & 0 deletions onos-e2t/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,15 @@
# This is a YAML-formatted file.
# Declare variables to be passed into your templates.

global:
image:
registry: ""
tag: ""

replicaCount: 1

image:
registry: ""
repository: onosproject/onos-e2t
tag: v0.6.1
pullPolicy: IfNotPresent
Expand Down