mirror of
https://github.com/submariner-io/submariner-charts.git
synced 2026-09-21 20:50:35 +00:00
Compare commits
31
Commits
@@ -45,3 +45,21 @@ updates:
|
|||||||
github-actions:
|
github-actions:
|
||||||
patterns:
|
patterns:
|
||||||
- "*"
|
- "*"
|
||||||
|
- package-ecosystem: github-actions
|
||||||
|
directory: '/'
|
||||||
|
target-branch: "release-0.21"
|
||||||
|
schedule:
|
||||||
|
interval: monthly
|
||||||
|
groups:
|
||||||
|
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
|
name: PR targets branch
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- name: Check that the PR targets release-0.21
|
- name: Check that the PR targets release-0.23
|
||||||
if: ${{ github.base_ref != 'release-0.21' }}
|
if: ${{ github.base_ref != 'release-0.23' }}
|
||||||
run: exit 1
|
run: exit 1
|
||||||
|
|||||||
@@ -29,11 +29,11 @@ jobs:
|
|||||||
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1
|
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1
|
||||||
|
|
||||||
- name: Run E2E deployment and tests
|
- name: Run E2E deployment and tests
|
||||||
uses: submariner-io/shipyard/gh-actions/e2e@release-0.21
|
uses: submariner-io/shipyard/gh-actions/e2e@release-0.23
|
||||||
with:
|
with:
|
||||||
k8s_version: ${{ matrix.k8s_version }}
|
k8s_version: ${{ matrix.k8s_version }}
|
||||||
using: ${{ matrix.cable_driver }} ${{ matrix.globalnet }} ${{ matrix.lighthouse }}
|
using: ${{ matrix.cable_driver }} ${{ matrix.globalnet }} ${{ matrix.lighthouse }}
|
||||||
|
|
||||||
- name: Post mortem
|
- name: Post mortem
|
||||||
if: failure()
|
if: failure()
|
||||||
uses: submariner-io/shipyard/gh-actions/post-mortem@release-0.21
|
uses: submariner-io/shipyard/gh-actions/post-mortem@release-0.23
|
||||||
|
|||||||
@@ -16,8 +16,8 @@ jobs:
|
|||||||
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1
|
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1
|
||||||
|
|
||||||
- name: Run E2E deployment and tests
|
- name: Run E2E deployment and tests
|
||||||
uses: submariner-io/shipyard/gh-actions/e2e@release-0.21
|
uses: submariner-io/shipyard/gh-actions/e2e@release-0.23
|
||||||
|
|
||||||
- name: Post mortem
|
- name: Post mortem
|
||||||
if: failure()
|
if: failure()
|
||||||
uses: submariner-io/shipyard/gh-actions/post-mortem@release-0.21
|
uses: submariner-io/shipyard/gh-actions/post-mortem@release-0.23
|
||||||
|
|||||||
@@ -24,10 +24,10 @@ jobs:
|
|||||||
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1
|
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1
|
||||||
|
|
||||||
- name: Run E2E deployment and tests
|
- name: Run E2E deployment and tests
|
||||||
uses: submariner-io/shipyard/gh-actions/e2e@release-0.21
|
uses: submariner-io/shipyard/gh-actions/e2e@release-0.23
|
||||||
with:
|
with:
|
||||||
using: ${{ matrix.cable_driver }} ${{ matrix.globalnet }} ${{ matrix.lighthouse }}
|
using: ${{ matrix.cable_driver }} ${{ matrix.globalnet }} ${{ matrix.lighthouse }}
|
||||||
|
|
||||||
- name: Post mortem
|
- name: Post mortem
|
||||||
if: failure()
|
if: failure()
|
||||||
uses: submariner-io/shipyard/gh-actions/post-mortem@release-0.21
|
uses: submariner-io/shipyard/gh-actions/post-mortem@release-0.23
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ name: Release Charts
|
|||||||
on:
|
on:
|
||||||
push:
|
push:
|
||||||
branches:
|
branches:
|
||||||
- release-0.21
|
- release-0.23
|
||||||
|
|
||||||
permissions:
|
permissions:
|
||||||
contents: write
|
contents: write
|
||||||
|
|||||||
+3
-1
@@ -6,7 +6,9 @@ Makefile.dapper
|
|||||||
Makefile.shipyard
|
Makefile.shipyard
|
||||||
Dockerfile.*
|
Dockerfile.*
|
||||||
helm_repo
|
helm_repo
|
||||||
yamls
|
yamls/go.mod
|
||||||
|
yamls/go.sum
|
||||||
|
yamls/vendor
|
||||||
submariner-k8s-broker/crds/crd.yaml
|
submariner-k8s-broker/crds/crd.yaml
|
||||||
submariner-k8s-broker/templates/_role.tpl
|
submariner-k8s-broker/templates/_role.tpl
|
||||||
submariner-operator/crds/crd.yaml
|
submariner-operator/crds/crd.yaml
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
BASE_BRANCH ?= release-0.21
|
BASE_BRANCH ?= release-0.23
|
||||||
export BASE_BRANCH
|
export BASE_BRANCH
|
||||||
export HELM_REPO_LOCATION=./helm_repo
|
export HELM_REPO_LOCATION=./helm_repo
|
||||||
|
|
||||||
@@ -17,7 +17,7 @@ endif
|
|||||||
export DEPLOYTOOL = helm
|
export DEPLOYTOOL = helm
|
||||||
GH_URL=https://submariner-io.github.io/submariner-charts/charts
|
GH_URL=https://submariner-io.github.io/submariner-charts/charts
|
||||||
CHARTS_DIR=charts
|
CHARTS_DIR=charts
|
||||||
CHARTS_VERSION=0.21.3
|
CHARTS_VERSION=0.23.2
|
||||||
HELM_DOCS_VERSION=0.15.0
|
HELM_DOCS_VERSION=0.15.0
|
||||||
REPO_URL=$(shell git config remote.origin.url)
|
REPO_URL=$(shell git config remote.origin.url)
|
||||||
|
|
||||||
|
|||||||
@@ -1,21 +0,0 @@
|
|||||||
#!/usr/bin/awk -f
|
|
||||||
|
|
||||||
# Start of a file entry
|
|
||||||
/= `/ {
|
|
||||||
outfile = gensub("_yaml$", ".yaml", "1", $1)
|
|
||||||
print "Writing " outfile
|
|
||||||
firstline = substr($0, index($0, "`") + 1)
|
|
||||||
if (firstline !~ "^---")
|
|
||||||
firstline = "---\n"firstline
|
|
||||||
print firstline > outfile
|
|
||||||
next
|
|
||||||
}
|
|
||||||
|
|
||||||
/^`$/ {
|
|
||||||
outfile = ""
|
|
||||||
next
|
|
||||||
}
|
|
||||||
|
|
||||||
outfile != "" {
|
|
||||||
print >> outfile
|
|
||||||
}
|
|
||||||
+63
-46
@@ -10,81 +10,98 @@ GLOBALNET_RBAC_YAML=submariner-operator/templates/globalnet-rbac.yaml
|
|||||||
SERVICE_DISC_RBAC_YAML=submariner-operator/templates/service-discovery-rbac.yaml
|
SERVICE_DISC_RBAC_YAML=submariner-operator/templates/service-discovery-rbac.yaml
|
||||||
OPENSHIFT_MONITORING_YAML=submariner-operator/templates/openshift-monitoring-rbac.yaml
|
OPENSHIFT_MONITORING_YAML=submariner-operator/templates/openshift-monitoring-rbac.yaml
|
||||||
|
|
||||||
|
YAMLS_BASE=yamls/vendor
|
||||||
|
SUBM_CRDS=${YAMLS_BASE}/github.com/submariner-io/submariner/deploy/crds
|
||||||
|
OPERATOR_CRDS=${YAMLS_BASE}/github.com/submariner-io/submariner-operator/deploy/crds
|
||||||
|
MCS_CRDS=${YAMLS_BASE}/sigs.k8s.io/mcs-api/config/crd
|
||||||
|
BROKER=${YAMLS_BASE}/github.com/submariner-io/submariner-operator/config/broker/broker-client
|
||||||
|
RBAC_BASE=${YAMLS_BASE}/github.com/submariner-io/submariner-operator/config/rbac
|
||||||
|
OPENSHIFT=${YAMLS_BASE}/github.com/submariner-io/submariner-operator/config/openshift
|
||||||
|
|
||||||
function add_service_acct_ns() {
|
function add_service_acct_ns() {
|
||||||
sed -i '/- kind: ServiceAccount/a \ \ \ \ namespace: {{ .Release.Namespace }}' $1
|
sed -i '/- kind: ServiceAccount/a \ \ \ \ namespace: {{ .Release.Namespace }}' $1
|
||||||
}
|
}
|
||||||
|
|
||||||
mkdir -p yamls
|
|
||||||
cd yamls
|
cd yamls
|
||||||
curl -L https://raw.githubusercontent.com/submariner-io/submariner-operator/refs/heads/$1/pkg/embeddedyamls/yamls.go | ../extract-yamls
|
rm go.mod || true
|
||||||
cd -
|
go mod init
|
||||||
|
go get github.com/submariner-io/submariner-operator@$1
|
||||||
|
go mod tidy
|
||||||
|
go mod vendor
|
||||||
|
cd ..
|
||||||
|
|
||||||
# Generate the CRDs for the broker chart
|
# Generate the CRDs for the broker chart
|
||||||
mkdir -p submariner-k8s-broker/crds
|
mkdir -p submariner-k8s-broker/crds
|
||||||
cat yamls/Deploy_submariner_crds_submariner_io_endpoints.yaml \
|
cat ${SUBM_CRDS}/submariner.io_endpoints.yaml \
|
||||||
yamls/Deploy_submariner_crds_submariner_io_clusters.yaml \
|
${SUBM_CRDS}/submariner.io_clusters.yaml \
|
||||||
yamls/Deploy_submariner_crds_submariner_io_gateways.yaml \
|
${SUBM_CRDS}/submariner.io_gateways.yaml > submariner-k8s-broker/crds/crd.yaml
|
||||||
yamls/Deploy_mcsapi_crds_multicluster_x_k8s_io_serviceexports.yaml \
|
echo '---' >> submariner-k8s-broker/crds/crd.yaml
|
||||||
yamls/Deploy_mcsapi_crds_multicluster_x_k8s_io_serviceimports.yaml > submariner-k8s-broker/crds/crd.yaml
|
cat ${MCS_CRDS}/multicluster.x-k8s.io_serviceexports.yaml >> submariner-k8s-broker/crds/crd.yaml
|
||||||
|
echo '---' >> submariner-k8s-broker/crds/crd.yaml
|
||||||
|
cat ${MCS_CRDS}/multicluster.x-k8s.io_serviceimports.yaml >> submariner-k8s-broker/crds/crd.yaml
|
||||||
|
|
||||||
# Generate the client role yaml for the broker chart
|
# Generate the client role yaml for the broker chart
|
||||||
echo '{{- define "broker-role" -}}' > ${BROKER_ROLE_TPL}
|
echo '{{- define "broker-role" -}}' > ${BROKER_ROLE_TPL}
|
||||||
cat yamls/Config_broker_broker_client_role.yaml >> ${BROKER_ROLE_TPL}
|
cat ${BROKER}/role.yaml >> ${BROKER_ROLE_TPL}
|
||||||
echo '{{- end -}}' >> ${BROKER_ROLE_TPL}
|
echo '{{- end -}}' >> ${BROKER_ROLE_TPL}
|
||||||
sed -i -e 's/name:.*/name: {{ template "submariner-k8s-broker.fullname" \. }}-cluster/' ${BROKER_ROLE_TPL}
|
sed -i -e 's/name:.*/name: {{ template "submariner-k8s-broker.fullname" \. }}-cluster/' ${BROKER_ROLE_TPL}
|
||||||
|
|
||||||
# Generate the CRDs for the operator chart
|
# Generate the CRDs for the operator chart
|
||||||
mkdir -p submariner-operator/crds
|
mkdir -p submariner-operator/crds
|
||||||
cat yamls/Deploy_crds_submariner_io_submariners.yaml \
|
cat ${OPERATOR_CRDS}/submariner.io_submariners.yaml \
|
||||||
yamls/Deploy_crds_submariner_io_servicediscoveries.yaml \
|
${OPERATOR_CRDS}/submariner.io_servicediscoveries.yaml \
|
||||||
yamls/Deploy_crds_submariner_io_brokers.yaml > submariner-operator/crds/crd.yaml
|
${OPERATOR_CRDS}/submariner.io_brokers.yaml > submariner-operator/crds/crd.yaml
|
||||||
|
|
||||||
# Generate the operator RBAC yaml for the operator chart
|
# Generate the operator RBAC yaml for the operator chart
|
||||||
add_service_acct_ns yamls/Config_rbac_submariner_operator_cluster_role_binding.yaml
|
add_service_acct_ns ${RBAC_BASE}/submariner-operator/cluster_role_binding.yaml
|
||||||
cat yamls/Config_rbac_submariner_operator_service_account.yaml \
|
cat ${RBAC_BASE}/submariner-operator/service_account.yaml \
|
||||||
yamls/Config_rbac_submariner_operator_role.yaml \
|
${RBAC_BASE}/submariner-operator/role.yaml \
|
||||||
yamls/Config_rbac_submariner_operator_role_binding.yaml \
|
${RBAC_BASE}/submariner-operator/role_binding.yaml \
|
||||||
yamls/Config_rbac_submariner_operator_cluster_role.yaml \
|
${RBAC_BASE}/submariner-operator/cluster_role.yaml \
|
||||||
yamls/Config_rbac_submariner_operator_cluster_role_binding.yaml > ${OPERATOR_RBAC_YAML}
|
${RBAC_BASE}/submariner-operator/cluster_role_binding.yaml > ${OPERATOR_RBAC_YAML}
|
||||||
|
|
||||||
# Generate the gateway RBAC yaml for the operator chart
|
# Generate the gateway RBAC yaml for the operator chart
|
||||||
add_service_acct_ns yamls/Config_rbac_submariner_gateway_cluster_role_binding.yaml
|
add_service_acct_ns ${RBAC_BASE}/submariner-gateway/cluster_role_binding.yaml
|
||||||
cat yamls/Config_rbac_submariner_gateway_service_account.yaml \
|
cat ${RBAC_BASE}/submariner-gateway/service_account.yaml \
|
||||||
yamls/Config_rbac_submariner_gateway_role.yaml \
|
${RBAC_BASE}/submariner-gateway/role.yaml \
|
||||||
yamls/Config_rbac_submariner_gateway_role_binding.yaml \
|
${RBAC_BASE}/submariner-gateway/role_binding.yaml \
|
||||||
yamls/Config_rbac_submariner_gateway_cluster_role.yaml \
|
${RBAC_BASE}/submariner-gateway/cluster_role.yaml \
|
||||||
yamls/Config_rbac_submariner_gateway_cluster_role_binding.yaml > ${GATEWAY_RBAC_YAML}
|
${RBAC_BASE}/submariner-gateway/cluster_role_binding.yaml > ${GATEWAY_RBAC_YAML}
|
||||||
|
|
||||||
# Generate the routeagent RBAC yaml for the operator chart
|
# Generate the routeagent RBAC yaml for the operator chart
|
||||||
add_service_acct_ns yamls/Config_rbac_submariner_route_agent_cluster_role_binding.yaml
|
add_service_acct_ns ${RBAC_BASE}/submariner-route-agent/cluster_role_binding.yaml
|
||||||
cat yamls/Config_rbac_submariner_route_agent_service_account.yaml \
|
cat ${RBAC_BASE}/submariner-route-agent/service_account.yaml \
|
||||||
yamls/Config_rbac_submariner_route_agent_role.yaml \
|
${RBAC_BASE}/submariner-route-agent/role.yaml \
|
||||||
yamls/Config_rbac_submariner_route_agent_role_binding.yaml \
|
${RBAC_BASE}/submariner-route-agent/role_binding.yaml \
|
||||||
yamls/Config_rbac_submariner_route_agent_cluster_role.yaml \
|
${RBAC_BASE}/submariner-route-agent/cluster_role.yaml \
|
||||||
yamls/Config_rbac_submariner_route_agent_cluster_role_binding.yaml > ${ROUTE_AGENT_RBAC_YAML}
|
${RBAC_BASE}/submariner-route-agent/cluster_role_binding.yaml > ${ROUTE_AGENT_RBAC_YAML}
|
||||||
|
|
||||||
# Generate the globalnet RBAC yaml for the operator chart
|
# Generate the globalnet RBAC yaml for the operator chart
|
||||||
echo '{{- if .Values.broker.globalnet }}' > ${GLOBALNET_RBAC_YAML}
|
echo '{{- if .Values.broker.globalnet }}' > ${GLOBALNET_RBAC_YAML}
|
||||||
add_service_acct_ns yamls/Config_rbac_submariner_globalnet_cluster_role_binding.yaml
|
add_service_acct_ns ${RBAC_BASE}/submariner-globalnet/cluster_role_binding.yaml
|
||||||
cat yamls/Config_rbac_submariner_globalnet_service_account.yaml \
|
cat ${RBAC_BASE}/submariner-globalnet/service_account.yaml \
|
||||||
yamls/Config_rbac_submariner_globalnet_role.yaml \
|
${RBAC_BASE}/submariner-globalnet/role.yaml \
|
||||||
yamls/Config_rbac_submariner_globalnet_role_binding.yaml \
|
${RBAC_BASE}/submariner-globalnet/role_binding.yaml \
|
||||||
yamls/Config_rbac_submariner_globalnet_cluster_role.yaml \
|
${RBAC_BASE}/submariner-globalnet/cluster_role.yaml \
|
||||||
yamls/Config_rbac_submariner_globalnet_cluster_role_binding.yaml >> ${GLOBALNET_RBAC_YAML}
|
${RBAC_BASE}/submariner-globalnet/cluster_role_binding.yaml >> ${GLOBALNET_RBAC_YAML}
|
||||||
echo '{{- end -}}' >> ${GLOBALNET_RBAC_YAML}
|
echo '{{- end -}}' >> ${GLOBALNET_RBAC_YAML}
|
||||||
|
|
||||||
# Generate the service discovery RBAC yaml for the operator chart
|
# Generate the service discovery RBAC yaml for the operator chart
|
||||||
echo '{{- if .Values.submariner.serviceDiscovery }}' > ${SERVICE_DISC_RBAC_YAML}
|
echo '{{- if .Values.submariner.serviceDiscovery }}' > ${SERVICE_DISC_RBAC_YAML}
|
||||||
add_service_acct_ns yamls/Config_rbac_lighthouse_agent_cluster_role_binding.yaml
|
add_service_acct_ns ${RBAC_BASE}/lighthouse-agent/cluster_role_binding.yaml
|
||||||
add_service_acct_ns yamls/Config_rbac_lighthouse_coredns_cluster_role_binding.yaml
|
add_service_acct_ns ${RBAC_BASE}/lighthouse-coredns/cluster_role_binding.yaml
|
||||||
cat yamls/Config_rbac_lighthouse_agent_service_account.yaml \
|
cat ${RBAC_BASE}/lighthouse-agent/service_account.yaml \
|
||||||
yamls/Config_rbac_lighthouse_agent_cluster_role.yaml \
|
${RBAC_BASE}/lighthouse-agent/cluster_role.yaml \
|
||||||
yamls/Config_rbac_lighthouse_agent_cluster_role_binding.yaml \
|
${RBAC_BASE}/lighthouse-agent/cluster_role_binding.yaml \
|
||||||
yamls/Config_rbac_lighthouse_coredns_service_account.yaml \
|
${RBAC_BASE}/lighthouse-agent/role.yaml \
|
||||||
yamls/Config_rbac_lighthouse_coredns_cluster_role.yaml \
|
${RBAC_BASE}/lighthouse-agent/role_binding.yaml \
|
||||||
yamls/Config_rbac_lighthouse_coredns_cluster_role_binding.yaml >> ${SERVICE_DISC_RBAC_YAML}
|
${RBAC_BASE}/lighthouse-coredns/service_account.yaml \
|
||||||
|
${RBAC_BASE}/lighthouse-coredns/cluster_role.yaml \
|
||||||
|
${RBAC_BASE}/lighthouse-coredns/cluster_role_binding.yaml \
|
||||||
|
${RBAC_BASE}/lighthouse-coredns/role.yaml \
|
||||||
|
${RBAC_BASE}/lighthouse-coredns/role_binding.yaml >> ${SERVICE_DISC_RBAC_YAML}
|
||||||
echo '{{- end -}}' >> ${SERVICE_DISC_RBAC_YAML}
|
echo '{{- end -}}' >> ${SERVICE_DISC_RBAC_YAML}
|
||||||
|
|
||||||
# Generate the openshift monitoring rbac yaml for the operator chart
|
# Generate the openshift monitoring rbac yaml for the operator chart
|
||||||
cat yamls/Config_openshift_rbac_submariner_metrics_reader_role.yaml \
|
cat ${OPENSHIFT}/rbac/submariner-metrics-reader/role.yaml \
|
||||||
yamls/Config_openshift_rbac_submariner_metrics_reader_role_binding.yaml > ${OPENSHIFT_MONITORING_YAML}
|
${OPENSHIFT}/rbac/submariner-metrics-reader/role_binding.yaml > ${OPENSHIFT_MONITORING_YAML}
|
||||||
|
|||||||
@@ -28,6 +28,7 @@ Submariner enables direct networking between Pods and Services in different Kube
|
|||||||
| ipsec.forceUDPEncaps | bool | `false` | |
|
| ipsec.forceUDPEncaps | bool | `false` | |
|
||||||
| ipsec.ikePort | int | `500` | |
|
| ipsec.ikePort | int | `500` | |
|
||||||
| ipsec.natPort | int | `4500` | |
|
| ipsec.natPort | int | `4500` | |
|
||||||
|
| ipsec.pskSecret | string | `""` | Name of the Kubernetes Secret containing the IPsec PSK as field psk |
|
||||||
| ipsec.psk | string | `""` | |
|
| ipsec.psk | string | `""` | |
|
||||||
| leadership.leaseDuration | int | `10` | |
|
| leadership.leaseDuration | int | `10` | |
|
||||||
| leadership.renewDeadline | int | `5` | |
|
| leadership.renewDeadline | int | `5` | |
|
||||||
@@ -52,5 +53,6 @@ Submariner enables direct networking between Pods and Services in different Kube
|
|||||||
| submariner.images.tag | string | `"0.14.0"` | |
|
| submariner.images.tag | string | `"0.14.0"` | |
|
||||||
| submariner.natEnabled | bool | `false` | |
|
| submariner.natEnabled | bool | `false` | |
|
||||||
| submariner.serviceCidr | string | `""` | |
|
| submariner.serviceCidr | string | `""` | |
|
||||||
|
| submariner.brokerK8sSecret | string | `""` | Name of the Kubernetes Secret containing broker credentials (ca.crt, token). |
|
||||||
| submariner.serviceDiscovery | bool | `true` | |
|
| submariner.serviceDiscovery | bool | `true` | |
|
||||||
| submariner.token | string | `""` | |
|
| submariner.token | string | `""` | |
|
||||||
|
|||||||
@@ -6,15 +6,23 @@ metadata:
|
|||||||
spec:
|
spec:
|
||||||
broker: k8s
|
broker: k8s
|
||||||
brokerK8sApiServer: {{ .Values.broker.server }}
|
brokerK8sApiServer: {{ .Values.broker.server }}
|
||||||
|
{{- if .Values.submariner.brokerK8sSecret }}
|
||||||
|
brokerK8sSecret: {{ .Values.submariner.brokerK8sSecret }}
|
||||||
|
{{- else }}
|
||||||
brokerK8sApiServerToken: {{ .Values.broker.token }}
|
brokerK8sApiServerToken: {{ .Values.broker.token }}
|
||||||
brokerK8sCA: {{ .Values.broker.ca }}
|
brokerK8sCA: {{ .Values.broker.ca }}
|
||||||
|
{{- end }}
|
||||||
brokerK8sRemoteNamespace: {{ .Values.broker.namespace }}
|
brokerK8sRemoteNamespace: {{ .Values.broker.namespace }}
|
||||||
brokerK8sInsecure: {{ .Values.broker.insecure }}
|
brokerK8sInsecure: {{ .Values.broker.insecure }}
|
||||||
ceIPSecDebug: {{ .Values.ipsec.debug }}
|
ceIPSecDebug: {{ .Values.ipsec.debug }}
|
||||||
ceIPSecForceUDPEncaps: {{ .Values.ipsec.forceUDPEncaps }}
|
ceIPSecForceUDPEncaps: {{ .Values.ipsec.forceUDPEncaps }}
|
||||||
ceIPSecIKEPort: {{ .Values.ipsec.ikePort }}
|
ceIPSecIKEPort: {{ .Values.ipsec.ikePort }}
|
||||||
ceIPSecNATTPort: {{ .Values.ipsec.natPort }}
|
ceIPSecNATTPort: {{ .Values.ipsec.natPort }}
|
||||||
|
{{- if .Values.ipsec.pskSecret }}
|
||||||
|
ceIPSecPSKSecret: {{ .Values.ipsec.pskSecret }}
|
||||||
|
{{- else }}
|
||||||
ceIPSecPSK: {{ .Values.ipsec.psk }}
|
ceIPSecPSK: {{ .Values.ipsec.psk }}
|
||||||
|
{{- end }}
|
||||||
clusterCIDR: "{{ .Values.submariner.clusterCidr }}"
|
clusterCIDR: "{{ .Values.submariner.clusterCidr }}"
|
||||||
clusterID: {{ .Values.submariner.clusterId }}
|
clusterID: {{ .Values.submariner.clusterId }}
|
||||||
colorCodes: {{ .Values.submariner.colorCodes }}
|
colorCodes: {{ .Values.submariner.colorCodes }}
|
||||||
|
|||||||
@@ -7,6 +7,7 @@ submariner:
|
|||||||
globalCidr: ""
|
globalCidr: ""
|
||||||
clustersetIpCidr: ""
|
clustersetIpCidr: ""
|
||||||
clustersetIpEnabled: false
|
clustersetIpEnabled: false
|
||||||
|
brokerK8sSecret: ""
|
||||||
loadBalancerEnabled: false
|
loadBalancerEnabled: false
|
||||||
natEnabled: false
|
natEnabled: false
|
||||||
colorCodes: blue
|
colorCodes: blue
|
||||||
@@ -28,6 +29,7 @@ broker:
|
|||||||
images: {}
|
images: {}
|
||||||
ipsec:
|
ipsec:
|
||||||
psk: ""
|
psk: ""
|
||||||
|
pskSecret: ""
|
||||||
debug: false
|
debug: false
|
||||||
forceUDPEncaps: false
|
forceUDPEncaps: false
|
||||||
ikePort: 500
|
ikePort: 500
|
||||||
|
|||||||
@@ -0,0 +1,38 @@
|
|||||||
|
//go:build yamls
|
||||||
|
|
||||||
|
/*
|
||||||
|
SPDX-License-Identifier: Apache-2.0
|
||||||
|
|
||||||
|
Copyright Contributors to the Submariner project.
|
||||||
|
|
||||||
|
Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
you may not use this file except in compliance with the License.
|
||||||
|
You may obtain a copy of the License at
|
||||||
|
|
||||||
|
http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
|
||||||
|
Unless required by applicable law or agreed to in writing, software
|
||||||
|
distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
See the License for the specific language governing permissions and
|
||||||
|
limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
// Place any runtime dependencies as imports in this file.
|
||||||
|
// Go modules will be forced to download and install them.
|
||||||
|
|
||||||
|
package yamls
|
||||||
|
|
||||||
|
import (
|
||||||
|
_ "github.com/submariner-io/submariner-operator/config/broker/broker-client"
|
||||||
|
_ "github.com/submariner-io/submariner-operator/config/openshift/rbac/submariner-metrics-reader"
|
||||||
|
_ "github.com/submariner-io/submariner-operator/config/rbac/submariner-gateway"
|
||||||
|
_ "github.com/submariner-io/submariner-operator/config/rbac/submariner-globalnet"
|
||||||
|
_ "github.com/submariner-io/submariner-operator/config/rbac/submariner-operator"
|
||||||
|
_ "github.com/submariner-io/submariner-operator/config/rbac/submariner-route-agent"
|
||||||
|
_ "github.com/submariner-io/submariner-operator/config/rbac/lighthouse-agent"
|
||||||
|
_ "github.com/submariner-io/submariner-operator/config/rbac/lighthouse-coredns"
|
||||||
|
_ "github.com/submariner-io/submariner-operator/deploy/crds"
|
||||||
|
_ "github.com/submariner-io/submariner/deploy/crds"
|
||||||
|
_ "sigs.k8s.io/mcs-api/config/crd"
|
||||||
|
)
|
||||||
Reference in New Issue
Block a user