Bump the github-actions group with 4 updates

Bumps the github-actions group with 4 updates: [depends-on/depends-on-action](https://github.com/depends-on/depends-on-action), [actions/checkout](https://github.com/actions/checkout), [actions/setup-python](https://github.com/actions/setup-python) and [actions/stale](https://github.com/actions/stale).


Updates `depends-on/depends-on-action` from 0.16.0 to 0.17.0
- [Release notes](https://github.com/depends-on/depends-on-action/releases)
- [Commits](https://github.com/depends-on/depends-on-action/compare/826c144163ac67bf08347590a5f81afd45da63ca...c7ac9a6932a7069e83aef80c202d9f60f91e43fd)

Updates `actions/checkout` from 7.0.0 to 7.0.1
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0...3d3c42e5aac5ba805825da76410c181273ba90b1)

Updates `actions/setup-python` from 6.3.0 to 7.0.0
- [Release notes](https://github.com/actions/setup-python/releases)
- [Commits](https://github.com/actions/setup-python/compare/ece7cb06caefa5fff74198d8649806c4678c61a1...5fda3b95a4ea91299a34e894583c3862153e4b97)

Updates `actions/stale` from 10.3.0 to 11.0.0
- [Release notes](https://github.com/actions/stale/releases)
- [Changelog](https://github.com/actions/stale/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/stale/compare/eb5cf3af3ac0a1aa4c9c45633dd1ae542a27a899...4391f3da665fdf50b6810c1a66712fb9ba21aa93)

---
updated-dependencies:
- dependency-name: depends-on/depends-on-action
  dependency-version: 0.17.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: github-actions
- dependency-name: actions/checkout
  dependency-version: 7.0.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: github-actions
- dependency-name: actions/setup-python
  dependency-version: 7.0.0
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: github-actions
- dependency-name: actions/stale
  dependency-version: 11.0.0
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: github-actions
...

Signed-off-by: dependabot[bot] <support@github.com>

.github/dependabot.yml

@@ -5,18 +5,70 @@ updates:
     directory: '/'
     schedule:
       interval: monthly
+    groups:
+      github-actions:
+        patterns:
+          - "*"
   - package-ecosystem: github-actions
     directory: '/'
-    target-branch: "release-0.12"
+    target-branch: "release-0.18"
     schedule:
       interval: monthly
+    groups:
+      github-actions:
+        patterns:
+          - "*"
   - package-ecosystem: github-actions
     directory: '/'
-    target-branch: "release-0.13"
+    target-branch: "release-0.19"
     schedule:
       interval: monthly
+    groups:
+      github-actions:
+        patterns:
+          - "*"
   - package-ecosystem: github-actions
     directory: '/'
-    target-branch: "release-0.14"
+    target-branch: "release-0.20"
     schedule:
       interval: monthly
+    groups:
+      github-actions:
+        patterns:
+          - "*"
+  - package-ecosystem: github-actions
+    directory: '/'
+    target-branch: "release-0.21"
+    schedule:
+      interval: monthly
+    groups:
+      github-actions:
+        patterns:
+          - "*"
+  - package-ecosystem: github-actions
+    directory: '/'
+    target-branch: "release-0.22"
+    schedule:
+      interval: monthly
+    groups:
+      github-actions:
+        patterns:
+          - "*"
+  - package-ecosystem: github-actions
+    directory: '/'
+    target-branch: "release-0.23"
+    schedule:
+      interval: monthly
+    groups:
+      github-actions:
+        patterns:
+          - "*"
+  - package-ecosystem: github-actions
+    directory: '/'
+    target-branch: "release-0.24"
+    schedule:
+      interval: monthly
+    groups:
+      github-actions:
+        patterns:
+          - "*"

.github/stale.yml

@@ -1,57 +0,0 @@
----
-# Configuration for probot-stale - https://github.com/probot/stale
-
-# Number of days of inactivity before an Issue becomes stale (pull request is overridden later)
-daysUntilStale: 120
-
-# Number of days of inactivity before an Issue or Pull Request with the stale label is closed.
-# Set to false to disable. If disabled, issues still need to be closed manually, but will remain marked as stale.
-daysUntilClose: 7
-
-# Only issues or pull requests with all of these labels are check if stale. Defaults to `[]` (disabled)
-onlyLabels: []
-
-# Issues or Pull Requests with these labels will never be considered stale. Set to `[]` to disable
-exemptLabels:
-  - security
-  - confirmed
-
-# Set to true to ignore issues in a project (defaults to false)
-exemptProjects: false
-
-# Set to true to ignore issues in a milestone (defaults to false)
-exemptMilestones: false
-
-# Set to true to ignore issues with an assignee (defaults to false)
-exemptAssignees: false
-
-# Label to use when marking as stale
-staleLabel: wontfix
-
-# Comment to post when marking as stale. Set to `false` to disable
-markComment: >
-  This issue has been automatically marked as stale because it has not had
-  activity for 60 days. It will be closed if no further activity occurs.
-  Please make a comment if this issue/pr is still valid. Thank you
-  for your contributions.
-
-# Comment to post when removing the stale label.
-# unmarkComment: >
-#   Your comment here.
-
-# Comment to post when closing a stale Issue or Pull Request.
-# closeComment: >
-#   Your comment here.
-
-# Limit the number of actions per hour, from 1-30. Default is 30
-limitPerRun: 30
-
-# Limit to only `issues` or `pulls`
-# only: issues
-
-pulls:
-  daysUntilStale: 30
-  markComment: >
-    This pull request has been automatically marked as stale because it has not had
-    recent activity. It will be closed if no further activity occurs. Thank you
-    for your contributions.

.github/workflows/branch.yml

@@ -11,6 +11,6 @@ jobs:
     name: PR targets branch
     runs-on: ubuntu-latest
     steps:
-      - name: Check that the PR targets release-0.15
-        if: ${{ github.base_ref != 'release-0.15' }}
+      - name: Check that the PR targets devel
+        if: ${{ github.base_ref != 'devel' }}
         run: exit 1

.github/workflows/dependent-issues.yml

@@ -2,27 +2,15 @@
 name: PR Dependencies
 
 on:
-  issues:
-    types:
-      - opened
-      - edited
-      - closed
-      - reopened
-      - synchronize
   pull_request_target:
     types:
       - opened
       - edited
-      - closed
       - reopened
       - synchronize
-  schedule:
-    - cron: '0 0/6 * * *'  # every 6 hours
 
 permissions:
-  issues: write
   pull-requests: write
-  statuses: write
 
 jobs:
   check:
@@ -30,15 +18,7 @@ jobs:
     if: github.repository_owner == 'submariner-io'
     runs-on: ubuntu-latest
     steps:
-      - uses: z0al/dependent-issues@950226e7ca8fc43dc209a7febf67c655af3bdb43
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - uses: depends-on/depends-on-action@c7ac9a6932a7069e83aef80c202d9f60f91e43fd  # v0.17.0
         with:
-          # The label to use to mark dependent issues
-          label: dependent
-
-          # Enable checking for dependencies in issues.
-          check_issues: on
-
-          # A comma-separated list of keywords to mark dependency.
-          keywords: depends on, Depends on
+          token: ${{ secrets.GITHUB_TOKEN }}
+          check-unmerged-pr: true

.github/workflows/e2e-full.yml

@@ -18,22 +18,22 @@ jobs:
       matrix:
         cable_driver: ['libreswan', 'wireguard', 'vxlan']
         globalnet: ['', 'globalnet']
-        k8s_version: ['1.25']
+        # Run most tests against the latest K8s version
+        k8s_version: ['k8s-latest']
         lighthouse: ['', 'lighthouse']
         include:
-          - k8s_version: '1.22'
-          - k8s_version: '1.23'
-          - k8s_version: '1.24'
+          # Bottom of supported K8s version range
+          - k8s_version: 'k8s-oldest-supported'
     steps:
       - name: Check out the repository
-        uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3
+        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1
 
       - name: Run E2E deployment and tests
-        uses: submariner-io/shipyard/gh-actions/e2e@release-0.15
+        uses: submariner-io/shipyard/gh-actions/e2e@devel
         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.15
+        uses: submariner-io/shipyard/gh-actions/post-mortem@devel

.github/workflows/e2e.yml

@@ -13,11 +13,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out the repository
-        uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3
+        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1
 
       - name: Run E2E deployment and tests
-        uses: submariner-io/shipyard/gh-actions/e2e@release-0.15
+        uses: submariner-io/shipyard/gh-actions/e2e@devel
 
       - name: Post mortem
         if: failure()
-        uses: submariner-io/shipyard/gh-actions/post-mortem@release-0.15
+        uses: submariner-io/shipyard/gh-actions/post-mortem@devel

.github/workflows/flake_finder.yml

@@ -21,13 +21,13 @@ jobs:
         lighthouse: ['', 'lighthouse']
     steps:
       - name: Check out the repository
-        uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3
+        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1
 
       - name: Run E2E deployment and tests
-        uses: submariner-io/shipyard/gh-actions/e2e@release-0.15
+        uses: submariner-io/shipyard/gh-actions/e2e@devel
         with:
           using: ${{ matrix.cable_driver }} ${{ matrix.globalnet }} ${{ matrix.lighthouse }}
 
       - name: Post mortem
         if: failure()
-        uses: submariner-io/shipyard/gh-actions/post-mortem@release-0.15
+        uses: submariner-io/shipyard/gh-actions/post-mortem@devel

.github/workflows/linting.yml

@@ -13,12 +13,12 @@ jobs:
     steps:
       - name: Get PR commits
         id: 'get-pr-commits'
-        uses: tim-actions/get-pr-commits@8673d84c368f480628607dbe21c88545811ef23a
+        uses: tim-actions/get-pr-commits@198af03565609bb4ed924d1260247b4881f09e7d
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
 
       - name: 'Verify no "Apply suggestions from code review" commits'
-        uses: tim-actions/commit-message-checker-with-regex@e16b08b1a7f5cafeb1f8167de05bf1d40239eb5d
+        uses: tim-actions/commit-message-checker-with-regex@094fc16ff83d04e2ec73edb5eaf6aa267db33791
         with:
           commits: ${{ steps.get-pr-commits.outputs.commits }}
           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'
 
       - name: 'Verify no "fixup!" commits'
-        uses: tim-actions/commit-message-checker-with-regex@e16b08b1a7f5cafeb1f8167de05bf1d40239eb5d
+        uses: tim-actions/commit-message-checker-with-regex@094fc16ff83d04e2ec73edb5eaf6aa267db33791
         with:
           commits: ${{ steps.get-pr-commits.outputs.commits }}
           pattern: '^(?!fixup!)'
@@ -38,20 +38,20 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out the repository
-        uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3
+        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1
 
       - name: Set up Helm
-        uses: azure/setup-helm@5119fcb9089d432beecbf79bb2c7915207344b78
+        uses: azure/setup-helm@9bc31f4ebc9c6b171d7bfbaa5d006ae7abdb4310
         with:
           version: v3.6.0
 
       - name: Set up Python
-        uses: actions/setup-python@d27e3f3d7c64b4bbf8e4abfb9b63b83e846e0435
+        uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97
         with:
-          python-version: '3.x'
+          python-version: '3.13.x'
 
       - name: Set up helm/chart-testing
-        uses: helm/chart-testing-action@e8788873172cb653a90ca2e819d79d65a66d4e76
+        uses: helm/chart-testing-action@6ec842c01de15ebb84c8627d2744a0c2f2755c9f
 
       - name: Set up local helm repo
         run: make local-helm-repo
@@ -64,7 +64,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out the repository
-        uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3
+        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1
         with:
           fetch-depth: 0
       - name: Run gitlint
@@ -75,7 +75,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out the repository
-        uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3
+        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1
 
       - name: Run helm-docs and verify docs are up-to-date
         run: make helm-docs
@@ -85,10 +85,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out the repository
-        uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3
+        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1
 
       - name: Run markdown-link-check
-        uses: gaurav-nelson/github-action-markdown-link-check@d53a906aa6b22b8979d33bc86170567e619495ec
+        uses: gaurav-nelson/github-action-markdown-link-check@3c3b66f1f7d0900e37b71eca45b63ea9eedfce31
         with:
           config-file: ".markdownlinkcheck.json"
           check-modified-files-only: "yes"
@@ -99,7 +99,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out the repository
-        uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3
+        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1
       - name: Run markdownlint
         run: make markdownlint
 
@@ -108,6 +108,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out the repository
-        uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3
+        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1
       - name: Run yamllint
         run: make yamllint

.github/workflows/periodic.yml

@@ -16,16 +16,16 @@ jobs:
       issues: write
     steps:
       - name: Check out the repository
-        uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3
+        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1
 
       - name: Run markdown-link-check
-        uses: gaurav-nelson/github-action-markdown-link-check@d53a906aa6b22b8979d33bc86170567e619495ec
+        uses: gaurav-nelson/github-action-markdown-link-check@3c3b66f1f7d0900e37b71eca45b63ea9eedfce31
         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@fca9117c27cdc29c6c4db3b86c48e4115a786710
         with:
           title: Broken link detected by CI
           content-filepath: .github/ISSUE_TEMPLATE/broken-link.md

.github/workflows/release.yml

@@ -4,7 +4,7 @@ name: Release Charts
 on:
   push:
     branches:
-      - release-0.15
+      - devel
 
 permissions:
   contents: write
@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3
+        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1
         with:
           fetch-depth: 0
 

.github/workflows/stale.yml

@@ -0,0 +1,32 @@
+---
+name: Stale
+
+on:
+  schedule:
+    - cron: "0 0 * * *"
+
+permissions: {}
+
+jobs:
+  stale:
+    name: Close Stale Issues and PRs
+    if: github.repository_owner == 'submariner-io'
+    runs-on: ubuntu-latest
+    permissions:
+      issues: write
+      pull-requests: write
+    steps:
+      - uses: actions/stale@4391f3da665fdf50b6810c1a66712fb9ba21aa93
+        with:
+          days-before-issue-stale: 120
+          days-before-pr-stale: 14
+          exempt-issue-labels: 'confirmed,security'
+          exempt-pr-labels: 'confirmed,security'
+          stale-issue-label: 'stale'
+          stale-issue-message: |
+            This issue has been automatically marked as stale because it has not had recent activity. It will be closed if no further
+            activity occurs. Thank you for your contributions.
+          stale-pr-label: 'stale'
+          stale-pr-message: |
+            This pull request has been automatically marked as stale because it has not had recent activity. It will be closed if no further
+            activity occurs. Thank you for your contributions.

.gitignore

@@ -3,5 +3,13 @@
 .shflags
 *.tgz
 Makefile.dapper
+Makefile.shipyard
 Dockerfile.*
 helm_repo
+yamls/go.mod
+yamls/go.sum
+yamls/vendor
+submariner-k8s-broker/crds/crd.yaml
+submariner-k8s-broker/templates/_role.tpl
+submariner-operator/crds/crd.yaml
+submariner-operator/templates/*-rbac.yaml

.markdownlint.yml

@@ -2,6 +2,9 @@
 # Breaks reusing MD snippets extracted to files
 first-line-heading: false
 
+# Accept any consistent table column style
+table-column-style: false
+
 # Set maximum line Length to 140c to match Go linting
 line-length:
   line_length: 140

CODEOWNERS

@@ -1,3 +1,4 @@
 # Auto-generated, do not edit; see CODEOWNERS.in
-* @Oats87 @skitt @sridhargaddam @tpantelis
-*.md @dfarrell07 @Oats87 @skitt @sridhargaddam @tpantelis
+* @Oats87 @skitt @sridhargaddam @tpantelis @vthapar
+*.md @dfarrell07 @Oats87 @skitt @sridhargaddam @tpantelis @vthapar
+Makefile @aswinsuryan @dfarrell07 @maayanf24 @Oats87 @skitt @sridhargaddam @tpantelis @vthapar @yboaron

CODEOWNERS.in

@@ -1,5 +1,9 @@
-@dfarrell07 *.md
+@aswinsuryan Makefile
+@dfarrell07 *.md Makefile
+@maayanf24 Makefile
 @Oats87 *
 @skitt *
 @sridhargaddam *
 @tpantelis *
+@vthapar *
+@yboaron Makefile

Makefile

@@ -1,4 +1,4 @@
-BASE_BRANCH ?= release-0.15
+BASE_BRANCH ?= devel
 export BASE_BRANCH
 export HELM_REPO_LOCATION=./helm_repo
 
@@ -17,11 +17,9 @@ endif
 export DEPLOYTOOL = helm
 GH_URL=https://submariner-io.github.io/submariner-charts/charts
 CHARTS_DIR=charts
-CHARTS_VERSION=0.14.0
+CHARTS_VERSION=0.25.0-m0
 HELM_DOCS_VERSION=0.15.0
 REPO_URL=$(shell git config remote.origin.url)
-SUBCTL_VERSION=$(CHARTS_VERSION)
-export SUBCTL_VERSION
 
 # Targets to make
 
@@ -36,7 +34,10 @@ local-helm-repo: $(CHART_PACKAGES)
 e2e: local-helm-repo
 	$(SCRIPTS_DIR)/e2e.sh
 
-%.tgz:
+generate-yamls:
+	./generate-yamls.sh $(BASE_BRANCH)
+
+%.tgz: generate-yamls
 	helm dep update $(subst -$(CHARTS_VERSION),,$(basename $(@F)))
 	helm package --version $(CHARTS_VERSION) --app-version $(CHARTS_VERSION) $(subst -$(CHARTS_VERSION),,$(basename $(@F)))
 

generate-yamls.sh

@@ -0,0 +1,107 @@
+#!/bin/bash
+
+set -e
+
+BROKER_ROLE_TPL=submariner-k8s-broker/templates/_role.tpl
+OPERATOR_RBAC_YAML=submariner-operator/templates/operator-rbac.yaml
+GATEWAY_RBAC_YAML=submariner-operator/templates/gateway-rbac.yaml
+ROUTE_AGENT_RBAC_YAML=submariner-operator/templates/routeagent-rbac.yaml
+GLOBALNET_RBAC_YAML=submariner-operator/templates/globalnet-rbac.yaml
+SERVICE_DISC_RBAC_YAML=submariner-operator/templates/service-discovery-rbac.yaml
+OPENSHIFT_MONITORING_YAML=submariner-operator/templates/openshift-monitoring-rbac.yaml
+
+YAMLS_BASE=yamls/vendor
+SUBM_CRDS=${YAMLS_BASE}/github.com/submariner-io/submariner/deploy/crds
+OPERATOR_CRDS=${YAMLS_BASE}/github.com/submariner-io/submariner-operator/deploy/crds
+MCS_CRDS=${YAMLS_BASE}/sigs.k8s.io/mcs-api/config/crd
+BROKER=${YAMLS_BASE}/github.com/submariner-io/submariner-operator/config/broker/broker-client
+RBAC_BASE=${YAMLS_BASE}/github.com/submariner-io/submariner-operator/config/rbac
+OPENSHIFT=${YAMLS_BASE}/github.com/submariner-io/submariner-operator/config/openshift
+
+function add_service_acct_ns() {
+    sed -i '/- kind: ServiceAccount/a \ \ \ \ namespace: {{ .Release.Namespace }}' $1
+}
+
+cd yamls
+rm go.mod || true
+go mod init
+go get github.com/submariner-io/submariner-operator@$1
+go mod tidy
+go mod vendor
+cd ..
+
+# Generate the CRDs for the broker chart
+mkdir -p submariner-k8s-broker/crds
+cat ${SUBM_CRDS}/submariner.io_endpoints.yaml \
+	  ${SUBM_CRDS}/submariner.io_clusters.yaml \
+		${SUBM_CRDS}/submariner.io_gateways.yaml > submariner-k8s-broker/crds/crd.yaml
+echo '---' >> submariner-k8s-broker/crds/crd.yaml
+cat ${MCS_CRDS}/multicluster.x-k8s.io_serviceexports.yaml >> submariner-k8s-broker/crds/crd.yaml
+echo '---' >> submariner-k8s-broker/crds/crd.yaml
+cat ${MCS_CRDS}/multicluster.x-k8s.io_serviceimports.yaml >> submariner-k8s-broker/crds/crd.yaml
+
+# Generate the client role yaml for the broker chart
+echo '{{- define "broker-role" -}}' > ${BROKER_ROLE_TPL}
+cat ${BROKER}/role.yaml >> ${BROKER_ROLE_TPL}
+echo '{{- end -}}' >> ${BROKER_ROLE_TPL}
+sed -i -e 's/name:.*/name: {{ template "submariner-k8s-broker.fullname" \. }}-cluster/' ${BROKER_ROLE_TPL}
+
+# Generate the CRDs for the operator chart
+mkdir -p submariner-operator/crds
+cat ${OPERATOR_CRDS}/submariner.io_submariners.yaml \
+    ${OPERATOR_CRDS}/submariner.io_servicediscoveries.yaml \
+    ${OPERATOR_CRDS}/submariner.io_brokers.yaml > submariner-operator/crds/crd.yaml
+
+# Generate the operator RBAC yaml for the operator chart
+add_service_acct_ns ${RBAC_BASE}/submariner-operator/cluster_role_binding.yaml
+cat ${RBAC_BASE}/submariner-operator/service_account.yaml \
+    ${RBAC_BASE}/submariner-operator/role.yaml \
+    ${RBAC_BASE}/submariner-operator/role_binding.yaml \
+    ${RBAC_BASE}/submariner-operator/cluster_role.yaml \
+    ${RBAC_BASE}/submariner-operator/cluster_role_binding.yaml > ${OPERATOR_RBAC_YAML}
+
+# Generate the gateway RBAC yaml for the operator chart
+add_service_acct_ns ${RBAC_BASE}/submariner-gateway/cluster_role_binding.yaml
+cat ${RBAC_BASE}/submariner-gateway/service_account.yaml \
+    ${RBAC_BASE}/submariner-gateway/role.yaml \
+    ${RBAC_BASE}/submariner-gateway/role_binding.yaml \
+    ${RBAC_BASE}/submariner-gateway/cluster_role.yaml \
+    ${RBAC_BASE}/submariner-gateway/cluster_role_binding.yaml > ${GATEWAY_RBAC_YAML}
+
+# Generate the routeagent RBAC yaml for the operator chart
+add_service_acct_ns ${RBAC_BASE}/submariner-route-agent/cluster_role_binding.yaml
+cat ${RBAC_BASE}/submariner-route-agent/service_account.yaml \
+    ${RBAC_BASE}/submariner-route-agent/role.yaml \
+    ${RBAC_BASE}/submariner-route-agent/role_binding.yaml \
+    ${RBAC_BASE}/submariner-route-agent/cluster_role.yaml \
+    ${RBAC_BASE}/submariner-route-agent/cluster_role_binding.yaml > ${ROUTE_AGENT_RBAC_YAML}
+
+# Generate the globalnet RBAC yaml for the operator chart
+echo '{{- if .Values.broker.globalnet }}' > ${GLOBALNET_RBAC_YAML}
+add_service_acct_ns ${RBAC_BASE}/submariner-globalnet/cluster_role_binding.yaml
+cat ${RBAC_BASE}/submariner-globalnet/service_account.yaml \
+    ${RBAC_BASE}/submariner-globalnet/role.yaml \
+    ${RBAC_BASE}/submariner-globalnet/role_binding.yaml \
+    ${RBAC_BASE}/submariner-globalnet/cluster_role.yaml \
+    ${RBAC_BASE}/submariner-globalnet/cluster_role_binding.yaml >> ${GLOBALNET_RBAC_YAML}
+echo '{{- end -}}' >> ${GLOBALNET_RBAC_YAML}
+
+# Generate the service discovery RBAC yaml for the operator chart
+echo '{{- if .Values.submariner.serviceDiscovery }}' > ${SERVICE_DISC_RBAC_YAML}
+add_service_acct_ns ${RBAC_BASE}/lighthouse-agent/cluster_role_binding.yaml
+add_service_acct_ns ${RBAC_BASE}/lighthouse-coredns/cluster_role_binding.yaml
+cat ${RBAC_BASE}/lighthouse-agent/service_account.yaml \
+    ${RBAC_BASE}/lighthouse-agent/cluster_role.yaml \
+    ${RBAC_BASE}/lighthouse-agent/cluster_role_binding.yaml \
+    ${RBAC_BASE}/lighthouse-agent/role.yaml \
+    ${RBAC_BASE}/lighthouse-agent/role_binding.yaml \
+    ${RBAC_BASE}/lighthouse-coredns/service_account.yaml \
+    ${RBAC_BASE}/lighthouse-coredns/cluster_role.yaml \
+    ${RBAC_BASE}/lighthouse-coredns/cluster_role_binding.yaml \
+    ${RBAC_BASE}/lighthouse-coredns/role.yaml \
+    ${RBAC_BASE}/lighthouse-coredns/role_binding.yaml >> ${SERVICE_DISC_RBAC_YAML}
+echo '{{- end -}}' >> ${SERVICE_DISC_RBAC_YAML}
+
+# Generate the openshift monitoring rbac yaml for the operator chart
+cat ${OPENSHIFT}/rbac/submariner-metrics-reader/role.yaml \
+    ${OPENSHIFT}/rbac/submariner-metrics-reader/role_binding.yaml > ${OPENSHIFT_MONITORING_YAML}

submariner-k8s-broker/README.md

@@ -6,19 +6,10 @@ Submariner Kubernetes Broker
 
 ## Maintainers
 
-| Name | Email | Url |
-| ---- | ------ | --- |
-| Contributors to the Submariner project | submariner-dev@googlegroups.com | https://submariner.io/ |
+ | Name | Email | Url |
+ | ---- | ------ | --- |
+ | Contributors to the Submariner project | submariner-dev@googlegroups.com | https://submariner.io/ |
 
 ## Source Code
 
 * <https://submariner-io.github.io/submariner-charts/charts>
-
-## Values
-
-| Key | Type | Default | Description |
-|-----|------|---------|-------------|
-| crd.create | bool | `true` |  |
-| rbac.create | bool | `true` |  |
-| serviceAccounts.client.create | bool | `true` |  |
-| serviceAccounts.client.name | string | `""` |  |

submariner-k8s-broker/crds/crd.yaml

@@ -1,560 +0,0 @@
-apiVersion: apiextensions.k8s.io/v1
-kind: CustomResourceDefinition
-metadata:
-  name: clusters.submariner.io
-spec:
-  group: submariner.io
-  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
-kind: CustomResourceDefinition
-metadata:
-  name: endpoints.submariner.io
-spec:
-  group: submariner.io
-  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
-kind: CustomResourceDefinition
-metadata:
-  name: gateways.submariner.io
-spec:
-  group: submariner.io
-  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
-      type: string
-    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
-          status:
-            properties:
-              connections:
-                items:
-                  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: []
----
-apiVersion: apiextensions.k8s.io/v1
-kind: CustomResourceDefinition
-metadata:
-  name: serviceexports.multicluster.x-k8s.io
-spec:
-  group: multicluster.x-k8s.io
-  scope: Namespaced
-  names:
-    plural: serviceexports
-    singular: serviceexport
-    kind: ServiceExport
-    shortNames:
-      - svcex
-  versions:
-    - name: v1alpha1
-      served: true
-      storage: true
-      subresources:
-        status: {}
-      additionalPrinterColumns:
-        - name: Age
-          type: date
-          jsonPath: .metadata.creationTimestamp
-      "schema":
-        "openAPIV3Schema":
-          description: ServiceExport declares that the Service with the same name and
-            namespace as this export should be consumable from other clusters.
-          type: object
-          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:
-              description: status describes the current state of an exported service.
-                Service configuration comes from the Service that had the same name
-                and namespace as this ServiceExport. Populated by the multi-cluster
-                service implementation's controller.
-              type: object
-              properties:
-                conditions:
-                  type: array
-                  items:
-                    description: "ServiceExportCondition contains details for the current
-                    condition of this service export. \n Once [KEP-1623](https://github.com/kubernetes/enhancements/tree/master/keps/sig-api-machinery/1623-standardize-conditions)
-                    is implemented, this will be replaced by metav1.Condition."
-                    type: object
-                    required:
-                      - status
-                      - type
-                    properties:
-                      lastTransitionTime:
-                        type: string
-                        format: date-time
-                      message:
-                        type: string
-                      reason:
-                        type: string
-                      status:
-                        description: Status is one of {"True", "False", "Unknown"}
-                        type: string
-                        enum:
-                          - "True"
-                          - "False"
-                          - Unknown
-                      type:
-                        description: ServiceExportConditionType identifies a specific
-                          condition.
-                        type: string
-                  x-kubernetes-list-map-keys:
-                    - type
-                  x-kubernetes-list-type: map
----
-apiVersion: apiextensions.k8s.io/v1
-kind: CustomResourceDefinition
-metadata:
-  name: serviceimports.multicluster.x-k8s.io
-spec:
-  group: multicluster.x-k8s.io
-  scope: Namespaced
-  names:
-    plural: serviceimports
-    singular: serviceimport
-    kind: ServiceImport
-    shortNames:
-      - svcim
-  versions:
-    - name: v1alpha1
-      served: true
-      storage: true
-      subresources:
-        status: {}
-      additionalPrinterColumns:
-        - name: Type
-          type: string
-          description: The type of this ServiceImport
-          jsonPath: .spec.type
-        - name: IP
-          type: string
-          description: The VIP for this ServiceImport
-          jsonPath: .spec.ips
-        - name: Age
-          type: date
-          jsonPath: .metadata.creationTimestamp
-      "schema":
-        "openAPIV3Schema":
-          description: ServiceImport describes a service imported from clusters in a
-            ClusterSet.
-          type: object
-          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:
-              description: spec defines the behavior of a ServiceImport.
-              type: object
-              required:
-                - ports
-                - type
-              properties:
-                ips:
-                  description: ip will be used as the VIP for this service when type
-                    is ClusterSetIP.
-                  type: array
-                  maxItems: 1
-                  items:
-                    type: string
-                ports:
-                  type: array
-                  items:
-                    description: ServicePort represents the port on which the service
-                      is exposed
-                    type: object
-                    required:
-                      - port
-                    properties:
-                      appProtocol:
-                        description: The application protocol for this port. This field
-                          follows standard Kubernetes label syntax. Un-prefixed names
-                          are reserved for IANA standard service names (as per RFC-6335
-                          and http://www.iana.org/assignments/service-names). Non-standard
-                          protocols should use prefixed names such as mycompany.com/my-custom-protocol.
-                          Field can be enabled with ServiceAppProtocol feature gate.
-                        type: string
-                      name:
-                        description: The name of this port within the service. This
-                          must be a DNS_LABEL. All ports within a ServiceSpec must have
-                          unique names. When considering the endpoints for a Service,
-                          this must match the 'name' field in the EndpointPort. Optional
-                          if only one ServicePort is defined on this service.
-                        type: string
-                      port:
-                        description: The port that will be exposed by this service.
-                        type: integer
-                        format: int32
-                      protocol:
-                        description: The IP protocol for this port. Supports "TCP",
-                          "UDP", and "SCTP". Default is TCP.
-                        type: string
-                  x-kubernetes-list-type: atomic
-                sessionAffinity:
-                  description: 'Supports "ClientIP" and "None". Used to maintain session
-                  affinity. Enable client IP based session affinity. Must be ClientIP
-                  or None. Defaults to None. Ignored when type is Headless More info:
-                  https://kubernetes.io/docs/concepts/services-networking/service/#virtual-ips-and-service-proxies'
-                  type: string
-                sessionAffinityConfig:
-                  description: sessionAffinityConfig contains session affinity configuration.
-                  type: object
-                  properties:
-                    clientIP:
-                      description: clientIP contains the configurations of Client IP
-                        based session affinity.
-                      type: object
-                      properties:
-                        timeoutSeconds:
-                          description: timeoutSeconds specifies the seconds of ClientIP
-                            type session sticky time. The value must be >0 && <=86400(for
-                            1 day) if ServiceAffinity == "ClientIP". Default value is
-                            10800(for 3 hours).
-                          type: integer
-                          format: int32
-                type:
-                  description: type defines the type of this service. Must be ClusterSetIP
-                    or Headless.
-                  type: string
-                  enum:
-                    - ClusterSetIP
-                    - Headless
-            status:
-              description: status contains information about the exported services that
-                form the multi-cluster service referenced by this ServiceImport.
-              type: object
-              properties:
-                clusters:
-                  description: clusters is the list of exporting clusters from which
-                    this service was derived.
-                  type: array
-                  items:
-                    description: ClusterStatus contains service configuration mapped
-                      to a specific source cluster
-                    type: object
-                    required:
-                      - cluster
-                    properties:
-                      cluster:
-                        description: cluster is the name of the exporting cluster. Must
-                          be a valid RFC-1123 DNS label.
-                        type: string
-                  x-kubernetes-list-map-keys:
-                    - cluster
-                  x-kubernetes-list-type: map

submariner-k8s-broker/templates/_helpers.tpl

@@ -35,9 +35,5 @@ Create chart name and version as used by the chart label.
 Create the name of the submariner-client service account to use
 */}}
 {{- define "submariner-k8s-broker.clientServiceAccountName" -}}
-{{- if .Values.serviceAccounts.client.create -}}
-    {{ default (printf "%s-client" (include "submariner-k8s-broker.fullname" .)) .Values.serviceAccounts.client.name }}
-{{- else -}}
-    {{ default "default" .Values.serviceAccounts.client.name }}
-{{- end -}}
+{{- printf "%s-client" (include "submariner-k8s-broker.fullname" .)}}
 {{- end -}}

submariner-k8s-broker/templates/rbac.yaml

@@ -1,26 +1,4 @@
-{{- if .Values.rbac.create -}}
-apiVersion: rbac.authorization.k8s.io/v1
-kind: Role
-metadata:
-  name: {{ template "submariner-k8s-broker.fullname" . }}-cluster
-  labels:
-    heritage: {{ .Release.Service | quote }}
-    release: {{ .Release.Name | quote }}
-    chart: {{ template "submariner-k8s-broker.chart" . }}
-    app: {{ template "submariner-k8s-broker.name" . }}
-rules:
-- apiGroups: ["submariner.io"]
-  resources: ["clusters", "endpoints"]
-  verbs: ["create", "get", "list", "watch", "patch", "update", "delete"]
-- apiGroups: ["lighthouse.submariner.io"]
-  resources: ["*"]
-  verbs: ["create", "get", "list", "watch", "patch", "update", "delete"]
-- apiGroups: ["discovery.k8s.io"]
-  resources: ["endpointslices", "endpointslices/restricted"]
-  verbs: ["create", "get", "list", "watch","patch", "update", "delete"]
-- apiGroups: ["multicluster.x-k8s.io"]
-  resources: ["*"]
-  verbs: ["create", "get", "list", "watch", "update", "delete"]
+{{ include "broker-role" $ }}
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
@@ -34,4 +12,3 @@ subjects:
 - kind: ServiceAccount
   name: {{ template "submariner-k8s-broker.clientServiceAccountName" . }}
   namespace: {{ .Release.Namespace }}
-{{- end -}}

submariner-k8s-broker/templates/svc-acct.yaml

@@ -1,4 +1,3 @@
-{{- if .Values.serviceAccounts.client.create }}
 apiVersion: v1
 kind: ServiceAccount
 metadata:
@@ -16,4 +15,3 @@ metadata:
   annotations:
     kubernetes.io/service-account.name: {{ template "submariner-k8s-broker.clientServiceAccountName" . }}
 type: kubernetes.io/service-account-token
-{{- end }}

submariner-k8s-broker/values.yaml

@@ -1,9 +1 @@
 ---
-rbac:
-  create: true
-crd:
-  create: true
-serviceAccounts:
-  client:
-    create: true
-    name: ""

submariner-operator/README.md

@@ -6,9 +6,9 @@ Submariner enables direct networking between Pods and Services in different Kube
 
 ## Maintainers
 
-| Name | Email | Url |
-| ---- | ------ | --- |
-| Contributors to the Submariner project | submariner-dev@googlegroups.com | https://submariner.io/ |
+ | Name | Email | Url |
+ | ---- | ------ | --- |
+ | Contributors to the Submariner project | submariner-dev@googlegroups.com | https://submariner.io/ |
 
 ## Source Code
 
@@ -16,52 +16,43 @@ Submariner enables direct networking between Pods and Services in different Kube
 
 ## Values
 
-| Key | Type | Default | Description |
-|-----|------|---------|-------------|
-| broker.ca | string | `""` |  |
-| broker.globalnet | bool | `false` |  |
-| broker.insecure | bool | `false` |  |
-| broker.namespace | string | `"xyz"` |  |
-| broker.server | string | `"example.k8s.apiserver"` |  |
-| broker.token | string | `"test"` |  |
-| ipsec.debug | bool | `false` |  |
-| ipsec.forceUDPEncaps | bool | `false` |  |
-| ipsec.ikePort | int | `500` |  |
-| ipsec.natPort | int | `4500` |  |
-| ipsec.psk | string | `""` |  |
-| leadership.leaseDuration | int | `10` |  |
-| leadership.renewDeadline | int | `5` |  |
-| leadership.retryPeriod | int | `2` |  |
-| 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.resources | object | `{}` |  |
-| operator.tolerations | list | `[]` |  |
-| rbac.create | bool | `true` |  |
-| serviceAccounts.gateway.create | bool | `true` |  |
-| serviceAccounts.gateway.name | string | `""` |  |
-| serviceAccounts.globalnet.create | bool | `true` |  |
-| serviceAccounts.globalnet.name | string | `""` |  |
-| serviceAccounts.lighthouseAgent.create | bool | `true` |  |
-| serviceAccounts.lighthouseAgent.name | string | `""` |  |
-| serviceAccounts.lighthouseCoreDns.create | bool | `true` |  |
-| serviceAccounts.lighthouseCoreDns.name | string | `""` |  |
-| serviceAccounts.operator.create | bool | `true` |  |
-| serviceAccounts.operator.name | string | `""` |  |
-| serviceAccounts.routeAgent.create | bool | `true` |  |
-| serviceAccounts.routeAgent.name | string | `""` |  |
-| submariner.cableDriver | string | `"libreswan"` |  |
-| 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.natEnabled | bool | `false` |  |
-| submariner.serviceCidr | string | `""` |  |
-| submariner.serviceDiscovery | bool | `true` |  |
-| submariner.token | string | `""` |  |
+ | Key | Type | Default | Description |
+ | ----- | ------ | --------- | ------------- |
+ | broker.ca | string | `""` |  |
+ | broker.globalnet | bool | `false` |  |
+ | broker.insecure | bool | `false` |  |
+ | broker.namespace | string | `"xyz"` |  |
+ | broker.server | string | `"example.k8s.apiserver"` |  |
+ | broker.token | string | `"test"` |  |
+ | ipsec.debug | bool | `false` |  |
+ | ipsec.forceUDPEncaps | bool | `false` |  |
+ | ipsec.ikePort | int | `500` |  |
+ | ipsec.natPort | int | `4500` |  |
+ | ipsec.pskSecret | string | `""` | Name of the Kubernetes Secret containing the IPsec PSK as field psk |
+ | ipsec.psk | string | `""` |  |
+ | leadership.leaseDuration | int | `10` |  |
+ | leadership.renewDeadline | int | `5` |  |
+ | leadership.retryPeriod | int | `2` |  |
+ | 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.resources | object | `{}` |  |
+ | operator.tolerations | list | `[]` |  |
+ | submariner.cableDriver | string | `"libreswan"` |  |
+ | submariner.clusterCidr | string | `""` |  |
+ | submariner.clusterId | string | `""` |  |
+ | submariner.colorCodes | string | `"blue"` |  |
+ | submariner.coreDNSCustomConfig | object | `{}` |  |
+ | submariner.debug | bool | `false` |  |
+ | submariner.globalCidr | string | `""` |  |
+ | submariner.clustersetIpCidr | string | `""` |  |
+ | submariner.clustersetIpEnabled | bool | `false` |  |
+ | submariner.healthcheckEnabled | bool | `true` |  |
+ | submariner.images.repository | string | `"quay.io/submariner"` |  |
+ | submariner.images.tag | string | `"0.14.0"` |  |
+ | submariner.natEnabled | bool | `false` |  |
+ | submariner.serviceCidr | string | `""` |  |
+ | submariner.brokerK8sSecret | string | `""` |  Name of the Kubernetes Secret containing broker credentials (ca.crt, token). |
+ | submariner.serviceDiscovery | bool | `true` |  |
+ | submariner.token | string | `""` |  |

submariner-operator/templates/_helpers.tpl

@@ -1,11 +1,4 @@
 {{/* vim: set filetype=mustache: */}}
-{{/*
-Expand the name of the chart.
-*/}}
-{{- define "submariner.name" -}}
-{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
 {{/*
 Create a default fully qualified app name.
 We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
@@ -31,75 +24,3 @@ Create chart name and version as used by the chart label.
 {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 
-{{/*
-Create the name of the submariner-operator service account to use
-*/}}
-{{- define "submariner.operatorServiceAccountName" -}}
-{{- if .Values.serviceAccounts.operator.create -}}
-    {{ default (printf "%s" (include "submariner.fullname" .)) .Values.serviceAccounts.operator.name }}
-{{- else -}}
-    {{ default "default" .Values.serviceAccounts.operator.name }}
-{{- end -}}
-{{- end -}}
-
-{{/*
-Create the name of the submariner-gateway service account to use
-*/}}
-{{- define "submariner.gatewayServiceAccountName" -}}
-{{- if .Values.serviceAccounts.gateway.create -}}
-    {{ default "submariner-gateway" .Values.serviceAccounts.gateway.name }}
-{{- else -}}
-    {{ default "default" .Values.serviceAccounts.gateway.name }}
-{{- end -}}
-{{- end -}}
-
-{{/*
-Create the name of the submariner-route-agent service account to use
-*/}}
-{{- define "submariner.routeAgentServiceAccountName" -}}
-{{- if .Values.serviceAccounts.routeAgent.create -}}
-    {{ default "submariner-routeagent" .Values.serviceAccounts.routeAgent.name }}
-{{- else -}}
-    {{ default "default" .Values.serviceAccounts.routeAgent.name }}
-{{- end -}}
-{{- end -}}
-
-{{/*
-Create the name of the submariner-globalnet service account to use
-*/}}
-{{- define "submariner.globalnetServiceAccountName" -}}
-{{- if .Values.serviceAccounts.globalnet.create -}}
-    {{ default "submariner-globalnet" .Values.serviceAccounts.globalnet.name }}
-{{- else -}}
-    {{ default "default" .Values.serviceAccounts.globalnet.name }}
-{{- end -}}
-{{- end -}}
-
-{{/*
-Create the name of the submariner-lighthouse-agent service account to use
-*/}}
-{{- define "submariner.lighthouseAgentServiceAccountName" -}}
-{{- if and (.Values.submariner.serviceDiscovery ) (.Values.serviceAccounts.lighthouseAgent.create) -}}
-    {{ default "submariner-lighthouse-agent" .Values.serviceAccounts.lighthouseAgent.name }}
-{{- else -}}
-    {{ default "default" .Values.serviceAccounts.lighthouseAgent.name }}
-{{- end -}}
-{{- end -}}
-
-{{/*
-Create the name of the submariner-lighthouse-coredns service account to use
-*/}}
-{{- define "submariner.lighthouseCoreDnsServiceAccountName" -}}
-{{- if and (.Values.submariner.serviceDiscovery ) (.Values.serviceAccounts.lighthouseCoreDns.create) -}}
-    {{ default "submariner-lighthouse-coredns" .Values.serviceAccounts.lighthouseCoreDns.name }}
-{{- else -}}
-    {{ default "default" .Values.serviceAccounts.lighthouseCoreDns.name }}
-{{- end -}}
-{{- end -}}
-
-{{/*
-Create the name of the submariner-lighthouse-coredns service name to use
-*/}}
-{{- define "submariner.lighthouseDnsName" -}}
-{{- default (printf "%s-lighthouse-coredns" (include "submariner.fullname" .)) .Values.lighthouseCoredns.name }}
-{{- end -}}

submariner-operator/templates/operator-deployment.yaml

@@ -6,7 +6,6 @@ metadata:
     release: {{ .Release.Name | quote }}
     chart: {{ template "submariner.chart" . }}
     app: {{ template "submariner.fullname" . }}
-    component: gateway
   name: {{ template "submariner.fullname" . }}
 spec:
   progressDeadlineSeconds: 600
@@ -27,8 +26,8 @@ spec:
         name: {{ template "submariner.fullname" . }}
     spec:
       containers:
-      - command:
-        - submariner-operator
+      - args:
+        - --leader-elect
         env:
         - name: WATCH_NAMESPACE
           valueFrom:
@@ -52,6 +51,5 @@ spec:
       restartPolicy: Always
       schedulerName: default-scheduler
       securityContext: {}
-      serviceAccount: {{ template "submariner.fullname" . }}
-      serviceAccountName: {{ template "submariner.fullname" . }}
+      serviceAccountName: submariner-operator
       terminationGracePeriodSeconds: 30

submariner-operator/templates/rbac.yaml

@@ -1,924 +0,0 @@
-{{- if .Values.rbac.create -}}
-apiVersion: rbac.authorization.k8s.io/v1
-kind: Role
-metadata:
-  name: {{ template "submariner.fullname" . }}
-  labels:
-    heritage: {{ .Release.Service | quote }}
-    release: {{ .Release.Name | quote }}
-    chart: {{ template "submariner.chart" . }}
-    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:
-  - {{ template "submariner.fullname" . }}
-  resources:
-  - deployments/finalizers
-  verbs:
-  - update
-- apiGroups:
-  - ""
-  resources:
-  - pods
-  verbs:
-  - get
-- apiGroups:
-  - apps
-  resources:
-  - replicasets
-  verbs:
-  - get
-- apiGroups:
-  - submariner.io
-  resources:
-  - '*'
-  - servicediscoveries
-  verbs:
-  - '*'
----
-kind: RoleBinding
-apiVersion: rbac.authorization.k8s.io/v1
-metadata:
-  name: {{ template "submariner.fullname" . }}
-  labels:
-    heritage: {{ .Release.Service | quote }}
-    release: {{ .Release.Name | quote }}
-    chart: {{ template "submariner.chart" . }}
-    app: {{ template "submariner.name" . }}
-subjects:
-- kind: ServiceAccount
-  name: {{ template "submariner.operatorServiceAccountName" . }}
-roleRef:
-  kind: Role
-  name: {{ template "submariner.fullname" . }}
-  apiGroup: rbac.authorization.k8s.io
----
-apiVersion: rbac.authorization.k8s.io/v1
-kind: Role
-metadata:
-  name: {{ template "submariner.fullname" . }}:gateway
-  labels:
-    heritage: {{ .Release.Service | quote }}
-    release: {{ .Release.Name | quote }}
-    chart: {{ template "submariner.chart" . }}
-    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
-- apiGroups:
-    - coordination.k8s.io
-  resources:
-    - leases
-  verbs:
-    - get
-    - list
-    - watch
-    - create
-    - update
-    - delete
----
-apiVersion: rbac.authorization.k8s.io/v1
-kind: RoleBinding
-metadata:
-  name: {{ template "submariner.fullname" . }}:gateway
-  labels:
-    heritage: {{ .Release.Service | quote }}
-    release: {{ .Release.Name | quote }}
-    chart: {{ template "submariner.chart" . }}
-    app: {{ template "submariner.name" . }}
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: Role
-  name: {{ template "submariner.fullname" . }}:gateway
-subjects:
-- kind: ServiceAccount
-  name: {{ template "submariner.gatewayServiceAccountName" . }}
-  namespace: {{ .Release.Namespace }}
----
-apiVersion: rbac.authorization.k8s.io/v1
-kind: Role
-metadata:
-  name: {{ template "submariner.fullname" . }}:routeagent
-  labels:
-    heritage: {{ .Release.Service | quote }}
-    release: {{ .Release.Name | quote }}
-    chart: {{ template "submariner.chart" . }}
-    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
-kind: RoleBinding
-metadata:
-  name: {{ template "submariner.fullname" . }}:routeagent
-  labels:
-    heritage: {{ .Release.Service | quote }}
-    release: {{ .Release.Name | quote }}
-    chart: {{ template "submariner.chart" . }}
-    app: {{ template "submariner.name" . }}
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: Role
-  name: {{ template "submariner.fullname" . }}:routeagent
-subjects:
-- kind: ServiceAccount
-  name: {{ template "submariner.routeAgentServiceAccountName" . }}
-  namespace: {{ .Release.Namespace }}
----
-{{- if .Values.broker.globalnet }}
-apiVersion: rbac.authorization.k8s.io/v1
-kind: Role
-metadata:
-  name: {{ template "submariner.fullname" . }}:globalnet
-  labels:
-    heritage: {{ .Release.Service | quote }}
-    release: {{ .Release.Name | quote }}
-    chart: {{ template "submariner.chart" . }}
-    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
-kind: RoleBinding
-metadata:
-  name: {{ template "submariner.fullname" . }}:globalnet
-  labels:
-    heritage: {{ .Release.Service | quote }}
-    release: {{ .Release.Name | quote }}
-    chart: {{ template "submariner.chart" . }}
-    app: {{ template "submariner.name" . }}
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: Role
-  name: {{ template "submariner.fullname" . }}:globalnet
-subjects:
-  - kind: ServiceAccount
-    name: {{ template "submariner.globalnetServiceAccountName" . }}
-    namespace: {{ .Release.Namespace }}
----
-{{- end -}}
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRole
-metadata:
-  name: {{ template "submariner.fullname" . }}
-  labels:
-    heritage: {{ .Release.Service | quote }}
-    release: {{ .Release.Name | quote }}
-    chart: {{ template "submariner.chart" . }}
-    app: {{ template "submariner.name" . }}
-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:
-      - ""
-    resources:
-      - configmaps
-    verbs:
-      - create
-      - get
-      - list
-      - watch
-      - update
-  - apiGroups:
-      - apiextensions.k8s.io
-    resources:
-      - customresourcedefinitions
-    verbs:
-      - get
-      - list
-      - create
-      - update
-      - delete
-      - watch
-  - apiGroups:  # pods, services and nodes are looked up to figure out network settings
-      - ""
-    resources:
-      - pods
-      - services
-      - nodes
-    verbs:
-      - get
-      - list
-      - watch
-  - apiGroups:
-      - operator.openshift.io
-    resources:
-      - dnses
-    verbs:
-      - get
-      - list
-      - watch
-      - update
-  - apiGroups:
-      - config.openshift.io
-    resources:
-      - networks
-    verbs:
-      - get
-      - list
-  - apiGroups:
-      - ""
-    resources:
-      - namespaces
-    verbs:
-      - get
-      - list
-      - watch
-  - apiGroups:
-      - monitoring.coreos.com
-    resources:
-      - servicemonitors
-    verbs:
-      - get
-      - create
-  - apiGroups:
-      - apps
-    resources:
-      - daemonsets
-    verbs:
-      - get
-      - list
-      - watch
----
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRoleBinding
-metadata:
-  name: {{ template "submariner.fullname" . }}
-  labels:
-    heritage: {{ .Release.Service | quote }}
-    release: {{ .Release.Name | quote }}
-    chart: {{ template "submariner.chart" . }}
-    app: {{ template "submariner.name" . }}
-subjects:
-  - kind: ServiceAccount
-    name: {{ template "submariner.operatorServiceAccountName" . }}
-    namespace: {{ .Release.Namespace }}
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: ClusterRole
-  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
-  labels:
-    heritage: {{ .Release.Service | quote }}
-    release: {{ .Release.Name | quote }}
-    chart: {{ template "submariner.chart" . }}
-    app: {{ template "submariner.name" . }}
-rules:
-  - apiGroups:
-      - ""
-    resources:
-      - configmaps
-    verbs:
-      - get
-      - list
-      - watch
-      - create
-      - 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
-      - nodes
-    verbs:
-      - get
-      - list
-      - 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
-kind: ClusterRoleBinding
-metadata:
-  name: {{ template "submariner.fullname" . }}:gateway
-  labels:
-    heritage: {{ .Release.Service | quote }}
-    release: {{ .Release.Name | quote }}
-    chart: {{ template "submariner.chart" . }}
-    app: {{ template "submariner.name" . }}
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: ClusterRole
-  name: {{ template "submariner.fullname" . }}:gateway
-subjects:
-  - kind: ServiceAccount
-    name: {{ template "submariner.gatewayServiceAccountName" . }}
-    namespace: {{ .Release.Namespace }}
----
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRole
-metadata:
-  name: {{ template "submariner.fullname" . }}:routeagent
-  labels:
-    heritage: {{ .Release.Service | quote }}
-    release: {{ .Release.Name | quote }}
-    chart: {{ template "submariner.chart" . }}
-    app: {{ template "submariner.name" . }}
-rules:
-  - apiGroups:
-      - ""
-    resources:
-      - configmaps
-    verbs:
-      - get
-      - 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:
-      - config.openshift.io
-    resources:
-      - networks
-    verbs:
-      - get
-      - list
-  - apiGroups:
-      - ""
-    verbs:
-      - get
-      - list
-      - watch
-      - update
-    resources:
-      - nodes
----
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRoleBinding
-metadata:
-  name: {{ template "submariner.fullname" . }}:routeagent
-  labels:
-    heritage: {{ .Release.Service | quote }}
-    release: {{ .Release.Name | quote }}
-    chart: {{ template "submariner.chart" . }}
-    app: {{ template "submariner.name" . }}
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: ClusterRole
-  name: {{ template "submariner.fullname" . }}:routeagent
-subjects:
-  - kind: ServiceAccount
-    name: {{ template "submariner.routeAgentServiceAccountName" . }}
-    namespace: {{ .Release.Namespace }}
----
-{{- if .Values.broker.globalnet }}
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRole
-metadata:
-  name: {{ template "submariner.fullname" . }}:globalnet
-  labels:
-    heritage: {{ .Release.Service | quote }}
-    release: {{ .Release.Name | quote }}
-    chart: {{ template "submariner.chart" . }}
-    app: {{ template "submariner.name" . }}
-rules:
-  - apiGroups:
-      - ""
-    resources:
-      - pods
-      - namespaces
-      - nodes
-      - endpoints
-    verbs:
-      - get
-      - list
-      - watch
-      - update
-  - apiGroups:
-      - ""
-    resources:
-      - services
-    verbs:
-      - create
-      - get
-      - list
-      - watch
-      - update
-      - delete
-  - apiGroups:
-      - submariner.io
-    resources:
-      - endpoints
-      - clusters
-    verbs:
-      - get
-      - list
-      - watch
-  - apiGroups:
-      - submariner.io
-    resources:
-      - clusterglobalegressips
-      - globalegressips
-    verbs:
-      - create
-      - get
-      - list
-      - watch
-      - update
-  - apiGroups:
-      - submariner.io
-    resources:
-      - globalingressips
-    verbs:
-      - create
-      - get
-      - list
-      - watch
-      - update
-      - delete
-      - deletecollection
-  - apiGroups:
-      - multicluster.x-k8s.io
-    resources:
-      - "serviceexports"
-    verbs:
-      - get
-      - list
-      - watch
-  - apiGroups:
-      - network.openshift.io
-    resources:
-      - service/externalips
-    verbs:
-      - create
-      - get
-      - list
-      - delete
----
-{{- end -}}
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRoleBinding
-metadata:
-  name: {{ template "submariner.fullname" . }}:globalnet
-  labels:
-    heritage: {{ .Release.Service | quote }}
-    release: {{ .Release.Name | quote }}
-    chart: {{ template "submariner.chart" . }}
-    app: {{ template "submariner.name" . }}
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: ClusterRole
-  name: {{ template "submariner.fullname" . }}:globalnet
-subjects:
-- kind: ServiceAccount
-  name: {{ template "submariner.globalnetServiceAccountName" . }}
-  namespace: {{ .Release.Namespace }}
----
-{{- if .Values.submariner.serviceDiscovery }}
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRole
-metadata:
-  name: {{ template "submariner.fullname" . }}:lighthouse-agent
-  labels:
-    heritage: {{ .Release.Service | quote }}
-    release: {{ .Release.Name | quote }}
-    chart: {{ template "submariner.chart" . }}
-    app: {{ template "submariner.name" . }}
-rules:
-  - apiGroups:
-      - ""
-    resources:
-      - services
-      - namespaces
-      - endpoints
-    verbs:
-      - get
-      - list
-      - watch
-      - update
-  - apiGroups:
-      - discovery.k8s.io
-    resources:
-      - endpointslices
-      - endpointslices/restricted
-    verbs:
-      - create
-      - get
-      - list
-      - watch
-      - update
-      - delete
-      - deletecollection
-  - apiGroups:
-      - submariner.io
-    resources:
-      - "gateways"
-      - "globalingressips"
-    verbs:
-      - get
-      - list
-      - watch
-  - apiGroups:
-      - multicluster.x-k8s.io
-    resources:
-      - "*"
-    verbs:
-      - create
-      - get
-      - list
-      - watch
-      - update
-      - delete
----
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRoleBinding
-metadata:
-  name: {{ template "submariner.fullname" . }}:lighthouse-agent
-  labels:
-    heritage: {{ .Release.Service | quote }}
-    release: {{ .Release.Name | quote }}
-    chart: {{ template "submariner.chart" . }}
-    app: {{ template "submariner.name" . }}
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: ClusterRole
-  name: {{ template "submariner.fullname" . }}:lighthouse-agent
-subjects:
-  - kind: ServiceAccount
-    name: {{ template "submariner.lighthouseAgentServiceAccountName" . }}
-    namespace: {{ .Release.Namespace }}
----
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRole
-metadata:
-  name: {{ template "submariner.fullname" . }}:lighthouse-coredns
-rules:
-  - apiGroups:
-      - ""
-    resources:
-      - services
-      - namespaces
-      - endpoints
-    verbs:
-      - get
-      - list
-      - watch
-      - update
-  - apiGroups:
-      - discovery.k8s.io
-    resources:
-      - endpointslices
-    verbs:
-      - create
-      - get
-      - list
-      - watch
-      - update
-      - delete
-      - deletecollection
-  - apiGroups:
-      - submariner.io
-    resources:
-      - "gateways"
-      - "submariners"
-    verbs:
-      - get
-      - list
-      - watch
-  - apiGroups:
-      - multicluster.x-k8s.io
-    resources:
-      - "*"
-    verbs:
-      - create
-      - get
-      - list
-      - watch
-      - update
-      - delete
----
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRoleBinding
-metadata:
-  name: {{ template "submariner.fullname" . }}:lighthouse-coredns
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: ClusterRole
-  name: {{ template "submariner.fullname" . }}:lighthouse-coredns
-subjects:
-  - kind: ServiceAccount
-    name: {{ template "submariner.lighthouseCoreDnsServiceAccountName" . }}
-    namespace: {{ .Release.Namespace }}
-{{- end -}}
-{{- end -}}

submariner-operator/templates/submariner.yaml

@@ -6,15 +6,23 @@ metadata:
 spec:
   broker: k8s
   brokerK8sApiServer: {{ .Values.broker.server }}
+  {{- if .Values.submariner.brokerK8sSecret }}
+  brokerK8sSecret: {{ .Values.submariner.brokerK8sSecret }}
+  {{- else }}
   brokerK8sApiServerToken: {{ .Values.broker.token }}
   brokerK8sCA: {{ .Values.broker.ca }}
+  {{- end }}
   brokerK8sRemoteNamespace: {{ .Values.broker.namespace }}
   brokerK8sInsecure: {{ .Values.broker.insecure }}
   ceIPSecDebug: {{ .Values.ipsec.debug }}
   ceIPSecForceUDPEncaps: {{ .Values.ipsec.forceUDPEncaps }}
   ceIPSecIKEPort: {{ .Values.ipsec.ikePort }}
   ceIPSecNATTPort: {{ .Values.ipsec.natPort }}
+  {{- if .Values.ipsec.pskSecret }}
+  ceIPSecPSKSecret: {{ .Values.ipsec.pskSecret }}
+  {{- else }}
   ceIPSecPSK: {{ .Values.ipsec.psk }}
+  {{- end }}
   clusterCIDR: "{{ .Values.submariner.clusterCidr }}"
   clusterID: {{ .Values.submariner.clusterId }}
   colorCodes: {{ .Values.submariner.colorCodes }}
@@ -52,6 +60,8 @@ spec:
 {{- end }}
   serviceCIDR: "{{ .Values.submariner.serviceCidr }}"
   globalCIDR: "{{ .Values.submariner.globalCidr }}"
+  clustersetIPCIDR: "{{ .Values.submariner.clustersetIpCidr }}"
+  clustersetIPEnabled: {{ .Values.submariner.clustersetIpEnabled }}
   serviceDiscoveryEnabled: {{ .Values.submariner.serviceDiscovery }}
   cableDriver: {{ .Values.submariner.cableDriver }}
   connectionHealthCheck:

submariner-operator/templates/svc-acct.yaml

@@ -1,119 +0,0 @@
-{{- if .Values.serviceAccounts.operator.create }}
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: {{ template "submariner.operatorServiceAccountName" . }}
-  labels:
-    heritage: {{ .Release.Service | quote }}
-    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 }}
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: {{ template "submariner.gatewayServiceAccountName" . }}
-  labels:
-    heritage: {{ .Release.Service | quote }}
-    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 }}
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: {{ template "submariner.routeAgentServiceAccountName" . }}
-  labels:
-    heritage: {{ .Release.Service | quote }}
-    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 }}
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: {{ template "submariner.globalnetServiceAccountName" . }}
-  labels:
-    heritage: {{ .Release.Service | quote }}
-    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 }}
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: {{ template "submariner.lighthouseAgentServiceAccountName" . }}
-  labels:
-    heritage: {{ .Release.Service | quote }}
-    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 }}
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: {{ template "submariner.lighthouseCoreDnsServiceAccountName" . }}
-  labels:
-    heritage: {{ .Release.Service | quote }}
-    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 }}

submariner-operator/values.yaml

@@ -5,6 +5,9 @@ submariner:
   clusterCidr: ""
   serviceCidr: ""
   globalCidr: ""
+  clustersetIpCidr: ""
+  clustersetIpEnabled: false
+  brokerK8sSecret: ""
   loadBalancerEnabled: false
   natEnabled: false
   colorCodes: blue
@@ -23,11 +26,10 @@ broker:
   insecure: false
   ca: ""
   globalnet: false
-rbac:
-  create: true
 images: {}
 ipsec:
   psk: ""
+  pskSecret: ""
   debug: false
   forceUDPEncaps: false
   ikePort: 500
@@ -44,22 +46,3 @@ operator:
   resources: {}
   tolerations: []
   affinity: {}
-serviceAccounts:
-  operator:
-    create: true
-    name: ""
-  gateway:
-    create: true
-    name: ""
-  routeAgent:
-    create: true
-    name: ""
-  globalnet:
-    create: true
-    name: ""
-  lighthouseAgent:
-    create: true
-    name: ""
-  lighthouseCoreDns:
-    create: true
-    name: ""

yamls/generate-yamls.go

@@ -0,0 +1,38 @@
+//go:build yamls
+
+/*
+SPDX-License-Identifier: Apache-2.0
+
+Copyright Contributors to the Submariner project.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+// Place any runtime dependencies as imports in this file.
+// Go modules will be forced to download and install them.
+
+package yamls
+
+import (
+	_ "github.com/submariner-io/submariner-operator/config/broker/broker-client"
+	_ "github.com/submariner-io/submariner-operator/config/openshift/rbac/submariner-metrics-reader"
+	_ "github.com/submariner-io/submariner-operator/config/rbac/submariner-gateway"
+	_ "github.com/submariner-io/submariner-operator/config/rbac/submariner-globalnet"
+	_ "github.com/submariner-io/submariner-operator/config/rbac/submariner-operator"
+	_ "github.com/submariner-io/submariner-operator/config/rbac/submariner-route-agent"
+	_ "github.com/submariner-io/submariner-operator/config/rbac/lighthouse-agent"
+	_ "github.com/submariner-io/submariner-operator/config/rbac/lighthouse-coredns"
+	_ "github.com/submariner-io/submariner-operator/deploy/crds"
+	_ "github.com/submariner-io/submariner/deploy/crds"
+	_ "sigs.k8s.io/mcs-api/config/crd"
+)