Update base image to use stable branch 'release-0.15'

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

.github/dependabot.yml

@@ -5,6 +5,11 @@ updates:
     directory: '/'
     schedule:
       interval: monthly
+  - package-ecosystem: github-actions
+    directory: '/'
+    target-branch: "release-0.12"
+    schedule:
+      interval: monthly
   - package-ecosystem: github-actions
     directory: '/'
     target-branch: "release-0.13"
@@ -15,8 +20,3 @@ updates:
     target-branch: "release-0.14"
     schedule:
       interval: monthly
-  - package-ecosystem: github-actions
-    directory: '/'
-    target-branch: "release-0.15"
-    schedule:
-      interval: monthly

.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 release-0.15
-        if: ${{ github.base_ref != 'release-0.16' }}
+        if: ${{ github.base_ref != 'release-0.15' }}
         run: exit 1

.github/workflows/e2e-full.yml

@@ -26,14 +26,14 @@ jobs:
           - k8s_version: '1.24'
     steps:
       - name: Check out the repository
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
+        uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c
 
       - name: Run E2E deployment and tests
-        uses: submariner-io/shipyard/gh-actions/e2e@release-0.16
+        uses: submariner-io/shipyard/gh-actions/e2e@release-0.15
         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@release-0.15

.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@ac593985615ec2ede58e132d2e21d2b1cbd6127c
 
       - name: Run E2E deployment and tests
-        uses: submariner-io/shipyard/gh-actions/e2e@release-0.16
+        uses: submariner-io/shipyard/gh-actions/e2e@release-0.15
 
       - name: Post mortem
         if: failure()
-        uses: submariner-io/shipyard/gh-actions/post-mortem@release-0.16
+        uses: submariner-io/shipyard/gh-actions/post-mortem@release-0.15

.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@ac593985615ec2ede58e132d2e21d2b1cbd6127c
 
       - name: Run E2E deployment and tests
-        uses: submariner-io/shipyard/gh-actions/e2e@release-0.16
+        uses: submariner-io/shipyard/gh-actions/e2e@release-0.15
         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@release-0.15

.github/workflows/linting.yml

@@ -13,12 +13,12 @@ jobs:
     steps:
       - name: Get PR commits
         id: 'get-pr-commits'
-        uses: tim-actions/get-pr-commits@198af03565609bb4ed924d1260247b4881f09e7d
+        uses: tim-actions/get-pr-commits@8673d84c368f480628607dbe21c88545811ef23a
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
 
       - name: 'Verify no "Apply suggestions from code review" commits'
-        uses: tim-actions/commit-message-checker-with-regex@094fc16ff83d04e2ec73edb5eaf6aa267db33791
+        uses: tim-actions/commit-message-checker-with-regex@e16b08b1a7f5cafeb1f8167de05bf1d40239eb5d
         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@094fc16ff83d04e2ec73edb5eaf6aa267db33791
+        uses: tim-actions/commit-message-checker-with-regex@e16b08b1a7f5cafeb1f8167de05bf1d40239eb5d
         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@11bd71901bbe5b1630ceea73d27597364c9af683
+        uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c
 
       - name: Set up Helm
-        uses: azure/setup-helm@b9e51907a09c216f16ebe8536097933489208112
+        uses: azure/setup-helm@5119fcb9089d432beecbf79bb2c7915207344b78
         with:
           version: v3.6.0
 
       - name: Set up Python
-        uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065
+        uses: actions/setup-python@d27e3f3d7c64b4bbf8e4abfb9b63b83e846e0435
         with:
           python-version: '3.x'
 
       - name: Set up helm/chart-testing
-        uses: helm/chart-testing-action@0d28d3144d3a25ea2cc349d6e59901c4ff469b3b
+        uses: helm/chart-testing-action@afea100a513515fbd68b0e72a7bb0ae34cb62aec
 
       - 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@11bd71901bbe5b1630ceea73d27597364c9af683
+        uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c
         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@ac593985615ec2ede58e132d2e21d2b1cbd6127c
 
       - 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@11bd71901bbe5b1630ceea73d27597364c9af683
+        uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c
 
       - name: Run markdown-link-check
-        uses: gaurav-nelson/github-action-markdown-link-check@3c3b66f1f7d0900e37b71eca45b63ea9eedfce31
+        uses: gaurav-nelson/github-action-markdown-link-check@3faccbcf285e2c0424212c17908f8adcfbd0c2ad
         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@11bd71901bbe5b1630ceea73d27597364c9af683
+        uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c
       - 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@ac593985615ec2ede58e132d2e21d2b1cbd6127c
       - 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@11bd71901bbe5b1630ceea73d27597364c9af683
+        uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c
 
       - name: Run markdown-link-check
-        uses: gaurav-nelson/github-action-markdown-link-check@3c3b66f1f7d0900e37b71eca45b63ea9eedfce31
+        uses: gaurav-nelson/github-action-markdown-link-check@3faccbcf285e2c0424212c17908f8adcfbd0c2ad
         with:
           config-file: ".markdownlinkcheck.json"
 
       - 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@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.16
+      - release-0.15
 
 permissions:
   contents: write
@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
+        uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c
         with:
           fetch-depth: 0
 

.gitignore

@@ -3,6 +3,5 @@
 .shflags
 *.tgz
 Makefile.dapper
-Makefile.shipyard
 Dockerfile.*
 helm_repo

CODEOWNERS

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

CODEOWNERS.in

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

Makefile

@@ -1,4 +1,4 @@
-BASE_BRANCH ?= release-0.16
+BASE_BRANCH ?= release-0.15
 export BASE_BRANCH
 export HELM_REPO_LOCATION=./helm_repo
 
@@ -17,9 +17,11 @@ 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.14.0
 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-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
@@ -237,16 +302,74 @@ metadata:
     app: {{ template "submariner.name" . }}
 rules:
   - apiGroups:
-      - coordination.k8s.io
+      - ""
     resources:
-      - leases
+      - 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
-      - list
-      - watch
       - 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
@@ -301,10 +424,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 +440,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 +468,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 +531,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 +555,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 +613,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,25 +696,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
@@ -551,8 +719,8 @@ rules:
   - apiGroups:
       - submariner.io
     resources:
-      - clusters
       - endpoints
+      - clusters
     verbs:
       - get
       - list
@@ -561,11 +729,17 @@ rules:
       - submariner.io
     resources:
       - clusterglobalegressips
-      - clusterglobalegressips/status
       - globalegressips
-      - globalegressips/status
+    verbs:
+      - create
+      - get
+      - list
+      - watch
+      - update
+  - apiGroups:
+      - submariner.io
+    resources:
       - globalingressips
-      - globalingressips/status
     verbs:
       - create
       - get
@@ -577,7 +751,7 @@ rules:
   - apiGroups:
       - multicluster.x-k8s.io
     resources:
-      - serviceexports
+      - "serviceexports"
     verbs:
       - get
       - list
@@ -632,6 +806,7 @@ rules:
       - get
       - list
       - watch
+      - update
   - apiGroups:
       - discovery.k8s.io
     resources:
@@ -648,8 +823,8 @@ rules:
   - apiGroups:
       - submariner.io
     resources:
-      - gateways
+      - "gateways"
-      - globalingressips
+      - "globalingressips"
     verbs:
       - get
       - list
@@ -657,8 +832,7 @@ rules:
   - apiGroups:
       - multicluster.x-k8s.io
     resources:
-      - serviceimports
+      - "*"
-      - serviceimports/status
     verbs:
       - create
       - get
@@ -666,20 +840,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 +865,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 +899,14 @@ rules:
   - apiGroups:
       - multicluster.x-k8s.io
     resources:
-      - serviceimports
+      - "*"
     verbs:
+      - create
       - get
       - list
       - watch
+      - update
+      - delete
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding