Update Submariner dependencies to v0.19.4

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

.github/dependabot.yml

@@ -9,15 +9,6 @@ updates:
       github-actions:
         patterns:
           - "*"
-  - 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"
@@ -36,3 +27,21 @@ updates:
       github-actions:
         patterns:
           - "*"
+  - package-ecosystem: github-actions
+    directory: '/'
+    target-branch: "release-0.17"
+    schedule:
+      interval: monthly
+    groups:
+      github-actions:
+        patterns:
+          - "*"
+  - package-ecosystem: github-actions
+    directory: '/'
+    target-branch: "release-0.18"
+    schedule:
+      interval: monthly
+    groups:
+      github-actions:
+        patterns:
+          - "*"

.github/workflows/branch.yml

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

.github/workflows/e2e-full.yml

@@ -19,21 +19,21 @@ jobs:
         cable_driver: ['libreswan', 'wireguard', 'vxlan']
         globalnet: ['', 'globalnet']
         # Run most tests against the latest K8s version
-        k8s_version: ['1.28']
+        k8s_version: ['1.29']
         lighthouse: ['', 'lighthouse']
         include:
           # Bottom of supported K8s version range
           - k8s_version: '1.26'
     steps:
       - name: Check out the repository
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
 
       - name: Run E2E deployment and tests
-        uses: submariner-io/shipyard/gh-actions/e2e@devel
+        uses: submariner-io/shipyard/gh-actions/e2e@release-0.19
         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@devel
+        uses: submariner-io/shipyard/gh-actions/post-mortem@release-0.19

.github/workflows/e2e.yml

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

.github/workflows/flake_finder.yml

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

.github/workflows/linting.yml

@@ -13,7 +13,7 @@ jobs:
     steps:
       - name: Get PR commits
         id: 'get-pr-commits'
-        uses: tim-actions/get-pr-commits@3efc1387ead42029a0d488ab98f24b7452dc3cde
+        uses: tim-actions/get-pr-commits@198af03565609bb4ed924d1260247b4881f09e7d
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
 
@@ -38,20 +38,20 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out the repository
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
 
       - name: Set up Helm
-        uses: azure/setup-helm@5119fcb9089d432beecbf79bb2c7915207344b78
+        uses: azure/setup-helm@b9e51907a09c216f16ebe8536097933489208112
         with:
           version: v3.6.0
 
       - name: Set up Python
-        uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c
+        uses: actions/setup-python@8d9ed9ac5c53483de85588cdf95a591a75ab9f55
         with:
           python-version: '3.x'
 
       - name: Set up helm/chart-testing
-        uses: helm/chart-testing-action@e6669bcd63d7cb57cb4380c33043eebe5d111992
+        uses: helm/chart-testing-action@0d28d3144d3a25ea2cc349d6e59901c4ff469b3b
 
       - 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@b4ffde65f46336ab88eb53be808477a3936bae11
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
         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@b4ffde65f46336ab88eb53be808477a3936bae11
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
 
       - 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@b4ffde65f46336ab88eb53be808477a3936bae11
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
 
       - 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@b4ffde65f46336ab88eb53be808477a3936bae11
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
       - name: Run markdownlint
         run: make markdownlint
 
@@ -108,6 +108,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out the repository
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
       - 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@b4ffde65f46336ab88eb53be808477a3936bae11
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
 
       - 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@e8ef132d6df98ed982188e460ebb3b5d4ef3a9cd
         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:
-      - devel
+      - release-0.19
 
 permissions:
   contents: write
@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
         with:
           fetch-depth: 0
 

.github/workflows/stale.yml

@@ -16,7 +16,7 @@ jobs:
       issues: write
       pull-requests: write
     steps:
-      - uses: actions/stale@3f3b0175e8c66fb49b9a6d5a0cd1f8436d4c3ab6
+      - uses: actions/stale@ba23c1cb02e5cb8f885b0994d870e6032be00186
         with:
           days-before-issue-stale: 120
           days-before-pr-stale: 14

.gitignore

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

CODEOWNERS

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

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 ?= devel
+BASE_BRANCH ?= release-0.19
 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.17.0-m3
+CHARTS_VERSION=0.19.4
 HELM_DOCS_VERSION=0.15.0
 REPO_URL=$(shell git config remote.origin.url)
 

submariner-operator/README.md

@@ -58,6 +58,8 @@ Submariner enables direct networking between Pods and Services in different Kube
 | 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-operator/crds/crd.yaml

@@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.4.1
+    controller-gen.kubebuilder.io/version: v0.12.1
-  creationTimestamp: null
   name: submariners.submariner.io
 spec:
   group: submariner.io
@@ -18,7 +17,7 @@ spec:
     - name: v1alpha1
       schema:
         openAPIV3Schema:
-        description: Submariner is the Schema for the submariners API
+          description: Submariner is the Schema for the submariners API.
           properties:
             apiVersion:
               description: 'APIVersion defines the versioned schema of this representation
@@ -33,43 +32,72 @@ spec:
             metadata:
               type: object
             spec:
-            description: SubmarinerSpec defines the desired state of Submariner
+              description: SubmarinerSpec defines the desired state of Submariner.
               properties:
+                airGappedDeployment:
+                  type: boolean
                 broker:
+                  description: Type of broker (must be "k8s").
                   type: string
                 brokerK8sApiServer:
+                  description: The broker API URL.
                   type: string
                 brokerK8sApiServerToken:
+                  description: The broker API Token.
                   type: string
                 brokerK8sCA:
+                  description: The broker certificate authority.
                   type: string
                 brokerK8sInsecure:
                   type: boolean
                 brokerK8sRemoteNamespace:
+                  description: The Broker namespace.
+                  type: string
+                brokerK8sSecret:
                   type: string
                 cableDriver:
+                  description: Cable driver implementation - any of [libreswan, wireguard,
+                    vxlan].
                   type: string
                 ceIPSecDebug:
+                  description: Enable logging IPsec debugging information.
                   type: boolean
                 ceIPSecForceUDPEncaps:
+                  description: Force UDP encapsulation for IPsec.
                   type: boolean
                 ceIPSecIKEPort:
+                  description: The IPsec IKE port (500 usually).
                   type: integer
                 ceIPSecNATTPort:
+                  description: The IPsec NAT traversal port (4500 usually).
                   type: integer
                 ceIPSecPSK:
+                  description: The IPsec Pre-Shared Key which must be identical in all
+                    route agents across the cluster.
+                  type: string
+                ceIPSecPSKSecret:
                   type: string
                 ceIPSecPreferredServer:
+                  description: Enable this cluster as a preferred server for data-plane
+                    connections.
                   type: boolean
                 clusterCIDR:
+                  description: The cluster CIDR.
                   type: string
                 clusterID:
+                  description: The cluster ID used to identify the tunnels.
+                  type: string
+                clustersetIPCIDR:
+                  description:  ClustersetIP CIDR for allocating ClustersetIPs to exported
+                    services.
                   type: string
                 colorCodes:
                   type: string
                 connectionHealthCheck:
+                  description: The gateway connection health check.
                   properties:
                     enabled:
+                      description: Enable the connection health check.
                       type: boolean
                     intervalSeconds:
                       description: The interval at which health check pings are sent.
@@ -82,47 +110,111 @@ spec:
                       type: integer
                   type: object
                 coreDNSCustomConfig:
+                  description: Name of the custom CoreDNS configmap to configure forwarding
+                    to Lighthouse. It should be in <namespace>/<name> format where <namespace>
+                    is optional and defaults to kube-system.
                   properties:
                     configMapName:
+                      description: Name of the custom CoreDNS configmap.
                       type: string
                     namespace:
+                      description: Namespace of the custom CoreDNS configmap.
                       type: string
                   type: object
                 customDomains:
+                  description: List of domains to use for multi-cluster service discovery.
                   items:
                     type: string
                   type: array
                   x-kubernetes-list-type: set
                 debug:
+                  description: Enable operator debugging.
                   type: boolean
                 globalCIDR:
+                  description: The Global CIDR super-net range for allocating GlobalCIDRs
+                    to each cluster.
                   type: string
+                haltOnCertificateError:
+                  description: Halt on certificate error (so the pod gets restarted).
+                  type: boolean
                 imageOverrides:
                   additionalProperties:
                     type: string
+                  description: Override component images.
                   type: object
                 loadBalancerEnabled:
+                  description: Enable automatic Load Balancer in front of the gateways.
                   type: boolean
                 namespace:
+                  description: The namespace in which to deploy the submariner operator.
                   type: string
                 natEnabled:
+                  description: Enable NAT between clusters.
                   type: boolean
+                nodeSelector:
+                  additionalProperties:
+                    type: string
+                  type: object
                 repository:
+                  description: The image repository.
                   type: string
                 serviceCIDR:
+                  description: The service CIDR.
                   type: string
                 serviceDiscoveryEnabled:
+                  description: Enable support for Service Discovery (Lighthouse).
                   type: boolean
+                clustersetIPEnabled:
+                  description: Enable ClustersetIP default for services exported on this
+                    cluster.
+                  type: boolean
+                tolerations:
+                  items:
+                    description: The pod this Toleration is attached to tolerates any
+                      taint that matches the triple <key,value,effect> using the matching
+                      operator <operator>.
+                    properties:
+                      effect:
+                        description: Effect indicates the taint effect to match. Empty
+                          means match all taint effects. When specified, allowed values
+                          are NoSchedule, PreferNoSchedule and NoExecute.
+                        type: string
+                      key:
+                        description: Key is the taint key that the toleration applies
+                          to. Empty means match all taint keys. If the key is empty,
+                          operator must be Exists; this combination means to match all
+                          values and all keys.
+                        type: string
+                      operator:
+                        description: Operator represents a key's relationship to the
+                          value. Valid operators are Exists and Equal. Defaults to Equal.
+                          Exists is equivalent to wildcard for value, so that a pod
+                          can tolerate all taints of a particular category.
+                        type: string
+                      tolerationSeconds:
+                        description: TolerationSeconds represents the period of time
+                          the toleration (which must be of effect NoExecute, otherwise
+                          this field is ignored) tolerates the taint. By default, it
+                          is not set, which means tolerate the taint forever (do not
+                          evict). Zero and negative values will be treated as 0 (evict
+                          immediately) by the system.
+                        format: int64
+                        type: integer
+                      value:
+                        description: Value is the taint value the toleration matches
+                          to. If the operator is Exists, the value should be empty,
+                          otherwise just a regular string.
+                        type: string
+                    type: object
+                  type: array
                 version:
+                  description: The image tag.
                   type: string
               required:
                 - broker
                 - brokerK8sApiServer
-            - brokerK8sApiServerToken
-            - brokerK8sCA
                 - brokerK8sRemoteNamespace
                 - ceIPSecDebug
-            - ceIPSecPSK
                 - clusterCIDR
                 - clusterID
                 - debug
@@ -131,15 +223,23 @@ spec:
                 - serviceCIDR
               type: object
             status:
-            description: SubmarinerStatus defines the observed state of Submariner
+              description: SubmarinerStatus defines the observed state of Submariner.
               properties:
+                airGappedDeployment:
+                  type: boolean
                 clusterCIDR:
+                  description: The current cluster CIDR.
                   type: string
                 clusterID:
+                  description: The current cluster ID.
+                  type: string
+                clustersetIPCIDR:
+                  description: The current clustersetIP CIDR.
                   type: string
                 colorCodes:
                   type: string
                 deploymentInfo:
+                  description: Information about the deployment.
                   properties:
                     cloudProvider:
                       type: string
@@ -151,6 +251,7 @@ spec:
                       type: string
                   type: object
                 gatewayDaemonSetStatus:
+                  description: The status of the gateway DaemonSet.
                   properties:
                     lastResourceVersion:
                       type: string
@@ -174,7 +275,7 @@ spec:
                             description: Details about a terminated container
                             properties:
                               containerID:
-                              description: Container's ID in the format 'docker://<container_id>'
+                                description: Container's ID in the format '<type>://<container_id>'
                                 type: string
                               exitCode:
                                 description: Exit status from the last termination of
@@ -287,9 +388,9 @@ spec:
                           format: int32
                           type: integer
                         numberReady:
-                        description: The number of nodes that should be running the
+                          description: numberReady is the number of nodes that should
-                          daemon pod and have one or more of the daemon pod running
+                            be running the daemon pod and have one or more of the daemon
-                          and ready.
+                            pod running with a Ready Condition.
                           format: int32
                           type: integer
                         numberUnavailable:
@@ -318,6 +419,7 @@ spec:
                     - mismatchedContainerImages
                   type: object
                 gateways:
+                  description: Status of the gateways in the cluster.
                   items:
                     properties:
                       connections:
@@ -444,8 +546,10 @@ spec:
                     type: object
                   type: array
                 globalCIDR:
+                  description: The current global CIDR.
                   type: string
                 globalnetDaemonSetStatus:
+                  description: The status of the Globalnet DaemonSet.
                   properties:
                     lastResourceVersion:
                       type: string
@@ -469,7 +573,7 @@ spec:
                             description: Details about a terminated container
                             properties:
                               containerID:
-                              description: Container's ID in the format 'docker://<container_id>'
+                                description: Container's ID in the format '<type>://<container_id>'
                                 type: string
                               exitCode:
                                 description: Exit status from the last termination of
@@ -582,9 +686,9 @@ spec:
                           format: int32
                           type: integer
                         numberReady:
-                        description: The number of nodes that should be running the
+                          description: numberReady is the number of nodes that should
-                          daemon pod and have one or more of the daemon pod running
+                            be running the daemon pod and have one or more of the daemon
-                          and ready.
+                            pod running with a Ready Condition.
                           format: int32
                           type: integer
                         numberUnavailable:
@@ -613,6 +717,7 @@ spec:
                     - mismatchedContainerImages
                   type: object
                 loadBalancerStatus:
+                  description: The status of the load balancer DaemonSet.
                   properties:
                     status:
                       description: LoadBalancerStatus represents the status of a load-balancer.
@@ -634,15 +739,53 @@ spec:
                                 description: IP is set for load-balancer ingress points
                                   that are IP based (typically GCE or OpenStack load-balancers)
                                 type: string
+                              ports:
+                                description: Ports is a list of records of service ports
+                                  If used, every port defined in the service should
+                                  have an entry in it
+                                items:
+                                  properties:
+                                    error:
+                                      description: 'Error is to record the problem with
+                                      the service port The format of the error shall
+                                      comply with the following rules: - built-in
+                                      error values shall be specified in this file
+                                      and those shall use CamelCase names - cloud
+                                      provider specific error values must have names
+                                      that comply with the format foo.example.com/CamelCase.
+                                      --- The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt)'
+                                      maxLength: 316
+                                      pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$
+                                      type: string
+                                    port:
+                                      description: Port is the port number of the service
+                                        port of which status is recorded here
+                                      format: int32
+                                      type: integer
+                                    protocol:
+                                      default: TCP
+                                      description: 'Protocol is the protocol of the
+                                      service port of which status is recorded here
+                                      The supported values are: "TCP", "UDP", "SCTP"'
+                                      type: string
+                                  required:
+                                    - port
+                                    - protocol
+                                  type: object
+                                type: array
+                                x-kubernetes-list-type: atomic
                             type: object
                           type: array
                       type: object
                   type: object
                 natEnabled:
+                  description: The current NAT status.
                   type: boolean
                 networkPlugin:
+                  description: The current network plugin.
                   type: string
                 routeAgentDaemonSetStatus:
+                  description: The status of the route agent DaemonSet.
                   properties:
                     lastResourceVersion:
                       type: string
@@ -666,7 +809,7 @@ spec:
                             description: Details about a terminated container
                             properties:
                               containerID:
-                              description: Container's ID in the format 'docker://<container_id>'
+                                description: Container's ID in the format '<type>://<container_id>'
                                 type: string
                               exitCode:
                                 description: Exit status from the last termination of
@@ -779,9 +922,9 @@ spec:
                           format: int32
                           type: integer
                         numberReady:
-                        description: The number of nodes that should be running the
+                          description: numberReady is the number of nodes that should
-                          daemon pod and have one or more of the daemon pod running
+                            be running the daemon pod and have one or more of the daemon
-                          and ready.
+                            pod running with a Ready Condition.
                           format: int32
                           type: integer
                         numberUnavailable:
@@ -810,6 +953,11 @@ spec:
                     - mismatchedContainerImages
                   type: object
                 serviceCIDR:
+                  description: The current service CIDR.
+                  type: string
+                version:
+                  description: The image version in use by the various Submariner DaemonSets
+                    and Deployments.
                   type: string
               required:
                 - clusterID
@@ -820,19 +968,12 @@ spec:
       storage: true
       subresources:
         status: {}
-status:
-  acceptedNames:
-    kind: ""
-    plural: ""
-  conditions: []
-  storedVersions: []
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.4.1
+    controller-gen.kubebuilder.io/version: v0.12.1
-  creationTimestamp: null
   name: servicediscoveries.submariner.io
 spec:
   group: submariner.io
@@ -846,7 +987,7 @@ spec:
     - name: v1alpha1
       schema:
         openAPIV3Schema:
-        description: ServiceDiscovery is the Schema for the servicediscoveries API
+          description: ServiceDiscovery is the Schema for the servicediscoveries API.
           properties:
             apiVersion:
               description: 'APIVersion defines the versioned schema of this representation
@@ -861,7 +1002,7 @@ spec:
             metadata:
               type: object
             spec:
-            description: ServiceDiscoverySpec defines the desired state of ServiceDiscovery
+              description: ServiceDiscoverySpec defines the desired state of ServiceDiscovery.
               properties:
                 brokerK8sApiServer:
                   type: string
@@ -873,13 +1014,19 @@ spec:
                   type: boolean
                 brokerK8sRemoteNamespace:
                   type: string
+                brokerK8sSecret:
+                  type: string
                 clusterID:
                   type: string
+                clustersetIPCIDR:
+                  type: string
                 coreDNSCustomConfig:
                   properties:
                     configMapName:
+                      description: Name of the custom CoreDNS configmap.
                       type: string
                     namespace:
+                      description: Namespace of the custom CoreDNS configmap.
                       type: string
                   type: object
                 customDomains:
@@ -891,27 +1038,72 @@ spec:
                   type: boolean
                 globalnetEnabled:
                   type: boolean
+                haltOnCertificateError:
+                  type: boolean
+                clustersetIPEnabled:
+                  type: boolean
                 imageOverrides:
                   additionalProperties:
                     type: string
                   type: object
                 namespace:
                   type: string
+                nodeSelector:
+                  additionalProperties:
+                    type: string
+                  type: object
                 repository:
                   type: string
+                tolerations:
+                  items:
+                    description: The pod this Toleration is attached to tolerates any
+                      taint that matches the triple <key,value,effect> using the matching
+                      operator <operator>.
+                    properties:
+                      effect:
+                        description: Effect indicates the taint effect to match. Empty
+                          means match all taint effects. When specified, allowed values
+                          are NoSchedule, PreferNoSchedule and NoExecute.
+                        type: string
+                      key:
+                        description: Key is the taint key that the toleration applies
+                          to. Empty means match all taint keys. If the key is empty,
+                          operator must be Exists; this combination means to match all
+                          values and all keys.
+                        type: string
+                      operator:
+                        description: Operator represents a key's relationship to the
+                          value. Valid operators are Exists and Equal. Defaults to Equal.
+                          Exists is equivalent to wildcard for value, so that a pod
+                          can tolerate all taints of a particular category.
+                        type: string
+                      tolerationSeconds:
+                        description: TolerationSeconds represents the period of time
+                          the toleration (which must be of effect NoExecute, otherwise
+                          this field is ignored) tolerates the taint. By default, it
+                          is not set, which means tolerate the taint forever (do not
+                          evict). Zero and negative values will be treated as 0 (evict
+                          immediately) by the system.
+                        format: int64
+                        type: integer
+                      value:
+                        description: Value is the taint value the toleration matches
+                          to. If the operator is Exists, the value should be empty,
+                          otherwise just a regular string.
+                        type: string
+                    type: object
+                  type: array
                 version:
                   type: string
               required:
                 - brokerK8sApiServer
-            - brokerK8sApiServerToken
-            - brokerK8sCA
                 - brokerK8sRemoteNamespace
                 - clusterID
                 - debug
                 - namespace
               type: object
             status:
-            description: ServiceDiscoveryStatus defines the observed state of ServiceDiscovery
+              description: ServiceDiscoveryStatus defines the observed state of ServiceDiscovery.
               properties:
                 deploymentInfo:
                   properties:
@@ -930,12 +1122,6 @@ spec:
       storage: true
       subresources:
         status: {}
-status:
-  acceptedNames:
-    kind: ""
-    plural: ""
-  conditions: []
-  storedVersions: []
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition

submariner-operator/templates/rbac.yaml

@@ -12,28 +12,38 @@ rules:
   - apiGroups:
       - ""
     resources:
-  - pods
+      # For metrics
       - services
-  - services/finalizers
-  - endpoints
-  - persistentvolumeclaims
-  - events
-  - configmaps
-  - secrets
     verbs:
-  - '*'
+      - get
+      - create
+      - update
+  - apiGroups:
+      - ""
+    resources:
+      # Temporarily needed for network-plugin syncer removal
+      - serviceaccounts
+    resourceNames:
+      - submariner-networkplugin-syncer
+    verbs:
+      - delete
   - apiGroups:
       - apps
     resources:
       - deployments
       - daemonsets
-  - replicasets
-  - statefulsets
     verbs:
-  - '*'
+      - create
+      - delete
+      - get
+      - list
+      - patch
+      - update
+      - watch
   - apiGroups:
       - monitoring.coreos.com
     resources:
+      # Needed for openshift monitoring
       - servicemonitors
     verbs:
       - get
@@ -47,24 +57,36 @@ rules:
     verbs:
       - update
   - apiGroups:
-  - ""
+      - submariner.io
     resources:
-  - pods
+      - brokers
-  verbs:
+      - brokers/status
-  - get
+      - submariners
-- apiGroups:
+      - submariners/status
-  - apps
+      - servicediscoveries
-  resources:
+      - servicediscoveries/status
-  - replicasets
     verbs:
       - get
+      - list
+      - watch
+      - create
+      - update
+      - delete
   - apiGroups:
       - submariner.io
     resources:
-  - '*'
+      - gateways
-  - servicediscoveries
     verbs:
-  - '*'
+      - get
+      - list
+      - watch
+  - apiGroups:
+      - submariner.io
+    resources:
+      - submariners/finalizers
+      - servicediscoveries/finalizers
+    verbs:
+      - update
 ---
 kind: RoleBinding
 apiVersion: rbac.authorization.k8s.io/v1
@@ -97,71 +119,23 @@ rules:
       - ""
     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:
+      - patch
-    - ""
-  resources:
-    - pods
-  verbs:
-    - get
-- apiGroups:
-    - apps
-  resources:
-    - replicasets
-  verbs:
-    - get
   - apiGroups:
       - submariner.io
     resources:
-    - '*'
+      - clusters
-    - servicediscoveries
+      - endpoints
+      - gateways
     verbs:
-    - '*'
-- apiGroups:
-    - lighthouse.submariner.io
-  resources:
-    - '*'
-    - serviceexports
-  verbs:
-    - create
-    - delete
       - get
       - list
-    - patch
-    - update
       - watch
+      - create
+      - update
+      - delete
   - apiGroups:
       - coordination.k8s.io
     resources:
@@ -203,74 +177,25 @@ 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
-      - servicediscoveries
+      - nongatewayroutes
     verbs:
-      - '*'
-  - apiGroups:
-      - lighthouse.submariner.io
-    resources:
-      - '*'
-      - serviceexports
-    verbs:
-      - create
-      - delete
       - get
       - list
-      - patch
-      - update
       - watch
+      - create
+      - update
+      - delete
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
@@ -301,75 +226,15 @@ 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:
-      - '*'
+      - gateways
-      - servicediscoveries
     verbs:
-      - '*'
-  - apiGroups:
-      - lighthouse.submariner.io
-    resources:
-      - '*'
-      - serviceexports
-    verbs:
-      - create
-      - delete
       - get
       - list
-      - patch
-      - update
       - watch
+      - update
   - apiGroups:
       - coordination.k8s.io
     resources:
@@ -435,9 +300,10 @@ rules:
       - update
       - delete
       - watch
-  - apiGroups:  # pods, services and nodes are looked up to figure out network settings
+  - apiGroups:
       - ""
     resources:
+      # Needed for network settings discovery
       - pods
       - services
       - nodes
@@ -451,27 +317,20 @@ 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
@@ -479,11 +338,21 @@ rules:
   - apiGroups:
       - apps
     resources:
+      # Needed for Flannel CNI discovery
       - daemonsets
     verbs:
-      - get
       - list
-      - watch
+  - apiGroups:
+      - 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
@@ -542,21 +411,7 @@ 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
@@ -566,32 +421,6 @@ 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
@@ -623,57 +452,41 @@ metadata:
 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
+      - secrets
+      - configmaps
+      - endpoints
     verbs:
       - get
       - list
-      - watch
-  - apiGroups:
-      - operator.openshift.io
-    resources:
-      - dnses
-    verbs:
-      - get
-      - list
-      - watch
-      - update
   - apiGroups:
       - config.openshift.io
     resources:
       - networks
+    resourceNames:
+      - cluster
     verbs:
       - get
-      - list
   - apiGroups:
       - ""
+    resources:
+      - nodes
     verbs:
       - get
       - list
       - watch
-      - update
+  - apiGroups:
+      - projectcalico.org
     resources:
-      - nodes
+      - ippools
+    verbs:
+      - get
+      - create
+      - delete
+      - update
+      - deletecollection
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
@@ -708,13 +521,10 @@ rules:
       - ""
     resources:
       - pods
-      - namespaces
-      - nodes
     verbs:
       - get
       - list
       - watch
-      - update
   - apiGroups:
       - ""
     resources:
@@ -730,8 +540,8 @@ rules:
   - apiGroups:
       - submariner.io
     resources:
-      - endpoints
       - clusters
+      - endpoints
     verbs:
       - get
       - list
@@ -756,7 +566,7 @@ rules:
   - apiGroups:
       - multicluster.x-k8s.io
     resources:
-      - "serviceexports"
+      - serviceexports
     verbs:
       - get
       - list
@@ -811,7 +621,6 @@ rules:
       - get
       - list
       - watch
-      - update
   - apiGroups:
       - discovery.k8s.io
     resources:
@@ -828,8 +637,8 @@ rules:
   - apiGroups:
       - submariner.io
     resources:
-      - "gateways"
+      - gateways
-      - "globalingressips"
+      - globalingressips
     verbs:
       - get
       - list
@@ -837,7 +646,8 @@ rules:
   - apiGroups:
       - multicluster.x-k8s.io
     resources:
-      - "*"
+      - serviceimports
+      - serviceimports/status
     verbs:
       - create
       - get
@@ -845,6 +655,20 @@ 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
@@ -869,34 +693,19 @@ 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"
+      - gateways
-      - "submariners"
+      - submariners
     verbs:
       - get
       - list
@@ -904,14 +713,11 @@ 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

@@ -52,6 +52,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/values.yaml

@@ -5,6 +5,8 @@ submariner:
   clusterCidr: ""
   serviceCidr: ""
   globalCidr: ""
+  clustersetIpCidr: ""
+  clustersetIpEnabled: false
   loadBalancerEnabled: false
   natEnabled: false
   colorCodes: blue