mirror of
https://github.com/submariner-io/submariner-charts.git
synced 2026-09-20 23:50:36 +00:00
Compare commits
10
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
  Automated ReleaseandSubmariner Bot
|
5278632b7a | ||
  dependabot[bot]andgithub-actions[bot]
|
86b5116c5d | ||
|
dependabot[bot]andgithub-actions[bot]
|
3f3164ece6 | ||
 Tom Pantelis
|
8770883d38 | ||
|
Automated ReleaseandSubmariner Bot
|
453401c805 | ||
|
dependabot[bot]andThomas Pantelis
|
1868f79d48 | ||
|
Automated ReleaseandSubmariner Bot
|
8c74589510 | ||
|
Automated ReleaseandSubmariner Bot
|
2f5665b6c1 | ||
|
Automated ReleaseandSubmariner Bot
|
31a32ab054 | ||
|
Automated Release
|
847208fe8e |
@@ -54,12 +54,3 @@ updates:
|
||||
github-actions:
|
||||
patterns:
|
||||
- "*"
|
||||
- package-ecosystem: github-actions
|
||||
directory: '/'
|
||||
target-branch: "release-0.22"
|
||||
schedule:
|
||||
interval: monthly
|
||||
groups:
|
||||
github-actions:
|
||||
patterns:
|
||||
- "*"
|
||||
|
||||
@@ -11,6 +11,6 @@ jobs:
|
||||
name: PR targets branch
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Check that the PR targets devel
|
||||
if: ${{ github.base_ref != 'devel' }}
|
||||
- name: Check that the PR targets release-0.22
|
||||
if: ${{ github.base_ref != 'release-0.22' }}
|
||||
run: exit 1
|
||||
|
||||
@@ -29,11 +29,11 @@ jobs:
|
||||
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
|
||||
|
||||
- name: Run E2E deployment and tests
|
||||
uses: submariner-io/shipyard/gh-actions/e2e@devel
|
||||
uses: submariner-io/shipyard/gh-actions/e2e@release-0.22
|
||||
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@devel
|
||||
uses: submariner-io/shipyard/gh-actions/post-mortem@release-0.22
|
||||
|
||||
@@ -16,8 +16,8 @@ jobs:
|
||||
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
|
||||
|
||||
- name: Run E2E deployment and tests
|
||||
uses: submariner-io/shipyard/gh-actions/e2e@devel
|
||||
uses: submariner-io/shipyard/gh-actions/e2e@release-0.22
|
||||
|
||||
- name: Post mortem
|
||||
if: failure()
|
||||
uses: submariner-io/shipyard/gh-actions/post-mortem@devel
|
||||
uses: submariner-io/shipyard/gh-actions/post-mortem@release-0.22
|
||||
|
||||
@@ -24,10 +24,10 @@ jobs:
|
||||
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
|
||||
|
||||
- name: Run E2E deployment and tests
|
||||
uses: submariner-io/shipyard/gh-actions/e2e@devel
|
||||
uses: submariner-io/shipyard/gh-actions/e2e@release-0.22
|
||||
with:
|
||||
using: ${{ matrix.cable_driver }} ${{ matrix.globalnet }} ${{ matrix.lighthouse }}
|
||||
|
||||
- name: Post mortem
|
||||
if: failure()
|
||||
uses: submariner-io/shipyard/gh-actions/post-mortem@devel
|
||||
uses: submariner-io/shipyard/gh-actions/post-mortem@release-0.22
|
||||
|
||||
@@ -4,7 +4,7 @@ name: Release Charts
|
||||
on:
|
||||
push:
|
||||
branches:
|
||||
- devel
|
||||
- release-0.22
|
||||
|
||||
permissions:
|
||||
contents: write
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
BASE_BRANCH ?= devel
|
||||
BASE_BRANCH ?= release-0.22
|
||||
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.24.0-m0
|
||||
CHARTS_VERSION=0.22.1
|
||||
HELM_DOCS_VERSION=0.15.0
|
||||
REPO_URL=$(shell git config remote.origin.url)
|
||||
|
||||
|
||||
@@ -28,7 +28,6 @@ Submariner enables direct networking between Pods and Services in different Kube
|
||||
| ipsec.forceUDPEncaps | bool | `false` | |
|
||||
| ipsec.ikePort | int | `500` | |
|
||||
| ipsec.natPort | int | `4500` | |
|
||||
| ipsec.pskSecret | string | `""` | Name of the Kubernetes Secret containing the IPsec PSK as field psk |
|
||||
| ipsec.psk | string | `""` | |
|
||||
| leadership.leaseDuration | int | `10` | |
|
||||
| leadership.renewDeadline | int | `5` | |
|
||||
@@ -53,6 +52,5 @@ Submariner enables direct networking between Pods and Services in different Kube
|
||||
| submariner.images.tag | string | `"0.14.0"` | |
|
||||
| submariner.natEnabled | bool | `false` | |
|
||||
| submariner.serviceCidr | string | `""` | |
|
||||
| submariner.brokerK8sSecret | string | `""` | Name of the Kubernetes Secret containing broker credentials (ca.crt, token). |
|
||||
| submariner.serviceDiscovery | bool | `true` | |
|
||||
| submariner.token | string | `""` | |
|
||||
|
||||
@@ -6,23 +6,15 @@ metadata:
|
||||
spec:
|
||||
broker: k8s
|
||||
brokerK8sApiServer: {{ .Values.broker.server }}
|
||||
{{- if .Values.submariner.brokerK8sSecret }}
|
||||
brokerK8sSecret: {{ .Values.submariner.brokerK8sSecret }}
|
||||
{{- else }}
|
||||
brokerK8sApiServerToken: {{ .Values.broker.token }}
|
||||
brokerK8sCA: {{ .Values.broker.ca }}
|
||||
{{- end }}
|
||||
brokerK8sRemoteNamespace: {{ .Values.broker.namespace }}
|
||||
brokerK8sInsecure: {{ .Values.broker.insecure }}
|
||||
ceIPSecDebug: {{ .Values.ipsec.debug }}
|
||||
ceIPSecForceUDPEncaps: {{ .Values.ipsec.forceUDPEncaps }}
|
||||
ceIPSecIKEPort: {{ .Values.ipsec.ikePort }}
|
||||
ceIPSecNATTPort: {{ .Values.ipsec.natPort }}
|
||||
{{- if .Values.ipsec.pskSecret }}
|
||||
ceIPSecPSKSecret: {{ .Values.ipsec.pskSecret }}
|
||||
{{- else }}
|
||||
ceIPSecPSK: {{ .Values.ipsec.psk }}
|
||||
{{- end }}
|
||||
clusterCIDR: "{{ .Values.submariner.clusterCidr }}"
|
||||
clusterID: {{ .Values.submariner.clusterId }}
|
||||
colorCodes: {{ .Values.submariner.colorCodes }}
|
||||
|
||||
@@ -7,7 +7,6 @@ submariner:
|
||||
globalCidr: ""
|
||||
clustersetIpCidr: ""
|
||||
clustersetIpEnabled: false
|
||||
brokerK8sSecret: ""
|
||||
loadBalancerEnabled: false
|
||||
natEnabled: false
|
||||
colorCodes: blue
|
||||
@@ -29,7 +28,6 @@ broker:
|
||||
images: {}
|
||||
ipsec:
|
||||
psk: ""
|
||||
pskSecret: ""
|
||||
debug: false
|
||||
forceUDPEncaps: false
|
||||
ikePort: 500
|
||||
|
||||
Reference in New Issue
Block a user