Update Submariner dependencies to v0.18.0-m2

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

.github/dependabot.yml

@@ -5,18 +5,43 @@ updates:
     directory: '/'
     schedule:
       interval: monthly
-  - package-ecosystem: github-actions
+    groups:
-    directory: '/'
+      github-actions:
-    target-branch: "release-0.13"
+        patterns:
-    schedule:
+          - "*"
-      interval: monthly
   - package-ecosystem: github-actions
     directory: '/'
     target-branch: "release-0.14"
     schedule:
       interval: monthly
+    groups:
+      github-actions:
+        patterns:
+          - "*"
   - package-ecosystem: github-actions
     directory: '/'
     target-branch: "release-0.15"
     schedule:
       interval: monthly
+    groups:
+      github-actions:
+        patterns:
+          - "*"
+  - package-ecosystem: github-actions
+    directory: '/'
+    target-branch: "release-0.16"
+    schedule:
+      interval: monthly
+    groups:
+      github-actions:
+        patterns:
+          - "*"
+  - package-ecosystem: github-actions
+    directory: '/'
+    target-branch: "release-0.17"
+    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.16
+      - name: Check that the PR targets devel
-        if: ${{ github.base_ref != 'release-0.16' }}
+        if: ${{ github.base_ref != 'devel' }}
         run: exit 1

.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: ['1.29']
         lighthouse: ['', 'lighthouse']
         include:
-          - k8s_version: '1.22'
+          # Bottom of supported K8s version range
-          - k8s_version: '1.23'
+          - k8s_version: '1.26'
-          - k8s_version: '1.24'
     steps:
       - name: Check out the repository
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
 
       - name: Run E2E deployment and tests
-        uses: submariner-io/shipyard/gh-actions/e2e@release-0.16
+        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.16
+        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@11bd71901bbe5b1630ceea73d27597364c9af683
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
 
       - name: Run E2E deployment and tests
-        uses: submariner-io/shipyard/gh-actions/e2e@release-0.16
+        uses: submariner-io/shipyard/gh-actions/e2e@devel
 
       - name: Post mortem
         if: failure()
-        uses: submariner-io/shipyard/gh-actions/post-mortem@release-0.16
+        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@11bd71901bbe5b1630ceea73d27597364c9af683
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
 
       - name: Run E2E deployment and tests
-        uses: submariner-io/shipyard/gh-actions/e2e@release-0.16
+        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.16
+        uses: submariner-io/shipyard/gh-actions/post-mortem@devel

.github/workflows/linting.yml

@@ -38,15 +38,15 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out the repository
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
+        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@0b93645e9fea7318ecaed2b359559ac225c90a2b
+        uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c
         with:
           python-version: '3.x'
 
@@ -64,7 +64,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out the repository
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
+        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@11bd71901bbe5b1630ceea73d27597364c9af683
+        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@11bd71901bbe5b1630ceea73d27597364c9af683
+        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@11bd71901bbe5b1630ceea73d27597364c9af683
+        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@11bd71901bbe5b1630ceea73d27597364c9af683
+        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@11bd71901bbe5b1630ceea73d27597364c9af683
+        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@e8ef132d6df98ed982188e460ebb3b5d4ef3a9cd
+        uses: peter-evans/create-issue-from-file@24452a72d85239eacf1468b0f1982a9f3fec4c94
         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.16
+      - devel
 
 permissions:
   contents: write
@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
+        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@3f3b0175e8c66fb49b9a6d5a0cd1f8436d4c3ab6
+        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,6 +3,5 @@
 .shflags
 *.tgz
 Makefile.dapper
-Makefile.shipyard
 Dockerfile.*
 helm_repo

Makefile

@@ -1,4 +1,4 @@
-BASE_BRANCH ?= release-0.16
+BASE_BRANCH ?= devel
 export BASE_BRANCH
 export HELM_REPO_LOCATION=./helm_repo
 
@@ -17,7 +17,7 @@ endif
 export DEPLOYTOOL = helm
 GH_URL=https://submariner-io.github.io/submariner-charts/charts
 CHARTS_DIR=charts
-CHARTS_VERSION=0.16.8
+CHARTS_VERSION=0.18.0-m2
 HELM_DOCS_VERSION=0.15.0
 REPO_URL=$(shell git config remote.origin.url)
 

submariner-operator/templates/rbac.yaml

@@ -9,94 +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
-      - ""
+  verbs:
-    resources:
+  - '*'
-      # Temporarily needed for network-plugin syncer removal
+- apiGroups:
-      - serviceaccounts
+  - monitoring.coreos.com
-    resourceNames:
+  resources:
-      - submariner-networkplugin-syncer
+  - servicemonitors
-    verbs:
+  verbs:
-      - delete
+  - get
-  - apiGroups:
+  - create
-      - apps
+- apiGroups:
-    resources:
+  - apps
-      - deployments
+  resourceNames:
-      - daemonsets
+  - {{ template "submariner.fullname" . }}
-    verbs:
+  resources:
-      - create
+  - deployments/finalizers
-      - delete
+  verbs:
-      - get
+  - update
-      - list
+- apiGroups:
-      - patch
+  - ""
-      - update
+  resources:
-      - watch
+  - pods
-  - apiGroups:
+  verbs:
-      - monitoring.coreos.com
+  - get
-    resources:
+- apiGroups:
-      # Needed for openshift monitoring
+  - apps
-      - servicemonitors
+  resources:
-    verbs:
+  - replicasets
-      - get
+  verbs:
-      - create
+  - get
-  - apiGroups:
+- apiGroups:
-      - apps
+  - submariner.io
-    resourceNames:
+  resources:
-      - {{ template "submariner.fullname" . }}
+  - '*'
-    resources:
+  - servicediscoveries
-      - deployments/finalizers
+  verbs:
-    verbs:
+  - '*'
-      - update
-  - apiGroups:
-      - submariner.io
-    resources:
-      - brokers
-      - brokers/status
-      - submariners
-      - submariners/status
-      - servicediscoveries
-      - servicediscoveries/status
-    verbs:
-      - get
-      - list
-      - watch
-      - create
-      - update
-      - delete
-  - apiGroups:
-      - submariner.io
-    resources:
-      - gateways
-    verbs:
-      - get
-      - list
-      - watch
-  - apiGroups:
-      - submariner.io
-    resources:
-      - submariners/finalizers
-      - servicediscoveries/finalizers
-    verbs:
-      - update
 ---
 kind: RoleBinding
 apiVersion: rbac.authorization.k8s.io/v1
@@ -125,38 +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:
+    - 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
@@ -187,25 +203,74 @@ 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
-      - list
-      - watch
   - apiGroups:
       - submariner.io
     resources:
-      - gatewayroutes
+      - '*'
-      - nongatewayroutes
+      - servicediscoveries
     verbs:
+      - '*'
+  - apiGroups:
+      - lighthouse.submariner.io
+    resources:
+      - '*'
+      - serviceexports
+    verbs:
+      - create
+      - delete
       - get
       - list
-      - watch
+      - patch
-      - create
       - update
-      - delete
+      - watch
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
@@ -236,6 +301,75 @@ metadata:
     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:
@@ -301,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
@@ -318,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
@@ -339,21 +479,11 @@ rules:
   - apiGroups:
       - apps
     resources:
-      # Needed for Flannel CNI discovery
       - daemonsets
     verbs:
+      - get
       - list
-  - apiGroups:
+      - watch
-      - rbac.authorization.k8s.io
-    resources:
-      # Temporarily needed for network-plugin syncer removal
-      - clusterroles
-      - clusterrolebindings
-    resourceNames:
-      - ocp-submariner-networkplugin-syncer
-      - submariner-networkplugin-syncer
-    verbs:
-      - delete
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
@@ -412,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
@@ -422,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
@@ -454,41 +624,56 @@ rules:
   - apiGroups:
       - ""
     resources:
-      - pods
-      - services
-      - secrets
       - configmaps
-      - endpoints
-    verbs:
-      - get
-      - list
-  - apiGroups:
-      - config.openshift.io
-    resources:
-      - networks
-    resourceNames:
-      - cluster
-    verbs:
-      - get
-  - apiGroups:
-      - ""
-    resources:
-      - nodes
     verbs:
       - get
       - list
       - watch
       - update
   - apiGroups:
-      - projectcalico.org
+      - apiextensions.k8s.io
     resources:
-      - ippools
+      - customresourcedefinitions
     verbs:
       - get
+      - list
       - create
-      - delete
       - update
-      - deletecollection
+      - 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
@@ -522,20 +707,14 @@ rules:
   - apiGroups:
       - ""
     resources:
+      - pods
+      - namespaces
       - nodes
     verbs:
       - get
       - list
       - watch
       - update
-  - apiGroups:
-      - ""
-    resources:
-      - pods
-    verbs:
-      - get
-      - list
-      - watch
   - apiGroups:
       - ""
     resources:
@@ -551,8 +730,8 @@ rules:
   - apiGroups:
       - submariner.io
     resources:
-      - clusters
       - endpoints
+      - clusters
     verbs:
       - get
       - list
@@ -577,7 +756,7 @@ rules:
   - apiGroups:
       - multicluster.x-k8s.io
     resources:
-      - serviceexports
+      - "serviceexports"
     verbs:
       - get
       - list
@@ -632,6 +811,7 @@ rules:
       - get
       - list
       - watch
+      - update
   - apiGroups:
       - discovery.k8s.io
     resources:
@@ -648,8 +828,8 @@ rules:
   - apiGroups:
       - submariner.io
     resources:
-      - gateways
+      - "gateways"
-      - globalingressips
+      - "globalingressips"
     verbs:
       - get
       - list
@@ -657,8 +837,7 @@ rules:
   - apiGroups:
       - multicluster.x-k8s.io
     resources:
-      - serviceimports
+      - "*"
-      - serviceimports/status
     verbs:
       - create
       - get
@@ -666,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
@@ -705,18 +870,33 @@ metadata:
   name: {{ template "submariner.fullname" . }}:lighthouse-coredns
 rules:
   - apiGroups:
-      - discovery.k8s.io
+      - ""
     resources:
-      - endpointslices
+      - 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
@@ -724,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