Bump actions/checkout from 3.5.2 to 3.5.3

Bumps [actions/checkout](https://github.com/actions/checkout) from 3.5.2 to 3.5.3.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/8e5e7e5ab8b370d6c329ec480221332ada57f0ab...c85c95e3d7251135ab7dc9ce3241c5835cc595a9)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

.github/ISSUE_TEMPLATE/bug-report.md

@@ -23,11 +23,9 @@ Submariner Owners: https://github.com/orgs/submariner-io/teams/submariner-core
 **Anything else we need to know?**:
 
 **Environment**:
-- Submariner version (use `subctl version`):
+- Diagnose information (use `subctl diagnose all`):
-- Kubernetes version (use `kubectl version`):
+- Gather information (use `subctl gather`):
 - Cloud provider or hardware configuration:
-- OS (e.g: `cat /etc/os-release`):
-- Kernel (e.g. `uname -a`):
 - Install tools:
 - Network plugin and version (if this is a network-related bug):
 - Others:

.github/ISSUE_TEMPLATE/support.md

@@ -6,7 +6,7 @@ labels: support
 ---
 
 <!--
-GitHub may not the right place for support requests.
+GitHub may not be the right place for support requests.
 
 You can also post your question on the [Submariner
 Slack](https://kubernetes.slack.com/archives/C010RJV694M) or the Submariner

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,13 @@
+<!--  Thanks for sending a pull request!  Here are some tips for you:
+
+1. If this is your first time, please read our developer guide: https://submariner.io/development/
+2. Ensure you have added the appropriate tests for your PR: https://submariner.io/development/code-review/#test-new-functionality
+3. Read the code review guide to ease the review process: https://submariner.io/development/code-review/
+4. If the PR is unfinished, mark it as a draft: https://submariner.io/development/code-review/#mark-work-in-progress-prs-as-drafts
+5. If you are using CI to debug, use your private fork: https://submariner.io/development/code-review/#use-private-forks-for-debugging-prs-by-running-ci
+6. Add labels to the PR as appropriate.
+
+This template is based on the K8s/K8s template:
+
+https://github.com/kubernetes/kubernetes/blob/master/.github/PULL_REQUEST_TEMPLATE.md
+-->

.github/stale.yml

@@ -2,7 +2,7 @@
 # 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: 60
+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.

.github/workflows/branch.yml

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

.github/workflows/dependent-issues.yml

@@ -0,0 +1,39 @@
+---
+name: PR Dependencies
+
+on:
+  issues:
+    types:
+      - opened
+      - edited
+      - closed
+      - reopened
+      - synchronize
+  pull_request_target:
+    types:
+      - opened
+      - edited
+      - closed
+      - reopened
+      - synchronize
+  schedule:
+    - 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
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          # The label to use to mark dependent issues
+          label: dependent
+
+          # Enable checking for dependencies in issues.
+          check_issues: on
+
+          # A comma-separated list of keywords to mark dependency.
+          keywords: depends on, Depends on

.github/workflows/e2e-full.yml

@@ -0,0 +1,37 @@
+---
+name: End to End Full
+
+on:
+  pull_request:
+    types: [labeled, opened, synchronize, reopened]
+
+jobs:
+  e2e:
+    name: E2E
+    if: contains(github.event.pull_request.labels.*.name, 'ready-to-test')
+    timeout-minutes: 45
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        cable_driver: ['libreswan', 'wireguard', 'vxlan']
+        globalnet: ['', 'globalnet']
+        k8s_version: ['1.23']
+        lighthouse: ['', 'lighthouse']
+        include:
+          - k8s_version: '1.20'
+          - k8s_version: '1.21'
+          - k8s_version: '1.22'
+    steps:
+      - name: Check out the repository
+        uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9
+
+      - name: Run E2E deployment and tests
+        uses: submariner-io/shipyard/gh-actions/e2e@release-0.12
+        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.12

.github/workflows/e2e.yml

@@ -1,5 +1,5 @@
 ---
-name: End to End Tests
+name: End to End Default
 
 on:
   pull_request:
@@ -9,28 +9,13 @@ jobs:
     name: E2E
     timeout-minutes: 30
     runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        cable_driver: ['libreswan', 'wireguard']
-        globalnet: ['', 'globalnet']
-        k8s_version: ['1.17.17']
-        lighthouse: ['', 'lighthouse']
-        include:
-          # Recentness of K8s versions are limited by kindest/node image releases
-          - k8s_version: 1.18.15
-          - k8s_version: 1.19.7
-          - k8s_version: 1.20.2
     steps:
       - name: Check out the repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9
 
       - name: Run E2E deployment and tests
-        uses: submariner-io/shipyard/gh-actions/e2e@devel
+        uses: submariner-io/shipyard/gh-actions/e2e@release-0.12
-        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.12

.github/workflows/flake_finder.yml

@@ -8,23 +8,24 @@ on:
 jobs:
   e2e:
     name: E2E
+    if: github.repository_owner == 'submariner-io'
     timeout-minutes: 30
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
-        cable_driver: ['libreswan', 'wireguard']
+        cable_driver: ['libreswan', 'wireguard', 'vxlan']
         globalnet: ['', 'globalnet']
         lighthouse: ['', 'lighthouse']
     steps:
       - name: Check out the repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9
 
       - name: Run E2E deployment and tests
-        uses: submariner-io/shipyard/gh-actions/e2e@devel
+        uses: submariner-io/shipyard/gh-actions/e2e@release-0.12
         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.12

.github/workflows/linting.yml

@@ -5,26 +5,85 @@ on:
   pull_request:
 
 jobs:
+  apply-suggestions-commits:
+    name: 'No "Apply suggestions from code review" Commits'
+    runs-on: ubuntu-latest
+    steps:
+      - name: Get PR commits
+        id: 'get-pr-commits'
+        uses: tim-actions/get-pr-commits@3efc1387ead42029a0d488ab98f24b7452dc3cde
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: 'Verify no "Apply suggestions from code review" commits'
+        uses: tim-actions/commit-message-checker-with-regex@e16b08b1a7f5cafeb1f8167de05bf1d40239eb5d
+        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@c85c95e3d7251135ab7dc9ce3241c5835cc595a9
+
+      - name: Set up Helm
+        uses: azure/setup-helm@5119fcb9089d432beecbf79bb2c7915207344b78
+        with:
+          version: v3.6.0
+
+      - name: Set up Python
+        uses: actions/setup-python@bd6b4b6205c4dbad673328db7b31b7fab9e241c0
+        with:
+          python-version: '3.x'
+
+      - name: Set up helm/chart-testing
+        uses: helm/chart-testing-action@e8788873172cb653a90ca2e819d79d65a66d4e76
+
+      - name: Run helm/chart-testing (lint)
+        run: ct lint --config ct.yaml
+
   gitlint:
     name: Commit Message(s)
     runs-on: ubuntu-latest
     steps:
       - name: Check out the repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9
         with:
           fetch-depth: 0
       - name: Run gitlint
         run: make gitlint
 
+  helm-docs:
+    name: Helm Docs Generation
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out the repository
+        uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9
+
+      - name: Run helm-docs and verify docs are up-to-date
+        run: make helm-docs
+
   markdown-link-check:
     name: Markdown Links (modified files)
     runs-on: ubuntu-latest
     steps:
       - name: Check out the repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9
 
       - name: Run markdown-link-check
-        uses: gaurav-nelson/github-action-markdown-link-check@v1
+        uses: gaurav-nelson/github-action-markdown-link-check@d53a906aa6b22b8979d33bc86170567e619495ec
         with:
           config-file: ".markdownlinkcheck.json"
           check-modified-files-only: "yes"
@@ -35,7 +94,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out the repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9
       - name: Run markdownlint
         run: make markdownlint
 
@@ -44,9 +103,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out the repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9
       - name: Run yamllint
-        uses: ibiqlik/action-yamllint@v1
+        uses: ibiqlik/action-yamllint@2576378a8e339169678f9939646ee3ee325e845c
         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
+          strict: true

.github/workflows/periodic.yml

@@ -8,19 +8,20 @@ on:
 jobs:
   markdown-link-check-periodic:
     name: Markdown Links (all files)
+    if: github.repository_owner == 'submariner-io'
     runs-on: ubuntu-latest
     steps:
       - name: Check out the repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9
 
       - name: Run markdown-link-check
-        uses: gaurav-nelson/github-action-markdown-link-check@v1
+        uses: gaurav-nelson/github-action-markdown-link-check@d53a906aa6b22b8979d33bc86170567e619495ec
         with:
           config-file: ".markdownlinkcheck.json"
 
       - name: Raise an Issue to report broken links
         if: ${{ failure() }}
-        uses: peter-evans/create-issue-from-file@v2.3.2
+        uses: peter-evans/create-issue-from-file@433e51abf769039ee20ba1293a088ca19d573b7f
         with:
           title: Broken link detected by CI
           content-filepath: .github/ISSUE_TEMPLATE/broken-link.md

.github/workflows/release.yml

@@ -4,15 +4,16 @@ name: Release Charts
 on:
   push:
     branches:
-      - devel
+      - release-0.12
 
 jobs:
   release:
     name: Release
+    if: github.repository_owner == 'submariner-io'
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9
         with:
           fetch-depth: 0
 

.gitlint

@@ -1,9 +0,0 @@
-[general]
-# body-is-missing: Allow commit messages with only a title
-# body-min-length: Allow short body lines, like "Relates-to: #issue"
-ignore=body-is-missing,body-min-length
-
-[ignore-by-body]
-# Dependabot doesn't follow our conventions, unfortunately
-regex=^Signed-off-by: dependabot\[bot\](.*)
-ignore=all

.markdownlinkcheck.json

@@ -5,6 +5,9 @@
     },
     {
       "pattern": "^http://localhost:"
+    },
+    {
+      "pattern": "^https://submariner-io.github.io/submariner-charts/charts"
     }
   ]
 }

.markdownlint.yml

@@ -10,3 +10,7 @@ line-length:
 no-inline-html:
   allowed_elements:
     - span
+
+# Temporary while helm-docs has a bug where maintainer URLs are used raw in MD
+# Waiting on: https://github.com/norwoodj/helm-docs/pull/102
+no-bare-urls: false

.shipyard.e2e.ovn.yml

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

.shipyard.e2e.yml

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

.submarinerbot.yaml

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

CODEOWNERS

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

CODEOWNERS.in

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

Dockerfile.dapper

@@ -9,6 +9,8 @@ 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 ?= devel
+BASE_BRANCH ?= release-0.12
 export BASE_BRANCH
 
 ifneq (,$(DAPPER_HOST_ARCH))
@@ -9,11 +9,10 @@ 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 = --cluster_settings $(DAPPER_SOURCE)/cluster_settings.ovn
+CLUSTER_SETTINGS_FLAG = --settings $(DAPPER_SOURCE)/.shipyard.e2e.ovn.yml
 else
-CLUSTER_SETTINGS_FLAG = --cluster_settings $(DAPPER_SOURCE)/cluster_settings
+CLUSTER_SETTINGS_FLAG = --settings $(DAPPER_SOURCE)/.shipyard.e2e.yml
 endif
 
 override CLUSTERS_ARGS += $(CLUSTER_SETTINGS_FLAG)
@@ -21,7 +20,8 @@ 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.7.0
+CHARTS_VERSION=0.12.2
+HELM_DOCS_VERSION=0.15.0
 REPO_URL=$(shell git config remote.origin.url)
 
 # Process extra flags from the `using=a,b,c` optional flag
@@ -42,6 +42,20 @@ e2e: E2E_ARGS=cluster1 cluster2
 	helm dep update $(subst -$(CHARTS_VERSION),,$(basename $(@F)))
 	helm package --version $(CHARTS_VERSION) $(subst -$(CHARTS_VERSION),,$(basename $(@F)))
 
+helm-docs:
+	# Avoid polluting repo with helm-docs' README/LICENSE or other files in the release archive
+	cd /tmp && \
+	curl -sL https://github.com/norwoodj/helm-docs/releases/download/v$(HELM_DOCS_VERSION)/helm-docs_$(HELM_DOCS_VERSION)_Linux_x86_64.tar.gz | tar zx && \
+	cd -
+	/tmp/helm-docs
+	if [ ! -z $(git status --porcelain) ]; then \
+		echo "Helm docs not up-to-date:"; \
+		git status --porcelain; \
+		git diff; \
+		echo "Run make helm-docs locally to generate updated docs, commit the updates."; \
+		exit 1; \
+	fi
+
 release: submariner-k8s-broker-$(CHARTS_VERSION).tgz submariner-operator-$(CHARTS_VERSION).tgz
 	git checkout gh-pages
 	mv *.tgz $(CHARTS_DIR)
@@ -51,7 +65,7 @@ release: submariner-k8s-broker-$(CHARTS_VERSION).tgz submariner-operator-$(CHART
 	  helm repo index $(CHARTS_DIR) --url $(GH_URL); \
 	fi
 
-.PHONY: release
+.PHONY: release helm-docs
 
 else
 

README.md

@@ -1,5 +1,12 @@
 # submariner-charts
 
+<!-- markdownlint-disable line-length -->
+[![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/4865/badge)](https://bestpractices.coreinfrastructure.org/projects/4865)
+[![Release Charts](https://github.com/submariner-io/submariner-charts/workflows/Release%20Charts/badge.svg)](https://github.com/submariner-io/submariner-charts/actions?query=workflow%3A%22Release+Charts%22)
+[![Periodic](https://github.com/submariner-io/submariner-charts/workflows/Periodic/badge.svg)](https://github.com/submariner-io/submariner-charts/actions?query=workflow%3APeriodic)
+[![Flake Finder](https://github.com/submariner-io/submariner-charts/workflows/Flake%20Finder/badge.svg)](https://github.com/submariner-io/submariner-charts/actions?query=workflow%3A%22Flake+Finder%22)
+<!-- markdownlint-enable line-length -->
+
 Please see the [Helm docs on Submariner's website](https://submariner.io/operations/deployment/helm/).
 
 ## Development workflow

cluster_settings

@@ -1,10 +0,0 @@
-. "${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

@@ -1,10 +0,0 @@
-. "${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

@@ -0,0 +1,6 @@
+charts:
+  - submariner-operator
+  - submariner-k8s-broker
+# Tests that maintainer name is valid GitHub account, which isn't what we want
+# See: https://github.com/helm/chart-testing/issues/192
+validate-maintainers: false

submariner-k8s-broker/Chart.yaml

@@ -1,12 +1,14 @@
 ---
 name: submariner-k8s-broker
-version: 0.6.0
+version: 0.12.2
-appVersion: 0.6.0
+apiVersion: v2
+appVersion: 0.12.2
 description: Submariner Kubernetes Broker
 keywords:
 home: https://submariner-io.github.io/
 sources:
   - https://submariner-io.github.io/submariner-charts/charts
 maintainers:
-- name: Submariner Developers
+  - name: Contributors to the Submariner project
     email: submariner-dev@googlegroups.com
+    url: https://submariner.io/

submariner-k8s-broker/README.md

@@ -0,0 +1,26 @@
+# submariner-k8s-broker
+
+![Version: 0.12.2](https://img.shields.io/badge/Version-0.12.2-informational?style=flat-square) ![AppVersion: 0.12.2](https://img.shields.io/badge/AppVersion-0.12.2-informational?style=flat-square)
+
+Submariner Kubernetes Broker
+
+**Homepage:** <https://submariner-io.github.io/>
+
+## Maintainers
+
+| Name | Email | Url |
+| ---- | ------ | --- |
+| Contributors to the Submariner project | submariner-dev@googlegroups.com | https://submariner.io/ |
+
+## Source Code
+
+* <https://submariner-io.github.io/submariner-charts/charts>
+
+## Values
+
+| Key | Type | Default | Description |
+|-----|------|---------|-------------|
+| crd.create | bool | `true` |  |
+| rbac.create | bool | `true` |  |
+| serviceAccounts.client.create | bool | `true` |  |
+| serviceAccounts.client.name | string | `""` |  |

submariner-k8s-broker/crds/crd.yaml

@@ -1,97 +1,333 @@
-apiVersion: apiextensions.k8s.io/v1beta1
+apiVersion: apiextensions.k8s.io/v1
 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/v1beta1
+apiVersion: apiextensions.k8s.io/v1
 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/v1beta1
+apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   name: gateways.submariner.io
 spec:
   group: submariner.io
-  version: v1
   names:
     kind: Gateway
+    listKind: GatewayList
     plural: gateways
+    singular: gateway
   scope: Namespaced
-  additionalPrinterColumns:
+  versions:
-    - name: ha-status
+  - additionalPrinterColumns:
+    - description: High availability status of the Gateway
+      jsonPath: .status.haStatus
+      name: HA Status
       type: string
-      description: High Availability Status of the Gateway
+    name: v1
-      JSONPath: .status.haStatus
+    schema:
----
-apiVersion: apiextensions.k8s.io/v1beta1
-kind: CustomResourceDefinition
-metadata:
-  name: multiclusterservices.lighthouse.submariner.io
-spec:
-  group: lighthouse.submariner.io
-  version: v1
-  names:
-    kind: MultiClusterService
-    plural: multiclusterservices
-    singular: multiclusterservice
-  scope: Namespaced
-  validation:
       openAPIV3Schema:
         properties:
-        spec:
+          apiVersion:
-          properties:
+            description: 'APIVersion defines the versioned schema of this representation
-            clusterServiceInfo:
+              of an object. Servers should convert recognized schemas to the latest
-              properties:
+              internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
-                clusterID:
+            type: string
-                  type: "string"
+          kind:
-                clusterDomain:
+            description: 'Kind is a string value representing the REST resource this
-                  type: "string"
+              object represents. Servers may infer this from the endpoint the client
-                serviceIP:
+              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"
+            type: string
-                port:
-                  type: "integer"
----
-apiVersion: apiextensions.k8s.io/v1beta1
-kind: CustomResourceDefinition
           metadata:
-  name: serviceexports.lighthouse.submariner.io
+            type: object
-spec:
+          status:
-  group: lighthouse.submariner.io
+            properties:
-  version: v2alpha1
+              connections:
-  names:
+                items:
-    kind: ServiceExport
+                  properties:
-    plural: serviceexports
+                    endpoint:
-    singular: serviceexport
+                      properties:
-  scope: Namespaced
+                        backend:
----
+                          type: string
-apiVersion: apiextensions.k8s.io/v1beta1
+                        backend_config:
-kind: CustomResourceDefinition
+                          additionalProperties:
-metadata:
+                            type: string
-  name: serviceimports.lighthouse.submariner.io
+                          type: object
-spec:
+                        cable_name:
-  group: lighthouse.submariner.io
+                          type: string
-  version: v2alpha1
+                        cluster_id:
-  names:
+                          type: string
-    kind: ServiceImport
+                        healthCheckIP:
-    plural: serviceimports
+                          type: string
-    singular: serviceimport
+                        hostname:
-  scope: Namespaced
+                          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
+                    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/templates/rbac.yaml

@@ -2,7 +2,7 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
-  name: {{ template "submariner-k8s-broker.fullname" . }}:client
+  name: {{ template "submariner-k8s-broker.fullname" . }}-cluster
   labels:
     heritage: {{ .Release.Service | quote }}
     release: {{ .Release.Name | quote }}
@@ -16,7 +16,7 @@ rules:
   resources: ["*"]
   verbs: ["create", "get", "list", "watch", "patch", "update", "delete"]
 - apiGroups: ["discovery.k8s.io"]
-  resources: ["endpointslices"]
+  resources: ["endpointslices", "endpointslices/restricted"]
   verbs: ["create", "get", "list", "watch","patch", "update", "delete"]
 - apiGroups: ["multicluster.x-k8s.io"]
   resources: ["*"]
@@ -25,11 +25,11 @@ rules:
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
-  name: {{ template "submariner-k8s-broker.fullname" . }}:client
+  name: {{ template "submariner-k8s-broker.fullname" . }}-cluster
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role
-  name: {{ template "submariner-k8s-broker.fullname" . }}:client
+  name: {{ template "submariner-k8s-broker.fullname" . }}-cluster
 subjects:
 - kind: ServiceAccount
   name: {{ template "submariner-k8s-broker.clientServiceAccountName" . }}

submariner-operator/Chart.yaml

@@ -1,12 +1,14 @@
 ---
 name: submariner-operator
-version: 0.7.0
+version: 0.12.2
-appVersion: 0.7.0
+apiVersion: v2
+appVersion: 0.12.2
 description: Submariner enables direct networking between Pods and Services in different Kubernetes clusters
 keywords:
 home: https://submariner-io.github.io/
 sources:
   - https://submariner-io.github.io/submariner-charts/charts
 maintainers:
-  - name: Submariner Developers
+  - name: Contributors to the Submariner project
     email: submariner-dev@googlegroups.com
+    url: https://submariner.io/

submariner-operator/README.md

@@ -0,0 +1,71 @@
+# submariner-operator
+
+![Version: 0.12.2](https://img.shields.io/badge/Version-0.12.2-informational?style=flat-square) ![AppVersion: 0.12.2](https://img.shields.io/badge/AppVersion-0.12.2-informational?style=flat-square)
+
+Submariner enables direct networking between Pods and Services in different Kubernetes clusters
+
+**Homepage:** <https://submariner-io.github.io/>
+
+## Maintainers
+
+| Name | Email | Url |
+| ---- | ------ | --- |
+| Contributors to the Submariner project | submariner-dev@googlegroups.com | https://submariner.io/ |
+
+## Source Code
+
+* <https://submariner-io.github.io/submariner-charts/charts>
+
+## Values
+
+| Key | Type | Default | Description |
+|-----|------|---------|-------------|
+| broker.ca | string | `""` |  |
+| broker.globalnet | bool | `false` |  |
+| broker.insecure | bool | `false` |  |
+| broker.namespace | string | `"xyz"` |  |
+| broker.server | string | `"example.k8s.apiserver"` |  |
+| broker.token | string | `"test"` |  |
+| gateway.image.repository | string | `"quay.io/submariner/submariner-gateway"` |  |
+| gateway.image.tag | string | `"0.12.2"` |  |
+| ipsec.debug | bool | `false` |  |
+| ipsec.forceUDPEncaps | bool | `false` |  |
+| ipsec.ikePort | int | `500` |  |
+| ipsec.natPort | int | `4500` |  |
+| ipsec.psk | string | `""` |  |
+| leadership.leaseDuration | int | `10` |  |
+| leadership.renewDeadline | int | `5` |  |
+| leadership.retryPeriod | int | `2` |  |
+| operator.affinity | object | `{}` |  |
+| operator.image.pullPolicy | string | `"IfNotPresent"` |  |
+| operator.image.repository | string | `"quay.io/submariner/submariner-operator"` |  |
+| operator.image.tag | string | `"0.12.2"` |  |
+| operator.resources | object | `{}` |  |
+| operator.tolerations | list | `[]` |  |
+| rbac.create | bool | `true` |  |
+| serviceAccounts.gateway.create | bool | `true` |  |
+| serviceAccounts.gateway.name | string | `""` |  |
+| serviceAccounts.globalnet.create | bool | `true` |  |
+| serviceAccounts.globalnet.name | string | `""` |  |
+| serviceAccounts.lighthouseAgent.create | bool | `true` |  |
+| serviceAccounts.lighthouseAgent.name | string | `""` |  |
+| serviceAccounts.lighthouseCoreDns.create | bool | `true` |  |
+| serviceAccounts.lighthouseCoreDns.name | string | `""` |  |
+| serviceAccounts.operator.create | bool | `true` |  |
+| serviceAccounts.operator.name | string | `""` |  |
+| serviceAccounts.routeAgent.create | bool | `true` |  |
+| serviceAccounts.routeAgent.name | string | `""` |  |
+| submariner.cableDriver | string | `"libreswan"` |  |
+| 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.12.2"` |  |
+| submariner.natEnabled | bool | `false` |  |
+| submariner.serviceCidr | string | `""` |  |
+| submariner.serviceDiscovery | bool | `true` |  |
+| submariner.token | string | `""` |  |

submariner-operator/crds/crd.yaml

@@ -1,10 +1,11 @@
 ---
-apiVersion: apiextensions.k8s.io/v1beta1
+apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
-  name: submariners.submariner.io
   annotations:
-    controller-gen.kubebuilder.io/version: v0.3.0
+    controller-gen.kubebuilder.io/version: v0.4.1
+  creationTimestamp: null
+  name: submariners.submariner.io
 spec:
   group: submariner.io
   names:
@@ -13,9 +14,9 @@ spec:
     plural: submariners
     singular: submariner
   scope: Namespaced
-  subresources:
+  versions:
-    status: {}
+  - name: v1alpha1
-  validation:
+    schema:
       openAPIV3Schema:
         description: Submariner is the Schema for the submariners API
         properties:
@@ -42,24 +43,51 @@ spec:
                 type: string
               brokerK8sCA:
                 type: string
+              brokerK8sInsecure:
+                type: boolean
               brokerK8sRemoteNamespace:
                 type: string
               cableDriver:
                 type: string
               ceIPSecDebug:
                 type: boolean
+              ceIPSecForceUDPEncaps:
+                type: boolean
               ceIPSecIKEPort:
                 type: integer
               ceIPSecNATTPort:
                 type: integer
               ceIPSecPSK:
                 type: string
+              ceIPSecPreferredServer:
+                type: boolean
               clusterCIDR:
                 type: string
               clusterID:
                 type: string
               colorCodes:
                 type: string
+              connectionHealthCheck:
+                properties:
+                  enabled:
+                    type: boolean
+                  intervalSeconds:
+                    description: The interval at which health check pings are sent.
+                    format: int64
+                    type: integer
+                  maxPacketLossCount:
+                    description: The maximum number of packets lost at which the health
+                      checker will mark the connection as down.
+                    format: int64
+                    type: integer
+                type: object
+              coreDNSCustomConfig:
+                properties:
+                  configMapName:
+                    type: string
+                  namespace:
+                    type: string
+                type: object
               customDomains:
                 items:
                   type: string
@@ -69,6 +97,12 @@ spec:
                 type: boolean
               globalCIDR:
                 type: string
+              imageOverrides:
+                additionalProperties:
+                  type: string
+                type: object
+              loadBalancerEnabled:
+                type: boolean
               namespace:
                 type: string
               natEnabled:
@@ -105,6 +139,17 @@ spec:
                 type: string
               colorCodes:
                 type: string
+              deploymentInfo:
+                properties:
+                  cloudProvider:
+                    type: string
+                  kubernetesType:
+                    type: string
+                  kubernetesTypeVersion:
+                    type: string
+                  kubernetesVersion:
+                    type: string
+                type: object
               gatewayDaemonSetStatus:
                 properties:
                   lastResourceVersion:
@@ -114,8 +159,8 @@ spec:
                   nonReadyContainerStates:
                     items:
                       description: ContainerState holds a possible state of container.
-                      Only one of its members may be specified. If none of them is
+                        Only one of its members may be specified. If none of them
-                      specified, the default one is ContainerStateWaiting.
+                        is specified, the default one is ContainerStateWaiting.
                       properties:
                         running:
                           description: Details about a running container
@@ -141,20 +186,21 @@ spec:
                               format: date-time
                               type: string
                             message:
-                            description: Message regarding the last termination of
+                              description: Message regarding the last termination
-                              the container
+                                of the container
                               type: string
                             reason:
                               description: (brief) reason from the last termination
                                 of the container
                               type: string
                             signal:
-                            description: Signal from the last termination of the container
+                              description: Signal from the last termination of the
+                                container
                               format: int32
                               type: integer
                             startedAt:
-                            description: Time at which previous execution of the container
+                              description: Time at which previous execution of the
-                              started
+                                container started
                               format: date-time
                               type: string
                           required:
@@ -164,18 +210,19 @@ spec:
                           description: Details about a waiting container
                           properties:
                             message:
-                            description: Message regarding why the container is not
+                              description: Message regarding why the container is
-                              yet running.
+                                not yet running.
                               type: string
                             reason:
-                            description: (brief) reason the container is not yet running.
+                              description: (brief) reason the container is not yet
+                                running.
                               type: string
                           type: object
                       type: object
                     type: array
                   status:
-                  description: DaemonSetStatus represents the current status of a
+                    description: DaemonSetStatus represents the current status of
-                    daemon set.
+                      a daemon set.
                     properties:
                       collisionCount:
                         description: Count of hash collisions for the DaemonSet. The
@@ -185,11 +232,11 @@ spec:
                         format: int32
                         type: integer
                       conditions:
-                      description: Represents the latest available observations of
+                        description: Represents the latest available observations
-                        a DaemonSet's current state.
+                          of a DaemonSet's current state.
                         items:
-                        description: DaemonSetCondition describes the state of a DaemonSet
+                          description: DaemonSetCondition describes the state of a
-                          at a certain point.
+                            DaemonSet at a certain point.
                           properties:
                             lastTransitionTime:
                               description: Last time the condition transitioned from
@@ -287,6 +334,10 @@ spec:
                               cable_name:
                                 type: string
                               cluster_id:
+                                maxLength: 63
+                                minLength: 1
+                                type: string
+                              healthCheckIP:
                                 type: string
                               hostname:
                                 type: string
@@ -310,10 +361,30 @@ spec:
                             - public_ip
                             - subnets
                             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
+                          usingIP:
+                            type: string
+                          usingNAT:
+                            type: boolean
                         required:
                         - endpoint
                         - status
@@ -333,6 +404,10 @@ spec:
                         cable_name:
                           type: string
                         cluster_id:
+                          maxLength: 63
+                          minLength: 1
+                          type: string
+                        healthCheckIP:
                           type: string
                         hostname:
                           type: string
@@ -379,8 +454,8 @@ spec:
                   nonReadyContainerStates:
                     items:
                       description: ContainerState holds a possible state of container.
-                      Only one of its members may be specified. If none of them is
+                        Only one of its members may be specified. If none of them
-                      specified, the default one is ContainerStateWaiting.
+                        is specified, the default one is ContainerStateWaiting.
                       properties:
                         running:
                           description: Details about a running container
@@ -406,20 +481,21 @@ spec:
                               format: date-time
                               type: string
                             message:
-                            description: Message regarding the last termination of
+                              description: Message regarding the last termination
-                              the container
+                                of the container
                               type: string
                             reason:
                               description: (brief) reason from the last termination
                                 of the container
                               type: string
                             signal:
-                            description: Signal from the last termination of the container
+                              description: Signal from the last termination of the
+                                container
                               format: int32
                               type: integer
                             startedAt:
-                            description: Time at which previous execution of the container
+                              description: Time at which previous execution of the
-                              started
+                                container started
                               format: date-time
                               type: string
                           required:
@@ -429,18 +505,19 @@ spec:
                           description: Details about a waiting container
                           properties:
                             message:
-                            description: Message regarding why the container is not
+                              description: Message regarding why the container is
-                              yet running.
+                                not yet running.
                               type: string
                             reason:
-                            description: (brief) reason the container is not yet running.
+                              description: (brief) reason the container is not yet
+                                running.
                               type: string
                           type: object
                       type: object
                     type: array
                   status:
-                  description: DaemonSetStatus represents the current status of a
+                    description: DaemonSetStatus represents the current status of
-                    daemon set.
+                      a daemon set.
                     properties:
                       collisionCount:
                         description: Count of hash collisions for the DaemonSet. The
@@ -450,11 +527,11 @@ spec:
                         format: int32
                         type: integer
                       conditions:
-                      description: Represents the latest available observations of
+                        description: Represents the latest available observations
-                        a DaemonSet's current state.
+                          of a DaemonSet's current state.
                         items:
-                        description: DaemonSetCondition describes the state of a DaemonSet
+                          description: DaemonSetCondition describes the state of a
-                          at a certain point.
+                            DaemonSet at a certain point.
                           properties:
                             lastTransitionTime:
                               description: Last time the condition transitioned from
@@ -535,8 +612,36 @@ spec:
                 required:
                 - mismatchedContainerImages
                 type: object
+              loadBalancerStatus:
+                properties:
+                  status:
+                    description: LoadBalancerStatus represents the status of a load-balancer.
+                    properties:
+                      ingress:
+                        description: Ingress is a list containing ingress points for
+                          the load-balancer. Traffic intended for the service should
+                          be sent to these ingress points.
+                        items:
+                          description: 'LoadBalancerIngress represents the status
+                            of a load-balancer ingress point: traffic intended for
+                            the service should be sent to an ingress point.'
+                          properties:
+                            hostname:
+                              description: Hostname is set for load-balancer ingress
+                                points that are DNS based (typically AWS load-balancers)
+                              type: string
+                            ip:
+                              description: IP is set for load-balancer ingress points
+                                that are IP based (typically GCE or OpenStack load-balancers)
+                              type: string
+                          type: object
+                        type: array
+                    type: object
+                type: object
               natEnabled:
                 type: boolean
+              networkPlugin:
+                type: string
               routeAgentDaemonSetStatus:
                 properties:
                   lastResourceVersion:
@@ -546,8 +651,8 @@ spec:
                   nonReadyContainerStates:
                     items:
                       description: ContainerState holds a possible state of container.
-                      Only one of its members may be specified. If none of them is
+                        Only one of its members may be specified. If none of them
-                      specified, the default one is ContainerStateWaiting.
+                        is specified, the default one is ContainerStateWaiting.
                       properties:
                         running:
                           description: Details about a running container
@@ -573,20 +678,21 @@ spec:
                               format: date-time
                               type: string
                             message:
-                            description: Message regarding the last termination of
+                              description: Message regarding the last termination
-                              the container
+                                of the container
                               type: string
                             reason:
                               description: (brief) reason from the last termination
                                 of the container
                               type: string
                             signal:
-                            description: Signal from the last termination of the container
+                              description: Signal from the last termination of the
+                                container
                               format: int32
                               type: integer
                             startedAt:
-                            description: Time at which previous execution of the container
+                              description: Time at which previous execution of the
-                              started
+                                container started
                               format: date-time
                               type: string
                           required:
@@ -596,18 +702,19 @@ spec:
                           description: Details about a waiting container
                           properties:
                             message:
-                            description: Message regarding why the container is not
+                              description: Message regarding why the container is
-                              yet running.
+                                not yet running.
                               type: string
                             reason:
-                            description: (brief) reason the container is not yet running.
+                              description: (brief) reason the container is not yet
+                                running.
                               type: string
                           type: object
                       type: object
                     type: array
                   status:
-                  description: DaemonSetStatus represents the current status of a
+                    description: DaemonSetStatus represents the current status of
-                    daemon set.
+                      a daemon set.
                     properties:
                       collisionCount:
                         description: Count of hash collisions for the DaemonSet. The
@@ -617,11 +724,11 @@ spec:
                         format: int32
                         type: integer
                       conditions:
-                      description: Represents the latest available observations of
+                        description: Represents the latest available observations
-                        a DaemonSet's current state.
+                          of a DaemonSet's current state.
                         items:
-                        description: DaemonSetCondition describes the state of a DaemonSet
+                          description: DaemonSetCondition describes the state of a
-                          at a certain point.
+                            DaemonSet at a certain point.
                           properties:
                             lastTransitionTime:
                               description: Last time the condition transitioned from
@@ -709,11 +816,10 @@ spec:
             - natEnabled
             type: object
         type: object
-  version: v1alpha1
-  versions:
-  - name: v1alpha1
     served: true
     storage: true
+    subresources:
+      status: {}
 status:
   acceptedNames:
     kind: ""
@@ -725,7 +831,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.3.0
+    controller-gen.kubebuilder.io/version: v0.4.1
   creationTimestamp: null
   name: servicediscoveries.submariner.io
 spec:
@@ -763,10 +869,19 @@ spec:
                 type: string
               brokerK8sCA:
                 type: string
+              brokerK8sInsecure:
+                type: boolean
               brokerK8sRemoteNamespace:
                 type: string
               clusterID:
                 type: string
+              coreDNSCustomConfig:
+                properties:
+                  configMapName:
+                    type: string
+                  namespace:
+                    type: string
+                type: object
               customDomains:
                 items:
                   type: string
@@ -797,6 +912,18 @@ spec:
             type: object
           status:
             description: ServiceDiscoveryStatus defines the observed state of ServiceDiscovery
+            properties:
+              deploymentInfo:
+                properties:
+                  cloudProvider:
+                    type: string
+                  kubernetesType:
+                    type: string
+                  kubernetesTypeVersion:
+                    type: string
+                  kubernetesVersion:
+                    type: string
+                type: object
             type: object
         type: object
     served: true

submariner-operator/questions.yml

@@ -13,7 +13,7 @@ questions:
     type: string
     label: Submariner Operator Image Repository
   - variable: operator.image.tag
-    default: "0.7.0"
+    default: "0.12.2"
     description: "Submariner Operator Image Tag"
     type: string
     label: Submariner Operator Image Tag
@@ -31,7 +31,7 @@ questions:
     type: string
     label: Submariner Repository
   - variable: submariner.images.tag
-    default: "0.7.0"
+    default: "0.12.2"
     description: "Submariner Images Tag (shared for all non-operator images)"
     type: string
     label: Submariner Images Tag
@@ -136,3 +136,9 @@ questions:
   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

@@ -397,6 +397,7 @@ rules:
     resources:
       - configmaps
     verbs:
+      - create
       - get
       - list
       - watch
@@ -411,11 +412,13 @@ rules:
       - create
       - update
       - delete
-  - apiGroups:  # pods and services are looked up to figure out network settings
+      - watch
+  - apiGroups:  # pods, services and nodes are looked up to figure out network settings
       - ""
     resources:
       - pods
       - services
+      - nodes
     verbs:
       - get
       - list
@@ -436,6 +439,21 @@ 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
@@ -456,6 +474,29 @@ 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
@@ -637,14 +678,25 @@ 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:
@@ -654,6 +706,29 @@ rules:
       - get
       - list
       - watch
+  - apiGroups:
+      - submariner.io
+    resources:
+      - clusterglobalegressips
+      - globalegressips
+    verbs:
+      - create
+      - get
+      - list
+      - watch
+      - update
+  - apiGroups:
+      - submariner.io
+    resources:
+      - globalingressips
+    verbs:
+      - create
+      - get
+      - list
+      - watch
+      - update
+      - delete
+      - deletecollection
   - apiGroups:
       - multicluster.x-k8s.io
     resources:
@@ -662,6 +737,15 @@ rules:
       - get
       - list
       - watch
+  - apiGroups:
+      - network.openshift.io
+    resources:
+      - service/externalips
+    verbs:
+      - create
+      - get
+      - list
+      - delete
 ---
 {{- end -}}
 apiVersion: rbac.authorization.k8s.io/v1
@@ -708,6 +792,7 @@ rules:
       - discovery.k8s.io
     resources:
       - endpointslices
+      - endpointslices/restricted
     verbs:
       - create
       - get
@@ -720,6 +805,7 @@ rules:
       - submariner.io
     resources:
       - "gateways"
+      - "globalingressips"
     verbs:
       - get
       - list

submariner-operator/templates/submariner.yaml

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