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

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

.github/dependabot.yml

@@ -1,12 +0,0 @@
----
-version: 2
-updates:
-  - package-ecosystem: github-actions
-    directory: '/'
-    schedule:
-      interval: daily
-  - package-ecosystem: github-actions
-    directory: '/'
-    target-branch: "release-0.12"
-    schedule:
-      interval: daily

.github/workflows/branch.yml

@@ -5,10 +5,10 @@ on:
   pull_request:
 
 jobs:
-  target_branch:
+  target_devel:
-    name: PR targets branch
+    name: PR targets release-0.10
     runs-on: ubuntu-latest
     steps:
-      - name: Check that the PR targets release-0.13
+      - name: Check that the PR targets release-0.10
-        if: ${{ github.base_ref != 'release-0.13' }}
+        if: ${{ github.base_ref != 'release-0.10' }}
         run: exit 1

.github/workflows/dependent-issues.yml

@@ -17,15 +17,14 @@ on:
       - reopened
       - synchronize
   schedule:
-    - cron: '0 0/6 * * *'  # every 6 hours
+    - cron: '0 0/6 * * *' # every 6 hours
 
 jobs:
   check:
     name: Check Dependencies
-    if: github.repository_owner == 'submariner-io'
     runs-on: ubuntu-latest
     steps:
-      - uses: z0al/dependent-issues@950226e7ca8fc43dc209a7febf67c655af3bdb43
+      - uses: z0al/dependent-issues@70a1b2d4ee1cdc743af33498bd0204123953a887
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
@@ -36,4 +35,4 @@ jobs:
           check_issues: on
 
           # A comma-separated list of keywords to mark dependency.
-          keywords: depends on, Depends on
+          keywords: depends on, Depends on

.github/workflows/e2e-full.yml

@@ -16,21 +16,22 @@ jobs:
       matrix:
         cable_driver: ['libreswan', 'wireguard', 'vxlan']
         globalnet: ['', 'globalnet']
-        k8s_version: ['1.23']
+        k8s_version: ['1.17']
         lighthouse: ['', 'lighthouse']
         include:
-          - k8s_version: '1.21'
+          - k8s_version: '1.18'
-          - k8s_version: '1.22'
+          - k8s_version: '1.19'
+          - k8s_version: '1.20'
     steps:
       - name: Check out the repository
-        uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab
+        uses: actions/checkout@v2
 
       - name: Run E2E deployment and tests
-        uses: submariner-io/shipyard/gh-actions/e2e@release-0.13
+        uses: submariner-io/shipyard/gh-actions/e2e@release-0.10
         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.13
+        uses: submariner-io/shipyard/gh-actions/post-mortem@release-0.10

.github/workflows/e2e.yml

@@ -11,11 +11,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out the repository
-        uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab
+        uses: actions/checkout@v2
 
       - name: Run E2E deployment and tests
-        uses: submariner-io/shipyard/gh-actions/e2e@release-0.13
+        uses: submariner-io/shipyard/gh-actions/e2e@release-0.10
 
       - name: Post mortem
         if: failure()
-        uses: submariner-io/shipyard/gh-actions/post-mortem@release-0.13
+        uses: submariner-io/shipyard/gh-actions/post-mortem@release-0.10

.github/workflows/flake_finder.yml

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

.github/workflows/linting.yml

@@ -11,45 +11,37 @@ jobs:
     steps:
       - name: Get PR commits
         id: 'get-pr-commits'
-        uses: tim-actions/get-pr-commits@8673d84c368f480628607dbe21c88545811ef23a
+        uses: tim-actions/get-pr-commits@v1.1.0
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
 
       - name: 'Verify no "Apply suggestions from code review" commits'
-        uses: tim-actions/commit-message-checker-with-regex@e16b08b1a7f5cafeb1f8167de05bf1d40239eb5d
+        uses: tim-actions/commit-message-checker-with-regex@v0.3.1
         with:
           commits: ${{ steps.get-pr-commits.outputs.commits }}
           pattern: '^(?!.*(apply suggestions from code review))'
           flags: 'i'
           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@e16b08b1a7f5cafeb1f8167de05bf1d40239eb5d
-        with:
-          commits: ${{ steps.get-pr-commits.outputs.commits }}
-          pattern: '^(?!fixup!)'
-          flags: 'i'
-          error: 'Fixup commits should be squashed into the commits under review'
-
   chart-testing:
     name: Helm Chart Linting
     runs-on: ubuntu-latest
     steps:
       - name: Check out the repository
-        uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab
+        uses: actions/checkout@v2
 
       - name: Set up Helm
-        uses: azure/setup-helm@5119fcb9089d432beecbf79bb2c7915207344b78
+        uses: azure/setup-helm@v1
         with:
           version: v3.6.0
 
       - name: Set up Python
-        uses: actions/setup-python@57ded4d7d5e986d7296eab16560982c6dd7c923b
+        uses: actions/setup-python@v2
         with:
           python-version: '3.x'
 
       - name: Set up helm/chart-testing
-        uses: helm/chart-testing-action@e8788873172cb653a90ca2e819d79d65a66d4e76
+        uses: helm/chart-testing-action@v2.1.0
 
       - name: Run helm/chart-testing (lint)
         run: ct lint --config ct.yaml
@@ -59,7 +51,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out the repository
-        uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab
+        uses: actions/checkout@v2
         with:
           fetch-depth: 0
       - name: Run gitlint
@@ -70,7 +62,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out the repository
-        uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab
+        uses: actions/checkout@v2
 
       - name: Run helm-docs and verify docs are up-to-date
         run: make helm-docs
@@ -80,10 +72,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out the repository
-        uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab
+        uses: actions/checkout@v2
 
       - name: Run markdown-link-check
-        uses: gaurav-nelson/github-action-markdown-link-check@d53a906aa6b22b8979d33bc86170567e619495ec
+        uses: gaurav-nelson/github-action-markdown-link-check@v1
         with:
           config-file: ".markdownlinkcheck.json"
           check-modified-files-only: "yes"
@@ -94,7 +86,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out the repository
-        uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab
+        uses: actions/checkout@v2
       - name: Run markdownlint
         run: make markdownlint
 
@@ -103,6 +95,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out the repository
-        uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab
+        uses: actions/checkout@v2
       - name: Run yamllint
-        run: make yamllint
+        uses: ibiqlik/action-yamllint@v1
+        with:
+          file_or_dir: submariner-k8s-broker/Chart.yaml submariner-k8s-broker/values.yaml submariner-operator/Chart.yaml submariner-operator/values.yaml
+          config_file: .yamllint.yml

.github/workflows/periodic.yml

@@ -12,16 +12,16 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out the repository
-        uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab
+        uses: actions/checkout@v2
 
       - name: Run markdown-link-check
-        uses: gaurav-nelson/github-action-markdown-link-check@d53a906aa6b22b8979d33bc86170567e619495ec
+        uses: gaurav-nelson/github-action-markdown-link-check@v1
         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@v2.3.2
         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.13
+      - release-0.10
 
 jobs:
   release:
@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab
+        uses: actions/checkout@v2
         with:
           fetch-depth: 0
 

.markdownlinkcheck.json

@@ -1,8 +1,5 @@
 {
   "ignorePatterns": [
-    {
-      "pattern": "^https://docs.github.com"
-    },
     {
       "pattern": "^https://github.com/\\S+/\\S+/(issues|pull)/[0-9]+"
     },

.shipyard.e2e.ovn.yml

@@ -1,7 +0,0 @@
----
-cni: ovn
-submariner: true
-nodes: control-plane worker worker
-clusters:
-  cluster1:
-  cluster2:

.shipyard.e2e.yml

@@ -1,6 +0,0 @@
----
-submariner: true
-nodes: control-plane worker
-clusters:
-  cluster1:
-  cluster2:

.submarinerbot.yaml

@@ -1,4 +1,3 @@
----
 label-approved:
   approvals: 2
   label: ready-to-test

.yamllint.yml

@@ -1,15 +1,15 @@
 ---
 extends: default
-
 rules:
+  comments: disable
+  comments-indentation: disable
   line-length:
-    max: 140
+    max: 150
-  # Allow standard GHA syntax for "on: *"
+  braces:
-  truthy:
+    min-spaces-inside: 0
-    ignore: '.github/workflows/*.yml'
+    max-spaces-inside: 0
-
+  brackets:
-ignore: |
+    min-spaces-inside: 0
-  /submariner-k8s-broker/crds
+    max-spaces-inside: 0
-  /submariner-operator/crds
+  indentation:
-  /submariner-k8s-broker/templates
+    indent-sequences: consistent
-  /submariner-operator/templates

CODEOWNERS

@@ -1,3 +1 @@
-# Auto-generated, do not edit; see CODEOWNERS.in
+* @mangelajo @Oats87 @skitt @tpantelis
-* @Oats87 @skitt @sridhargaddam @tpantelis
-*.md @dfarrell07 @Oats87 @skitt @sridhargaddam @tpantelis

CODEOWNERS.in

@@ -1,5 +0,0 @@
-@dfarrell07 *.md
-@Oats87 *
-@skitt *
-@sridhargaddam *
-@tpantelis *

Dockerfile.dapper

@@ -9,8 +9,6 @@ ENV DAPPER_OUTPUT=${DAPPER_SOURCE}/output PATH=${DAPPER_SOURCE}/bin/:${PATH}
 
 WORKDIR ${DAPPER_SOURCE}
 
-RUN git config --global --add safe.directory ${DAPPER_SOURCE}
-
 # Override the Helm deployment scripts
 COPY deploy_helm /opt/shipyard/scripts/lib/
 

Makefile

@@ -1,4 +1,4 @@
-BASE_BRANCH ?= release-0.13
+BASE_BRANCH ?= release-0.10
 export BASE_BRANCH
 
 ifneq (,$(DAPPER_HOST_ARCH))
@@ -9,10 +9,11 @@ PRELOAD_IMAGES := submariner-gateway submariner-operator submariner-route-agent
 
 include $(SHIPYARD_DIR)/Makefile.inc
 
+CLUSTER_SETTINGS_FLAG = --cluster_settings $(DAPPER_SOURCE)/cluster_settings
 ifneq (,$(filter ovn,$(_using)))
-CLUSTER_SETTINGS_FLAG = --settings $(DAPPER_SOURCE)/.shipyard.e2e.ovn.yml
+CLUSTER_SETTINGS_FLAG = --cluster_settings $(DAPPER_SOURCE)/cluster_settings.ovn
 else
-CLUSTER_SETTINGS_FLAG = --settings $(DAPPER_SOURCE)/.shipyard.e2e.yml
+CLUSTER_SETTINGS_FLAG = --cluster_settings $(DAPPER_SOURCE)/cluster_settings
 endif
 
 override CLUSTERS_ARGS += $(CLUSTER_SETTINGS_FLAG)
@@ -20,7 +21,7 @@ override DEPLOY_ARGS += $(CLUSTER_SETTINGS_FLAG) --deploytool helm
 export DEPLOY_ARGS
 GH_URL=https://submariner-io.github.io/submariner-charts/charts
 CHARTS_DIR=charts
-CHARTS_VERSION=0.10.1
+CHARTS_VERSION=0.7.0
 HELM_DOCS_VERSION=0.15.0
 REPO_URL=$(shell git config remote.origin.url)
 

README.md

@@ -60,4 +60,4 @@ working correctly.
 [Helm]: https://helm.sh/docs/using_helm/#installing-helm
 [Docker]: https://docs.docker.com/install/
 [Podman]: https://podman.io/getting-started/installation
-[Create a fork]: https://docs.github.com/en/get-started/quickstart/fork-a-repo
+[Create a fork]: https://help.github.com/en/articles/fork-a-repo

cluster_settings

@@ -0,0 +1,10 @@
+. "${SCRIPTS_DIR}"/lib/source_only
+
+# We need a minimal setup to verify the deployment works
+clusters=('cluster1' 'cluster2')
+cluster_nodes['cluster1']="control-plane worker"
+cluster_nodes['cluster2']="control-plane worker"
+
+cluster_cni=( ['cluster1']="weave" ['cluster2']="weave" )
+
+cluster_subm=( ['cluster1']="true" ['cluster2']="true" )

cluster_settings.ovn

@@ -0,0 +1,10 @@
+. "${SCRIPTS_DIR}"/lib/source_only
+
+# We need a minimal setup to verify the deployment works
+clusters=('cluster1' 'cluster2')
+cluster_nodes['cluster1']="control-plane worker worker"
+cluster_nodes['cluster2']="control-plane worker worker"
+
+cluster_cni=( ['cluster1']="ovn" ['cluster2']="ovn" )
+
+cluster_subm=( ['cluster1']="true" ['cluster2']="true" )

ct.yaml

@@ -1,4 +1,3 @@
----
 charts:
   - submariner-operator
   - submariner-k8s-broker

submariner-k8s-broker/crds/crd.yaml

@@ -1,333 +1,97 @@
-apiVersion: apiextensions.k8s.io/v1
+apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
   name: clusters.submariner.io
 spec:
   group: submariner.io
+  version: v1
   names:
     kind: Cluster
-    listKind: ClusterList
     plural: clusters
-    singular: cluster
   scope: Namespaced
-  versions:
-  - name: v1
-    schema:
-      openAPIV3Schema:
-        properties:
-          apiVersion:
-            description: 'APIVersion defines the versioned schema of this representation
-              of an object. Servers should convert recognized schemas to the latest
-              internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
-            type: string
-          kind:
-            description: 'Kind is a string value representing the REST resource this
-              object represents. Servers may infer this from the endpoint the client
-              submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
-            type: string
-          metadata:
-            type: object
-          spec:
-            properties:
-              cluster_cidr:
-                items:
-                  type: string
-                type: array
-              cluster_id:
-                type: string
-              color_codes:
-                items:
-                  type: string
-                type: array
-              global_cidr:
-                items:
-                  type: string
-                type: array
-              service_cidr:
-                items:
-                  type: string
-                type: array
-            required:
-            - cluster_cidr
-            - cluster_id
-            - color_codes
-            - global_cidr
-            - service_cidr
-            type: object
-        required:
-        - spec
-        type: object
-    served: true
-    storage: true
-status:
-  acceptedNames:
-    kind: ""
-    plural: ""
-  conditions: []
-  storedVersions: []
 ---
-apiVersion: apiextensions.k8s.io/v1
+apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
   name: endpoints.submariner.io
 spec:
   group: submariner.io
+  version: v1
   names:
     kind: Endpoint
-    listKind: EndpointList
     plural: endpoints
-    singular: endpoint
   scope: Namespaced
-  versions:
-  - name: v1
-    schema:
-      openAPIV3Schema:
-        properties:
-          apiVersion:
-            description: 'APIVersion defines the versioned schema of this representation
-              of an object. Servers should convert recognized schemas to the latest
-              internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
-            type: string
-          kind:
-            description: 'Kind is a string value representing the REST resource this
-              object represents. Servers may infer this from the endpoint the client
-              submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
-            type: string
-          metadata:
-            type: object
-          spec:
-            properties:
-              backend:
-                type: string
-              backend_config:
-                additionalProperties:
-                  type: string
-                type: object
-              cable_name:
-                type: string
-              cluster_id:
-                type: string
-              healthCheckIP:
-                type: string
-              hostname:
-                type: string
-              nat_enabled:
-                type: boolean
-              private_ip:
-                type: string
-              public_ip:
-                type: string
-              subnets:
-                items:
-                  type: string
-                type: array
-            required:
-            - backend
-            - cable_name
-            - cluster_id
-            - hostname
-            - nat_enabled
-            - private_ip
-            - public_ip
-            - subnets
-            type: object
-        required:
-        - spec
-        type: object
-    served: true
-    storage: true
-status:
-  acceptedNames:
-    kind: ""
-    plural: ""
-  conditions: []
-  storedVersions: []
 ---
-apiVersion: apiextensions.k8s.io/v1
+apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
   name: gateways.submariner.io
 spec:
   group: submariner.io
+  version: v1
   names:
     kind: Gateway
-    listKind: GatewayList
     plural: gateways
-    singular: gateway
   scope: Namespaced
-  versions:
+  additionalPrinterColumns:
-  - additionalPrinterColumns:
+    - name: ha-status
-    - description: High availability status of the Gateway
-      jsonPath: .status.haStatus
-      name: HA Status
       type: string
-    name: v1
+      description: High Availability Status of the Gateway
-    schema:
+      JSONPath: .status.haStatus
-      openAPIV3Schema:
+---
-        properties:
+apiVersion: apiextensions.k8s.io/v1beta1
-          apiVersion:
+kind: CustomResourceDefinition
-            description: 'APIVersion defines the versioned schema of this representation
+metadata:
-              of an object. Servers should convert recognized schemas to the latest
+  name: multiclusterservices.lighthouse.submariner.io
-              internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+spec:
-            type: string
+  group: lighthouse.submariner.io
-          kind:
+  version: v1
-            description: 'Kind is a string value representing the REST resource this
+  names:
-              object represents. Servers may infer this from the endpoint the client
+    kind: MultiClusterService
-              submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+    plural: multiclusterservices
-            type: string
+    singular: multiclusterservice
-          metadata:
+  scope: Namespaced
-            type: object
+  validation:
-          status:
+    openAPIV3Schema:
-            properties:
+      properties:
-              connections:
+        spec:
-                items:
+          properties:
-                  properties:
+            clusterServiceInfo:
-                    endpoint:
+              properties:
-                      properties:
+                clusterID:
-                        backend:
+                  type: "string"
-                          type: string
+                clusterDomain:
-                        backend_config:
+                  type: "string"
-                          additionalProperties:
+                serviceIP:
-                            type: string
+                  type: "string"
-                          type: object
+                port:
-                        cable_name:
+                  type: "integer"
-                          type: string
+---
-                        cluster_id:
+apiVersion: apiextensions.k8s.io/v1beta1
-                          type: string
+kind: CustomResourceDefinition
-                        healthCheckIP:
+metadata:
-                          type: string
+  name: serviceexports.lighthouse.submariner.io
-                        hostname:
+spec:
-                          type: string
+  group: lighthouse.submariner.io
-                        nat_enabled:
+  version: v2alpha1
-                          type: boolean
+  names:
-                        private_ip:
+    kind: ServiceExport
-                          type: string
+    plural: serviceexports
-                        public_ip:
+    singular: serviceexport
-                          type: string
+  scope: Namespaced
-                        subnets:
+---
-                          items:
+apiVersion: apiextensions.k8s.io/v1beta1
-                            type: string
+kind: CustomResourceDefinition
-                          type: array
+metadata:
-                      required:
+  name: serviceimports.lighthouse.submariner.io
-                      - backend
+spec:
-                      - cable_name
+  group: lighthouse.submariner.io
-                      - cluster_id
+  version: v2alpha1
-                      - hostname
+  names:
-                      - nat_enabled
+    kind: ServiceImport
-                      - private_ip
+    plural: serviceimports
-                      - public_ip
+    singular: serviceimport
-                      - subnets
+  scope: Namespaced
-                      type: object
-                    latency:
-                      description: LatencySpec describes the round trip time information
-                        in nanoseconds for a packet between the gateway pods of two
-                        clusters.
-                      properties:
-                        averageRTT:
-                          format: int64
-                          type: integer
-                        lastRTT:
-                          description: TODO This shall be deleted once the operator
-                            is using the latest. Using Optional to avoid validation
-                            errors when this field is not used.
-                          format: int64
-                          type: integer
-                        maxRTT:
-                          format: int64
-                          type: integer
-                        minRTT:
-                          format: int64
-                          type: integer
-                        stddevRTT:
-                          format: int64
-                          type: integer
-                      type: object
-                    latencyRTT:
-                      description: LatencySpec describes the round trip time information
-                        for a packet between the gateway pods of two clusters.
-                      properties:
-                        average:
-                          type: string
-                        last:
-                          type: string
-                        max:
-                          type: string
-                        min:
-                          type: string
-                        stdDev:
-                          type: string
-                      type: object
-                    status:
-                      type: string
-                    statusMessage:
-                      type: string
-                  required:
-                  - endpoint
-                  - status
-                  - statusMessage
-                  type: object
-                type: array
-              haStatus:
-                type: string
-              localEndpoint:
-                properties:
-                  backend:
-                    type: string
-                  backend_config:
-                    additionalProperties:
-                      type: string
-                    type: object
-                  cable_name:
-                    type: string
-                  cluster_id:
-                    type: string
-                  healthCheckIP:
-                    type: string
-                  hostname:
-                    type: string
-                  nat_enabled:
-                    type: boolean
-                  private_ip:
-                    type: string
-                  public_ip:
-                    type: string
-                  subnets:
-                    items:
-                      type: string
-                    type: array
-                required:
-                - backend
-                - cable_name
-                - cluster_id
-                - hostname
-                - nat_enabled
-                - private_ip
-                - public_ip
-                - subnets
-                type: object
-              statusFailure:
-                type: string
-              version:
-                type: string
-            required:
-            - connections
-            - haStatus
-            - localEndpoint
-            - statusFailure
-            - version
-            type: object
-        required:
-        - status
-        type: object
-    served: true
-    storage: true
-    subresources: {}
-status:
-  acceptedNames:
-    kind: ""
-    plural: ""
-  conditions: []
-  storedVersions: []
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition

submariner-k8s-broker/questions.yml

@@ -1,20 +1,19 @@
----
 questions:
-  - variable: submariner-k8s-broker.rbac.create
+- variable: submariner-k8s-broker.rbac.create
-    type: boolean
+  type: boolean
-    default: true
+  default: true
-    group: "Role Based Access Control"
+  group: "Role Based Access Control"
-    description: "Create the role/rolebinding for the Submariner client"
+  description: "Create the role/rolebinding for the Submariner client"
-    label: "RBAC Creation Enabled"
+  label: "RBAC Creation Enabled"
-  - variable: submariner-k8s-broker.crd.create
+- variable: submariner-k8s-broker.crd.create
-    type: boolean
+  type: boolean
-    default: true
+  default: true
-    group: "Submariner CRD"
+  group: "Submariner CRD"
-    description: "Create the submariner CRDs for the Submariner client"
+  description: "Create the submariner CRDs for the Submariner client"
-    label: "Submariner CRD Creation Enabled"
+  label: "Submariner CRD Creation Enabled"
-  - variable: submariner-k8s-broker.serviceAccounts.client.create
+- variable: submariner-k8s-broker.serviceAccounts.client.create
-    type: boolean
+  type: boolean
-    default: true
+  default: true
-    group: "Service Account"
+  group: "Service Account"
-    description: "Create the service account for the Submariner client"
+  description: "Create the service account for the Submariner client"
-    label: "Submariner Service Account Creation Enabled"
+  label: "Submariner Service Account Creation Enabled"

submariner-k8s-broker/templates/rbac.yaml

@@ -16,7 +16,7 @@ rules:
   resources: ["*"]
   verbs: ["create", "get", "list", "watch", "patch", "update", "delete"]
 - apiGroups: ["discovery.k8s.io"]
-  resources: ["endpointslices", "endpointslices/restricted"]
+  resources: ["endpointslices"]
   verbs: ["create", "get", "list", "watch","patch", "update", "delete"]
 - apiGroups: ["multicluster.x-k8s.io"]
   resources: ["*"]

submariner-operator/Chart.yaml

@@ -1,8 +1,8 @@
 ---
 name: submariner-operator
-version: 0.10.1
+version: 0.7.0
 apiVersion: v2
-appVersion: 0.10.1
+appVersion: 0.7.0
 description: Submariner enables direct networking between Pods and Services in different Kubernetes clusters
 keywords:
 home: https://submariner-io.github.io/

submariner-operator/README.md

@@ -1,6 +1,6 @@
 # submariner-operator
 
-![Version: 0.10.1](https://img.shields.io/badge/Version-0.10.1-informational?style=flat-square) ![AppVersion: 0.10.1](https://img.shields.io/badge/AppVersion-0.10.1-informational?style=flat-square)
+![Version: 0.7.0](https://img.shields.io/badge/Version-0.7.0-informational?style=flat-square) ![AppVersion: 0.7.0](https://img.shields.io/badge/AppVersion-0.7.0-informational?style=flat-square)
 
 Submariner enables direct networking between Pods and Services in different Kubernetes clusters
 
@@ -27,9 +27,8 @@ Submariner enables direct networking between Pods and Services in different Kube
 | broker.server | string | `"example.k8s.apiserver"` |  |
 | broker.token | string | `"test"` |  |
 | gateway.image.repository | string | `"quay.io/submariner/submariner-gateway"` |  |
-| gateway.image.tag | string | `"0.10.1"` |  |
+| gateway.image.tag | string | `"0.7.0"` |  |
 | ipsec.debug | bool | `false` |  |
-| ipsec.forceUDPEncaps | bool | `false` |  |
 | ipsec.ikePort | int | `500` |  |
 | ipsec.natPort | int | `4500` |  |
 | ipsec.psk | string | `""` |  |
@@ -39,7 +38,7 @@ Submariner enables direct networking between Pods and Services in different Kube
 | operator.affinity | object | `{}` |  |
 | operator.image.pullPolicy | string | `"IfNotPresent"` |  |
 | operator.image.repository | string | `"quay.io/submariner/submariner-operator"` |  |
-| operator.image.tag | string | `"0.10.1"` |  |
+| operator.image.tag | string | `"0.7.0"` |  |
 | operator.resources | object | `{}` |  |
 | operator.tolerations | list | `[]` |  |
 | rbac.create | bool | `true` |  |
@@ -59,12 +58,10 @@ Submariner enables direct networking between Pods and Services in different Kube
 | submariner.clusterCidr | string | `""` |  |
 | submariner.clusterId | string | `""` |  |
 | submariner.colorCodes | string | `"blue"` |  |
-| submariner.coreDNSCustomConfig | object | `{}` |  |
 | submariner.debug | bool | `false` |  |
 | submariner.globalCidr | string | `""` |  |
-| submariner.healthcheckEnabled | bool | `true` |  |
 | submariner.images.repository | string | `"quay.io/submariner"` |  |
-| submariner.images.tag | string | `"0.10.1"` |  |
+| submariner.images.tag | string | `"0.7.0"` |  |
 | submariner.natEnabled | bool | `false` |  |
 | submariner.serviceCidr | string | `""` |  |
 | submariner.serviceDiscovery | bool | `true` |  |

submariner-operator/questions.yml

@@ -1,145 +1,138 @@
----
 questions:
-  - variable: defaultOperatorImage
+- variable: defaultOperatorImage
-    default: true
+  default: true
-    description: "Use default Submariner operator image or specify a custom one"
+  description: "Use default Submariner operator image or specify a custom one"
-    label: Use default Submariner operator image
+  label: Use default Submariner operator image
-    type: boolean
+  type: boolean
-    show_subquestion_if: false
+  show_subquestion_if: false
-    group: "Container Images"
+  group: "Container Images"
-    subquestions:
+  subquestions:
-      - variable: operator.image.repository
+  - variable: operator.image.repository
-        default: "quay.io/submariner/submariner-operator"
+    default: "quay.io/submariner/submariner-operator"
-        description: "Submariner Operator Image Repository"
+    description: "Submariner Operator Image Repository"
-        type: string
+    type: string
-        label: Submariner Operator Image Repository
+    label: Submariner Operator Image Repository
-      - variable: operator.image.tag
+  - variable: operator.image.tag
-        default: "0.10.1"
+    default: "0.7.0"
-        description: "Submariner Operator Image Tag"
+    description: "Submariner Operator Image Tag"
-        type: string
+    type: string
-        label: Submariner Operator Image Tag
+    label: Submariner Operator Image Tag
-  - variable: defaultSubmarinerImages
+- variable: defaultSubmarinerImages
-    default: true
+  default: true
-    description: "Use default Submariner images or specify custom ones"
+  description: "Use default Submariner images or specify custom ones"
-    label: Use default Submariner images
+  label: Use default Submariner images
-    type: boolean
+  type: boolean
-    show_subquestion_if: false
+  show_subquestion_if: false
-    group: "Container images"
+  group: "Container images"
-    subquestions:
+  subquestions:
-      - variable: submariner.images.repository
+  - variable: submariner.images.repository
-        default: "quay.io/submariner"
+    default: "quay.io/submariner"
-        description: "Submariner Repository (base for all non-operator images)"
+    description: "Submariner Repository (base for all non-operator images)"
-        type: string
+    type: string
-        label: Submariner Repository
+    label: Submariner Repository
-      - variable: submariner.images.tag
+  - variable: submariner.images.tag
-        default: "0.10.1"
+    default: "0.7.0"
-        description: "Submariner Images Tag (shared for all non-operator images)"
+    description: "Submariner Images Tag (shared for all non-operator images)"
-        type: string
+    type: string
-        label: Submariner Images Tag
+    label: Submariner Images Tag
-  - variable: submariner.clusterId
+- variable: submariner.clusterId
+  default: ""
+  description: "Enter a unique cluster ID to identify this cluster"
+  type: string
+  label: "Cluster ID"
+  group: "Configuration"
+  required: true
+- variable: ipsec.psk
+  default: ""
+  description: "Enter the pre-shared key for the IPsec Cable Engine"
+  type: string
+  label: "IPsec Pre-Shared Key"
+  group: "Configuration"
+  required: true
+- variable: broker.server
+  type: string
+  default: ""
+  group: "Broker Configuration"
+  label: "Broker Server"
+  description: "Broker server to use (without the https://)"
+- variable: broker.insecure
+  type: boolean
+  default: false
+  show_subquestion_if: false
+  group: "Broker Configuration"
+  label: "Insecure Broker"
+  description: "Connect to K8s broker without validating CA"
+  subquestions:
+  - variable: broker.ca
+    type: string
+    description: "Base64 encoded broker ca.crt"
+    label: "Broker CA encoded in base64"
     default: ""
-    description: "Enter a unique cluster ID to identify this cluster"
+- variable: broker.token
-    type: string
+  type: string
-    label: "Cluster ID"
+  group: "Broker Configuration"
-    group: "Configuration"
+  label: "Broker Token"
-    required: true
+  description: "Bearer token for broker"
-  - variable: ipsec.psk
+- variable: broker.namespace
+  type: string
+  group: "Broker Configuration"
+  label: "Broker Namespace"
+  description: "Enter namespace to use on central broker"
+- variable: submariner.clusterCidr
+  default: ""
+  description: "Enter the cluster CIDR (i.e. 10.42.0.0/16) for this cluster"
+  type: string
+  label: "Cluster CIDR"
+  group: "CIDR Configuration"
+  required: true
+- variable: submariner.serviceCidr
+  default: ""
+  description: "Enter the service CIDR (i.e. 10.43.0.0/16) for this cluster"
+  type: string
+  label: "Service CIDR"
+  group: "CIDR Configuration"
+  required: true
+- variable: submariner.serviceDiscovery
+  type: boolean
+  default: false
+  group: "Advanced Configuration"
+  description: "Enable multicluster service discovery"
+  label: "Service Discovery Enabled"
+- variable: broker.globalnet
+  type: boolean
+  default: false
+  group: "Broker Configuration"
+  description: "Enable support for overlapping Cluster/Service CIDRs in connecting clusters"
+  label: "Globalnet Enabled"
+  subquestions:
+  - variable: submariner.globalCidr
     default: ""
-    description: "Enter the pre-shared key for the IPsec Cable Engine"
+    description: "Enter the globalnet CIDR (i.e. 169.254.1.0/24) for this cluster if using globalnet"
     type: string
-    label: "IPsec Pre-Shared Key"
+    label: "Globalnet CIDR"
-    group: "Configuration"
-    required: true
-  - variable: broker.server
-    type: string
-    default: ""
-    group: "Broker Configuration"
-    label: "Broker Server"
-    description: "Broker server to use (without the https://)"
-  - variable: broker.insecure
-    type: boolean
-    default: false
-    show_subquestion_if: false
-    group: "Broker Configuration"
-    label: "Insecure Broker"
-    description: "Connect to K8s broker without validating CA"
-    subquestions:
-      - variable: broker.ca
-        type: string
-        description: "Base64 encoded broker ca.crt"
-        label: "Broker CA encoded in base64"
-        default: ""
-  - variable: broker.token
-    type: string
-    group: "Broker Configuration"
-    label: "Broker Token"
-    description: "Bearer token for broker"
-  - variable: broker.namespace
-    type: string
-    group: "Broker Configuration"
-    label: "Broker Namespace"
-    description: "Enter namespace to use on central broker"
-  - variable: submariner.clusterCidr
-    default: ""
-    description: "Enter the cluster CIDR (i.e. 10.42.0.0/16) for this cluster"
-    type: string
-    label: "Cluster CIDR"
     group: "CIDR Configuration"
-    required: true
+    required: false
-  - variable: submariner.serviceCidr
+- variable: submariner.natEnabled
-    default: ""
+  type: boolean
-    description: "Enter the service CIDR (i.e. 10.43.0.0/16) for this cluster"
+  default: false
-    type: string
+  group: "Advanced Configuration"
-    label: "Service CIDR"
+  description: "If the gateway nodes for this cluster are behind 1:1 NAT, you should enable NAT"
-    group: "CIDR Configuration"
+  label: "NAT Enabled"
-    required: true
+- variable: submariner.debug
-  - variable: submariner.serviceDiscovery
+  type: boolean
-    type: boolean
+  default: false
-    default: false
+  group: "Advanced Configuration"
-    group: "Advanced Configuration"
+  description: "Enable submariner debug mode"
-    description: "Enable multicluster service discovery"
+  label: "Submariner Debug Enabled"
-    label: "Service Discovery Enabled"
+- variable: ipsec.debug
-  - variable: broker.globalnet
+  type: boolean
-    type: boolean
+  default: false
-    default: false
+  group: "Advanced Configuration"
-    group: "Broker Configuration"
+  description: "Enable Charon debug mode"
-    description: "Enable support for overlapping Cluster/Service CIDRs in connecting clusters"
+  label: "Charon Enabled"
-    label: "Globalnet Enabled"
+- variable: submariner.cableDriver
-    subquestions:
+  type: string
-      - variable: submariner.globalCidr
+  default: ""
-        default: ""
+  group: "Advanced Configuration"
-        description: "Enter the globalnet CIDR (i.e. 169.254.1.0/24) for this cluster if using globalnet"
+  description: "Cable driver implementation"
-        type: string
+  label: "Cable Driver"
-        label: "Globalnet CIDR"
-        group: "CIDR Configuration"
-        required: false
-  - variable: submariner.natEnabled
-    type: boolean
-    default: false
-    group: "Advanced Configuration"
-    description: "If the gateway nodes for this cluster are behind 1:1 NAT, you should enable NAT"
-    label: "NAT Enabled"
-  - variable: submariner.debug
-    type: boolean
-    default: false
-    group: "Advanced Configuration"
-    description: "Enable submariner debug mode"
-    label: "Submariner Debug Enabled"
-  - variable: ipsec.debug
-    type: boolean
-    default: false
-    group: "Advanced Configuration"
-    description: "Enable Charon debug mode"
-    label: "Charon Enabled"
-  - variable: submariner.cableDriver
-    type: string
-    default: ""
-    group: "Advanced Configuration"
-    description: "Cable driver implementation"
-    label: "Cable Driver"
-  - variable: submariner.healthcheckEnabled
-    type: boolean
-    default: true
-    group: "Advanced Configuration"
-    description: "Disable Healthcheck"
-    label: "Healthcheck Disabled"

submariner-operator/templates/rbac.yaml

@@ -439,21 +439,6 @@ rules:
     verbs:
       - get
       - list
-  - apiGroups:
-      - ""
-    resources:
-      - namespaces
-    verbs:
-      - get
-      - list
-      - watch
-  - apiGroups:
-      - monitoring.coreos.com
-    resources:
-      - servicemonitors
-    verbs:
-      - get
-      - create
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
@@ -474,29 +459,6 @@ roleRef:
   name: {{ template "submariner.fullname" . }}
 ---
 apiVersion: rbac.authorization.k8s.io/v1
-kind: Role
-metadata:
-  name: submariner-metrics-reader
-  namespace: {{ .Release.Namespace }}
-rules:
-  - apiGroups: [""]
-    resources: ["pods", "services", "endpoints"]
-    verbs: ["get", "list", "watch"]
----
-apiVersion: rbac.authorization.k8s.io/v1
-kind: RoleBinding
-metadata:
-  name: read-submariner-metrics
-subjects:
-  - kind: ServiceAccount
-    name: prometheus-k8s
-    namespace: openshift-monitoring
-roleRef:
-  kind: Role
-  name: submariner-metrics-reader
-  apiGroup: rbac.authorization.k8s.io
----
-apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
   name: {{ template "submariner.fullname" . }}:gateway
@@ -678,25 +640,14 @@ rules:
       - ""
     resources:
       - pods
+      - services
       - namespaces
       - nodes
-      - endpoints
     verbs:
       - get
       - list
       - watch
       - update
-  - apiGroups:
-      - ""
-    resources:
-      - services
-    verbs:
-      - create
-      - get
-      - list
-      - watch
-      - update
-      - delete
   - apiGroups:
       - submariner.io
     resources:
@@ -737,15 +688,6 @@ rules:
       - get
       - list
       - watch
-  - apiGroups:
-      - network.openshift.io
-    resources:
-      - service/externalips
-    verbs:
-      - create
-      - get
-      - list
-      - delete
 ---
 {{- end -}}
 apiVersion: rbac.authorization.k8s.io/v1
@@ -792,7 +734,6 @@ rules:
       - discovery.k8s.io
     resources:
       - endpointslices
-      - endpointslices/restricted
     verbs:
       - create
       - get

submariner-operator/templates/submariner.yaml

@@ -9,9 +9,7 @@ spec:
   brokerK8sApiServerToken: {{ .Values.broker.token }}
   brokerK8sCA: {{ .Values.broker.ca }}
   brokerK8sRemoteNamespace: {{ .Values.broker.namespace }}
-  brokerK8sInsecure: {{ .Values.broker.insecure }}
   ceIPSecDebug: {{ .Values.ipsec.debug }}
-  ceIPSecForceUDPEncaps: {{ .Values.ipsec.forceUDPEncaps }}
   ceIPSecIKEPort: {{ .Values.ipsec.ikePort }}
   ceIPSecNATTPort: {{ .Values.ipsec.natPort }}
   ceIPSecPSK: {{ .Values.ipsec.psk }}
@@ -27,12 +25,3 @@ spec:
   globalCIDR: "{{ .Values.submariner.globalCidr }}"
   serviceDiscoveryEnabled: {{ .Values.submariner.serviceDiscovery }}
   cableDriver: {{ .Values.submariner.cableDriver }}
-  connectionHealthCheck:
-    enabled: {{ .Values.submariner.healthcheckEnabled }}
-    intervalSeconds: 1
-    maxPacketLossCount: 5
-{{- with .Values.submariner.coreDNSCustomConfig }}
-  coreDNSCustomConfig:
-    configmapName: {{ .configmapName }}
-    namespace: {{ .namespace }}
-{{- end }}

submariner-operator/values.yaml

@@ -10,11 +10,9 @@ submariner:
   debug: false
   serviceDiscovery: true
   cableDriver: "libreswan"
-  healthcheckEnabled: true
-  coreDNSCustomConfig: {}
   images:
     repository: quay.io/submariner
-    tag: "0.10.1"
+    tag: "0.7.0"
 broker:
   server: example.k8s.apiserver
   token: test
@@ -27,7 +25,6 @@ rbac:
 ipsec:
   psk: ""
   debug: false
-  forceUDPEncaps: false
   ikePort: 500
   natPort: 4500
 leadership:
@@ -37,7 +34,7 @@ leadership:
 operator:
   image:
     repository: quay.io/submariner/submariner-operator
-    tag: "0.10.1"
+    tag: "0.7.0"
     pullPolicy: IfNotPresent
   resources: {}
   tolerations: []
@@ -45,7 +42,7 @@ operator:
 gateway:
   image:
     repository: quay.io/submariner/submariner-gateway
-    tag: "0.10.1"
+    tag: "0.7.0"
 serviceAccounts:
   operator:
     create: true