mirror of
https://github.com/submariner-io/submariner-charts.git
synced 2026-09-21 20:50:35 +00:00
Compare commits
12
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
883d93c0be | ||
|
|
414c72fc28 | ||
|
|
2f1cd8d728 | ||
|
|
d667fc2546 | ||
|
|
a1b5d7f20a | ||
|
|
85b746dd4c | ||
|
|
e6c1600270 | ||
|
|
9e5b80abda | ||
|
|
077c26b714 | ||
|
|
7f4648985e | ||
|
|
c605528741 | ||
|
|
d3a4507650 |
@@ -10,3 +10,8 @@ updates:
|
|||||||
target-branch: "release-0.12"
|
target-branch: "release-0.12"
|
||||||
schedule:
|
schedule:
|
||||||
interval: daily
|
interval: daily
|
||||||
|
- package-ecosystem: github-actions
|
||||||
|
directory: '/'
|
||||||
|
target-branch: "release-0.13"
|
||||||
|
schedule:
|
||||||
|
interval: daily
|
||||||
|
|||||||
@@ -9,6 +9,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.13
|
- name: Check that the PR targets devel
|
||||||
if: ${{ github.base_ref != 'release-0.13' }}
|
if: ${{ github.base_ref != 'devel' }}
|
||||||
run: exit 1
|
run: exit 1
|
||||||
|
|||||||
@@ -25,7 +25,7 @@ jobs:
|
|||||||
if: github.repository_owner == 'submariner-io'
|
if: github.repository_owner == 'submariner-io'
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: z0al/dependent-issues@950226e7ca8fc43dc209a7febf67c655af3bdb43
|
- uses: z0al/dependent-issues@0fae07162bc9e0d8e116a133bd03686eed6efa21
|
||||||
env:
|
env:
|
||||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
with:
|
with:
|
||||||
|
|||||||
@@ -16,21 +16,21 @@ jobs:
|
|||||||
matrix:
|
matrix:
|
||||||
cable_driver: ['libreswan', 'wireguard', 'vxlan']
|
cable_driver: ['libreswan', 'wireguard', 'vxlan']
|
||||||
globalnet: ['', 'globalnet']
|
globalnet: ['', 'globalnet']
|
||||||
k8s_version: ['1.23']
|
k8s_version: ['1.24']
|
||||||
lighthouse: ['', 'lighthouse']
|
lighthouse: ['', 'lighthouse']
|
||||||
include:
|
include:
|
||||||
- k8s_version: '1.21'
|
|
||||||
- k8s_version: '1.22'
|
- k8s_version: '1.22'
|
||||||
|
- k8s_version: '1.23'
|
||||||
steps:
|
steps:
|
||||||
- name: Check out the repository
|
- name: Check out the repository
|
||||||
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
|
uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
|
||||||
|
|
||||||
- name: Run E2E deployment and tests
|
- name: Run E2E deployment and tests
|
||||||
uses: submariner-io/shipyard/gh-actions/e2e@release-0.13
|
uses: submariner-io/shipyard/gh-actions/e2e@devel
|
||||||
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.13
|
uses: submariner-io/shipyard/gh-actions/post-mortem@devel
|
||||||
|
|||||||
@@ -11,11 +11,11 @@ jobs:
|
|||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- name: Check out the repository
|
- name: Check out the repository
|
||||||
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
|
uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
|
||||||
|
|
||||||
- name: Run E2E deployment and tests
|
- name: Run E2E deployment and tests
|
||||||
uses: submariner-io/shipyard/gh-actions/e2e@release-0.13
|
uses: submariner-io/shipyard/gh-actions/e2e@devel
|
||||||
|
|
||||||
- name: Post mortem
|
- name: Post mortem
|
||||||
if: failure()
|
if: failure()
|
||||||
uses: submariner-io/shipyard/gh-actions/post-mortem@release-0.13
|
uses: submariner-io/shipyard/gh-actions/post-mortem@devel
|
||||||
|
|||||||
@@ -19,13 +19,13 @@ jobs:
|
|||||||
lighthouse: ['', 'lighthouse']
|
lighthouse: ['', 'lighthouse']
|
||||||
steps:
|
steps:
|
||||||
- name: Check out the repository
|
- name: Check out the repository
|
||||||
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
|
uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
|
||||||
|
|
||||||
- name: Run E2E deployment and tests
|
- name: Run E2E deployment and tests
|
||||||
uses: submariner-io/shipyard/gh-actions/e2e@release-0.13
|
uses: submariner-io/shipyard/gh-actions/e2e@devel
|
||||||
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.13
|
uses: submariner-io/shipyard/gh-actions/post-mortem@devel
|
||||||
|
|||||||
@@ -11,12 +11,12 @@ jobs:
|
|||||||
steps:
|
steps:
|
||||||
- name: Get PR commits
|
- name: Get PR commits
|
||||||
id: 'get-pr-commits'
|
id: 'get-pr-commits'
|
||||||
uses: tim-actions/get-pr-commits@3efc1387ead42029a0d488ab98f24b7452dc3cde
|
uses: tim-actions/get-pr-commits@c64db31d359214d244884dd68f971a110b29ab83
|
||||||
with:
|
with:
|
||||||
token: ${{ secrets.GITHUB_TOKEN }}
|
token: ${{ secrets.GITHUB_TOKEN }}
|
||||||
|
|
||||||
- name: 'Verify no "Apply suggestions from code review" commits'
|
- name: 'Verify no "Apply suggestions from code review" commits'
|
||||||
uses: tim-actions/commit-message-checker-with-regex@094fc16ff83d04e2ec73edb5eaf6aa267db33791
|
uses: tim-actions/commit-message-checker-with-regex@d6d9770051dd6460679d1cab1dcaa8cffc5c2bbd
|
||||||
with:
|
with:
|
||||||
commits: ${{ steps.get-pr-commits.outputs.commits }}
|
commits: ${{ steps.get-pr-commits.outputs.commits }}
|
||||||
pattern: '^(?!.*(apply suggestions from code review))'
|
pattern: '^(?!.*(apply suggestions from code review))'
|
||||||
@@ -24,7 +24,7 @@ jobs:
|
|||||||
error: 'Commits addressing code review feedback should typically be squashed into the commits under review'
|
error: 'Commits addressing code review feedback should typically be squashed into the commits under review'
|
||||||
|
|
||||||
- name: 'Verify no "fixup!" commits'
|
- name: 'Verify no "fixup!" commits'
|
||||||
uses: tim-actions/commit-message-checker-with-regex@094fc16ff83d04e2ec73edb5eaf6aa267db33791
|
uses: tim-actions/commit-message-checker-with-regex@d6d9770051dd6460679d1cab1dcaa8cffc5c2bbd
|
||||||
with:
|
with:
|
||||||
commits: ${{ steps.get-pr-commits.outputs.commits }}
|
commits: ${{ steps.get-pr-commits.outputs.commits }}
|
||||||
pattern: '^(?!fixup!)'
|
pattern: '^(?!fixup!)'
|
||||||
@@ -36,20 +36,20 @@ jobs:
|
|||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- name: Check out the repository
|
- name: Check out the repository
|
||||||
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
|
uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
|
||||||
|
|
||||||
- name: Set up Helm
|
- name: Set up Helm
|
||||||
uses: azure/setup-helm@5119fcb9089d432beecbf79bb2c7915207344b78
|
uses: azure/setup-helm@217bf70cbd2e930ba2e81ba7e1de2f7faecc42ba
|
||||||
with:
|
with:
|
||||||
version: v3.6.0
|
version: v3.6.0
|
||||||
|
|
||||||
- name: Set up Python
|
- name: Set up Python
|
||||||
uses: actions/setup-python@65d7f2d534ac1bc67fcd62888c5f4f3d2cb2b236
|
uses: actions/setup-python@b55428b1882923874294fa556849718a1d7f2ca5
|
||||||
with:
|
with:
|
||||||
python-version: '3.x'
|
python-version: '3.x'
|
||||||
|
|
||||||
- name: Set up helm/chart-testing
|
- name: Set up helm/chart-testing
|
||||||
uses: helm/chart-testing-action@e6669bcd63d7cb57cb4380c33043eebe5d111992
|
uses: helm/chart-testing-action@09ed88797198755e5031f25be13da255e7e33aad
|
||||||
|
|
||||||
- name: Run helm/chart-testing (lint)
|
- name: Run helm/chart-testing (lint)
|
||||||
run: ct lint --config ct.yaml
|
run: ct lint --config ct.yaml
|
||||||
@@ -59,7 +59,7 @@ jobs:
|
|||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- name: Check out the repository
|
- name: Check out the repository
|
||||||
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
|
uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
|
||||||
with:
|
with:
|
||||||
fetch-depth: 0
|
fetch-depth: 0
|
||||||
- name: Run gitlint
|
- name: Run gitlint
|
||||||
@@ -70,7 +70,7 @@ jobs:
|
|||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- name: Check out the repository
|
- name: Check out the repository
|
||||||
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
|
uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
|
||||||
|
|
||||||
- name: Run helm-docs and verify docs are up-to-date
|
- name: Run helm-docs and verify docs are up-to-date
|
||||||
run: make helm-docs
|
run: make helm-docs
|
||||||
@@ -80,10 +80,10 @@ jobs:
|
|||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- name: Check out the repository
|
- name: Check out the repository
|
||||||
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
|
uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
|
||||||
|
|
||||||
- name: Run markdown-link-check
|
- name: Run markdown-link-check
|
||||||
uses: gaurav-nelson/github-action-markdown-link-check@d53a906aa6b22b8979d33bc86170567e619495ec
|
uses: gaurav-nelson/github-action-markdown-link-check@228fbf4ffb2a86a65314866e9b2322b519fd885f
|
||||||
with:
|
with:
|
||||||
config-file: ".markdownlinkcheck.json"
|
config-file: ".markdownlinkcheck.json"
|
||||||
check-modified-files-only: "yes"
|
check-modified-files-only: "yes"
|
||||||
@@ -94,7 +94,7 @@ jobs:
|
|||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- name: Check out the repository
|
- name: Check out the repository
|
||||||
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
|
uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
|
||||||
- name: Run markdownlint
|
- name: Run markdownlint
|
||||||
run: make markdownlint
|
run: make markdownlint
|
||||||
|
|
||||||
@@ -103,6 +103,6 @@ jobs:
|
|||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- name: Check out the repository
|
- name: Check out the repository
|
||||||
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
|
uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
|
||||||
- name: Run yamllint
|
- name: Run yamllint
|
||||||
run: make yamllint
|
run: make yamllint
|
||||||
|
|||||||
@@ -12,16 +12,16 @@ jobs:
|
|||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- name: Check out the repository
|
- name: Check out the repository
|
||||||
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
|
uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
|
||||||
|
|
||||||
- name: Run markdown-link-check
|
- name: Run markdown-link-check
|
||||||
uses: gaurav-nelson/github-action-markdown-link-check@d53a906aa6b22b8979d33bc86170567e619495ec
|
uses: gaurav-nelson/github-action-markdown-link-check@228fbf4ffb2a86a65314866e9b2322b519fd885f
|
||||||
with:
|
with:
|
||||||
config-file: ".markdownlinkcheck.json"
|
config-file: ".markdownlinkcheck.json"
|
||||||
|
|
||||||
- name: Raise an Issue to report broken links
|
- name: Raise an Issue to report broken links
|
||||||
if: ${{ failure() }}
|
if: ${{ failure() }}
|
||||||
uses: peter-evans/create-issue-from-file@433e51abf769039ee20ba1293a088ca19d573b7f
|
uses: peter-evans/create-issue-from-file@99b87c35610e986ad2034a7b0518a9b3ebea541b
|
||||||
with:
|
with:
|
||||||
title: Broken link detected by CI
|
title: Broken link detected by CI
|
||||||
content-filepath: .github/ISSUE_TEMPLATE/broken-link.md
|
content-filepath: .github/ISSUE_TEMPLATE/broken-link.md
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ name: Release Charts
|
|||||||
on:
|
on:
|
||||||
push:
|
push:
|
||||||
branches:
|
branches:
|
||||||
- release-0.13
|
- devel
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
release:
|
release:
|
||||||
@@ -13,7 +13,7 @@ jobs:
|
|||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout
|
- name: Checkout
|
||||||
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
|
uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
|
||||||
with:
|
with:
|
||||||
fetch-depth: 0
|
fetch-depth: 0
|
||||||
|
|
||||||
|
|||||||
@@ -3,3 +3,4 @@
|
|||||||
.shflags
|
.shflags
|
||||||
*.tgz
|
*.tgz
|
||||||
Makefile.dapper
|
Makefile.dapper
|
||||||
|
Dockerfile.*
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
---
|
---
|
||||||
cni: ovn
|
cni: ovn
|
||||||
submariner: true
|
submariner: true
|
||||||
nodes: control-plane worker worker
|
nodes: control-plane
|
||||||
clusters:
|
clusters:
|
||||||
cluster1:
|
cluster1:
|
||||||
cluster2:
|
cluster2:
|
||||||
|
|||||||
+2
-1
@@ -1,6 +1,7 @@
|
|||||||
---
|
---
|
||||||
|
cni: weave
|
||||||
submariner: true
|
submariner: true
|
||||||
nodes: control-plane worker
|
nodes: control-plane
|
||||||
clusters:
|
clusters:
|
||||||
cluster1:
|
cluster1:
|
||||||
cluster2:
|
cluster2:
|
||||||
|
|||||||
@@ -1,18 +0,0 @@
|
|||||||
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}
|
|
||||||
|
|
||||||
RUN git config --global --add safe.directory ${DAPPER_SOURCE}
|
|
||||||
|
|
||||||
# Override the Helm deployment scripts
|
|
||||||
COPY deploy_helm /opt/shipyard/scripts/lib/
|
|
||||||
|
|
||||||
ENTRYPOINT ["/opt/shipyard/scripts/entry"]
|
|
||||||
CMD ["sh"]
|
|
||||||
@@ -1,5 +1,6 @@
|
|||||||
BASE_BRANCH ?= release-0.13
|
BASE_BRANCH ?= devel
|
||||||
export BASE_BRANCH
|
export BASE_BRANCH
|
||||||
|
export HELM_REPO_LOCATION=.
|
||||||
|
|
||||||
ifneq (,$(DAPPER_HOST_ARCH))
|
ifneq (,$(DAPPER_HOST_ARCH))
|
||||||
|
|
||||||
@@ -10,30 +11,18 @@ PRELOAD_IMAGES := submariner-gateway submariner-operator submariner-route-agent
|
|||||||
include $(SHIPYARD_DIR)/Makefile.inc
|
include $(SHIPYARD_DIR)/Makefile.inc
|
||||||
|
|
||||||
ifneq (,$(filter ovn,$(_using)))
|
ifneq (,$(filter ovn,$(_using)))
|
||||||
CLUSTER_SETTINGS_FLAG = --settings $(DAPPER_SOURCE)/.shipyard.e2e.ovn.yml
|
export SETTINGS = $(DAPPER_SOURCE)/.shipyard.e2e.ovn.yml
|
||||||
else
|
else
|
||||||
CLUSTER_SETTINGS_FLAG = --settings $(DAPPER_SOURCE)/.shipyard.e2e.yml
|
export SETTINGS = $(DAPPER_SOURCE)/.shipyard.e2e.yml
|
||||||
endif
|
endif
|
||||||
|
|
||||||
override CLUSTERS_ARGS += $(CLUSTER_SETTINGS_FLAG)
|
export DEPLOYTOOL = helm
|
||||||
override DEPLOY_ARGS += $(CLUSTER_SETTINGS_FLAG) --deploytool helm
|
|
||||||
export DEPLOY_ARGS
|
|
||||||
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.10.1
|
CHARTS_VERSION=0.13.0-rc2
|
||||||
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)
|
||||||
|
|
||||||
# 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
|
# Targets to make
|
||||||
|
|
||||||
e2e: E2E_ARGS=cluster1 cluster2
|
e2e: E2E_ARGS=cluster1 cluster2
|
||||||
|
|||||||
-76
@@ -1,76 +0,0 @@
|
|||||||
# 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
|
name: submariner-k8s-broker
|
||||||
version: 0.6.0
|
version: 0.13.0-rc2
|
||||||
apiVersion: v2
|
apiVersion: v2
|
||||||
appVersion: 0.6.0
|
appVersion: 0.13.0-rc2
|
||||||
description: Submariner Kubernetes Broker
|
description: Submariner Kubernetes Broker
|
||||||
keywords:
|
keywords:
|
||||||
home: https://submariner-io.github.io/
|
home: https://submariner-io.github.io/
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
# submariner-k8s-broker
|
# submariner-k8s-broker
|
||||||
|
|
||||||
 
|
 
|
||||||
|
|
||||||
Submariner Kubernetes Broker
|
Submariner Kubernetes Broker
|
||||||
|
|
||||||
|
|||||||
@@ -6,5 +6,5 @@ You can retrieve the server URL by running
|
|||||||
|
|
||||||
The broker client token and CA can be retrieved by running
|
The broker client token and CA can be retrieved by running
|
||||||
|
|
||||||
$ 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_CA=$(kubectl -n "${SUBMARINER_BROKER_NS}" get secrets "${SUBMARINER_BROKER_NS}-client-token" -o jsonpath="{.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)
|
$ SUBMARINER_BROKER_TOKEN=$(kubectl -n "${SUBMARINER_BROKER_NS}" get secrets "${SUBMARINER_BROKER_NS}-client-token" -o jsonpath="{.data.token}"|base64 --decode)
|
||||||
|
|||||||
@@ -8,4 +8,12 @@ metadata:
|
|||||||
release: {{ .Release.Name | quote }}
|
release: {{ .Release.Name | quote }}
|
||||||
chart: {{ template "submariner-k8s-broker.chart" . }}
|
chart: {{ template "submariner-k8s-broker.chart" . }}
|
||||||
app: {{ template "submariner-k8s-broker.name" . }}
|
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 }}
|
{{- end }}
|
||||||
@@ -1,8 +1,8 @@
|
|||||||
---
|
---
|
||||||
name: submariner-operator
|
name: submariner-operator
|
||||||
version: 0.10.1
|
version: 0.13.0-rc2
|
||||||
apiVersion: v2
|
apiVersion: v2
|
||||||
appVersion: 0.10.1
|
appVersion: 0.13.0-rc2
|
||||||
description: Submariner enables direct networking between Pods and Services in different Kubernetes clusters
|
description: Submariner enables direct networking between Pods and Services in different Kubernetes clusters
|
||||||
keywords:
|
keywords:
|
||||||
home: https://submariner-io.github.io/
|
home: https://submariner-io.github.io/
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
# submariner-operator
|
# submariner-operator
|
||||||
|
|
||||||
 
|
 
|
||||||
|
|
||||||
Submariner enables direct networking between Pods and Services in different Kubernetes clusters
|
Submariner enables direct networking between Pods and Services in different Kubernetes clusters
|
||||||
|
|
||||||
@@ -27,7 +27,7 @@ Submariner enables direct networking between Pods and Services in different Kube
|
|||||||
| broker.server | string | `"example.k8s.apiserver"` | |
|
| broker.server | string | `"example.k8s.apiserver"` | |
|
||||||
| broker.token | string | `"test"` | |
|
| broker.token | string | `"test"` | |
|
||||||
| gateway.image.repository | string | `"quay.io/submariner/submariner-gateway"` | |
|
| gateway.image.repository | string | `"quay.io/submariner/submariner-gateway"` | |
|
||||||
| gateway.image.tag | string | `"0.10.1"` | |
|
| gateway.image.tag | string | `"0.13.0-rc2"` | |
|
||||||
| ipsec.debug | bool | `false` | |
|
| ipsec.debug | bool | `false` | |
|
||||||
| ipsec.forceUDPEncaps | bool | `false` | |
|
| ipsec.forceUDPEncaps | bool | `false` | |
|
||||||
| ipsec.ikePort | int | `500` | |
|
| ipsec.ikePort | int | `500` | |
|
||||||
@@ -39,7 +39,7 @@ Submariner enables direct networking between Pods and Services in different Kube
|
|||||||
| operator.affinity | object | `{}` | |
|
| operator.affinity | object | `{}` | |
|
||||||
| operator.image.pullPolicy | string | `"IfNotPresent"` | |
|
| operator.image.pullPolicy | string | `"IfNotPresent"` | |
|
||||||
| operator.image.repository | string | `"quay.io/submariner/submariner-operator"` | |
|
| operator.image.repository | string | `"quay.io/submariner/submariner-operator"` | |
|
||||||
| operator.image.tag | string | `"0.10.1"` | |
|
| operator.image.tag | string | `"0.13.0-rc2"` | |
|
||||||
| operator.resources | object | `{}` | |
|
| operator.resources | object | `{}` | |
|
||||||
| operator.tolerations | list | `[]` | |
|
| operator.tolerations | list | `[]` | |
|
||||||
| rbac.create | bool | `true` | |
|
| rbac.create | bool | `true` | |
|
||||||
@@ -64,7 +64,7 @@ Submariner enables direct networking between Pods and Services in different Kube
|
|||||||
| submariner.globalCidr | string | `""` | |
|
| submariner.globalCidr | string | `""` | |
|
||||||
| submariner.healthcheckEnabled | bool | `true` | |
|
| submariner.healthcheckEnabled | bool | `true` | |
|
||||||
| submariner.images.repository | string | `"quay.io/submariner"` | |
|
| submariner.images.repository | string | `"quay.io/submariner"` | |
|
||||||
| submariner.images.tag | string | `"0.10.1"` | |
|
| submariner.images.tag | string | `"0.13.0-rc2"` | |
|
||||||
| submariner.natEnabled | bool | `false` | |
|
| submariner.natEnabled | bool | `false` | |
|
||||||
| submariner.serviceCidr | string | `""` | |
|
| submariner.serviceCidr | string | `""` | |
|
||||||
| submariner.serviceDiscovery | bool | `true` | |
|
| submariner.serviceDiscovery | bool | `true` | |
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ questions:
|
|||||||
type: string
|
type: string
|
||||||
label: Submariner Operator Image Repository
|
label: Submariner Operator Image Repository
|
||||||
- variable: operator.image.tag
|
- variable: operator.image.tag
|
||||||
default: "0.10.1"
|
default: "0.13.0-rc2"
|
||||||
description: "Submariner Operator Image Tag"
|
description: "Submariner Operator Image Tag"
|
||||||
type: string
|
type: string
|
||||||
label: Submariner Operator Image Tag
|
label: Submariner Operator Image Tag
|
||||||
@@ -32,7 +32,7 @@ questions:
|
|||||||
type: string
|
type: string
|
||||||
label: Submariner Repository
|
label: Submariner Repository
|
||||||
- variable: submariner.images.tag
|
- variable: submariner.images.tag
|
||||||
default: "0.10.1"
|
default: "0.13.0-rc2"
|
||||||
description: "Submariner Images Tag (shared for all non-operator images)"
|
description: "Submariner Images Tag (shared for all non-operator images)"
|
||||||
type: string
|
type: string
|
||||||
label: Submariner Images Tag
|
label: Submariner Images Tag
|
||||||
|
|||||||
@@ -162,6 +162,17 @@ rules:
|
|||||||
- patch
|
- patch
|
||||||
- update
|
- update
|
||||||
- watch
|
- watch
|
||||||
|
- apiGroups:
|
||||||
|
- coordination.k8s.io
|
||||||
|
resources:
|
||||||
|
- leases
|
||||||
|
verbs:
|
||||||
|
- get
|
||||||
|
- list
|
||||||
|
- watch
|
||||||
|
- create
|
||||||
|
- update
|
||||||
|
- delete
|
||||||
---
|
---
|
||||||
apiVersion: rbac.authorization.k8s.io/v1
|
apiVersion: rbac.authorization.k8s.io/v1
|
||||||
kind: RoleBinding
|
kind: RoleBinding
|
||||||
|
|||||||
@@ -8,6 +8,14 @@ metadata:
|
|||||||
release: {{ .Release.Name | quote }}
|
release: {{ .Release.Name | quote }}
|
||||||
chart: {{ template "submariner.chart" . }}
|
chart: {{ template "submariner.chart" . }}
|
||||||
app: {{ template "submariner.name" . }}
|
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 }}
|
{{- end }}
|
||||||
---
|
---
|
||||||
{{- if .Values.serviceAccounts.gateway.create }}
|
{{- if .Values.serviceAccounts.gateway.create }}
|
||||||
@@ -20,6 +28,14 @@ metadata:
|
|||||||
release: {{ .Release.Name | quote }}
|
release: {{ .Release.Name | quote }}
|
||||||
chart: {{ template "submariner.chart" . }}
|
chart: {{ template "submariner.chart" . }}
|
||||||
app: {{ template "submariner.name" . }}
|
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 }}
|
{{- end }}
|
||||||
---
|
---
|
||||||
{{- if .Values.serviceAccounts.routeAgent.create }}
|
{{- if .Values.serviceAccounts.routeAgent.create }}
|
||||||
@@ -32,6 +48,14 @@ metadata:
|
|||||||
release: {{ .Release.Name | quote }}
|
release: {{ .Release.Name | quote }}
|
||||||
chart: {{ template "submariner.chart" . }}
|
chart: {{ template "submariner.chart" . }}
|
||||||
app: {{ template "submariner.name" . }}
|
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 }}
|
{{- end }}
|
||||||
---
|
---
|
||||||
{{- if .Values.serviceAccounts.globalnet.create }}
|
{{- if .Values.serviceAccounts.globalnet.create }}
|
||||||
@@ -44,6 +68,14 @@ metadata:
|
|||||||
release: {{ .Release.Name | quote }}
|
release: {{ .Release.Name | quote }}
|
||||||
chart: {{ template "submariner.chart" . }}
|
chart: {{ template "submariner.chart" . }}
|
||||||
app: {{ template "submariner.name" . }}
|
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 }}
|
{{- end }}
|
||||||
---
|
---
|
||||||
{{- if .Values.serviceAccounts.lighthouseAgent.create }}
|
{{- if .Values.serviceAccounts.lighthouseAgent.create }}
|
||||||
@@ -56,6 +88,14 @@ metadata:
|
|||||||
release: {{ .Release.Name | quote }}
|
release: {{ .Release.Name | quote }}
|
||||||
chart: {{ template "submariner.chart" . }}
|
chart: {{ template "submariner.chart" . }}
|
||||||
app: {{ template "submariner.name" . }}
|
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 }}
|
{{- end }}
|
||||||
---
|
---
|
||||||
{{- if .Values.serviceAccounts.lighthouseCoreDns.create }}
|
{{- if .Values.serviceAccounts.lighthouseCoreDns.create }}
|
||||||
@@ -68,4 +108,12 @@ metadata:
|
|||||||
release: {{ .Release.Name | quote }}
|
release: {{ .Release.Name | quote }}
|
||||||
chart: {{ template "submariner.chart" . }}
|
chart: {{ template "submariner.chart" . }}
|
||||||
app: {{ template "submariner.name" . }}
|
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 }}
|
{{- end }}
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ submariner:
|
|||||||
coreDNSCustomConfig: {}
|
coreDNSCustomConfig: {}
|
||||||
images:
|
images:
|
||||||
repository: quay.io/submariner
|
repository: quay.io/submariner
|
||||||
tag: "0.10.1"
|
tag: "0.13.0-rc2"
|
||||||
broker:
|
broker:
|
||||||
server: example.k8s.apiserver
|
server: example.k8s.apiserver
|
||||||
token: test
|
token: test
|
||||||
@@ -37,7 +37,7 @@ leadership:
|
|||||||
operator:
|
operator:
|
||||||
image:
|
image:
|
||||||
repository: quay.io/submariner/submariner-operator
|
repository: quay.io/submariner/submariner-operator
|
||||||
tag: "0.10.1"
|
tag: "0.13.0-rc2"
|
||||||
pullPolicy: IfNotPresent
|
pullPolicy: IfNotPresent
|
||||||
resources: {}
|
resources: {}
|
||||||
tolerations: []
|
tolerations: []
|
||||||
@@ -45,7 +45,7 @@ operator:
|
|||||||
gateway:
|
gateway:
|
||||||
image:
|
image:
|
||||||
repository: quay.io/submariner/submariner-gateway
|
repository: quay.io/submariner/submariner-gateway
|
||||||
tag: "0.10.1"
|
tag: "0.13.0-rc2"
|
||||||
serviceAccounts:
|
serviceAccounts:
|
||||||
operator:
|
operator:
|
||||||
create: true
|
create: true
|
||||||
|
|||||||
Reference in New Issue
Block a user