mirror of
https://github.com/submariner-io/submariner-charts.git
synced 2026-09-23 11:20:36 +00:00
Compare commits
1
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 Automated Release
|
33cb49c54e |
@@ -1,17 +0,0 @@
|
||||
---
|
||||
version: 2
|
||||
updates:
|
||||
- package-ecosystem: github-actions
|
||||
directory: '/'
|
||||
schedule:
|
||||
interval: weekly
|
||||
- package-ecosystem: github-actions
|
||||
directory: '/'
|
||||
target-branch: "release-0.12"
|
||||
schedule:
|
||||
interval: weekly
|
||||
- package-ecosystem: github-actions
|
||||
directory: '/'
|
||||
target-branch: "release-0.13"
|
||||
schedule:
|
||||
interval: weekly
|
||||
@@ -4,13 +4,11 @@ name: Branch Checks
|
||||
on:
|
||||
pull_request:
|
||||
|
||||
permissions: {}
|
||||
|
||||
jobs:
|
||||
target_branch:
|
||||
name: PR targets branch
|
||||
target_devel:
|
||||
name: PR targets release-0.10
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Check that the PR targets release-0.14
|
||||
if: ${{ github.base_ref != 'release-0.14' }}
|
||||
- name: Check that the PR targets release-0.10
|
||||
if: ${{ github.base_ref != 'release-0.10' }}
|
||||
run: exit 1
|
||||
|
||||
@@ -19,18 +19,12 @@ on:
|
||||
schedule:
|
||||
- cron: '0 0/6 * * *' # every 6 hours
|
||||
|
||||
permissions:
|
||||
issues: write
|
||||
pull-requests: write
|
||||
statuses: write
|
||||
|
||||
jobs:
|
||||
check:
|
||||
name: Check Dependencies
|
||||
if: github.repository_owner == 'submariner-io'
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: z0al/dependent-issues@0fae07162bc9e0d8e116a133bd03686eed6efa21
|
||||
- uses: z0al/dependent-issues@70a1b2d4ee1cdc743af33498bd0204123953a887
|
||||
env:
|
||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
with:
|
||||
|
||||
@@ -5,8 +5,6 @@ on:
|
||||
pull_request:
|
||||
types: [labeled, opened, synchronize, reopened]
|
||||
|
||||
permissions: {}
|
||||
|
||||
jobs:
|
||||
e2e:
|
||||
name: E2E
|
||||
@@ -18,22 +16,22 @@ jobs:
|
||||
matrix:
|
||||
cable_driver: ['libreswan', 'wireguard', 'vxlan']
|
||||
globalnet: ['', 'globalnet']
|
||||
k8s_version: ['1.25']
|
||||
k8s_version: ['1.17']
|
||||
lighthouse: ['', 'lighthouse']
|
||||
include:
|
||||
- k8s_version: '1.22'
|
||||
- k8s_version: '1.23'
|
||||
- k8s_version: '1.24'
|
||||
- k8s_version: '1.18'
|
||||
- k8s_version: '1.19'
|
||||
- k8s_version: '1.20'
|
||||
steps:
|
||||
- name: Check out the repository
|
||||
uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8
|
||||
uses: actions/checkout@v2
|
||||
|
||||
- name: Run E2E deployment and tests
|
||||
uses: submariner-io/shipyard/gh-actions/e2e@release-0.14
|
||||
uses: submariner-io/shipyard/gh-actions/e2e@release-0.10
|
||||
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.14
|
||||
uses: submariner-io/shipyard/gh-actions/post-mortem@release-0.10
|
||||
|
||||
@@ -4,8 +4,6 @@ name: End to End Default
|
||||
on:
|
||||
pull_request:
|
||||
|
||||
permissions: {}
|
||||
|
||||
jobs:
|
||||
e2e:
|
||||
name: E2E
|
||||
@@ -13,11 +11,11 @@ jobs:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Check out the repository
|
||||
uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8
|
||||
uses: actions/checkout@v2
|
||||
|
||||
- name: Run E2E deployment and tests
|
||||
uses: submariner-io/shipyard/gh-actions/e2e@release-0.14
|
||||
uses: submariner-io/shipyard/gh-actions/e2e@release-0.10
|
||||
|
||||
- name: Post mortem
|
||||
if: failure()
|
||||
uses: submariner-io/shipyard/gh-actions/post-mortem@release-0.14
|
||||
uses: submariner-io/shipyard/gh-actions/post-mortem@release-0.10
|
||||
|
||||
@@ -5,8 +5,6 @@ on:
|
||||
schedule:
|
||||
- cron: "0 0 * * *"
|
||||
|
||||
permissions: {}
|
||||
|
||||
jobs:
|
||||
e2e:
|
||||
name: E2E
|
||||
@@ -21,13 +19,13 @@ jobs:
|
||||
lighthouse: ['', 'lighthouse']
|
||||
steps:
|
||||
- name: Check out the repository
|
||||
uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8
|
||||
uses: actions/checkout@v2
|
||||
|
||||
- name: Run E2E deployment and tests
|
||||
uses: submariner-io/shipyard/gh-actions/e2e@release-0.14
|
||||
uses: submariner-io/shipyard/gh-actions/e2e@release-0.10
|
||||
with:
|
||||
using: ${{ matrix.cable_driver }} ${{ matrix.globalnet }} ${{ matrix.lighthouse }}
|
||||
|
||||
- name: Post mortem
|
||||
if: failure()
|
||||
uses: submariner-io/shipyard/gh-actions/post-mortem@release-0.14
|
||||
uses: submariner-io/shipyard/gh-actions/post-mortem@release-0.10
|
||||
|
||||
@@ -4,8 +4,6 @@ name: Linting
|
||||
on:
|
||||
pull_request:
|
||||
|
||||
permissions: {}
|
||||
|
||||
jobs:
|
||||
apply-suggestions-commits:
|
||||
name: 'No "Apply suggestions from code review" Commits'
|
||||
@@ -13,45 +11,37 @@ jobs:
|
||||
steps:
|
||||
- name: Get PR commits
|
||||
id: 'get-pr-commits'
|
||||
uses: tim-actions/get-pr-commits@c64db31d359214d244884dd68f971a110b29ab83
|
||||
uses: tim-actions/get-pr-commits@v1.1.0
|
||||
with:
|
||||
token: ${{ secrets.GITHUB_TOKEN }}
|
||||
|
||||
- name: 'Verify no "Apply suggestions from code review" commits'
|
||||
uses: tim-actions/commit-message-checker-with-regex@d6d9770051dd6460679d1cab1dcaa8cffc5c2bbd
|
||||
uses: tim-actions/commit-message-checker-with-regex@v0.3.1
|
||||
with:
|
||||
commits: ${{ steps.get-pr-commits.outputs.commits }}
|
||||
pattern: '^(?!.*(apply suggestions from code review))'
|
||||
flags: 'i'
|
||||
error: 'Commits addressing code review feedback should typically be squashed into the commits under review'
|
||||
|
||||
- name: 'Verify no "fixup!" commits'
|
||||
uses: tim-actions/commit-message-checker-with-regex@d6d9770051dd6460679d1cab1dcaa8cffc5c2bbd
|
||||
with:
|
||||
commits: ${{ steps.get-pr-commits.outputs.commits }}
|
||||
pattern: '^(?!fixup!)'
|
||||
flags: 'i'
|
||||
error: 'Fixup commits should be squashed into the commits under review'
|
||||
|
||||
chart-testing:
|
||||
name: Helm Chart Linting
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Check out the repository
|
||||
uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8
|
||||
uses: actions/checkout@v2
|
||||
|
||||
- name: Set up Helm
|
||||
uses: azure/setup-helm@b5b231a831f96336bbfeccc1329990f0005c5bb1
|
||||
uses: azure/setup-helm@v1
|
||||
with:
|
||||
version: v3.6.0
|
||||
|
||||
- name: Set up Python
|
||||
uses: actions/setup-python@13ae5bb136fac2878aff31522b9efb785519f984
|
||||
uses: actions/setup-python@v2
|
||||
with:
|
||||
python-version: '3.x'
|
||||
|
||||
- name: Set up helm/chart-testing
|
||||
uses: helm/chart-testing-action@afea100a513515fbd68b0e72a7bb0ae34cb62aec
|
||||
uses: helm/chart-testing-action@v2.1.0
|
||||
|
||||
- name: Run helm/chart-testing (lint)
|
||||
run: ct lint --config ct.yaml
|
||||
@@ -61,7 +51,7 @@ jobs:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Check out the repository
|
||||
uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8
|
||||
uses: actions/checkout@v2
|
||||
with:
|
||||
fetch-depth: 0
|
||||
- name: Run gitlint
|
||||
@@ -72,7 +62,7 @@ jobs:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Check out the repository
|
||||
uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8
|
||||
uses: actions/checkout@v2
|
||||
|
||||
- name: Run helm-docs and verify docs are up-to-date
|
||||
run: make helm-docs
|
||||
@@ -82,10 +72,10 @@ jobs:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Check out the repository
|
||||
uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8
|
||||
uses: actions/checkout@v2
|
||||
|
||||
- name: Run markdown-link-check
|
||||
uses: gaurav-nelson/github-action-markdown-link-check@228fbf4ffb2a86a65314866e9b2322b519fd885f
|
||||
uses: gaurav-nelson/github-action-markdown-link-check@v1
|
||||
with:
|
||||
config-file: ".markdownlinkcheck.json"
|
||||
check-modified-files-only: "yes"
|
||||
@@ -96,7 +86,7 @@ jobs:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Check out the repository
|
||||
uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8
|
||||
uses: actions/checkout@v2
|
||||
- name: Run markdownlint
|
||||
run: make markdownlint
|
||||
|
||||
@@ -105,6 +95,9 @@ jobs:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Check out the repository
|
||||
uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8
|
||||
uses: actions/checkout@v2
|
||||
- name: Run yamllint
|
||||
run: make yamllint
|
||||
uses: ibiqlik/action-yamllint@v1
|
||||
with:
|
||||
file_or_dir: submariner-k8s-broker/Chart.yaml submariner-k8s-broker/values.yaml submariner-operator/Chart.yaml submariner-operator/values.yaml
|
||||
config_file: .yamllint.yml
|
||||
|
||||
@@ -5,27 +5,23 @@ on:
|
||||
schedule:
|
||||
- cron: "0 0 * * 0"
|
||||
|
||||
permissions: {}
|
||||
|
||||
jobs:
|
||||
markdown-link-check-periodic:
|
||||
name: Markdown Links (all files)
|
||||
if: github.repository_owner == 'submariner-io'
|
||||
runs-on: ubuntu-latest
|
||||
permissions:
|
||||
issues: write
|
||||
steps:
|
||||
- name: Check out the repository
|
||||
uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8
|
||||
uses: actions/checkout@v2
|
||||
|
||||
- name: Run markdown-link-check
|
||||
uses: gaurav-nelson/github-action-markdown-link-check@228fbf4ffb2a86a65314866e9b2322b519fd885f
|
||||
uses: gaurav-nelson/github-action-markdown-link-check@v1
|
||||
with:
|
||||
config-file: ".markdownlinkcheck.json"
|
||||
|
||||
- name: Raise an Issue to report broken links
|
||||
if: ${{ failure() }}
|
||||
uses: peter-evans/create-issue-from-file@433e51abf769039ee20ba1293a088ca19d573b7f
|
||||
uses: peter-evans/create-issue-from-file@v2.3.2
|
||||
with:
|
||||
title: Broken link detected by CI
|
||||
content-filepath: .github/ISSUE_TEMPLATE/broken-link.md
|
||||
|
||||
@@ -4,10 +4,7 @@ name: Release Charts
|
||||
on:
|
||||
push:
|
||||
branches:
|
||||
- release-0.14
|
||||
|
||||
permissions:
|
||||
contents: write
|
||||
- release-0.10
|
||||
|
||||
jobs:
|
||||
release:
|
||||
@@ -16,7 +13,7 @@ jobs:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8
|
||||
uses: actions/checkout@v2
|
||||
with:
|
||||
fetch-depth: 0
|
||||
|
||||
|
||||
@@ -3,4 +3,3 @@
|
||||
.shflags
|
||||
*.tgz
|
||||
Makefile.dapper
|
||||
Dockerfile.*
|
||||
|
||||
@@ -1,8 +1,5 @@
|
||||
{
|
||||
"ignorePatterns": [
|
||||
{
|
||||
"pattern": "^https://docs.github.com"
|
||||
},
|
||||
{
|
||||
"pattern": "^https://github.com/\\S+/\\S+/(issues|pull)/[0-9]+"
|
||||
},
|
||||
|
||||
@@ -1,7 +0,0 @@
|
||||
---
|
||||
cni: ovn
|
||||
submariner: true
|
||||
nodes: control-plane
|
||||
clusters:
|
||||
cluster1:
|
||||
cluster2:
|
||||
@@ -1,6 +0,0 @@
|
||||
---
|
||||
submariner: true
|
||||
nodes: control-plane
|
||||
clusters:
|
||||
cluster1:
|
||||
cluster2:
|
||||
@@ -1,4 +1,3 @@
|
||||
---
|
||||
label-approved:
|
||||
approvals: 2
|
||||
label: ready-to-test
|
||||
|
||||
+11
-11
@@ -1,15 +1,15 @@
|
||||
---
|
||||
extends: default
|
||||
|
||||
rules:
|
||||
comments: disable
|
||||
comments-indentation: disable
|
||||
line-length:
|
||||
max: 140
|
||||
# Allow standard GHA syntax for "on: *"
|
||||
truthy:
|
||||
ignore: '.github/workflows/*.yml'
|
||||
|
||||
ignore: |
|
||||
/submariner-k8s-broker/crds
|
||||
/submariner-operator/crds
|
||||
/submariner-k8s-broker/templates
|
||||
/submariner-operator/templates
|
||||
max: 150
|
||||
braces:
|
||||
min-spaces-inside: 0
|
||||
max-spaces-inside: 0
|
||||
brackets:
|
||||
min-spaces-inside: 0
|
||||
max-spaces-inside: 0
|
||||
indentation:
|
||||
indent-sequences: consistent
|
||||
+1
-3
@@ -1,3 +1 @@
|
||||
# Auto-generated, do not edit; see CODEOWNERS.in
|
||||
* @Oats87 @skitt @sridhargaddam @tpantelis
|
||||
*.md @dfarrell07 @Oats87 @skitt @sridhargaddam @tpantelis
|
||||
* @mangelajo @Oats87 @skitt @tpantelis
|
||||
|
||||
@@ -1,5 +0,0 @@
|
||||
@dfarrell07 *.md
|
||||
@Oats87 *
|
||||
@skitt *
|
||||
@sridhargaddam *
|
||||
@tpantelis *
|
||||
@@ -0,0 +1,16 @@
|
||||
ARG BASE_BRANCH
|
||||
FROM quay.io/submariner/shipyard-dapper-base:${BASE_BRANCH}
|
||||
|
||||
ARG DAPPER_HOST_ARCH
|
||||
ENV HOST_ARCH=${DAPPER_HOST_ARCH} ARCH=${DAPPER_HOST_ARCH} \
|
||||
DAPPER_ENV="REPO TAG QUAY_USERNAME QUAY_PASSWORD GITHUB_SHA MAKEFLAGS CLUSTERS_ARGS DEPLOY_ARGS E2E_ARGS RELEASE_ARGS" \
|
||||
DAPPER_SOURCE=/go/src/github.com/submariner-io/submariner-charts DAPPER_DOCKER_SOCKET=true
|
||||
ENV DAPPER_OUTPUT=${DAPPER_SOURCE}/output PATH=${DAPPER_SOURCE}/bin/:${PATH}
|
||||
|
||||
WORKDIR ${DAPPER_SOURCE}
|
||||
|
||||
# Override the Helm deployment scripts
|
||||
COPY deploy_helm /opt/shipyard/scripts/lib/
|
||||
|
||||
ENTRYPOINT ["/opt/shipyard/scripts/entry"]
|
||||
CMD ["sh"]
|
||||
@@ -1,27 +1,39 @@
|
||||
BASE_BRANCH ?= release-0.14
|
||||
BASE_BRANCH ?= release-0.10
|
||||
export BASE_BRANCH
|
||||
export HELM_REPO_LOCATION=.
|
||||
|
||||
ifneq (,$(DAPPER_HOST_ARCH))
|
||||
|
||||
# Running in Dapper
|
||||
|
||||
PRELOAD_IMAGES := submariner-gateway submariner-operator submariner-route-agent lighthouse-agent lighthouse-coredns
|
||||
|
||||
include $(SHIPYARD_DIR)/Makefile.inc
|
||||
|
||||
CLUSTER_SETTINGS_FLAG = --cluster_settings $(DAPPER_SOURCE)/cluster_settings
|
||||
ifneq (,$(filter ovn,$(_using)))
|
||||
export SETTINGS = $(DAPPER_SOURCE)/.shipyard.e2e.ovn.yml
|
||||
CLUSTER_SETTINGS_FLAG = --cluster_settings $(DAPPER_SOURCE)/cluster_settings.ovn
|
||||
else
|
||||
export SETTINGS = $(DAPPER_SOURCE)/.shipyard.e2e.yml
|
||||
CLUSTER_SETTINGS_FLAG = --cluster_settings $(DAPPER_SOURCE)/cluster_settings
|
||||
endif
|
||||
|
||||
export DEPLOYTOOL = helm
|
||||
override CLUSTERS_ARGS += $(CLUSTER_SETTINGS_FLAG)
|
||||
override DEPLOY_ARGS += $(CLUSTER_SETTINGS_FLAG) --deploytool helm
|
||||
export DEPLOY_ARGS
|
||||
GH_URL=https://submariner-io.github.io/submariner-charts/charts
|
||||
CHARTS_DIR=charts
|
||||
CHARTS_VERSION=0.14.0-m1
|
||||
CHARTS_VERSION=0.7.0
|
||||
HELM_DOCS_VERSION=0.15.0
|
||||
REPO_URL=$(shell git config remote.origin.url)
|
||||
SUBCTL_VERSION=$(CHARTS_VERSION)
|
||||
export SUBCTL_VERSION
|
||||
|
||||
# Process extra flags from the `using=a,b,c` optional flag
|
||||
|
||||
ifneq (,$(filter lighthouse,$(_using)))
|
||||
override DEPLOY_ARGS += --service_discovery
|
||||
endif
|
||||
|
||||
ifneq (,$(filter globalnet,$(_using)))
|
||||
override DEPLOY_ARGS += --globalnet
|
||||
endif
|
||||
|
||||
# Targets to make
|
||||
|
||||
|
||||
@@ -60,4 +60,4 @@ working correctly.
|
||||
[Helm]: https://helm.sh/docs/using_helm/#installing-helm
|
||||
[Docker]: https://docs.docker.com/install/
|
||||
[Podman]: https://podman.io/getting-started/installation
|
||||
[Create a fork]: https://docs.github.com/en/get-started/quickstart/fork-a-repo
|
||||
[Create a fork]: https://help.github.com/en/articles/fork-a-repo
|
||||
|
||||
@@ -0,0 +1,10 @@
|
||||
. "${SCRIPTS_DIR}"/lib/source_only
|
||||
|
||||
# We need a minimal setup to verify the deployment works
|
||||
clusters=('cluster1' 'cluster2')
|
||||
cluster_nodes['cluster1']="control-plane worker"
|
||||
cluster_nodes['cluster2']="control-plane worker"
|
||||
|
||||
cluster_cni=( ['cluster1']="weave" ['cluster2']="weave" )
|
||||
|
||||
cluster_subm=( ['cluster1']="true" ['cluster2']="true" )
|
||||
@@ -0,0 +1,10 @@
|
||||
. "${SCRIPTS_DIR}"/lib/source_only
|
||||
|
||||
# We need a minimal setup to verify the deployment works
|
||||
clusters=('cluster1' 'cluster2')
|
||||
cluster_nodes['cluster1']="control-plane worker worker"
|
||||
cluster_nodes['cluster2']="control-plane worker worker"
|
||||
|
||||
cluster_cni=( ['cluster1']="ovn" ['cluster2']="ovn" )
|
||||
|
||||
cluster_subm=( ['cluster1']="true" ['cluster2']="true" )
|
||||
+76
@@ -0,0 +1,76 @@
|
||||
# shellcheck shell=bash
|
||||
# shellcheck source=scripts/shared/lib/source_only
|
||||
. "${BASH_SOURCE%/*}"/source_only
|
||||
|
||||
### Constants ###
|
||||
|
||||
readonly SUBMARINER_BROKER_NS=submariner-k8s-broker
|
||||
readonly SUBMARINER_PSK=$(LC_CTYPE=C tr -dc 'a-zA-Z0-9' < /dev/urandom | fold -w 64 | head -n 1)
|
||||
|
||||
### Functions ###
|
||||
|
||||
function deploytool_prereqs() {
|
||||
helm version
|
||||
}
|
||||
|
||||
function setup_broker() {
|
||||
if kubectl get crd clusters.submariner.io > /dev/null 2>&1; then
|
||||
echo "Submariner CRDs already exist, skipping broker creation..."
|
||||
else
|
||||
echo "Installing submariner broker..."
|
||||
# shellcheck disable=SC2086 # Split on purpose
|
||||
helm install "${SUBMARINER_BROKER_NS}" ./submariner-k8s-broker \
|
||||
--create-namespace \
|
||||
--kube-context "${cluster}" \
|
||||
--namespace "${SUBMARINER_BROKER_NS}" \
|
||||
${deploytool_broker_args}
|
||||
fi
|
||||
|
||||
submariner_broker_url=$(kubectl -n default get endpoints kubernetes -o jsonpath="{.subsets[0].addresses[0].ip}:{.subsets[0].ports[?(@.name=='https')].port}")
|
||||
submariner_broker_ca=$(kubectl -n "${SUBMARINER_BROKER_NS}" get secrets -o jsonpath="{.items[?(@.metadata.annotations['kubernetes\.io/service-account\.name']=='${SUBMARINER_BROKER_NS}-client')].data['ca\.crt']}")
|
||||
submariner_broker_token=$(kubectl -n "${SUBMARINER_BROKER_NS}" get secrets -o jsonpath="{.items[?(@.metadata.annotations['kubernetes\.io/service-account\.name']=='${SUBMARINER_BROKER_NS}-client')].data.token}"|base64 --decode)
|
||||
}
|
||||
|
||||
function helm_install_subm() {
|
||||
local crd_create=false
|
||||
[[ "${cluster}" = "${broker}" ]] || crd_create=true
|
||||
|
||||
if kubectl wait --for=condition=Ready pods -l app=submariner-operator -n "${SUBM_NS}" --timeout=60s > /dev/null 2>&1; then
|
||||
echo "Submariner already installed, skipping installation..."
|
||||
return
|
||||
fi
|
||||
|
||||
echo "Installing Submariner..."
|
||||
# shellcheck disable=SC2086 # Split on purpose
|
||||
helm --kube-context "${cluster}" install submariner-operator \
|
||||
./submariner-operator \
|
||||
--create-namespace \
|
||||
--namespace "${SUBM_NS}" \
|
||||
--set ipsec.psk="${SUBMARINER_PSK}" \
|
||||
--set broker.server="${submariner_broker_url}" \
|
||||
--set broker.token="${submariner_broker_token}" \
|
||||
--set broker.namespace="${SUBMARINER_BROKER_NS}" \
|
||||
--set broker.ca="${submariner_broker_ca}" \
|
||||
--set broker.globalnet="${globalnet}" \
|
||||
--set submariner.serviceDiscovery="${service_discovery}" \
|
||||
--set submariner.cableDriver="${cable_driver}" \
|
||||
--set submariner.clusterId="${cluster}" \
|
||||
--set submariner.clusterCidr="${cluster_CIDRs[$cluster]}" \
|
||||
--set submariner.serviceCidr="${service_CIDRs[$cluster]}" \
|
||||
--set submariner.globalCidr="${global_CIDRs[$cluster]}" \
|
||||
--set serviceAccounts.globalnet.create="${globalnet}" \
|
||||
--set serviceAccounts.lighthouseAgent.create="${service_discovery}" \
|
||||
--set serviceAccounts.lighthouseCoreDns.create="${service_discovery}" \
|
||||
--set submariner.natEnabled="false" \
|
||||
--set operator.image.repository="localhost:5000/submariner-operator" \
|
||||
--set operator.image.tag="local" \
|
||||
--set operator.image.pullPolicy="IfNotPresent" \
|
||||
--set submariner.images.repository="localhost:5000" \
|
||||
--set submariner.images.tag="local" \
|
||||
--set brokercrds.create="${crd_create}" \
|
||||
${deploytool_submariner_args}
|
||||
}
|
||||
|
||||
function install_subm_all_clusters() {
|
||||
run_subm_clusters helm_install_subm
|
||||
}
|
||||
@@ -1,8 +1,8 @@
|
||||
---
|
||||
name: submariner-k8s-broker
|
||||
version: 0.14.0-m1
|
||||
version: 0.6.0
|
||||
apiVersion: v2
|
||||
appVersion: 0.14.0-m1
|
||||
appVersion: 0.6.0
|
||||
description: Submariner Kubernetes Broker
|
||||
keywords:
|
||||
home: https://submariner-io.github.io/
|
||||
|
||||
@@ -1,5 +1,7 @@
|
||||
# submariner-k8s-broker
|
||||
|
||||
 
|
||||
|
||||
Submariner Kubernetes Broker
|
||||
|
||||
**Homepage:** <https://submariner-io.github.io/>
|
||||
|
||||
@@ -1,333 +1,97 @@
|
||||
apiVersion: apiextensions.k8s.io/v1
|
||||
apiVersion: apiextensions.k8s.io/v1beta1
|
||||
kind: CustomResourceDefinition
|
||||
metadata:
|
||||
name: clusters.submariner.io
|
||||
spec:
|
||||
group: submariner.io
|
||||
version: v1
|
||||
names:
|
||||
kind: Cluster
|
||||
listKind: ClusterList
|
||||
plural: clusters
|
||||
singular: cluster
|
||||
scope: Namespaced
|
||||
versions:
|
||||
- name: v1
|
||||
schema:
|
||||
openAPIV3Schema:
|
||||
properties:
|
||||
apiVersion:
|
||||
description: 'APIVersion defines the versioned schema of this representation
|
||||
of an object. Servers should convert recognized schemas to the latest
|
||||
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
|
||||
type: string
|
||||
kind:
|
||||
description: 'Kind is a string value representing the REST resource this
|
||||
object represents. Servers may infer this from the endpoint the client
|
||||
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
|
||||
type: string
|
||||
metadata:
|
||||
type: object
|
||||
spec:
|
||||
properties:
|
||||
cluster_cidr:
|
||||
items:
|
||||
type: string
|
||||
type: array
|
||||
cluster_id:
|
||||
type: string
|
||||
color_codes:
|
||||
items:
|
||||
type: string
|
||||
type: array
|
||||
global_cidr:
|
||||
items:
|
||||
type: string
|
||||
type: array
|
||||
service_cidr:
|
||||
items:
|
||||
type: string
|
||||
type: array
|
||||
required:
|
||||
- cluster_cidr
|
||||
- cluster_id
|
||||
- color_codes
|
||||
- global_cidr
|
||||
- service_cidr
|
||||
type: object
|
||||
required:
|
||||
- spec
|
||||
type: object
|
||||
served: true
|
||||
storage: true
|
||||
status:
|
||||
acceptedNames:
|
||||
kind: ""
|
||||
plural: ""
|
||||
conditions: []
|
||||
storedVersions: []
|
||||
---
|
||||
apiVersion: apiextensions.k8s.io/v1
|
||||
apiVersion: apiextensions.k8s.io/v1beta1
|
||||
kind: CustomResourceDefinition
|
||||
metadata:
|
||||
name: endpoints.submariner.io
|
||||
spec:
|
||||
group: submariner.io
|
||||
version: v1
|
||||
names:
|
||||
kind: Endpoint
|
||||
listKind: EndpointList
|
||||
plural: endpoints
|
||||
singular: endpoint
|
||||
scope: Namespaced
|
||||
versions:
|
||||
- name: v1
|
||||
schema:
|
||||
openAPIV3Schema:
|
||||
properties:
|
||||
apiVersion:
|
||||
description: 'APIVersion defines the versioned schema of this representation
|
||||
of an object. Servers should convert recognized schemas to the latest
|
||||
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
|
||||
type: string
|
||||
kind:
|
||||
description: 'Kind is a string value representing the REST resource this
|
||||
object represents. Servers may infer this from the endpoint the client
|
||||
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
|
||||
type: string
|
||||
metadata:
|
||||
type: object
|
||||
spec:
|
||||
properties:
|
||||
backend:
|
||||
type: string
|
||||
backend_config:
|
||||
additionalProperties:
|
||||
type: string
|
||||
type: object
|
||||
cable_name:
|
||||
type: string
|
||||
cluster_id:
|
||||
type: string
|
||||
healthCheckIP:
|
||||
type: string
|
||||
hostname:
|
||||
type: string
|
||||
nat_enabled:
|
||||
type: boolean
|
||||
private_ip:
|
||||
type: string
|
||||
public_ip:
|
||||
type: string
|
||||
subnets:
|
||||
items:
|
||||
type: string
|
||||
type: array
|
||||
required:
|
||||
- backend
|
||||
- cable_name
|
||||
- cluster_id
|
||||
- hostname
|
||||
- nat_enabled
|
||||
- private_ip
|
||||
- public_ip
|
||||
- subnets
|
||||
type: object
|
||||
required:
|
||||
- spec
|
||||
type: object
|
||||
served: true
|
||||
storage: true
|
||||
status:
|
||||
acceptedNames:
|
||||
kind: ""
|
||||
plural: ""
|
||||
conditions: []
|
||||
storedVersions: []
|
||||
---
|
||||
apiVersion: apiextensions.k8s.io/v1
|
||||
apiVersion: apiextensions.k8s.io/v1beta1
|
||||
kind: CustomResourceDefinition
|
||||
metadata:
|
||||
name: gateways.submariner.io
|
||||
spec:
|
||||
group: submariner.io
|
||||
version: v1
|
||||
names:
|
||||
kind: Gateway
|
||||
listKind: GatewayList
|
||||
plural: gateways
|
||||
singular: gateway
|
||||
scope: Namespaced
|
||||
versions:
|
||||
- additionalPrinterColumns:
|
||||
- description: High availability status of the Gateway
|
||||
jsonPath: .status.haStatus
|
||||
name: HA Status
|
||||
additionalPrinterColumns:
|
||||
- name: ha-status
|
||||
type: string
|
||||
name: v1
|
||||
schema:
|
||||
description: High Availability Status of the Gateway
|
||||
JSONPath: .status.haStatus
|
||||
---
|
||||
apiVersion: apiextensions.k8s.io/v1beta1
|
||||
kind: CustomResourceDefinition
|
||||
metadata:
|
||||
name: multiclusterservices.lighthouse.submariner.io
|
||||
spec:
|
||||
group: lighthouse.submariner.io
|
||||
version: v1
|
||||
names:
|
||||
kind: MultiClusterService
|
||||
plural: multiclusterservices
|
||||
singular: multiclusterservice
|
||||
scope: Namespaced
|
||||
validation:
|
||||
openAPIV3Schema:
|
||||
properties:
|
||||
apiVersion:
|
||||
description: 'APIVersion defines the versioned schema of this representation
|
||||
of an object. Servers should convert recognized schemas to the latest
|
||||
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
|
||||
type: string
|
||||
kind:
|
||||
description: 'Kind is a string value representing the REST resource this
|
||||
object represents. Servers may infer this from the endpoint the client
|
||||
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
|
||||
type: string
|
||||
metadata:
|
||||
type: object
|
||||
status:
|
||||
spec:
|
||||
properties:
|
||||
connections:
|
||||
items:
|
||||
clusterServiceInfo:
|
||||
properties:
|
||||
endpoint:
|
||||
properties:
|
||||
backend:
|
||||
type: string
|
||||
backend_config:
|
||||
additionalProperties:
|
||||
type: string
|
||||
type: object
|
||||
cable_name:
|
||||
type: string
|
||||
cluster_id:
|
||||
type: string
|
||||
healthCheckIP:
|
||||
type: string
|
||||
hostname:
|
||||
type: string
|
||||
nat_enabled:
|
||||
type: boolean
|
||||
private_ip:
|
||||
type: string
|
||||
public_ip:
|
||||
type: string
|
||||
subnets:
|
||||
items:
|
||||
type: string
|
||||
type: array
|
||||
required:
|
||||
- backend
|
||||
- cable_name
|
||||
- cluster_id
|
||||
- hostname
|
||||
- nat_enabled
|
||||
- private_ip
|
||||
- public_ip
|
||||
- subnets
|
||||
type: object
|
||||
latency:
|
||||
description: LatencySpec describes the round trip time information
|
||||
in nanoseconds for a packet between the gateway pods of two
|
||||
clusters.
|
||||
properties:
|
||||
averageRTT:
|
||||
format: int64
|
||||
type: integer
|
||||
lastRTT:
|
||||
description: TODO This shall be deleted once the operator
|
||||
is using the latest. Using Optional to avoid validation
|
||||
errors when this field is not used.
|
||||
format: int64
|
||||
type: integer
|
||||
maxRTT:
|
||||
format: int64
|
||||
type: integer
|
||||
minRTT:
|
||||
format: int64
|
||||
type: integer
|
||||
stddevRTT:
|
||||
format: int64
|
||||
type: integer
|
||||
type: object
|
||||
latencyRTT:
|
||||
description: LatencySpec describes the round trip time information
|
||||
for a packet between the gateway pods of two clusters.
|
||||
properties:
|
||||
average:
|
||||
type: string
|
||||
last:
|
||||
type: string
|
||||
max:
|
||||
type: string
|
||||
min:
|
||||
type: string
|
||||
stdDev:
|
||||
type: string
|
||||
type: object
|
||||
status:
|
||||
type: string
|
||||
statusMessage:
|
||||
type: string
|
||||
required:
|
||||
- endpoint
|
||||
- status
|
||||
- statusMessage
|
||||
type: object
|
||||
type: array
|
||||
haStatus:
|
||||
type: string
|
||||
localEndpoint:
|
||||
properties:
|
||||
backend:
|
||||
type: string
|
||||
backend_config:
|
||||
additionalProperties:
|
||||
type: string
|
||||
type: object
|
||||
cable_name:
|
||||
type: string
|
||||
cluster_id:
|
||||
type: string
|
||||
healthCheckIP:
|
||||
type: string
|
||||
hostname:
|
||||
type: string
|
||||
nat_enabled:
|
||||
type: boolean
|
||||
private_ip:
|
||||
type: string
|
||||
public_ip:
|
||||
type: string
|
||||
subnets:
|
||||
items:
|
||||
type: string
|
||||
type: array
|
||||
required:
|
||||
- backend
|
||||
- cable_name
|
||||
- cluster_id
|
||||
- hostname
|
||||
- nat_enabled
|
||||
- private_ip
|
||||
- public_ip
|
||||
- subnets
|
||||
type: object
|
||||
statusFailure:
|
||||
type: string
|
||||
version:
|
||||
type: string
|
||||
required:
|
||||
- connections
|
||||
- haStatus
|
||||
- localEndpoint
|
||||
- statusFailure
|
||||
- version
|
||||
type: object
|
||||
required:
|
||||
- status
|
||||
type: object
|
||||
served: true
|
||||
storage: true
|
||||
subresources: {}
|
||||
status:
|
||||
acceptedNames:
|
||||
kind: ""
|
||||
plural: ""
|
||||
conditions: []
|
||||
storedVersions: []
|
||||
clusterID:
|
||||
type: "string"
|
||||
clusterDomain:
|
||||
type: "string"
|
||||
serviceIP:
|
||||
type: "string"
|
||||
port:
|
||||
type: "integer"
|
||||
---
|
||||
apiVersion: apiextensions.k8s.io/v1beta1
|
||||
kind: CustomResourceDefinition
|
||||
metadata:
|
||||
name: serviceexports.lighthouse.submariner.io
|
||||
spec:
|
||||
group: lighthouse.submariner.io
|
||||
version: v2alpha1
|
||||
names:
|
||||
kind: ServiceExport
|
||||
plural: serviceexports
|
||||
singular: serviceexport
|
||||
scope: Namespaced
|
||||
---
|
||||
apiVersion: apiextensions.k8s.io/v1beta1
|
||||
kind: CustomResourceDefinition
|
||||
metadata:
|
||||
name: serviceimports.lighthouse.submariner.io
|
||||
spec:
|
||||
group: lighthouse.submariner.io
|
||||
version: v2alpha1
|
||||
names:
|
||||
kind: ServiceImport
|
||||
plural: serviceimports
|
||||
singular: serviceimport
|
||||
scope: Namespaced
|
||||
---
|
||||
apiVersion: apiextensions.k8s.io/v1
|
||||
kind: CustomResourceDefinition
|
||||
|
||||
@@ -0,0 +1,19 @@
|
||||
questions:
|
||||
- variable: submariner-k8s-broker.rbac.create
|
||||
type: boolean
|
||||
default: true
|
||||
group: "Role Based Access Control"
|
||||
description: "Create the role/rolebinding for the Submariner client"
|
||||
label: "RBAC Creation Enabled"
|
||||
- variable: submariner-k8s-broker.crd.create
|
||||
type: boolean
|
||||
default: true
|
||||
group: "Submariner CRD"
|
||||
description: "Create the submariner CRDs for the Submariner client"
|
||||
label: "Submariner CRD Creation Enabled"
|
||||
- variable: submariner-k8s-broker.serviceAccounts.client.create
|
||||
type: boolean
|
||||
default: true
|
||||
group: "Service Account"
|
||||
description: "Create the service account for the Submariner client"
|
||||
label: "Submariner Service Account Creation Enabled"
|
||||
@@ -6,5 +6,5 @@ You can retrieve the server URL by running
|
||||
|
||||
The broker client token and CA can be retrieved by running
|
||||
|
||||
$ SUBMARINER_BROKER_CA=$(kubectl -n "${SUBMARINER_BROKER_NS}" get secrets "${SUBMARINER_BROKER_NS}-client-token" -o jsonpath="{.data['ca\.crt']}")
|
||||
$ SUBMARINER_BROKER_TOKEN=$(kubectl -n "${SUBMARINER_BROKER_NS}" get secrets "${SUBMARINER_BROKER_NS}-client-token" -o jsonpath="{.data.token}"|base64 --decode)
|
||||
$ SUBMARINER_BROKER_CA=$(kubectl -n {{ .Release.Namespace }} get secrets -o jsonpath="{.items[?(@.metadata.annotations['kubernetes\.io/service-account\.name']=='{{ template "submariner-k8s-broker.clientServiceAccountName" . }}')].data['ca\.crt']}")
|
||||
$ SUBMARINER_BROKER_TOKEN=$(kubectl -n {{ .Release.Namespace }} get secrets -o jsonpath="{.items[?(@.metadata.annotations['kubernetes\.io/service-account\.name']=='{{ template "submariner-k8s-broker.clientServiceAccountName" . }}')].data.token}"|base64 --decode)
|
||||
|
||||
@@ -16,7 +16,7 @@ rules:
|
||||
resources: ["*"]
|
||||
verbs: ["create", "get", "list", "watch", "patch", "update", "delete"]
|
||||
- apiGroups: ["discovery.k8s.io"]
|
||||
resources: ["endpointslices", "endpointslices/restricted"]
|
||||
resources: ["endpointslices"]
|
||||
verbs: ["create", "get", "list", "watch","patch", "update", "delete"]
|
||||
- apiGroups: ["multicluster.x-k8s.io"]
|
||||
resources: ["*"]
|
||||
|
||||
@@ -8,12 +8,4 @@ metadata:
|
||||
release: {{ .Release.Name | quote }}
|
||||
chart: {{ template "submariner-k8s-broker.chart" . }}
|
||||
app: {{ template "submariner-k8s-broker.name" . }}
|
||||
---
|
||||
apiVersion: v1
|
||||
kind: Secret
|
||||
metadata:
|
||||
name: {{ template "submariner-k8s-broker.clientServiceAccountName" . }}-token
|
||||
annotations:
|
||||
kubernetes.io/service-account.name: {{ template "submariner-k8s-broker.clientServiceAccountName" . }}
|
||||
type: kubernetes.io/service-account-token
|
||||
{{- end }}
|
||||
@@ -1,8 +1,8 @@
|
||||
---
|
||||
name: submariner-operator
|
||||
version: 0.14.0-m1
|
||||
version: 0.7.0
|
||||
apiVersion: v2
|
||||
appVersion: 0.14.0-m1
|
||||
appVersion: 0.7.0
|
||||
description: Submariner enables direct networking between Pods and Services in different Kubernetes clusters
|
||||
keywords:
|
||||
home: https://submariner-io.github.io/
|
||||
|
||||
@@ -1,5 +1,7 @@
|
||||
# submariner-operator
|
||||
|
||||
 
|
||||
|
||||
Submariner enables direct networking between Pods and Services in different Kubernetes clusters
|
||||
|
||||
**Homepage:** <https://submariner-io.github.io/>
|
||||
@@ -25,9 +27,8 @@ Submariner enables direct networking between Pods and Services in different Kube
|
||||
| broker.server | string | `"example.k8s.apiserver"` | |
|
||||
| broker.token | string | `"test"` | |
|
||||
| gateway.image.repository | string | `"quay.io/submariner/submariner-gateway"` | |
|
||||
| gateway.image.tag | string | `"0.14.0"` | |
|
||||
| gateway.image.tag | string | `"0.7.0"` | |
|
||||
| ipsec.debug | bool | `false` | |
|
||||
| ipsec.forceUDPEncaps | bool | `false` | |
|
||||
| ipsec.ikePort | int | `500` | |
|
||||
| ipsec.natPort | int | `4500` | |
|
||||
| ipsec.psk | string | `""` | |
|
||||
@@ -37,7 +38,7 @@ Submariner enables direct networking between Pods and Services in different Kube
|
||||
| operator.affinity | object | `{}` | |
|
||||
| operator.image.pullPolicy | string | `"IfNotPresent"` | |
|
||||
| operator.image.repository | string | `"quay.io/submariner/submariner-operator"` | |
|
||||
| operator.image.tag | string | `"0.14.0"` | |
|
||||
| operator.image.tag | string | `"0.7.0"` | |
|
||||
| operator.resources | object | `{}` | |
|
||||
| operator.tolerations | list | `[]` | |
|
||||
| rbac.create | bool | `true` | |
|
||||
@@ -57,12 +58,10 @@ Submariner enables direct networking between Pods and Services in different Kube
|
||||
| submariner.clusterCidr | string | `""` | |
|
||||
| submariner.clusterId | string | `""` | |
|
||||
| submariner.colorCodes | string | `"blue"` | |
|
||||
| submariner.coreDNSCustomConfig | object | `{}` | |
|
||||
| submariner.debug | bool | `false` | |
|
||||
| submariner.globalCidr | string | `""` | |
|
||||
| submariner.healthcheckEnabled | bool | `true` | |
|
||||
| submariner.images.repository | string | `"quay.io/submariner"` | |
|
||||
| submariner.images.tag | string | `"0.14.0"` | |
|
||||
| submariner.images.tag | string | `"0.7.0"` | |
|
||||
| submariner.natEnabled | bool | `false` | |
|
||||
| submariner.serviceCidr | string | `""` | |
|
||||
| submariner.serviceDiscovery | bool | `true` | |
|
||||
|
||||
@@ -1,11 +1,10 @@
|
||||
---
|
||||
apiVersion: apiextensions.k8s.io/v1
|
||||
apiVersion: apiextensions.k8s.io/v1beta1
|
||||
kind: CustomResourceDefinition
|
||||
metadata:
|
||||
annotations:
|
||||
controller-gen.kubebuilder.io/version: v0.4.1
|
||||
creationTimestamp: null
|
||||
name: submariners.submariner.io
|
||||
annotations:
|
||||
controller-gen.kubebuilder.io/version: v0.3.0
|
||||
spec:
|
||||
group: submariner.io
|
||||
names:
|
||||
@@ -14,9 +13,9 @@ spec:
|
||||
plural: submariners
|
||||
singular: submariner
|
||||
scope: Namespaced
|
||||
versions:
|
||||
- name: v1alpha1
|
||||
schema:
|
||||
subresources:
|
||||
status: {}
|
||||
validation:
|
||||
openAPIV3Schema:
|
||||
description: Submariner is the Schema for the submariners API
|
||||
properties:
|
||||
@@ -43,51 +42,24 @@ spec:
|
||||
type: string
|
||||
brokerK8sCA:
|
||||
type: string
|
||||
brokerK8sInsecure:
|
||||
type: boolean
|
||||
brokerK8sRemoteNamespace:
|
||||
type: string
|
||||
cableDriver:
|
||||
type: string
|
||||
ceIPSecDebug:
|
||||
type: boolean
|
||||
ceIPSecForceUDPEncaps:
|
||||
type: boolean
|
||||
ceIPSecIKEPort:
|
||||
type: integer
|
||||
ceIPSecNATTPort:
|
||||
type: integer
|
||||
ceIPSecPSK:
|
||||
type: string
|
||||
ceIPSecPreferredServer:
|
||||
type: boolean
|
||||
clusterCIDR:
|
||||
type: string
|
||||
clusterID:
|
||||
type: string
|
||||
colorCodes:
|
||||
type: string
|
||||
connectionHealthCheck:
|
||||
properties:
|
||||
enabled:
|
||||
type: boolean
|
||||
intervalSeconds:
|
||||
description: The interval at which health check pings are sent.
|
||||
format: int64
|
||||
type: integer
|
||||
maxPacketLossCount:
|
||||
description: The maximum number of packets lost at which the health
|
||||
checker will mark the connection as down.
|
||||
format: int64
|
||||
type: integer
|
||||
type: object
|
||||
coreDNSCustomConfig:
|
||||
properties:
|
||||
configMapName:
|
||||
type: string
|
||||
namespace:
|
||||
type: string
|
||||
type: object
|
||||
customDomains:
|
||||
items:
|
||||
type: string
|
||||
@@ -97,12 +69,6 @@ spec:
|
||||
type: boolean
|
||||
globalCIDR:
|
||||
type: string
|
||||
imageOverrides:
|
||||
additionalProperties:
|
||||
type: string
|
||||
type: object
|
||||
loadBalancerEnabled:
|
||||
type: boolean
|
||||
namespace:
|
||||
type: string
|
||||
natEnabled:
|
||||
@@ -139,17 +105,6 @@ spec:
|
||||
type: string
|
||||
colorCodes:
|
||||
type: string
|
||||
deploymentInfo:
|
||||
properties:
|
||||
cloudProvider:
|
||||
type: string
|
||||
kubernetesType:
|
||||
type: string
|
||||
kubernetesTypeVersion:
|
||||
type: string
|
||||
kubernetesVersion:
|
||||
type: string
|
||||
type: object
|
||||
gatewayDaemonSetStatus:
|
||||
properties:
|
||||
lastResourceVersion:
|
||||
@@ -159,8 +114,8 @@ spec:
|
||||
nonReadyContainerStates:
|
||||
items:
|
||||
description: ContainerState holds a possible state of container.
|
||||
Only one of its members may be specified. If none of them
|
||||
is specified, the default one is ContainerStateWaiting.
|
||||
Only one of its members may be specified. If none of them is
|
||||
specified, the default one is ContainerStateWaiting.
|
||||
properties:
|
||||
running:
|
||||
description: Details about a running container
|
||||
@@ -186,21 +141,20 @@ spec:
|
||||
format: date-time
|
||||
type: string
|
||||
message:
|
||||
description: Message regarding the last termination
|
||||
of the container
|
||||
description: Message regarding the last termination of
|
||||
the container
|
||||
type: string
|
||||
reason:
|
||||
description: (brief) reason from the last termination
|
||||
of the container
|
||||
type: string
|
||||
signal:
|
||||
description: Signal from the last termination of the
|
||||
container
|
||||
description: Signal from the last termination of the container
|
||||
format: int32
|
||||
type: integer
|
||||
startedAt:
|
||||
description: Time at which previous execution of the
|
||||
container started
|
||||
description: Time at which previous execution of the container
|
||||
started
|
||||
format: date-time
|
||||
type: string
|
||||
required:
|
||||
@@ -210,19 +164,18 @@ spec:
|
||||
description: Details about a waiting container
|
||||
properties:
|
||||
message:
|
||||
description: Message regarding why the container is
|
||||
not yet running.
|
||||
description: Message regarding why the container is not
|
||||
yet running.
|
||||
type: string
|
||||
reason:
|
||||
description: (brief) reason the container is not yet
|
||||
running.
|
||||
description: (brief) reason the container is not yet running.
|
||||
type: string
|
||||
type: object
|
||||
type: object
|
||||
type: array
|
||||
status:
|
||||
description: DaemonSetStatus represents the current status of
|
||||
a daemon set.
|
||||
description: DaemonSetStatus represents the current status of a
|
||||
daemon set.
|
||||
properties:
|
||||
collisionCount:
|
||||
description: Count of hash collisions for the DaemonSet. The
|
||||
@@ -232,11 +185,11 @@ spec:
|
||||
format: int32
|
||||
type: integer
|
||||
conditions:
|
||||
description: Represents the latest available observations
|
||||
of a DaemonSet's current state.
|
||||
description: Represents the latest available observations of
|
||||
a DaemonSet's current state.
|
||||
items:
|
||||
description: DaemonSetCondition describes the state of a
|
||||
DaemonSet at a certain point.
|
||||
description: DaemonSetCondition describes the state of a DaemonSet
|
||||
at a certain point.
|
||||
properties:
|
||||
lastTransitionTime:
|
||||
description: Last time the condition transitioned from
|
||||
@@ -334,10 +287,6 @@ spec:
|
||||
cable_name:
|
||||
type: string
|
||||
cluster_id:
|
||||
maxLength: 63
|
||||
minLength: 1
|
||||
type: string
|
||||
healthCheckIP:
|
||||
type: string
|
||||
hostname:
|
||||
type: string
|
||||
@@ -361,30 +310,10 @@ spec:
|
||||
- public_ip
|
||||
- subnets
|
||||
type: object
|
||||
latencyRTT:
|
||||
description: LatencySpec describes the round trip time
|
||||
information for a packet between the gateway pods of
|
||||
two clusters.
|
||||
properties:
|
||||
average:
|
||||
type: string
|
||||
last:
|
||||
type: string
|
||||
max:
|
||||
type: string
|
||||
min:
|
||||
type: string
|
||||
stdDev:
|
||||
type: string
|
||||
type: object
|
||||
status:
|
||||
type: string
|
||||
statusMessage:
|
||||
type: string
|
||||
usingIP:
|
||||
type: string
|
||||
usingNAT:
|
||||
type: boolean
|
||||
required:
|
||||
- endpoint
|
||||
- status
|
||||
@@ -404,10 +333,6 @@ spec:
|
||||
cable_name:
|
||||
type: string
|
||||
cluster_id:
|
||||
maxLength: 63
|
||||
minLength: 1
|
||||
type: string
|
||||
healthCheckIP:
|
||||
type: string
|
||||
hostname:
|
||||
type: string
|
||||
@@ -454,8 +379,8 @@ spec:
|
||||
nonReadyContainerStates:
|
||||
items:
|
||||
description: ContainerState holds a possible state of container.
|
||||
Only one of its members may be specified. If none of them
|
||||
is specified, the default one is ContainerStateWaiting.
|
||||
Only one of its members may be specified. If none of them is
|
||||
specified, the default one is ContainerStateWaiting.
|
||||
properties:
|
||||
running:
|
||||
description: Details about a running container
|
||||
@@ -481,21 +406,20 @@ spec:
|
||||
format: date-time
|
||||
type: string
|
||||
message:
|
||||
description: Message regarding the last termination
|
||||
of the container
|
||||
description: Message regarding the last termination of
|
||||
the container
|
||||
type: string
|
||||
reason:
|
||||
description: (brief) reason from the last termination
|
||||
of the container
|
||||
type: string
|
||||
signal:
|
||||
description: Signal from the last termination of the
|
||||
container
|
||||
description: Signal from the last termination of the container
|
||||
format: int32
|
||||
type: integer
|
||||
startedAt:
|
||||
description: Time at which previous execution of the
|
||||
container started
|
||||
description: Time at which previous execution of the container
|
||||
started
|
||||
format: date-time
|
||||
type: string
|
||||
required:
|
||||
@@ -505,19 +429,18 @@ spec:
|
||||
description: Details about a waiting container
|
||||
properties:
|
||||
message:
|
||||
description: Message regarding why the container is
|
||||
not yet running.
|
||||
description: Message regarding why the container is not
|
||||
yet running.
|
||||
type: string
|
||||
reason:
|
||||
description: (brief) reason the container is not yet
|
||||
running.
|
||||
description: (brief) reason the container is not yet running.
|
||||
type: string
|
||||
type: object
|
||||
type: object
|
||||
type: array
|
||||
status:
|
||||
description: DaemonSetStatus represents the current status of
|
||||
a daemon set.
|
||||
description: DaemonSetStatus represents the current status of a
|
||||
daemon set.
|
||||
properties:
|
||||
collisionCount:
|
||||
description: Count of hash collisions for the DaemonSet. The
|
||||
@@ -527,11 +450,11 @@ spec:
|
||||
format: int32
|
||||
type: integer
|
||||
conditions:
|
||||
description: Represents the latest available observations
|
||||
of a DaemonSet's current state.
|
||||
description: Represents the latest available observations of
|
||||
a DaemonSet's current state.
|
||||
items:
|
||||
description: DaemonSetCondition describes the state of a
|
||||
DaemonSet at a certain point.
|
||||
description: DaemonSetCondition describes the state of a DaemonSet
|
||||
at a certain point.
|
||||
properties:
|
||||
lastTransitionTime:
|
||||
description: Last time the condition transitioned from
|
||||
@@ -612,36 +535,8 @@ spec:
|
||||
required:
|
||||
- mismatchedContainerImages
|
||||
type: object
|
||||
loadBalancerStatus:
|
||||
properties:
|
||||
status:
|
||||
description: LoadBalancerStatus represents the status of a load-balancer.
|
||||
properties:
|
||||
ingress:
|
||||
description: Ingress is a list containing ingress points for
|
||||
the load-balancer. Traffic intended for the service should
|
||||
be sent to these ingress points.
|
||||
items:
|
||||
description: 'LoadBalancerIngress represents the status
|
||||
of a load-balancer ingress point: traffic intended for
|
||||
the service should be sent to an ingress point.'
|
||||
properties:
|
||||
hostname:
|
||||
description: Hostname is set for load-balancer ingress
|
||||
points that are DNS based (typically AWS load-balancers)
|
||||
type: string
|
||||
ip:
|
||||
description: IP is set for load-balancer ingress points
|
||||
that are IP based (typically GCE or OpenStack load-balancers)
|
||||
type: string
|
||||
type: object
|
||||
type: array
|
||||
type: object
|
||||
type: object
|
||||
natEnabled:
|
||||
type: boolean
|
||||
networkPlugin:
|
||||
type: string
|
||||
routeAgentDaemonSetStatus:
|
||||
properties:
|
||||
lastResourceVersion:
|
||||
@@ -651,8 +546,8 @@ spec:
|
||||
nonReadyContainerStates:
|
||||
items:
|
||||
description: ContainerState holds a possible state of container.
|
||||
Only one of its members may be specified. If none of them
|
||||
is specified, the default one is ContainerStateWaiting.
|
||||
Only one of its members may be specified. If none of them is
|
||||
specified, the default one is ContainerStateWaiting.
|
||||
properties:
|
||||
running:
|
||||
description: Details about a running container
|
||||
@@ -678,21 +573,20 @@ spec:
|
||||
format: date-time
|
||||
type: string
|
||||
message:
|
||||
description: Message regarding the last termination
|
||||
of the container
|
||||
description: Message regarding the last termination of
|
||||
the container
|
||||
type: string
|
||||
reason:
|
||||
description: (brief) reason from the last termination
|
||||
of the container
|
||||
type: string
|
||||
signal:
|
||||
description: Signal from the last termination of the
|
||||
container
|
||||
description: Signal from the last termination of the container
|
||||
format: int32
|
||||
type: integer
|
||||
startedAt:
|
||||
description: Time at which previous execution of the
|
||||
container started
|
||||
description: Time at which previous execution of the container
|
||||
started
|
||||
format: date-time
|
||||
type: string
|
||||
required:
|
||||
@@ -702,19 +596,18 @@ spec:
|
||||
description: Details about a waiting container
|
||||
properties:
|
||||
message:
|
||||
description: Message regarding why the container is
|
||||
not yet running.
|
||||
description: Message regarding why the container is not
|
||||
yet running.
|
||||
type: string
|
||||
reason:
|
||||
description: (brief) reason the container is not yet
|
||||
running.
|
||||
description: (brief) reason the container is not yet running.
|
||||
type: string
|
||||
type: object
|
||||
type: object
|
||||
type: array
|
||||
status:
|
||||
description: DaemonSetStatus represents the current status of
|
||||
a daemon set.
|
||||
description: DaemonSetStatus represents the current status of a
|
||||
daemon set.
|
||||
properties:
|
||||
collisionCount:
|
||||
description: Count of hash collisions for the DaemonSet. The
|
||||
@@ -724,11 +617,11 @@ spec:
|
||||
format: int32
|
||||
type: integer
|
||||
conditions:
|
||||
description: Represents the latest available observations
|
||||
of a DaemonSet's current state.
|
||||
description: Represents the latest available observations of
|
||||
a DaemonSet's current state.
|
||||
items:
|
||||
description: DaemonSetCondition describes the state of a
|
||||
DaemonSet at a certain point.
|
||||
description: DaemonSetCondition describes the state of a DaemonSet
|
||||
at a certain point.
|
||||
properties:
|
||||
lastTransitionTime:
|
||||
description: Last time the condition transitioned from
|
||||
@@ -816,10 +709,11 @@ spec:
|
||||
- natEnabled
|
||||
type: object
|
||||
type: object
|
||||
version: v1alpha1
|
||||
versions:
|
||||
- name: v1alpha1
|
||||
served: true
|
||||
storage: true
|
||||
subresources:
|
||||
status: {}
|
||||
status:
|
||||
acceptedNames:
|
||||
kind: ""
|
||||
@@ -831,7 +725,7 @@ apiVersion: apiextensions.k8s.io/v1
|
||||
kind: CustomResourceDefinition
|
||||
metadata:
|
||||
annotations:
|
||||
controller-gen.kubebuilder.io/version: v0.4.1
|
||||
controller-gen.kubebuilder.io/version: v0.3.0
|
||||
creationTimestamp: null
|
||||
name: servicediscoveries.submariner.io
|
||||
spec:
|
||||
@@ -869,19 +763,10 @@ spec:
|
||||
type: string
|
||||
brokerK8sCA:
|
||||
type: string
|
||||
brokerK8sInsecure:
|
||||
type: boolean
|
||||
brokerK8sRemoteNamespace:
|
||||
type: string
|
||||
clusterID:
|
||||
type: string
|
||||
coreDNSCustomConfig:
|
||||
properties:
|
||||
configMapName:
|
||||
type: string
|
||||
namespace:
|
||||
type: string
|
||||
type: object
|
||||
customDomains:
|
||||
items:
|
||||
type: string
|
||||
@@ -912,18 +797,6 @@ spec:
|
||||
type: object
|
||||
status:
|
||||
description: ServiceDiscoveryStatus defines the observed state of ServiceDiscovery
|
||||
properties:
|
||||
deploymentInfo:
|
||||
properties:
|
||||
cloudProvider:
|
||||
type: string
|
||||
kubernetesType:
|
||||
type: string
|
||||
kubernetesTypeVersion:
|
||||
type: string
|
||||
kubernetesVersion:
|
||||
type: string
|
||||
type: object
|
||||
type: object
|
||||
type: object
|
||||
served: true
|
||||
|
||||
@@ -0,0 +1,138 @@
|
||||
questions:
|
||||
- variable: defaultOperatorImage
|
||||
default: true
|
||||
description: "Use default Submariner operator image or specify a custom one"
|
||||
label: Use default Submariner operator image
|
||||
type: boolean
|
||||
show_subquestion_if: false
|
||||
group: "Container Images"
|
||||
subquestions:
|
||||
- variable: operator.image.repository
|
||||
default: "quay.io/submariner/submariner-operator"
|
||||
description: "Submariner Operator Image Repository"
|
||||
type: string
|
||||
label: Submariner Operator Image Repository
|
||||
- variable: operator.image.tag
|
||||
default: "0.7.0"
|
||||
description: "Submariner Operator Image Tag"
|
||||
type: string
|
||||
label: Submariner Operator Image Tag
|
||||
- variable: defaultSubmarinerImages
|
||||
default: true
|
||||
description: "Use default Submariner images or specify custom ones"
|
||||
label: Use default Submariner images
|
||||
type: boolean
|
||||
show_subquestion_if: false
|
||||
group: "Container images"
|
||||
subquestions:
|
||||
- variable: submariner.images.repository
|
||||
default: "quay.io/submariner"
|
||||
description: "Submariner Repository (base for all non-operator images)"
|
||||
type: string
|
||||
label: Submariner Repository
|
||||
- variable: submariner.images.tag
|
||||
default: "0.7.0"
|
||||
description: "Submariner Images Tag (shared for all non-operator images)"
|
||||
type: string
|
||||
label: Submariner Images Tag
|
||||
- variable: submariner.clusterId
|
||||
default: ""
|
||||
description: "Enter a unique cluster ID to identify this cluster"
|
||||
type: string
|
||||
label: "Cluster ID"
|
||||
group: "Configuration"
|
||||
required: true
|
||||
- variable: ipsec.psk
|
||||
default: ""
|
||||
description: "Enter the pre-shared key for the IPsec Cable Engine"
|
||||
type: string
|
||||
label: "IPsec Pre-Shared Key"
|
||||
group: "Configuration"
|
||||
required: true
|
||||
- variable: broker.server
|
||||
type: string
|
||||
default: ""
|
||||
group: "Broker Configuration"
|
||||
label: "Broker Server"
|
||||
description: "Broker server to use (without the https://)"
|
||||
- variable: broker.insecure
|
||||
type: boolean
|
||||
default: false
|
||||
show_subquestion_if: false
|
||||
group: "Broker Configuration"
|
||||
label: "Insecure Broker"
|
||||
description: "Connect to K8s broker without validating CA"
|
||||
subquestions:
|
||||
- variable: broker.ca
|
||||
type: string
|
||||
description: "Base64 encoded broker ca.crt"
|
||||
label: "Broker CA encoded in base64"
|
||||
default: ""
|
||||
- variable: broker.token
|
||||
type: string
|
||||
group: "Broker Configuration"
|
||||
label: "Broker Token"
|
||||
description: "Bearer token for broker"
|
||||
- variable: broker.namespace
|
||||
type: string
|
||||
group: "Broker Configuration"
|
||||
label: "Broker Namespace"
|
||||
description: "Enter namespace to use on central broker"
|
||||
- variable: submariner.clusterCidr
|
||||
default: ""
|
||||
description: "Enter the cluster CIDR (i.e. 10.42.0.0/16) for this cluster"
|
||||
type: string
|
||||
label: "Cluster CIDR"
|
||||
group: "CIDR Configuration"
|
||||
required: true
|
||||
- variable: submariner.serviceCidr
|
||||
default: ""
|
||||
description: "Enter the service CIDR (i.e. 10.43.0.0/16) for this cluster"
|
||||
type: string
|
||||
label: "Service CIDR"
|
||||
group: "CIDR Configuration"
|
||||
required: true
|
||||
- variable: submariner.serviceDiscovery
|
||||
type: boolean
|
||||
default: false
|
||||
group: "Advanced Configuration"
|
||||
description: "Enable multicluster service discovery"
|
||||
label: "Service Discovery Enabled"
|
||||
- variable: broker.globalnet
|
||||
type: boolean
|
||||
default: false
|
||||
group: "Broker Configuration"
|
||||
description: "Enable support for overlapping Cluster/Service CIDRs in connecting clusters"
|
||||
label: "Globalnet Enabled"
|
||||
subquestions:
|
||||
- variable: submariner.globalCidr
|
||||
default: ""
|
||||
description: "Enter the globalnet CIDR (i.e. 169.254.1.0/24) for this cluster if using globalnet"
|
||||
type: string
|
||||
label: "Globalnet CIDR"
|
||||
group: "CIDR Configuration"
|
||||
required: false
|
||||
- variable: submariner.natEnabled
|
||||
type: boolean
|
||||
default: false
|
||||
group: "Advanced Configuration"
|
||||
description: "If the gateway nodes for this cluster are behind 1:1 NAT, you should enable NAT"
|
||||
label: "NAT Enabled"
|
||||
- variable: submariner.debug
|
||||
type: boolean
|
||||
default: false
|
||||
group: "Advanced Configuration"
|
||||
description: "Enable submariner debug mode"
|
||||
label: "Submariner Debug Enabled"
|
||||
- variable: ipsec.debug
|
||||
type: boolean
|
||||
default: false
|
||||
group: "Advanced Configuration"
|
||||
description: "Enable Charon debug mode"
|
||||
label: "Charon Enabled"
|
||||
- variable: submariner.cableDriver
|
||||
type: string
|
||||
default: ""
|
||||
group: "Advanced Configuration"
|
||||
description: "Cable driver implementation"
|
||||
label: "Cable Driver"
|
||||
@@ -162,17 +162,6 @@ rules:
|
||||
- patch
|
||||
- update
|
||||
- watch
|
||||
- apiGroups:
|
||||
- coordination.k8s.io
|
||||
resources:
|
||||
- leases
|
||||
verbs:
|
||||
- get
|
||||
- list
|
||||
- watch
|
||||
- create
|
||||
- update
|
||||
- delete
|
||||
---
|
||||
apiVersion: rbac.authorization.k8s.io/v1
|
||||
kind: RoleBinding
|
||||
@@ -450,21 +439,6 @@ rules:
|
||||
verbs:
|
||||
- get
|
||||
- list
|
||||
- apiGroups:
|
||||
- ""
|
||||
resources:
|
||||
- namespaces
|
||||
verbs:
|
||||
- get
|
||||
- list
|
||||
- watch
|
||||
- apiGroups:
|
||||
- monitoring.coreos.com
|
||||
resources:
|
||||
- servicemonitors
|
||||
verbs:
|
||||
- get
|
||||
- create
|
||||
---
|
||||
apiVersion: rbac.authorization.k8s.io/v1
|
||||
kind: ClusterRoleBinding
|
||||
@@ -485,29 +459,6 @@ roleRef:
|
||||
name: {{ template "submariner.fullname" . }}
|
||||
---
|
||||
apiVersion: rbac.authorization.k8s.io/v1
|
||||
kind: Role
|
||||
metadata:
|
||||
name: submariner-metrics-reader
|
||||
namespace: {{ .Release.Namespace }}
|
||||
rules:
|
||||
- apiGroups: [""]
|
||||
resources: ["pods", "services", "endpoints"]
|
||||
verbs: ["get", "list", "watch"]
|
||||
---
|
||||
apiVersion: rbac.authorization.k8s.io/v1
|
||||
kind: RoleBinding
|
||||
metadata:
|
||||
name: read-submariner-metrics
|
||||
subjects:
|
||||
- kind: ServiceAccount
|
||||
name: prometheus-k8s
|
||||
namespace: openshift-monitoring
|
||||
roleRef:
|
||||
kind: Role
|
||||
name: submariner-metrics-reader
|
||||
apiGroup: rbac.authorization.k8s.io
|
||||
---
|
||||
apiVersion: rbac.authorization.k8s.io/v1
|
||||
kind: ClusterRole
|
||||
metadata:
|
||||
name: {{ template "submariner.fullname" . }}:gateway
|
||||
@@ -689,25 +640,14 @@ rules:
|
||||
- ""
|
||||
resources:
|
||||
- pods
|
||||
- services
|
||||
- namespaces
|
||||
- nodes
|
||||
- endpoints
|
||||
verbs:
|
||||
- get
|
||||
- list
|
||||
- watch
|
||||
- update
|
||||
- apiGroups:
|
||||
- ""
|
||||
resources:
|
||||
- services
|
||||
verbs:
|
||||
- create
|
||||
- get
|
||||
- list
|
||||
- watch
|
||||
- update
|
||||
- delete
|
||||
- apiGroups:
|
||||
- submariner.io
|
||||
resources:
|
||||
@@ -748,15 +688,6 @@ rules:
|
||||
- get
|
||||
- list
|
||||
- watch
|
||||
- apiGroups:
|
||||
- network.openshift.io
|
||||
resources:
|
||||
- service/externalips
|
||||
verbs:
|
||||
- create
|
||||
- get
|
||||
- list
|
||||
- delete
|
||||
---
|
||||
{{- end -}}
|
||||
apiVersion: rbac.authorization.k8s.io/v1
|
||||
@@ -803,7 +734,6 @@ rules:
|
||||
- discovery.k8s.io
|
||||
resources:
|
||||
- endpointslices
|
||||
- endpointslices/restricted
|
||||
verbs:
|
||||
- create
|
||||
- get
|
||||
|
||||
@@ -9,9 +9,7 @@ spec:
|
||||
brokerK8sApiServerToken: {{ .Values.broker.token }}
|
||||
brokerK8sCA: {{ .Values.broker.ca }}
|
||||
brokerK8sRemoteNamespace: {{ .Values.broker.namespace }}
|
||||
brokerK8sInsecure: {{ .Values.broker.insecure }}
|
||||
ceIPSecDebug: {{ .Values.ipsec.debug }}
|
||||
ceIPSecForceUDPEncaps: {{ .Values.ipsec.forceUDPEncaps }}
|
||||
ceIPSecIKEPort: {{ .Values.ipsec.ikePort }}
|
||||
ceIPSecNATTPort: {{ .Values.ipsec.natPort }}
|
||||
ceIPSecPSK: {{ .Values.ipsec.psk }}
|
||||
@@ -19,47 +17,11 @@ spec:
|
||||
clusterID: {{ .Values.submariner.clusterId }}
|
||||
colorCodes: {{ .Values.submariner.colorCodes }}
|
||||
debug: {{ .Values.submariner.debug }}
|
||||
loadBalancerEnabled: {{ .Values.submariner.loadBalancerEnabled }}
|
||||
namespace: {{ .Release.Namespace }}
|
||||
natEnabled: {{ .Values.submariner.natEnabled }}
|
||||
repository: {{ .Values.submariner.images.repository }}
|
||||
version: {{ .Values.submariner.images.tag }}
|
||||
{{- with .Values.images }}
|
||||
{{- if . }}
|
||||
imageOverrides:
|
||||
{{- if index . "submariner-operator" }}
|
||||
submariner-operator: {{ index . "submariner-operator" }}
|
||||
{{- end }}
|
||||
{{- if index . "submariner-gateway" }}
|
||||
submariner-gateway: {{ index . "submariner-gateway" }}
|
||||
{{- end }}
|
||||
{{- if index . "submariner-route-agent" }}
|
||||
submariner-routeagent: {{ index . "submariner-route-agent" }}
|
||||
{{- end }}
|
||||
{{- if index . "submariner-globalnet" }}
|
||||
submariner-globalnet: {{ index . "submariner-globalnet" }}
|
||||
{{- end }}
|
||||
{{- if index . "submariner-networkplugin-syncer" }}
|
||||
submariner-networkplugin-syncer: {{ index . "submariner-networkplugin-syncer" }}
|
||||
{{- end }}
|
||||
{{- if index . "lighthouse-agent" }}
|
||||
submariner-lighthouse-agent: {{ index . "lighthouse-agent" }}
|
||||
{{- end }}
|
||||
{{- if index . "lighthouse-coredns" }}
|
||||
submariner-lighthouse-coredns: {{ index . "lighthouse-coredns" }}
|
||||
{{- end }}
|
||||
{{- end }}
|
||||
{{- end }}
|
||||
serviceCIDR: "{{ .Values.submariner.serviceCidr }}"
|
||||
globalCIDR: "{{ .Values.submariner.globalCidr }}"
|
||||
serviceDiscoveryEnabled: {{ .Values.submariner.serviceDiscovery }}
|
||||
cableDriver: {{ .Values.submariner.cableDriver }}
|
||||
connectionHealthCheck:
|
||||
enabled: {{ .Values.submariner.healthcheckEnabled }}
|
||||
intervalSeconds: 1
|
||||
maxPacketLossCount: 5
|
||||
{{- with .Values.submariner.coreDNSCustomConfig }}
|
||||
coreDNSCustomConfig:
|
||||
configmapName: {{ .configmapName }}
|
||||
namespace: {{ .namespace }}
|
||||
{{- end }}
|
||||
|
||||
@@ -8,14 +8,6 @@ metadata:
|
||||
release: {{ .Release.Name | quote }}
|
||||
chart: {{ template "submariner.chart" . }}
|
||||
app: {{ template "submariner.name" . }}
|
||||
---
|
||||
apiVersion: v1
|
||||
kind: Secret
|
||||
metadata:
|
||||
name: {{ template "submariner.operatorServiceAccountName" . }}-token
|
||||
annotations:
|
||||
kubernetes.io/service-account.name: {{ template "submariner.operatorServiceAccountName" . }}
|
||||
type: kubernetes.io/service-account-token
|
||||
{{- end }}
|
||||
---
|
||||
{{- if .Values.serviceAccounts.gateway.create }}
|
||||
@@ -28,14 +20,6 @@ metadata:
|
||||
release: {{ .Release.Name | quote }}
|
||||
chart: {{ template "submariner.chart" . }}
|
||||
app: {{ template "submariner.name" . }}
|
||||
---
|
||||
apiVersion: v1
|
||||
kind: Secret
|
||||
metadata:
|
||||
name: {{ template "submariner.gatewayServiceAccountName" . }}-token
|
||||
annotations:
|
||||
kubernetes.io/service-account.name: {{ template "submariner.gatewayServiceAccountName" . }}
|
||||
type: kubernetes.io/service-account-token
|
||||
{{- end }}
|
||||
---
|
||||
{{- if .Values.serviceAccounts.routeAgent.create }}
|
||||
@@ -48,14 +32,6 @@ metadata:
|
||||
release: {{ .Release.Name | quote }}
|
||||
chart: {{ template "submariner.chart" . }}
|
||||
app: {{ template "submariner.name" . }}
|
||||
---
|
||||
apiVersion: v1
|
||||
kind: Secret
|
||||
metadata:
|
||||
name: {{ template "submariner.routeAgentServiceAccountName" . }}-token
|
||||
annotations:
|
||||
kubernetes.io/service-account.name: {{ template "submariner.routeAgentServiceAccountName" . }}
|
||||
type: kubernetes.io/service-account-token
|
||||
{{- end }}
|
||||
---
|
||||
{{- if .Values.serviceAccounts.globalnet.create }}
|
||||
@@ -68,14 +44,6 @@ metadata:
|
||||
release: {{ .Release.Name | quote }}
|
||||
chart: {{ template "submariner.chart" . }}
|
||||
app: {{ template "submariner.name" . }}
|
||||
---
|
||||
apiVersion: v1
|
||||
kind: Secret
|
||||
metadata:
|
||||
name: {{ template "submariner.globalnetServiceAccountName" . }}-token
|
||||
annotations:
|
||||
kubernetes.io/service-account.name: {{ template "submariner.globalnetServiceAccountName" . }}
|
||||
type: kubernetes.io/service-account-token
|
||||
{{- end }}
|
||||
---
|
||||
{{- if .Values.serviceAccounts.lighthouseAgent.create }}
|
||||
@@ -88,14 +56,6 @@ metadata:
|
||||
release: {{ .Release.Name | quote }}
|
||||
chart: {{ template "submariner.chart" . }}
|
||||
app: {{ template "submariner.name" . }}
|
||||
---
|
||||
apiVersion: v1
|
||||
kind: Secret
|
||||
metadata:
|
||||
name: {{ template "submariner.lighthouseAgentServiceAccountName" . }}-token
|
||||
annotations:
|
||||
kubernetes.io/service-account.name: {{ template "submariner.lighthouseAgentServiceAccountName" . }}
|
||||
type: kubernetes.io/service-account-token
|
||||
{{- end }}
|
||||
---
|
||||
{{- if .Values.serviceAccounts.lighthouseCoreDns.create }}
|
||||
@@ -108,12 +68,4 @@ metadata:
|
||||
release: {{ .Release.Name | quote }}
|
||||
chart: {{ template "submariner.chart" . }}
|
||||
app: {{ template "submariner.name" . }}
|
||||
---
|
||||
apiVersion: v1
|
||||
kind: Secret
|
||||
metadata:
|
||||
name: {{ template "submariner.lighthouseCoreDnsServiceAccountName" . }}-token
|
||||
annotations:
|
||||
kubernetes.io/service-account.name: {{ template "submariner.lighthouseCoreDnsServiceAccountName" . }}
|
||||
type: kubernetes.io/service-account-token
|
||||
{{- end }}
|
||||
|
||||
@@ -5,17 +5,14 @@ submariner:
|
||||
clusterCidr: ""
|
||||
serviceCidr: ""
|
||||
globalCidr: ""
|
||||
loadBalancerEnabled: false
|
||||
natEnabled: false
|
||||
colorCodes: blue
|
||||
debug: false
|
||||
serviceDiscovery: true
|
||||
cableDriver: "libreswan"
|
||||
healthcheckEnabled: true
|
||||
coreDNSCustomConfig: {}
|
||||
images:
|
||||
repository: quay.io/submariner
|
||||
tag: "0.14.0-m1"
|
||||
tag: "0.7.0"
|
||||
broker:
|
||||
server: example.k8s.apiserver
|
||||
token: test
|
||||
@@ -25,11 +22,9 @@ broker:
|
||||
globalnet: false
|
||||
rbac:
|
||||
create: true
|
||||
images: {}
|
||||
ipsec:
|
||||
psk: ""
|
||||
debug: false
|
||||
forceUDPEncaps: false
|
||||
ikePort: 500
|
||||
natPort: 4500
|
||||
leadership:
|
||||
@@ -39,7 +34,7 @@ leadership:
|
||||
operator:
|
||||
image:
|
||||
repository: quay.io/submariner/submariner-operator
|
||||
tag: "0.14.0-m1"
|
||||
tag: "0.7.0"
|
||||
pullPolicy: IfNotPresent
|
||||
resources: {}
|
||||
tolerations: []
|
||||
@@ -47,7 +42,7 @@ operator:
|
||||
gateway:
|
||||
image:
|
||||
repository: quay.io/submariner/submariner-gateway
|
||||
tag: "0.14.0-m1"
|
||||
tag: "0.7.0"
|
||||
serviceAccounts:
|
||||
operator:
|
||||
create: true
|
||||
|
||||
Reference in New Issue
Block a user