Update Submariner dependencies to v0.17.0-m1

Signed-off-by: Automated Release <release@submariner.io>

.github/dependabot.yml

@@ -4,14 +4,24 @@ updates:
   - package-ecosystem: github-actions
     directory: '/'
     schedule:
-      interval: weekly
+      interval: monthly
-  - package-ecosystem: github-actions
-    directory: '/'
-    target-branch: "release-0.12"
-    schedule:
-      interval: weekly
   - package-ecosystem: github-actions
     directory: '/'
     target-branch: "release-0.13"
     schedule:
-      interval: weekly
+      interval: monthly
+  - package-ecosystem: github-actions
+    directory: '/'
+    target-branch: "release-0.14"
+    schedule:
+      interval: monthly
+  - package-ecosystem: github-actions
+    directory: '/'
+    target-branch: "release-0.15"
+    schedule:
+      interval: monthly
+  - package-ecosystem: github-actions
+    directory: '/'
+    target-branch: "release-0.16"
+    schedule:
+      interval: monthly

.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.14
+      - name: Check that the PR targets devel
-        if: ${{ github.base_ref != 'release-0.14' }}
+        if: ${{ github.base_ref != 'devel' }}
         run: exit 1

.github/workflows/e2e-full.yml

@@ -11,7 +11,7 @@ jobs:
   e2e:
     name: E2E
     if: contains(github.event.pull_request.labels.*.name, 'ready-to-test')
-    timeout-minutes: 120
+    timeout-minutes: 45
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
@@ -26,14 +26,14 @@ jobs:
           - k8s_version: '1.24'
     steps:
       - name: Check out the repository
-        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
 
       - name: Run E2E deployment and tests
-        uses: submariner-io/shipyard/gh-actions/e2e@release-0.14
+        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.14
+        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@692973e3d937129bcbf40652eb9f2f61becf3332
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
 
       - name: Run E2E deployment and tests
-        uses: submariner-io/shipyard/gh-actions/e2e@release-0.14
+        uses: submariner-io/shipyard/gh-actions/e2e@devel
 
       - name: Post mortem
         if: failure()
-        uses: submariner-io/shipyard/gh-actions/post-mortem@release-0.14
+        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@692973e3d937129bcbf40652eb9f2f61becf3332
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
 
       - name: Run E2E deployment and tests
-        uses: submariner-io/shipyard/gh-actions/e2e@release-0.14
+        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.14
+        uses: submariner-io/shipyard/gh-actions/post-mortem@devel

.github/workflows/linting.yml

@@ -13,7 +13,7 @@ jobs:
     steps:
       - name: Get PR commits
         id: 'get-pr-commits'
-        uses: tim-actions/get-pr-commits@198af03565609bb4ed924d1260247b4881f09e7d
+        uses: tim-actions/get-pr-commits@3efc1387ead42029a0d488ab98f24b7452dc3cde
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
 
@@ -38,20 +38,20 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out the repository
-        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
 
       - name: Set up Helm
-        uses: azure/setup-helm@fe7b79cd5ee1e45176fcad797de68ecaf3ca4814
+        uses: azure/setup-helm@5119fcb9089d432beecbf79bb2c7915207344b78
         with:
           version: v3.6.0
 
       - name: Set up Python
-        uses: actions/setup-python@39cd14951b08e74b54015e9e001cdefcf80e669f
+        uses: actions/setup-python@65d7f2d534ac1bc67fcd62888c5f4f3d2cb2b236
         with:
           python-version: '3.x'
 
       - name: Set up helm/chart-testing
-        uses: helm/chart-testing-action@e6669bcd63d7cb57cb4380c33043eebe5d111992
+        uses: helm/chart-testing-action@b43128a8b25298e1e7b043b78ea6613844e079b1
 
       - 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@692973e3d937129bcbf40652eb9f2f61becf3332
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
         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@692973e3d937129bcbf40652eb9f2f61becf3332
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
 
       - name: Run helm-docs and verify docs are up-to-date
         run: make helm-docs
@@ -85,7 +85,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out the repository
-        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
 
       - name: Run markdown-link-check
         uses: gaurav-nelson/github-action-markdown-link-check@d53a906aa6b22b8979d33bc86170567e619495ec
@@ -99,7 +99,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out the repository
-        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
       - name: Run markdownlint
         run: make markdownlint
 
@@ -108,6 +108,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out the repository
-        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
       - name: Run yamllint
         run: make yamllint

.github/workflows/periodic.yml

@@ -16,7 +16,7 @@ jobs:
       issues: write
     steps:
       - name: Check out the repository
-        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
 
       - name: Run markdown-link-check
         uses: gaurav-nelson/github-action-markdown-link-check@d53a906aa6b22b8979d33bc86170567e619495ec
@@ -25,7 +25,7 @@ jobs:
 
       - name: Raise an Issue to report broken links
         if: ${{ failure() }}
-        uses: peter-evans/create-issue-from-file@24452a72d85239eacf1468b0f1982a9f3fec4c94
+        uses: peter-evans/create-issue-from-file@433e51abf769039ee20ba1293a088ca19d573b7f
         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.14
+      - devel
 
 permissions:
   contents: write
@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
         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@b69b346013879cedbf50c69f572cd85439a41936
+        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.

Makefile

@@ -1,4 +1,4 @@
-BASE_BRANCH ?= release-0.14
+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.9
+CHARTS_VERSION=0.17.0-m1
 HELM_DOCS_VERSION=0.15.0
 REPO_URL=$(shell git config remote.origin.url)
-SUBCTL_VERSION=$(CHARTS_VERSION)
-export SUBCTL_VERSION
 
 # Targets to make
 

submariner-k8s-broker/templates/NOTES.txt

@@ -6,5 +6,5 @@ You can retrieve the server URL by running
 
 The broker client token and CA can be retrieved by running
 
-  $ SUBMARINER_BROKER_CA=$(kubectl -n "${SUBMARINER_BROKER_NS}" get secrets "${SUBMARINER_BROKER_NS}-client-token" -o jsonpath="{.data['ca\.crt']}")
+  $ SUBMARINER_BROKER_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)

submariner-operator/templates/NOTES.txt

@@ -1,3 +1,3 @@
 Submariner is now installed.
 
-By default, Submariner runs with 1 replica. If you have more than one Gateway host, you can scale Submariner to N replicas, and the other Submariner pods will simply join the leader election pool.
+By default, Submariner runs with 1 replica. If you have more than one Gateway host, you can scale Submariner to N replicas, and the other Submariner pods will simply join the leader election pool.

submariner-operator/templates/rbac.yaml

@@ -9,85 +9,62 @@ metadata:
     chart: {{ template "submariner.chart" . }}
     app: {{ template "submariner.name" . }}
 rules:
-  - apiGroups:
+- apiGroups:
-      - ""
+  - ""
-    resources:
+  resources:
-      # For metrics
+  - pods
-      - services
+  - services
-    verbs:
+  - services/finalizers
-      - get
+  - endpoints
-      - create
+  - persistentvolumeclaims
-      - update
+  - events
-  - apiGroups:
+  - configmaps
-      - ""
+  - secrets
-    resources:
+  verbs:
-      # For syncing Secrets from the broker
+  - '*'
-      - secrets
+- apiGroups:
-    verbs:
+  - apps
-      - get
+  resources:
-      - create
+  - deployments
-      - update
+  - daemonsets
-      - delete
+  - replicasets
-  - apiGroups:
+  - statefulsets
-      - apps
+  verbs:
-    resources:
+  - '*'
-      - deployments
+- apiGroups:
-      - daemonsets
+  - monitoring.coreos.com
-    verbs:
+  resources:
-      - create
+  - servicemonitors
-      - delete
+  verbs:
-      - get
+  - get
-      - list
+  - create
-      - patch
+- apiGroups:
-      - update
+  - apps
-      - watch
+  resourceNames:
-  - apiGroups:
+  - {{ template "submariner.fullname" . }}
-      - monitoring.coreos.com
+  resources:
-    resources:
+  - deployments/finalizers
-      # Needed for openshift monitoring
+  verbs:
-      - servicemonitors
+  - update
-    verbs:
+- apiGroups:
-      - get
+  - ""
-      - create
+  resources:
-  - apiGroups:
+  - pods
-      - apps
+  verbs:
-    resourceNames:
+  - get
-      - {{ template "submariner.fullname" . }}
+- apiGroups:
-    resources:
+  - apps
-      - deployments/finalizers
+  resources:
-    verbs:
+  - replicasets
-      - update
+  verbs:
-  - apiGroups:
+  - get
-      - submariner.io
+- apiGroups:
-    resources:
+  - submariner.io
-      - brokers
+  resources:
-      - brokers/status
+  - '*'
-      - submariners
+  - servicediscoveries
-      - submariners/status
+  verbs:
-      - 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
 apiVersion: rbac.authorization.k8s.io/v1
@@ -116,47 +93,86 @@ metadata:
     chart: {{ template "submariner.chart" . }}
     app: {{ template "submariner.name" . }}
 rules:
-  - apiGroups:
+- apiGroups:
-      - ""
+    - ""
-    resources:
+  resources:
-      - pods
+    - pods
-    verbs:
+    - services
-      - get
+    - services/finalizers
-      - update
+    - endpoints
-      - patch
+    - persistentvolumeclaims
-  - apiGroups:
+    - events
-      - submariner.io
+    - configmaps
-    resources:
+    - secrets
-      - clusters
+  verbs:
-      - endpoints
+    - '*'
-      - gateways
+- apiGroups:
-    verbs:
+    - apps
-      - get
+  resources:
-      - list
+    - deployments
-      - watch
+    - daemonsets
-      - create
+    - replicasets
-      - update
+    - statefulsets
-      - delete
+  verbs:
-  - apiGroups:
+    - '*'
-      - coordination.k8s.io
+- apiGroups:
-    resources:
+    - monitoring.coreos.com
-      - leases
+  resources:
-    verbs:
+    - servicemonitors
-      - get
+  verbs:
-      - list
+    - get
-      - watch
+    - create
-      - create
+- apiGroups:
-      - update
+    - apps
-      - delete
+  resourceNames:
-  - apiGroups:
+    - submariner-operator
-      - ""
+  resources:
-    resources:
+    - deployments/finalizers
-      # For leader election
+  verbs:
-      - configmaps
+    - update
-    verbs:
+- apiGroups:
-      - get
+    - ""
-      - create
+  resources:
-      - update
+    - 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
@@ -187,12 +203,73 @@ metadata:
     app: {{ template "submariner.name" . }}
 rules:
   - apiGroups:
-      - submariner.io
+      - ""
     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
@@ -223,6 +300,87 @@ metadata:
     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
@@ -253,6 +411,9 @@ metadata:
     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:
@@ -274,10 +435,9 @@ rules:
       - update
       - delete
       - watch
-  - apiGroups:
+  - apiGroups:  # pods, services and nodes are looked up to figure out network settings
       - ""
     resources:
-      # Needed for network settings discovery
       - pods
       - services
       - nodes
@@ -291,20 +451,27 @@ rules:
       - dnses
     verbs:
       - get
+      - list
+      - watch
       - update
   - apiGroups:
       - config.openshift.io
     resources:
-      # Needed for network settings discovery
       - networks
-    resourceNames:
-      - cluster
     verbs:
       - get
+      - list
+  - apiGroups:
+      - ""
+    resources:
+      - namespaces
+    verbs:
+      - get
+      - list
+      - watch
   - apiGroups:
       - monitoring.coreos.com
     resources:
-      # Needed for openshift monitoring
       - servicemonitors
     verbs:
       - get
@@ -312,10 +479,11 @@ rules:
   - apiGroups:
       - apps
     resources:
-      # Needed for Flannel CNI discovery
       - daemonsets
     verbs:
+      - get
       - list
+      - watch
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
@@ -374,7 +542,21 @@ rules:
       - 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
@@ -384,6 +566,32 @@ rules:
       - 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
@@ -416,29 +624,56 @@ rules:
   - apiGroups:
       - ""
     resources:
-      - pods
-      - services
       - configmaps
     verbs:
       - get
       - list
-  - apiGroups:
-      - config.openshift.io
-    resources:
-      - networks
-    resourceNames:
-      - cluster
-    verbs:
-      - get
-  - apiGroups:
-      - ""
-    resources:
-      - nodes
-    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
@@ -472,25 +707,19 @@ rules:
   - apiGroups:
       - ""
     resources:
+      - pods
+      - namespaces
       - nodes
-      - endpoints
     verbs:
       - get
       - list
       - watch
       - update
-  - apiGroups:
-      - ""
-    resources:
-      - pods
-    verbs:
-      - get
-      - list
-      - watch
   - apiGroups:
       - ""
     resources:
       - services
+      - endpoints
     verbs:
       - create
       - get
@@ -501,8 +730,8 @@ rules:
   - apiGroups:
       - submariner.io
     resources:
-      - clusters
       - endpoints
+      - clusters
     verbs:
       - get
       - list
@@ -511,17 +740,11 @@ rules:
       - submariner.io
     resources:
       - clusterglobalegressips
+      - clusterglobalegressips/status
       - globalegressips
-    verbs:
+      - globalegressips/status
-      - create
-      - get
-      - list
-      - watch
-      - update
-  - apiGroups:
-      - submariner.io
-    resources:
       - globalingressips
+      - globalingressips/status
     verbs:
       - create
       - get
@@ -533,7 +756,7 @@ rules:
   - apiGroups:
       - multicluster.x-k8s.io
     resources:
-      - serviceexports
+      - "serviceexports"
     verbs:
       - get
       - list
@@ -588,6 +811,7 @@ rules:
       - get
       - list
       - watch
+      - update
   - apiGroups:
       - discovery.k8s.io
     resources:
@@ -604,8 +828,8 @@ rules:
   - apiGroups:
       - submariner.io
     resources:
-      - gateways
+      - "gateways"
-      - globalingressips
+      - "globalingressips"
     verbs:
       - get
       - list
@@ -613,8 +837,7 @@ rules:
   - apiGroups:
       - multicluster.x-k8s.io
     resources:
-      - serviceimports
+      - "*"
-      - serviceimports/status
     verbs:
       - create
       - get
@@ -622,20 +845,6 @@ rules:
       - watch
       - update
       - 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
 kind: ClusterRoleBinding
@@ -664,23 +873,30 @@ rules:
       - ""
     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
+      - "gateways"
-      - submariners
+      - "submariners"
     verbs:
       - get
       - list
@@ -688,11 +904,14 @@ rules:
   - apiGroups:
       - multicluster.x-k8s.io
     resources:
-      - serviceimports
+      - "*"
     verbs:
+      - create
       - get
       - list
       - watch
+      - update
+      - delete
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding

submariner-operator/templates/submariner.yaml

@@ -60,6 +60,6 @@ spec:
     maxPacketLossCount: 5
 {{- with .Values.submariner.coreDNSCustomConfig }}
   coreDNSCustomConfig:
-    configmapName: {{ .configmapName }}
+    configMapName: {{ .configMapName }}
     namespace: {{ .namespace }}
 {{- end }}