Compare commits

..
Author SHA1 Message Date
Lucas Barros 55745a2ea6 Omit ceIPSecPSK when no IPsec PSK is set
With the default ipsec.psk of "" and no pskSecret, the template
rendered "ceIPSecPSK:" with no value, which is null. The Submariner
CRD types the field as a string, so the install fails with
'spec.ceIPSecPSK in body must be of type string: "null"'. This hits
anyone using the vxlan cable driver, which needs no PSK.

Only render ceIPSecPSK when a PSK is given, and quote it so that a
numeric PSK is not turned into an integer.

Fixes #753

Signed-off-by: Lucas Barros <lucasbarros.kam@gmail.com>
2026-11-04 10:53:14 -03:00
Automated Release c43953139c Update Submariner dependencies to v0.26.0-m0
Release Charts / Release (push) Canceled after 0s
Signed-off-by: Automated Release <release@submariner.io>
2026-10-12 22:21:39 +03:00
7 changed files with 13 additions and 13 deletions

No files matched your search

+2 -2
View File
@@ -11,6 +11,6 @@ jobs:
name: PR targets branch
runs-on: ubuntu-latest
steps:
- name: Check that the PR targets release-0.25
if: ${{ github.base_ref != 'release-0.25' }}
- name: Check that the PR targets devel
if: ${{ github.base_ref != 'devel' }}
run: exit 1
+2 -2
View File
@@ -29,11 +29,11 @@ jobs:
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1
- name: Run E2E deployment and tests
uses: submariner-io/shipyard/gh-actions/e2e@release-0.25
uses: submariner-io/shipyard/gh-actions/e2e@devel
with:
k8s_version: ${{ matrix.k8s_version }}
using: ${{ matrix.cable_driver }} ${{ matrix.globalnet }} ${{ matrix.lighthouse }}
- name: Post mortem
if: failure()
uses: submariner-io/shipyard/gh-actions/post-mortem@release-0.25
uses: submariner-io/shipyard/gh-actions/post-mortem@devel
+2 -2
View File
@@ -16,8 +16,8 @@ jobs:
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1
- name: Run E2E deployment and tests
uses: submariner-io/shipyard/gh-actions/e2e@release-0.25
uses: submariner-io/shipyard/gh-actions/e2e@devel
- name: Post mortem
if: failure()
uses: submariner-io/shipyard/gh-actions/post-mortem@release-0.25
uses: submariner-io/shipyard/gh-actions/post-mortem@devel
+2 -2
View File
@@ -24,10 +24,10 @@ jobs:
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1
- name: Run E2E deployment and tests
uses: submariner-io/shipyard/gh-actions/e2e@release-0.25
uses: submariner-io/shipyard/gh-actions/e2e@devel
with:
using: ${{ matrix.cable_driver }} ${{ matrix.globalnet }} ${{ matrix.lighthouse }}
- name: Post mortem
if: failure()
uses: submariner-io/shipyard/gh-actions/post-mortem@release-0.25
uses: submariner-io/shipyard/gh-actions/post-mortem@devel
+1 -1
View File
@@ -4,7 +4,7 @@ name: Release Charts
on:
push:
branches:
- release-0.25
- devel
permissions:
contents: write
+2 -2
View File
@@ -1,4 +1,4 @@
BASE_BRANCH ?= release-0.25
BASE_BRANCH ?= devel
export BASE_BRANCH
export HELM_REPO_LOCATION=./helm_repo
@@ -17,7 +17,7 @@ endif
export DEPLOYTOOL = helm
GH_URL=https://submariner-io.github.io/submariner-charts/charts
CHARTS_DIR=charts
CHARTS_VERSION=0.25.0
CHARTS_VERSION=0.26.0-m0
HELM_DOCS_VERSION=0.15.0
REPO_URL=$(shell git config remote.origin.url)
@@ -20,8 +20,8 @@ spec:
ceIPSecNATTPort: {{ .Values.ipsec.natPort }}
{{- if .Values.ipsec.pskSecret }}
ceIPSecPSKSecret: {{ .Values.ipsec.pskSecret }}
{{- else }}
ceIPSecPSK: {{ .Values.ipsec.psk }}
{{- else if .Values.ipsec.psk }}
ceIPSecPSK: {{ .Values.ipsec.psk | quote }}
{{- end }}
clusterCIDR: "{{ .Values.submariner.clusterCidr }}"
clusterID: {{ .Values.submariner.clusterId }}