mirror of
https://github.com/submariner-io/submariner-charts.git
synced 2026-09-21 18:30:34 +00:00
Compare commits
50
Commits
v0.15.0-m2
...
v0.15.4
@@ -4,19 +4,19 @@ updates:
|
|||||||
- package-ecosystem: github-actions
|
- package-ecosystem: github-actions
|
||||||
directory: '/'
|
directory: '/'
|
||||||
schedule:
|
schedule:
|
||||||
interval: weekly
|
interval: monthly
|
||||||
- package-ecosystem: github-actions
|
- package-ecosystem: github-actions
|
||||||
directory: '/'
|
directory: '/'
|
||||||
target-branch: "release-0.12"
|
target-branch: "release-0.12"
|
||||||
schedule:
|
schedule:
|
||||||
interval: weekly
|
interval: monthly
|
||||||
- package-ecosystem: github-actions
|
- package-ecosystem: github-actions
|
||||||
directory: '/'
|
directory: '/'
|
||||||
target-branch: "release-0.13"
|
target-branch: "release-0.13"
|
||||||
schedule:
|
schedule:
|
||||||
interval: weekly
|
interval: monthly
|
||||||
- package-ecosystem: github-actions
|
- package-ecosystem: github-actions
|
||||||
directory: '/'
|
directory: '/'
|
||||||
target-branch: "release-0.14"
|
target-branch: "release-0.14"
|
||||||
schedule:
|
schedule:
|
||||||
interval: weekly
|
interval: monthly
|
||||||
|
|||||||
@@ -11,6 +11,6 @@ jobs:
|
|||||||
name: PR targets branch
|
name: PR targets branch
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- name: Check that the PR targets devel
|
- name: Check that the PR targets release-0.15
|
||||||
if: ${{ github.base_ref != 'devel' }}
|
if: ${{ github.base_ref != 'release-0.15' }}
|
||||||
run: exit 1
|
run: exit 1
|
||||||
|
|||||||
@@ -30,7 +30,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@0fae07162bc9e0d8e116a133bd03686eed6efa21
|
- uses: z0al/dependent-issues@950226e7ca8fc43dc209a7febf67c655af3bdb43
|
||||||
env:
|
env:
|
||||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
with:
|
with:
|
||||||
|
|||||||
@@ -26,14 +26,14 @@ jobs:
|
|||||||
- k8s_version: '1.24'
|
- k8s_version: '1.24'
|
||||||
steps:
|
steps:
|
||||||
- name: Check out the repository
|
- name: Check out the repository
|
||||||
uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c
|
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
|
||||||
|
|
||||||
- name: Run E2E deployment and tests
|
- name: Run E2E deployment and tests
|
||||||
uses: submariner-io/shipyard/gh-actions/e2e@devel
|
uses: submariner-io/shipyard/gh-actions/e2e@release-0.15
|
||||||
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@devel
|
uses: submariner-io/shipyard/gh-actions/post-mortem@release-0.15
|
||||||
|
|||||||
@@ -13,11 +13,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@ac593985615ec2ede58e132d2e21d2b1cbd6127c
|
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
|
||||||
|
|
||||||
- name: Run E2E deployment and tests
|
- name: Run E2E deployment and tests
|
||||||
uses: submariner-io/shipyard/gh-actions/e2e@devel
|
uses: submariner-io/shipyard/gh-actions/e2e@release-0.15
|
||||||
|
|
||||||
- name: Post mortem
|
- name: Post mortem
|
||||||
if: failure()
|
if: failure()
|
||||||
uses: submariner-io/shipyard/gh-actions/post-mortem@devel
|
uses: submariner-io/shipyard/gh-actions/post-mortem@release-0.15
|
||||||
|
|||||||
@@ -21,13 +21,13 @@ jobs:
|
|||||||
lighthouse: ['', 'lighthouse']
|
lighthouse: ['', 'lighthouse']
|
||||||
steps:
|
steps:
|
||||||
- name: Check out the repository
|
- name: Check out the repository
|
||||||
uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c
|
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
|
||||||
|
|
||||||
- name: Run E2E deployment and tests
|
- name: Run E2E deployment and tests
|
||||||
uses: submariner-io/shipyard/gh-actions/e2e@devel
|
uses: submariner-io/shipyard/gh-actions/e2e@release-0.15
|
||||||
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@devel
|
uses: submariner-io/shipyard/gh-actions/post-mortem@release-0.15
|
||||||
|
|||||||
@@ -13,12 +13,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@c64db31d359214d244884dd68f971a110b29ab83
|
uses: tim-actions/get-pr-commits@198af03565609bb4ed924d1260247b4881f09e7d
|
||||||
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@d6d9770051dd6460679d1cab1dcaa8cffc5c2bbd
|
uses: tim-actions/commit-message-checker-with-regex@094fc16ff83d04e2ec73edb5eaf6aa267db33791
|
||||||
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))'
|
||||||
@@ -26,7 +26,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@d6d9770051dd6460679d1cab1dcaa8cffc5c2bbd
|
uses: tim-actions/commit-message-checker-with-regex@094fc16ff83d04e2ec73edb5eaf6aa267db33791
|
||||||
with:
|
with:
|
||||||
commits: ${{ steps.get-pr-commits.outputs.commits }}
|
commits: ${{ steps.get-pr-commits.outputs.commits }}
|
||||||
pattern: '^(?!fixup!)'
|
pattern: '^(?!fixup!)'
|
||||||
@@ -38,20 +38,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@ac593985615ec2ede58e132d2e21d2b1cbd6127c
|
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
|
||||||
|
|
||||||
- name: Set up Helm
|
- name: Set up Helm
|
||||||
uses: azure/setup-helm@5119fcb9089d432beecbf79bb2c7915207344b78
|
uses: azure/setup-helm@fe7b79cd5ee1e45176fcad797de68ecaf3ca4814
|
||||||
with:
|
with:
|
||||||
version: v3.6.0
|
version: v3.6.0
|
||||||
|
|
||||||
- name: Set up Python
|
- name: Set up Python
|
||||||
uses: actions/setup-python@d27e3f3d7c64b4bbf8e4abfb9b63b83e846e0435
|
uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d
|
||||||
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@afea100a513515fbd68b0e72a7bb0ae34cb62aec
|
uses: helm/chart-testing-action@e6669bcd63d7cb57cb4380c33043eebe5d111992
|
||||||
|
|
||||||
- name: Set up local helm repo
|
- name: Set up local helm repo
|
||||||
run: make local-helm-repo
|
run: make local-helm-repo
|
||||||
@@ -64,7 +64,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@ac593985615ec2ede58e132d2e21d2b1cbd6127c
|
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
|
||||||
with:
|
with:
|
||||||
fetch-depth: 0
|
fetch-depth: 0
|
||||||
- name: Run gitlint
|
- name: Run gitlint
|
||||||
@@ -75,7 +75,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@ac593985615ec2ede58e132d2e21d2b1cbd6127c
|
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
|
||||||
|
|
||||||
- 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
|
||||||
@@ -85,10 +85,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@ac593985615ec2ede58e132d2e21d2b1cbd6127c
|
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
|
||||||
|
|
||||||
- name: Run markdown-link-check
|
- name: Run markdown-link-check
|
||||||
uses: gaurav-nelson/github-action-markdown-link-check@4d97ad89bbb0de4be573a9d7a2fc0ce900afc519
|
uses: gaurav-nelson/github-action-markdown-link-check@d53a906aa6b22b8979d33bc86170567e619495ec
|
||||||
with:
|
with:
|
||||||
config-file: ".markdownlinkcheck.json"
|
config-file: ".markdownlinkcheck.json"
|
||||||
check-modified-files-only: "yes"
|
check-modified-files-only: "yes"
|
||||||
@@ -99,7 +99,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@ac593985615ec2ede58e132d2e21d2b1cbd6127c
|
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
|
||||||
- name: Run markdownlint
|
- name: Run markdownlint
|
||||||
run: make markdownlint
|
run: make markdownlint
|
||||||
|
|
||||||
@@ -108,6 +108,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@ac593985615ec2ede58e132d2e21d2b1cbd6127c
|
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
|
||||||
- name: Run yamllint
|
- name: Run yamllint
|
||||||
run: make yamllint
|
run: make yamllint
|
||||||
|
|||||||
@@ -16,16 +16,16 @@ jobs:
|
|||||||
issues: write
|
issues: write
|
||||||
steps:
|
steps:
|
||||||
- name: Check out the repository
|
- name: Check out the repository
|
||||||
uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c
|
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
|
||||||
|
|
||||||
- name: Run markdown-link-check
|
- name: Run markdown-link-check
|
||||||
uses: gaurav-nelson/github-action-markdown-link-check@4d97ad89bbb0de4be573a9d7a2fc0ce900afc519
|
uses: gaurav-nelson/github-action-markdown-link-check@d53a906aa6b22b8979d33bc86170567e619495ec
|
||||||
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@24452a72d85239eacf1468b0f1982a9f3fec4c94
|
||||||
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:
|
||||||
- devel
|
- release-0.15
|
||||||
|
|
||||||
permissions:
|
permissions:
|
||||||
contents: write
|
contents: write
|
||||||
@@ -16,7 +16,7 @@ jobs:
|
|||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout
|
- name: Checkout
|
||||||
uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c
|
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
|
||||||
with:
|
with:
|
||||||
fetch-depth: 0
|
fetch-depth: 0
|
||||||
|
|
||||||
|
|||||||
+3
-2
@@ -1,3 +1,4 @@
|
|||||||
# Auto-generated, do not edit; see CODEOWNERS.in
|
# Auto-generated, do not edit; see CODEOWNERS.in
|
||||||
* @Oats87 @skitt @sridhargaddam @tpantelis
|
* @Oats87 @skitt @sridhargaddam @tpantelis @vthapar
|
||||||
*.md @dfarrell07 @Oats87 @skitt @sridhargaddam @tpantelis
|
*.md @dfarrell07 @Oats87 @skitt @sridhargaddam @tpantelis @vthapar
|
||||||
|
Makefile @aswinsuryan @dfarrell07 @maayanf24 @Oats87 @skitt @sridhargaddam @tpantelis @vthapar @yboaron
|
||||||
|
|||||||
+5
-1
@@ -1,5 +1,9 @@
|
|||||||
@dfarrell07 *.md
|
@aswinsuryan Makefile
|
||||||
|
@dfarrell07 *.md Makefile
|
||||||
|
@maayanf24 Makefile
|
||||||
@Oats87 *
|
@Oats87 *
|
||||||
@skitt *
|
@skitt *
|
||||||
@sridhargaddam *
|
@sridhargaddam *
|
||||||
@tpantelis *
|
@tpantelis *
|
||||||
|
@vthapar *
|
||||||
|
@yboaron Makefile
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
BASE_BRANCH ?= devel
|
BASE_BRANCH ?= release-0.15
|
||||||
export BASE_BRANCH
|
export BASE_BRANCH
|
||||||
export HELM_REPO_LOCATION=./helm_repo
|
export HELM_REPO_LOCATION=./helm_repo
|
||||||
|
|
||||||
@@ -17,11 +17,9 @@ endif
|
|||||||
export DEPLOYTOOL = helm
|
export DEPLOYTOOL = helm
|
||||||
GH_URL=https://submariner-io.github.io/submariner-charts/charts
|
GH_URL=https://submariner-io.github.io/submariner-charts/charts
|
||||||
CHARTS_DIR=charts
|
CHARTS_DIR=charts
|
||||||
CHARTS_VERSION=0.14.0
|
CHARTS_VERSION=0.15.4
|
||||||
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)
|
||||||
SUBCTL_VERSION=$(CHARTS_VERSION)
|
|
||||||
export SUBCTL_VERSION
|
|
||||||
|
|
||||||
# Targets to make
|
# Targets to make
|
||||||
|
|
||||||
|
|||||||
@@ -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 "${SUBMARINER_BROKER_NS}" get secrets "${SUBMARINER_BROKER_NS}-client-token" -o jsonpath="{.data['ca\.crt']}")
|
$ SUBMARINER_BROKER_CA=$(kubectl -n "${BROKER_NS}" get secrets "${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_TOKEN=$(kubectl -n "${BROKER_NS}" get secrets "${BROKER_NS}-client-token" -o jsonpath="{.data.token}"|base64 --decode)
|
||||||
|
|||||||
@@ -9,62 +9,85 @@ metadata:
|
|||||||
chart: {{ template "submariner.chart" . }}
|
chart: {{ template "submariner.chart" . }}
|
||||||
app: {{ template "submariner.name" . }}
|
app: {{ template "submariner.name" . }}
|
||||||
rules:
|
rules:
|
||||||
- apiGroups:
|
- apiGroups:
|
||||||
- ""
|
- ""
|
||||||
resources:
|
resources:
|
||||||
- pods
|
# For metrics
|
||||||
- services
|
- services
|
||||||
- services/finalizers
|
verbs:
|
||||||
- endpoints
|
- get
|
||||||
- persistentvolumeclaims
|
- create
|
||||||
- events
|
- update
|
||||||
- configmaps
|
- apiGroups:
|
||||||
- secrets
|
- ""
|
||||||
verbs:
|
resources:
|
||||||
- '*'
|
# For syncing Secrets from the broker
|
||||||
- apiGroups:
|
- secrets
|
||||||
- apps
|
verbs:
|
||||||
resources:
|
- get
|
||||||
- deployments
|
- create
|
||||||
- daemonsets
|
- update
|
||||||
- replicasets
|
- delete
|
||||||
- statefulsets
|
- apiGroups:
|
||||||
verbs:
|
- apps
|
||||||
- '*'
|
resources:
|
||||||
- apiGroups:
|
- deployments
|
||||||
- monitoring.coreos.com
|
- daemonsets
|
||||||
resources:
|
verbs:
|
||||||
- servicemonitors
|
- create
|
||||||
verbs:
|
- delete
|
||||||
- get
|
- get
|
||||||
- create
|
- list
|
||||||
- apiGroups:
|
- patch
|
||||||
- apps
|
- update
|
||||||
resourceNames:
|
- watch
|
||||||
- {{ template "submariner.fullname" . }}
|
- apiGroups:
|
||||||
resources:
|
- monitoring.coreos.com
|
||||||
- deployments/finalizers
|
resources:
|
||||||
verbs:
|
# Needed for openshift monitoring
|
||||||
- update
|
- servicemonitors
|
||||||
- apiGroups:
|
verbs:
|
||||||
- ""
|
- get
|
||||||
resources:
|
- create
|
||||||
- pods
|
- apiGroups:
|
||||||
verbs:
|
- apps
|
||||||
- get
|
resourceNames:
|
||||||
- apiGroups:
|
- {{ template "submariner.fullname" . }}
|
||||||
- apps
|
resources:
|
||||||
resources:
|
- deployments/finalizers
|
||||||
- replicasets
|
verbs:
|
||||||
verbs:
|
- update
|
||||||
- get
|
- apiGroups:
|
||||||
- apiGroups:
|
- submariner.io
|
||||||
- submariner.io
|
resources:
|
||||||
resources:
|
- brokers
|
||||||
- '*'
|
- brokers/status
|
||||||
- servicediscoveries
|
- submariners
|
||||||
verbs:
|
- submariners/status
|
||||||
- '*'
|
- servicediscoveries
|
||||||
|
- servicediscoveries/status
|
||||||
|
verbs:
|
||||||
|
- get
|
||||||
|
- list
|
||||||
|
- watch
|
||||||
|
- create
|
||||||
|
- update
|
||||||
|
- delete
|
||||||
|
- apiGroups:
|
||||||
|
- submariner.io
|
||||||
|
resources:
|
||||||
|
- gateways
|
||||||
|
verbs:
|
||||||
|
- get
|
||||||
|
- list
|
||||||
|
- watch
|
||||||
|
- apiGroups:
|
||||||
|
- submariner.io
|
||||||
|
resources:
|
||||||
|
- submariners/finalizers
|
||||||
|
- servicediscoveries/finalizers
|
||||||
|
verbs:
|
||||||
|
- update
|
||||||
---
|
---
|
||||||
kind: RoleBinding
|
kind: RoleBinding
|
||||||
apiVersion: rbac.authorization.k8s.io/v1
|
apiVersion: rbac.authorization.k8s.io/v1
|
||||||
@@ -93,86 +116,47 @@ metadata:
|
|||||||
chart: {{ template "submariner.chart" . }}
|
chart: {{ template "submariner.chart" . }}
|
||||||
app: {{ template "submariner.name" . }}
|
app: {{ template "submariner.name" . }}
|
||||||
rules:
|
rules:
|
||||||
- apiGroups:
|
- apiGroups:
|
||||||
- ""
|
- ""
|
||||||
resources:
|
resources:
|
||||||
- pods
|
- pods
|
||||||
- services
|
verbs:
|
||||||
- services/finalizers
|
- get
|
||||||
- endpoints
|
- update
|
||||||
- persistentvolumeclaims
|
- patch
|
||||||
- events
|
- apiGroups:
|
||||||
- configmaps
|
- submariner.io
|
||||||
- secrets
|
resources:
|
||||||
verbs:
|
- clusters
|
||||||
- '*'
|
- endpoints
|
||||||
- apiGroups:
|
- gateways
|
||||||
- apps
|
verbs:
|
||||||
resources:
|
- get
|
||||||
- deployments
|
- list
|
||||||
- daemonsets
|
- watch
|
||||||
- replicasets
|
- create
|
||||||
- statefulsets
|
- update
|
||||||
verbs:
|
- delete
|
||||||
- '*'
|
- apiGroups:
|
||||||
- apiGroups:
|
- coordination.k8s.io
|
||||||
- monitoring.coreos.com
|
resources:
|
||||||
resources:
|
- leases
|
||||||
- servicemonitors
|
verbs:
|
||||||
verbs:
|
- get
|
||||||
- get
|
- list
|
||||||
- create
|
- watch
|
||||||
- apiGroups:
|
- create
|
||||||
- apps
|
- update
|
||||||
resourceNames:
|
- delete
|
||||||
- submariner-operator
|
- apiGroups:
|
||||||
resources:
|
- ""
|
||||||
- deployments/finalizers
|
resources:
|
||||||
verbs:
|
# For leader election
|
||||||
- update
|
- configmaps
|
||||||
- apiGroups:
|
verbs:
|
||||||
- ""
|
- get
|
||||||
resources:
|
- create
|
||||||
- pods
|
- update
|
||||||
verbs:
|
|
||||||
- get
|
|
||||||
- apiGroups:
|
|
||||||
- apps
|
|
||||||
resources:
|
|
||||||
- replicasets
|
|
||||||
verbs:
|
|
||||||
- get
|
|
||||||
- apiGroups:
|
|
||||||
- submariner.io
|
|
||||||
resources:
|
|
||||||
- '*'
|
|
||||||
- servicediscoveries
|
|
||||||
verbs:
|
|
||||||
- '*'
|
|
||||||
- apiGroups:
|
|
||||||
- lighthouse.submariner.io
|
|
||||||
resources:
|
|
||||||
- '*'
|
|
||||||
- serviceexports
|
|
||||||
verbs:
|
|
||||||
- create
|
|
||||||
- delete
|
|
||||||
- get
|
|
||||||
- list
|
|
||||||
- patch
|
|
||||||
- update
|
|
||||||
- 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
|
||||||
@@ -202,74 +186,13 @@ metadata:
|
|||||||
chart: {{ template "submariner.chart" . }}
|
chart: {{ template "submariner.chart" . }}
|
||||||
app: {{ template "submariner.name" . }}
|
app: {{ template "submariner.name" . }}
|
||||||
rules:
|
rules:
|
||||||
- apiGroups:
|
|
||||||
- ""
|
|
||||||
resources:
|
|
||||||
- pods
|
|
||||||
- services
|
|
||||||
- services/finalizers
|
|
||||||
- endpoints
|
|
||||||
- persistentvolumeclaims
|
|
||||||
- events
|
|
||||||
- configmaps
|
|
||||||
- secrets
|
|
||||||
verbs:
|
|
||||||
- '*'
|
|
||||||
- apiGroups:
|
|
||||||
- apps
|
|
||||||
resources:
|
|
||||||
- deployments
|
|
||||||
- daemonsets
|
|
||||||
- replicasets
|
|
||||||
- statefulsets
|
|
||||||
verbs:
|
|
||||||
- '*'
|
|
||||||
- apiGroups:
|
|
||||||
- monitoring.coreos.com
|
|
||||||
resources:
|
|
||||||
- servicemonitors
|
|
||||||
verbs:
|
|
||||||
- get
|
|
||||||
- create
|
|
||||||
- apiGroups:
|
|
||||||
- apps
|
|
||||||
resourceNames:
|
|
||||||
- submariner-operator
|
|
||||||
resources:
|
|
||||||
- deployments/finalizers
|
|
||||||
verbs:
|
|
||||||
- update
|
|
||||||
- apiGroups:
|
|
||||||
- ""
|
|
||||||
resources:
|
|
||||||
- pods
|
|
||||||
verbs:
|
|
||||||
- get
|
|
||||||
- apiGroups:
|
|
||||||
- apps
|
|
||||||
resources:
|
|
||||||
- replicasets
|
|
||||||
verbs:
|
|
||||||
- get
|
|
||||||
- apiGroups:
|
- apiGroups:
|
||||||
- submariner.io
|
- submariner.io
|
||||||
resources:
|
resources:
|
||||||
- '*'
|
- endpoints
|
||||||
- servicediscoveries
|
|
||||||
verbs:
|
verbs:
|
||||||
- '*'
|
|
||||||
- apiGroups:
|
|
||||||
- lighthouse.submariner.io
|
|
||||||
resources:
|
|
||||||
- '*'
|
|
||||||
- serviceexports
|
|
||||||
verbs:
|
|
||||||
- create
|
|
||||||
- delete
|
|
||||||
- get
|
- get
|
||||||
- list
|
- list
|
||||||
- patch
|
|
||||||
- update
|
|
||||||
- watch
|
- watch
|
||||||
---
|
---
|
||||||
apiVersion: rbac.authorization.k8s.io/v1
|
apiVersion: rbac.authorization.k8s.io/v1
|
||||||
@@ -300,76 +223,6 @@ 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" . }}
|
||||||
rules:
|
|
||||||
- apiGroups:
|
|
||||||
- ""
|
|
||||||
resources:
|
|
||||||
- pods
|
|
||||||
- services
|
|
||||||
- services/finalizers
|
|
||||||
- endpoints
|
|
||||||
- persistentvolumeclaims
|
|
||||||
- events
|
|
||||||
- configmaps
|
|
||||||
- secrets
|
|
||||||
verbs:
|
|
||||||
- '*'
|
|
||||||
- apiGroups:
|
|
||||||
- apps
|
|
||||||
resources:
|
|
||||||
- deployments
|
|
||||||
- daemonsets
|
|
||||||
- replicasets
|
|
||||||
- statefulsets
|
|
||||||
verbs:
|
|
||||||
- '*'
|
|
||||||
- apiGroups:
|
|
||||||
- monitoring.coreos.com
|
|
||||||
resources:
|
|
||||||
- servicemonitors
|
|
||||||
verbs:
|
|
||||||
- get
|
|
||||||
- create
|
|
||||||
- apiGroups:
|
|
||||||
- apps
|
|
||||||
resourceNames:
|
|
||||||
- submariner-operator
|
|
||||||
resources:
|
|
||||||
- deployments/finalizers
|
|
||||||
verbs:
|
|
||||||
- update
|
|
||||||
- apiGroups:
|
|
||||||
- ""
|
|
||||||
resources:
|
|
||||||
- pods
|
|
||||||
verbs:
|
|
||||||
- get
|
|
||||||
- apiGroups:
|
|
||||||
- apps
|
|
||||||
resources:
|
|
||||||
- replicasets
|
|
||||||
verbs:
|
|
||||||
- get
|
|
||||||
- apiGroups:
|
|
||||||
- submariner.io
|
|
||||||
resources:
|
|
||||||
- '*'
|
|
||||||
- servicediscoveries
|
|
||||||
verbs:
|
|
||||||
- '*'
|
|
||||||
- apiGroups:
|
|
||||||
- lighthouse.submariner.io
|
|
||||||
resources:
|
|
||||||
- '*'
|
|
||||||
- serviceexports
|
|
||||||
verbs:
|
|
||||||
- create
|
|
||||||
- delete
|
|
||||||
- get
|
|
||||||
- list
|
|
||||||
- patch
|
|
||||||
- update
|
|
||||||
- watch
|
|
||||||
---
|
---
|
||||||
apiVersion: rbac.authorization.k8s.io/v1
|
apiVersion: rbac.authorization.k8s.io/v1
|
||||||
kind: RoleBinding
|
kind: RoleBinding
|
||||||
@@ -400,9 +253,6 @@ metadata:
|
|||||||
chart: {{ template "submariner.chart" . }}
|
chart: {{ template "submariner.chart" . }}
|
||||||
app: {{ template "submariner.name" . }}
|
app: {{ template "submariner.name" . }}
|
||||||
rules:
|
rules:
|
||||||
# submariner-operator updates the config map of core-dns to forward requests to
|
|
||||||
# clusterset.local to Lighthouse DNS, also looks at existing configmaps
|
|
||||||
# to figure out network settings
|
|
||||||
- apiGroups:
|
- apiGroups:
|
||||||
- ""
|
- ""
|
||||||
resources:
|
resources:
|
||||||
@@ -424,9 +274,10 @@ rules:
|
|||||||
- update
|
- update
|
||||||
- delete
|
- delete
|
||||||
- watch
|
- watch
|
||||||
- apiGroups: # pods, services and nodes are looked up to figure out network settings
|
- apiGroups:
|
||||||
- ""
|
- ""
|
||||||
resources:
|
resources:
|
||||||
|
# Needed for network settings discovery
|
||||||
- pods
|
- pods
|
||||||
- services
|
- services
|
||||||
- nodes
|
- nodes
|
||||||
@@ -440,31 +291,31 @@ rules:
|
|||||||
- dnses
|
- dnses
|
||||||
verbs:
|
verbs:
|
||||||
- get
|
- get
|
||||||
- list
|
|
||||||
- watch
|
|
||||||
- update
|
- update
|
||||||
- apiGroups:
|
- apiGroups:
|
||||||
- config.openshift.io
|
- config.openshift.io
|
||||||
resources:
|
resources:
|
||||||
|
# Needed for network settings discovery
|
||||||
- networks
|
- networks
|
||||||
|
resourceNames:
|
||||||
|
- cluster
|
||||||
verbs:
|
verbs:
|
||||||
- get
|
- get
|
||||||
- list
|
|
||||||
- apiGroups:
|
|
||||||
- ""
|
|
||||||
resources:
|
|
||||||
- namespaces
|
|
||||||
verbs:
|
|
||||||
- get
|
|
||||||
- list
|
|
||||||
- watch
|
|
||||||
- apiGroups:
|
- apiGroups:
|
||||||
- monitoring.coreos.com
|
- monitoring.coreos.com
|
||||||
resources:
|
resources:
|
||||||
|
# Needed for openshift monitoring
|
||||||
- servicemonitors
|
- servicemonitors
|
||||||
verbs:
|
verbs:
|
||||||
- get
|
- get
|
||||||
- create
|
- create
|
||||||
|
- apiGroups:
|
||||||
|
- apps
|
||||||
|
resources:
|
||||||
|
# Needed for Flannel CNI discovery
|
||||||
|
- daemonsets
|
||||||
|
verbs:
|
||||||
|
- list
|
||||||
---
|
---
|
||||||
apiVersion: rbac.authorization.k8s.io/v1
|
apiVersion: rbac.authorization.k8s.io/v1
|
||||||
kind: ClusterRoleBinding
|
kind: ClusterRoleBinding
|
||||||
@@ -523,21 +374,7 @@ rules:
|
|||||||
- configmaps
|
- configmaps
|
||||||
verbs:
|
verbs:
|
||||||
- get
|
- get
|
||||||
- list
|
|
||||||
- watch
|
|
||||||
- create
|
|
||||||
- update
|
|
||||||
- apiGroups:
|
- apiGroups:
|
||||||
- apiextensions.k8s.io
|
|
||||||
resources:
|
|
||||||
- customresourcedefinitions
|
|
||||||
verbs:
|
|
||||||
- get
|
|
||||||
- list
|
|
||||||
- create
|
|
||||||
- update
|
|
||||||
- delete
|
|
||||||
- apiGroups: # pods and services are looked up to figure out network settings
|
|
||||||
- ""
|
- ""
|
||||||
resources:
|
resources:
|
||||||
- pods
|
- pods
|
||||||
@@ -547,32 +384,6 @@ rules:
|
|||||||
- get
|
- get
|
||||||
- list
|
- list
|
||||||
- watch
|
- watch
|
||||||
- apiGroups:
|
|
||||||
- operator.openshift.io
|
|
||||||
resources:
|
|
||||||
- dnses
|
|
||||||
verbs:
|
|
||||||
- get
|
|
||||||
- list
|
|
||||||
- watch
|
|
||||||
- update
|
|
||||||
- apiGroups:
|
|
||||||
- config.openshift.io
|
|
||||||
resources:
|
|
||||||
- networks
|
|
||||||
verbs:
|
|
||||||
- get
|
|
||||||
- list
|
|
||||||
- apiGroups:
|
|
||||||
- submariner.io
|
|
||||||
resources:
|
|
||||||
- endpoints
|
|
||||||
- gateways
|
|
||||||
- clusters
|
|
||||||
verbs:
|
|
||||||
- get
|
|
||||||
- list
|
|
||||||
- watch
|
|
||||||
---
|
---
|
||||||
apiVersion: rbac.authorization.k8s.io/v1
|
apiVersion: rbac.authorization.k8s.io/v1
|
||||||
kind: ClusterRoleBinding
|
kind: ClusterRoleBinding
|
||||||
@@ -605,56 +416,29 @@ rules:
|
|||||||
- apiGroups:
|
- apiGroups:
|
||||||
- ""
|
- ""
|
||||||
resources:
|
resources:
|
||||||
|
- pods
|
||||||
|
- services
|
||||||
- configmaps
|
- configmaps
|
||||||
verbs:
|
verbs:
|
||||||
- get
|
- get
|
||||||
- list
|
- list
|
||||||
- watch
|
|
||||||
- update
|
|
||||||
- apiGroups:
|
|
||||||
- apiextensions.k8s.io
|
|
||||||
resources:
|
|
||||||
- customresourcedefinitions
|
|
||||||
verbs:
|
|
||||||
- get
|
|
||||||
- list
|
|
||||||
- create
|
|
||||||
- update
|
|
||||||
- delete
|
|
||||||
- apiGroups: # pods and services are looked up to figure out network settings
|
|
||||||
- ""
|
|
||||||
resources:
|
|
||||||
- pods
|
|
||||||
- services
|
|
||||||
verbs:
|
|
||||||
- get
|
|
||||||
- list
|
|
||||||
- watch
|
|
||||||
- apiGroups:
|
|
||||||
- operator.openshift.io
|
|
||||||
resources:
|
|
||||||
- dnses
|
|
||||||
verbs:
|
|
||||||
- get
|
|
||||||
- list
|
|
||||||
- watch
|
|
||||||
- update
|
|
||||||
- apiGroups:
|
- apiGroups:
|
||||||
- config.openshift.io
|
- config.openshift.io
|
||||||
resources:
|
resources:
|
||||||
- networks
|
- networks
|
||||||
|
resourceNames:
|
||||||
|
- cluster
|
||||||
verbs:
|
verbs:
|
||||||
- get
|
- get
|
||||||
- list
|
|
||||||
- apiGroups:
|
- apiGroups:
|
||||||
- ""
|
- ""
|
||||||
|
resources:
|
||||||
|
- nodes
|
||||||
verbs:
|
verbs:
|
||||||
- get
|
- get
|
||||||
- list
|
- list
|
||||||
- watch
|
- watch
|
||||||
- update
|
- update
|
||||||
resources:
|
|
||||||
- nodes
|
|
||||||
---
|
---
|
||||||
apiVersion: rbac.authorization.k8s.io/v1
|
apiVersion: rbac.authorization.k8s.io/v1
|
||||||
kind: ClusterRoleBinding
|
kind: ClusterRoleBinding
|
||||||
@@ -688,19 +472,25 @@ rules:
|
|||||||
- apiGroups:
|
- apiGroups:
|
||||||
- ""
|
- ""
|
||||||
resources:
|
resources:
|
||||||
- pods
|
|
||||||
- namespaces
|
|
||||||
- nodes
|
- nodes
|
||||||
- endpoints
|
|
||||||
verbs:
|
verbs:
|
||||||
- get
|
- get
|
||||||
- list
|
- list
|
||||||
- watch
|
- watch
|
||||||
- update
|
- update
|
||||||
|
- apiGroups:
|
||||||
|
- ""
|
||||||
|
resources:
|
||||||
|
- pods
|
||||||
|
verbs:
|
||||||
|
- get
|
||||||
|
- list
|
||||||
|
- watch
|
||||||
- apiGroups:
|
- apiGroups:
|
||||||
- ""
|
- ""
|
||||||
resources:
|
resources:
|
||||||
- services
|
- services
|
||||||
|
- endpoints
|
||||||
verbs:
|
verbs:
|
||||||
- create
|
- create
|
||||||
- get
|
- get
|
||||||
@@ -711,8 +501,8 @@ rules:
|
|||||||
- apiGroups:
|
- apiGroups:
|
||||||
- submariner.io
|
- submariner.io
|
||||||
resources:
|
resources:
|
||||||
- endpoints
|
|
||||||
- clusters
|
- clusters
|
||||||
|
- endpoints
|
||||||
verbs:
|
verbs:
|
||||||
- get
|
- get
|
||||||
- list
|
- list
|
||||||
@@ -721,17 +511,11 @@ rules:
|
|||||||
- submariner.io
|
- submariner.io
|
||||||
resources:
|
resources:
|
||||||
- clusterglobalegressips
|
- clusterglobalegressips
|
||||||
|
- clusterglobalegressips/status
|
||||||
- globalegressips
|
- globalegressips
|
||||||
verbs:
|
- globalegressips/status
|
||||||
- create
|
|
||||||
- get
|
|
||||||
- list
|
|
||||||
- watch
|
|
||||||
- update
|
|
||||||
- apiGroups:
|
|
||||||
- submariner.io
|
|
||||||
resources:
|
|
||||||
- globalingressips
|
- globalingressips
|
||||||
|
- globalingressips/status
|
||||||
verbs:
|
verbs:
|
||||||
- create
|
- create
|
||||||
- get
|
- get
|
||||||
@@ -743,7 +527,7 @@ rules:
|
|||||||
- apiGroups:
|
- apiGroups:
|
||||||
- multicluster.x-k8s.io
|
- multicluster.x-k8s.io
|
||||||
resources:
|
resources:
|
||||||
- "serviceexports"
|
- serviceexports
|
||||||
verbs:
|
verbs:
|
||||||
- get
|
- get
|
||||||
- list
|
- list
|
||||||
@@ -798,7 +582,6 @@ rules:
|
|||||||
- get
|
- get
|
||||||
- list
|
- list
|
||||||
- watch
|
- watch
|
||||||
- update
|
|
||||||
- apiGroups:
|
- apiGroups:
|
||||||
- discovery.k8s.io
|
- discovery.k8s.io
|
||||||
resources:
|
resources:
|
||||||
@@ -815,8 +598,8 @@ rules:
|
|||||||
- apiGroups:
|
- apiGroups:
|
||||||
- submariner.io
|
- submariner.io
|
||||||
resources:
|
resources:
|
||||||
- "gateways"
|
- gateways
|
||||||
- "globalingressips"
|
- globalingressips
|
||||||
verbs:
|
verbs:
|
||||||
- get
|
- get
|
||||||
- list
|
- list
|
||||||
@@ -824,7 +607,8 @@ rules:
|
|||||||
- apiGroups:
|
- apiGroups:
|
||||||
- multicluster.x-k8s.io
|
- multicluster.x-k8s.io
|
||||||
resources:
|
resources:
|
||||||
- "*"
|
- serviceimports
|
||||||
|
- serviceimports/status
|
||||||
verbs:
|
verbs:
|
||||||
- create
|
- create
|
||||||
- get
|
- get
|
||||||
@@ -832,6 +616,20 @@ rules:
|
|||||||
- watch
|
- watch
|
||||||
- update
|
- update
|
||||||
- delete
|
- delete
|
||||||
|
- apiGroups:
|
||||||
|
- multicluster.x-k8s.io
|
||||||
|
resources:
|
||||||
|
- serviceexports
|
||||||
|
verbs:
|
||||||
|
- get
|
||||||
|
- list
|
||||||
|
- watch
|
||||||
|
- apiGroups:
|
||||||
|
- multicluster.x-k8s.io
|
||||||
|
resources:
|
||||||
|
- serviceexports/status
|
||||||
|
verbs:
|
||||||
|
- update
|
||||||
---
|
---
|
||||||
apiVersion: rbac.authorization.k8s.io/v1
|
apiVersion: rbac.authorization.k8s.io/v1
|
||||||
kind: ClusterRoleBinding
|
kind: ClusterRoleBinding
|
||||||
@@ -856,44 +654,19 @@ kind: ClusterRole
|
|||||||
metadata:
|
metadata:
|
||||||
name: {{ template "submariner.fullname" . }}:lighthouse-coredns
|
name: {{ template "submariner.fullname" . }}:lighthouse-coredns
|
||||||
rules:
|
rules:
|
||||||
- apiGroups:
|
|
||||||
- ""
|
|
||||||
resources:
|
|
||||||
- services
|
|
||||||
- namespaces
|
|
||||||
- endpoints
|
|
||||||
verbs:
|
|
||||||
- get
|
|
||||||
- list
|
|
||||||
- watch
|
|
||||||
- update
|
|
||||||
- apiGroups:
|
- apiGroups:
|
||||||
- discovery.k8s.io
|
- discovery.k8s.io
|
||||||
resources:
|
resources:
|
||||||
- endpointslices
|
- endpointslices
|
||||||
verbs:
|
verbs:
|
||||||
- create
|
|
||||||
- get
|
- get
|
||||||
- list
|
- list
|
||||||
- watch
|
- watch
|
||||||
- update
|
|
||||||
- delete
|
|
||||||
- deletecollection
|
|
||||||
- apiGroups:
|
|
||||||
- lighthouse.submariner.io
|
|
||||||
resources:
|
|
||||||
- "*"
|
|
||||||
verbs:
|
|
||||||
- create
|
|
||||||
- get
|
|
||||||
- list
|
|
||||||
- watch
|
|
||||||
- update
|
|
||||||
- delete
|
|
||||||
- apiGroups:
|
- apiGroups:
|
||||||
- submariner.io
|
- submariner.io
|
||||||
resources:
|
resources:
|
||||||
- "gateways"
|
- gateways
|
||||||
|
- submariners
|
||||||
verbs:
|
verbs:
|
||||||
- get
|
- get
|
||||||
- list
|
- list
|
||||||
@@ -901,14 +674,11 @@ rules:
|
|||||||
- apiGroups:
|
- apiGroups:
|
||||||
- multicluster.x-k8s.io
|
- multicluster.x-k8s.io
|
||||||
resources:
|
resources:
|
||||||
- "*"
|
- serviceimports
|
||||||
verbs:
|
verbs:
|
||||||
- create
|
|
||||||
- get
|
- get
|
||||||
- list
|
- list
|
||||||
- watch
|
- watch
|
||||||
- update
|
|
||||||
- delete
|
|
||||||
---
|
---
|
||||||
apiVersion: rbac.authorization.k8s.io/v1
|
apiVersion: rbac.authorization.k8s.io/v1
|
||||||
kind: ClusterRoleBinding
|
kind: ClusterRoleBinding
|
||||||
|
|||||||
@@ -60,6 +60,6 @@ spec:
|
|||||||
maxPacketLossCount: 5
|
maxPacketLossCount: 5
|
||||||
{{- with .Values.submariner.coreDNSCustomConfig }}
|
{{- with .Values.submariner.coreDNSCustomConfig }}
|
||||||
coreDNSCustomConfig:
|
coreDNSCustomConfig:
|
||||||
configmapName: {{ .configmapName }}
|
configMapName: {{ .configMapName }}
|
||||||
namespace: {{ .namespace }}
|
namespace: {{ .namespace }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
|
|||||||
Reference in New Issue
Block a user