Update Charts to v0.14.9

Signed-off-by: Tom Pantelis <tompantelis@gmail.com>

.github/dependabot.yml

@@ -4,44 +4,14 @@ updates:
   - package-ecosystem: github-actions
     directory: '/'
     schedule:
-      interval: monthly
+      interval: weekly
-    groups:
-      github-actions:
-        patterns:
-          - "*"
   - package-ecosystem: github-actions
     directory: '/'
-    target-branch: "release-0.15"
+    target-branch: "release-0.12"
     schedule:
-      interval: monthly
+      interval: weekly
-    groups:
-      github-actions:
-        patterns:
-          - "*"
   - package-ecosystem: github-actions
     directory: '/'
-    target-branch: "release-0.16"
+    target-branch: "release-0.13"
     schedule:
-      interval: monthly
+      interval: weekly
-    groups:
-      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/stale.yml

@@ -0,0 +1,57 @@
+---
+# 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.19
+      - name: Check that the PR targets release-0.14
-        if: ${{ github.base_ref != 'release-0.19' }}
+        if: ${{ github.base_ref != 'release-0.14' }}
         run: exit 1

.github/workflows/e2e-full.yml

@@ -11,29 +11,29 @@ jobs:
   e2e:
     name: E2E
     if: contains(github.event.pull_request.labels.*.name, 'ready-to-test')
-    timeout-minutes: 45
+    timeout-minutes: 120
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
         cable_driver: ['libreswan', 'wireguard', 'vxlan']
         globalnet: ['', 'globalnet']
-        # Run most tests against the latest K8s version
+        k8s_version: ['1.25']
-        k8s_version: ['1.29']
         lighthouse: ['', 'lighthouse']
         include:
-          # Bottom of supported K8s version range
+          - k8s_version: '1.22'
-          - k8s_version: '1.26'
+          - k8s_version: '1.23'
+          - k8s_version: '1.24'
     steps:
       - name: Check out the repository
         uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
 
       - name: Run E2E deployment and tests
-        uses: submariner-io/shipyard/gh-actions/e2e@release-0.19
+        uses: submariner-io/shipyard/gh-actions/e2e@release-0.14
         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.19
+        uses: submariner-io/shipyard/gh-actions/post-mortem@release-0.14

.github/workflows/e2e.yml

@@ -16,8 +16,8 @@ jobs:
         uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
 
       - name: Run E2E deployment and tests
-        uses: submariner-io/shipyard/gh-actions/e2e@release-0.19
+        uses: submariner-io/shipyard/gh-actions/e2e@release-0.14
 
       - name: Post mortem
         if: failure()
-        uses: submariner-io/shipyard/gh-actions/post-mortem@release-0.19
+        uses: submariner-io/shipyard/gh-actions/post-mortem@release-0.14

.github/workflows/flake_finder.yml

@@ -24,10 +24,10 @@ jobs:
         uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
 
       - name: Run E2E deployment and tests
-        uses: submariner-io/shipyard/gh-actions/e2e@release-0.19
+        uses: submariner-io/shipyard/gh-actions/e2e@release-0.14
         with:
           using: ${{ matrix.cable_driver }} ${{ matrix.globalnet }} ${{ matrix.lighthouse }}
 
       - name: Post mortem
         if: failure()
-        uses: submariner-io/shipyard/gh-actions/post-mortem@release-0.19
+        uses: submariner-io/shipyard/gh-actions/post-mortem@release-0.14

.github/workflows/linting.yml

@@ -46,7 +46,7 @@ jobs:
           version: v3.6.0
 
       - name: Set up Python
-        uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3
+        uses: actions/setup-python@39cd14951b08e74b54015e9e001cdefcf80e669f
         with:
           python-version: '3.x'
 

.github/workflows/release.yml

@@ -4,7 +4,7 @@ name: Release Charts
 on:
   push:
     branches:
-      - release-0.19
+      - release-0.14
 
 permissions:
   contents: write

.github/workflows/stale.yml

@@ -1,32 +0,0 @@
----
-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

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.19
+BASE_BRANCH ?= release-0.14
 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.19.2
+CHARTS_VERSION=0.14.9
 HELM_DOCS_VERSION=0.15.0
 REPO_URL=$(shell git config remote.origin.url)
+SUBCTL_VERSION=$(CHARTS_VERSION)
+export SUBCTL_VERSION
 
 # Targets to make
 

submariner-k8s-broker/templates/NOTES.txt

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

submariner-operator/README.md

@@ -58,8 +58,6 @@ 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,7 +3,8 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.12.1
+    controller-gen.kubebuilder.io/version: v0.4.1
+  creationTimestamp: null
   name: submariners.submariner.io
 spec:
   group: submariner.io
@@ -17,7 +18,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
@@ -32,72 +33,43 @@ 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.
@@ -110,111 +82,47 @@ 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
@@ -223,23 +131,15 @@ 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
@@ -251,7 +151,6 @@ spec:
                     type: string
                 type: object
               gatewayDaemonSetStatus:
-                  description: The status of the gateway DaemonSet.
                 properties:
                   lastResourceVersion:
                     type: string
@@ -275,7 +174,7 @@ spec:
                           description: Details about a terminated container
                           properties:
                             containerID:
-                                description: Container's ID in the format '<type>://<container_id>'
+                              description: Container's ID in the format 'docker://<container_id>'
                               type: string
                             exitCode:
                               description: Exit status from the last termination of
@@ -388,9 +287,9 @@ spec:
                         format: int32
                         type: integer
                       numberReady:
-                          description: numberReady is the number of nodes that should
+                        description: The number of nodes that should be running the
-                            be running the daemon pod and have one or more of the daemon
+                          daemon pod and have one or more of the daemon pod running
-                            pod running with a Ready Condition.
+                          and ready.
                         format: int32
                         type: integer
                       numberUnavailable:
@@ -419,7 +318,6 @@ spec:
                 - mismatchedContainerImages
                 type: object
               gateways:
-                  description: Status of the gateways in the cluster.
                 items:
                   properties:
                     connections:
@@ -546,10 +444,8 @@ 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
@@ -573,7 +469,7 @@ spec:
                           description: Details about a terminated container
                           properties:
                             containerID:
-                                description: Container's ID in the format '<type>://<container_id>'
+                              description: Container's ID in the format 'docker://<container_id>'
                               type: string
                             exitCode:
                               description: Exit status from the last termination of
@@ -686,9 +582,9 @@ spec:
                         format: int32
                         type: integer
                       numberReady:
-                          description: numberReady is the number of nodes that should
+                        description: The number of nodes that should be running the
-                            be running the daemon pod and have one or more of the daemon
+                          daemon pod and have one or more of the daemon pod running
-                            pod running with a Ready Condition.
+                          and ready.
                         format: int32
                         type: integer
                       numberUnavailable:
@@ -717,7 +613,6 @@ spec:
                 - mismatchedContainerImages
                 type: object
               loadBalancerStatus:
-                  description: The status of the load balancer DaemonSet.
                 properties:
                   status:
                     description: LoadBalancerStatus represents the status of a load-balancer.
@@ -739,53 +634,15 @@ 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
@@ -809,7 +666,7 @@ spec:
                           description: Details about a terminated container
                           properties:
                             containerID:
-                                description: Container's ID in the format '<type>://<container_id>'
+                              description: Container's ID in the format 'docker://<container_id>'
                               type: string
                             exitCode:
                               description: Exit status from the last termination of
@@ -922,9 +779,9 @@ spec:
                         format: int32
                         type: integer
                       numberReady:
-                          description: numberReady is the number of nodes that should
+                        description: The number of nodes that should be running the
-                            be running the daemon pod and have one or more of the daemon
+                          daemon pod and have one or more of the daemon pod running
-                            pod running with a Ready Condition.
+                          and ready.
                         format: int32
                         type: integer
                       numberUnavailable:
@@ -953,11 +810,6 @@ 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
@@ -968,12 +820,19 @@ 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.12.1
+    controller-gen.kubebuilder.io/version: v0.4.1
+  creationTimestamp: null
   name: servicediscoveries.submariner.io
 spec:
   group: submariner.io
@@ -987,7 +846,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
@@ -1002,7 +861,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
@@ -1014,19 +873,13 @@ 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:
@@ -1038,72 +891,27 @@ 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:
@@ -1122,6 +930,12 @@ spec:
     storage: true
     subresources:
       status: {}
+status:
+  acceptedNames:
+    kind: ""
+    plural: ""
+  conditions: []
+  storedVersions: []
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition

submariner-operator/templates/rbac.yaml

@@ -21,11 +21,12 @@ rules:
   - apiGroups:
       - ""
     resources:
-      # Temporarily needed for network-plugin syncer removal
+      # For syncing Secrets from the broker
-      - serviceaccounts
+      - secrets
-    resourceNames:
-      - submariner-networkplugin-syncer
     verbs:
+      - get
+      - create
+      - update
       - delete
   - apiGroups:
       - apps
@@ -147,6 +148,15 @@ rules:
       - create
       - update
       - delete
+  - apiGroups:
+      - ""
+    resources:
+      # For leader election
+      - configmaps
+    verbs:
+      - get
+      - create
+      - update
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
@@ -184,18 +194,6 @@ rules:
       - get
       - list
       - watch
-  - apiGroups:
-      - submariner.io
-    resources:
-      - gatewayroutes
-      - nongatewayroutes
-    verbs:
-      - get
-      - list
-      - watch
-      - create
-      - update
-      - delete
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
@@ -225,27 +223,6 @@ metadata:
     release: {{ .Release.Name | quote }}
     chart: {{ template "submariner.chart" . }}
     app: {{ template "submariner.name" . }}
-rules:
-  - apiGroups:
-      - submariner.io
-    resources:
-      - gateways
-    verbs:
-      - get
-      - list
-      - watch
-      - update
-  - apiGroups:
-      - coordination.k8s.io
-    resources:
-      - leases
-    verbs:
-      - get
-      - list
-      - watch
-      - create
-      - update
-      - delete
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
@@ -276,9 +253,6 @@ metadata:
     chart: {{ template "submariner.chart" . }}
     app: {{ template "submariner.name" . }}
 rules:
-  # submariner-operator updates the config map of core-dns to forward requests to
-  # clusterset.local to Lighthouse DNS, also looks at existing configmaps
-  # to figure out network settings
   - apiGroups:
       - ""
     resources:
@@ -342,17 +316,6 @@ rules:
       - daemonsets
     verbs:
       - list
-  - 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
@@ -455,9 +418,7 @@ rules:
     resources:
       - pods
       - services
-      - secrets
       - configmaps
-      - endpoints
     verbs:
       - get
       - list
@@ -477,16 +438,7 @@ rules:
       - get
       - list
       - watch
-  - apiGroups:
-      - projectcalico.org
-    resources:
-      - ippools
-    verbs:
-      - get
-      - create
-      - delete
       - update
-      - deletecollection
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
@@ -517,6 +469,16 @@ metadata:
     chart: {{ template "submariner.chart" . }}
     app: {{ template "submariner.name" . }}
 rules:
+  - apiGroups:
+      - ""
+    resources:
+      - nodes
+      - endpoints
+    verbs:
+      - get
+      - list
+      - watch
+      - update
   - apiGroups:
       - ""
     resources:
@@ -529,7 +491,6 @@ rules:
       - ""
     resources:
       - services
-      - endpoints
     verbs:
       - create
       - get
@@ -550,11 +511,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
@@ -693,6 +660,14 @@ kind: ClusterRole
 metadata:
   name: {{ template "submariner.fullname" . }}:lighthouse-coredns
 rules:
+  - apiGroups:
+      - ""
+    resources:
+      - services
+    verbs:
+      - get
+      - list
+      - watch
   - apiGroups:
       - discovery.k8s.io
     resources:

submariner-operator/templates/submariner.yaml

@@ -52,8 +52,6 @@ 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:
@@ -62,6 +60,6 @@ spec:
     maxPacketLossCount: 5
 {{- with .Values.submariner.coreDNSCustomConfig }}
   coreDNSCustomConfig:
-    configMapName: {{ .configMapName }}
+    configmapName: {{ .configmapName }}
     namespace: {{ .namespace }}
 {{- end }}

submariner-operator/values.yaml

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