From 8d2c48b8a145a7e87832489c89c15d65d297f8bd Mon Sep 17 00:00:00 2001 From: Dmitry Groisman Date: Thu, 26 Sep 2019 12:54:02 +0300 Subject: [PATCH] adding custom ipsec ports support --- .gitignore | 3 ++- submariner/Chart.yaml | 12 ++++++------ submariner/templates/engine-deploy.yaml | 4 ++++ submariner/values.yaml | 6 ++++-- 4 files changed, 16 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 723ef36..8d5c0a6 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ -.idea \ No newline at end of file +.idea +*.tgz \ No newline at end of file diff --git a/submariner/Chart.yaml b/submariner/Chart.yaml index 368caa9..077d18f 100644 --- a/submariner/Chart.yaml +++ b/submariner/Chart.yaml @@ -1,12 +1,12 @@ --- name: submariner -version: 0.0.1 -appVersion: v0.0.1 -description: Submariner +version: 0.0.2 +appVersion: v0.0.2 +description: Submariner with custom ipsec ports support keywords: home: https://submariner.io/ sources: -- https://submariner-io.github.io/submariner-charts/charts + - https://submariner-io.github.io/submariner-charts/charts maintainers: -- name: Rancher Labs - email: charts@rancher.com + - name: Rancher Labs + email: charts@rancher.com diff --git a/submariner/templates/engine-deploy.yaml b/submariner/templates/engine-deploy.yaml index 09ce7c3..c8ac059 100644 --- a/submariner/templates/engine-deploy.yaml +++ b/submariner/templates/engine-deploy.yaml @@ -97,6 +97,10 @@ spec: value: "{{ .Values.ipsec.psk }}" - name: CE_IPSEC_DEBUG value: "{{ .Values.ipsec.debug }}" + - name: CE_IPSEC_IKEPORT + value: "{{ .Values.ipsec.ikePort }}" + - name: CE_IPSEC_NATTPORT + value: "{{ .Values.ipsec.natPort }}" image: {{ .Values.engine.image.repository }}:{{ .Values.engine.image.tag }} imagePullPolicy: {{ .Values.engine.image.pullPolicy }} name: submariner diff --git a/submariner/values.yaml b/submariner/values.yaml index 277967d..73cfb76 100644 --- a/submariner/values.yaml +++ b/submariner/values.yaml @@ -21,6 +21,8 @@ rbac: ipsec: psk: "" debug: false + ikePort: 500 + natPort: 4500 engine: image: repository: rancher/submariner @@ -28,7 +30,7 @@ engine: pullPolicy: Always resources: {} # limits: - # cpu: 100m + # cpu: 100m # memory: 100Mi nodeSelectorEnabled: true nodeSelector: {} @@ -40,7 +42,7 @@ routeAgent: tag: v0.0.1 pullPolicy: Always resources: {} - # limits: + # limits: # cpu: 100m # memory: 100Mi nodeSelector: {}