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

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

.github/ISSUE_TEMPLATE/bug-report.md

@@ -23,9 +23,11 @@ Submariner Owners: https://github.com/orgs/submariner-io/teams/submariner-core
 **Anything else we need to know?**:
 
 **Environment**:
-- Diagnose information (use `subctl diagnose all`):
+- Submariner version (use `subctl version`):
-- Gather information (use `subctl gather`):
+- Kubernetes version (use `kubectl version`):
 - 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 be the right place for support requests.
+GitHub may not 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

@@ -1,13 +0,0 @@
-<!--  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: 120
+daysUntilStale: 60
 
 # 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_branch:
+  target_devel:
-    name: PR targets branch
+    name: PR targets release-0.9
     runs-on: ubuntu-latest
     steps:
-      - name: Check that the PR targets release-0.12
+      - name: Check that the PR targets release-0.9
-        if: ${{ github.base_ref != 'release-0.12' }}
+        if: ${{ github.base_ref != 'release-0.9' }}
         run: exit 1

.github/workflows/dependent-issues.yml

@@ -1,39 +0,0 @@
----
-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@70a1b2d4ee1cdc743af33498bd0204123953a887
-        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

@@ -1,37 +0,0 @@
----
-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@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
-
-      - 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 Default
+name: End to End Tests
 
 on:
   pull_request:
@@ -9,13 +9,28 @@ 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@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
+        uses: actions/checkout@v2
 
       - name: Run E2E deployment and tests
-        uses: submariner-io/shipyard/gh-actions/e2e@release-0.12
+        uses: submariner-io/shipyard/gh-actions/e2e@release-0.9
+        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
+        uses: submariner-io/shipyard/gh-actions/post-mortem@release-0.9

.github/workflows/flake_finder.yml

@@ -8,24 +8,23 @@ 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', 'vxlan']
+        cable_driver: ['libreswan', 'wireguard']
         globalnet: ['', 'globalnet']
         lighthouse: ['', 'lighthouse']
     steps:
       - name: Check out the repository
-        uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
+        uses: actions/checkout@v2
 
       - name: Run E2E deployment and tests
-        uses: submariner-io/shipyard/gh-actions/e2e@release-0.12
+        uses: submariner-io/shipyard/gh-actions/e2e@release-0.9
         with:
           using: ${{ matrix.cable_driver }} ${{ matrix.globalnet }} ${{ matrix.lighthouse }}
 
       - name: Post mortem
         if: failure()
-        uses: submariner-io/shipyard/gh-actions/post-mortem@release-0.12
+        uses: submariner-io/shipyard/gh-actions/post-mortem@release-0.9

.github/workflows/linting.yml

@@ -5,85 +5,26 @@ 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@55b867b9b28954e6f5c1a0fe2f729dc926c306d0
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: 'Verify no "Apply suggestions from code review" commits'
-        uses: tim-actions/commit-message-checker-with-regex@d6d9770051dd6460679d1cab1dcaa8cffc5c2bbd
-        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@d6d9770051dd6460679d1cab1dcaa8cffc5c2bbd
-        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@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
-
-      - name: Set up Helm
-        uses: azure/setup-helm@18bc76811624f360dbd7f18c2d4ecb32c7b87bab
-        with:
-          version: v3.6.0
-
-      - name: Set up Python
-        uses: actions/setup-python@dc73133d4da04e56a135ae2246682783cc7c7cb6
-        with:
-          python-version: '3.x'
-
-      - name: Set up helm/chart-testing
-        uses: helm/chart-testing-action@5f16c27cf7a4fa9c776ff73734df3909b2b65127
-
-      - 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@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
+        uses: actions/checkout@v2
         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@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
-
-      - 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@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
+        uses: actions/checkout@v2
 
       - name: Run markdown-link-check
-        uses: gaurav-nelson/github-action-markdown-link-check@9710f0fec812ce0a3b98bef4c9d842fc1f39d976
+        uses: gaurav-nelson/github-action-markdown-link-check@v1
         with:
           config-file: ".markdownlinkcheck.json"
           check-modified-files-only: "yes"
@@ -94,7 +35,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out the repository
-        uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
+        uses: actions/checkout@v2
       - name: Run markdownlint
         run: make markdownlint
 
@@ -103,10 +44,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out the repository
-        uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
+        uses: actions/checkout@v2
       - name: Run yamllint
-        uses: ibiqlik/action-yamllint@ed2b6e911569708ed121c14b87d513860a7e36a7
+        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
-          strict: true

.github/workflows/periodic.yml

@@ -8,20 +8,19 @@ 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@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
+        uses: actions/checkout@v2
 
       - name: Run markdown-link-check
-        uses: gaurav-nelson/github-action-markdown-link-check@9710f0fec812ce0a3b98bef4c9d842fc1f39d976
+        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@97e6f902a416aac38834e23fa52e166aad0437d2
+        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,16 +4,15 @@ name: Release Charts
 on:
   push:
     branches:
-      - release-0.12
+      - release-0.9
 
 jobs:
   release:
     name: Release
-    if: github.repository_owner == 'submariner-io'
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
+        uses: actions/checkout@v2
         with:
           fetch-depth: 0
 

.gitlint

@@ -0,0 +1,9 @@
+[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,9 +5,6 @@
     },
     {
       "pattern": "^http://localhost:"
-    },
-    {
-      "pattern": "^https://submariner-io.github.io/submariner-charts/charts"
     }
   ]
 }

.markdownlint.yml

@@ -10,7 +10,3 @@ 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

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

.shipyard.e2e.yml

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

.submarinerbot.yaml

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

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

@@ -1,5 +1,5 @@
 ARG BASE_BRANCH
-FROM quay.io/submariner/shipyard-dapper-base:${BASE_BRANCH}
+FROM quay.io/submariner/shipyard-dapper-base:release-0.9
 
 ARG DAPPER_HOST_ARCH
 ENV HOST_ARCH=${DAPPER_HOST_ARCH} ARCH=${DAPPER_HOST_ARCH} \

Makefile

@@ -1,4 +1,4 @@
-BASE_BRANCH ?= release-0.12
+BASE_BRANCH ?= release-0.9
 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,8 +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)
 
 # Process extra flags from the `using=a,b,c` optional flag
@@ -42,20 +42,6 @@ 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)
@@ -65,7 +51,7 @@ release: submariner-k8s-broker-$(CHARTS_VERSION).tgz submariner-operator-$(CHART
 	  helm repo index $(CHARTS_DIR) --url $(GH_URL); \
 	fi
 
-.PHONY: release helm-docs
+.PHONY: release
 
 else
 

README.md

@@ -1,12 +1,5 @@
 # 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

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

submariner-k8s-broker/README.md

@@ -1,26 +0,0 @@
-# submariner-k8s-broker
-
-![Version: 0.6.0](https://img.shields.io/badge/Version-0.6.0-informational?style=flat-square) ![AppVersion: 0.6.0](https://img.shields.io/badge/AppVersion-0.6.0-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,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/templates/rbac.yaml

@@ -2,7 +2,7 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
-  name: {{ template "submariner-k8s-broker.fullname" . }}-cluster
+  name: {{ template "submariner-k8s-broker.fullname" . }}:client
   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", "endpointslices/restricted"]
+  resources: ["endpointslices"]
   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" . }}-cluster
+  name: {{ template "submariner-k8s-broker.fullname" . }}:client
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role
-  name: {{ template "submariner-k8s-broker.fullname" . }}-cluster
+  name: {{ template "submariner-k8s-broker.fullname" . }}:client
 subjects:
 - kind: ServiceAccount
   name: {{ template "submariner-k8s-broker.clientServiceAccountName" . }}

submariner-operator/Chart.yaml

@@ -1,14 +1,12 @@
 ---
 name: submariner-operator
-version: 0.10.1
+version: 0.7.0
-apiVersion: v2
+appVersion: 0.7.0
-appVersion: 0.10.1
 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: Contributors to the Submariner project
+  - name: Submariner Developers
     email: submariner-dev@googlegroups.com
-    url: https://submariner.io/

submariner-operator/README.md

@@ -1,71 +0,0 @@
-# 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)
-
-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.10.1"` |  |
-| 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.10.1"` |  |
-| 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.10.1"` |  |
-| submariner.natEnabled | bool | `false` |  |
-| submariner.serviceCidr | string | `""` |  |
-| submariner.serviceDiscovery | bool | `true` |  |
-| submariner.token | string | `""` |  |

submariner-operator/questions.yml

@@ -13,7 +13,7 @@ questions:
     type: string
     label: Submariner Operator Image Repository
   - variable: operator.image.tag
-    default: "0.10.1"
+    default: "0.7.0"
     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.10.1"
+    default: "0.7.0"
     description: "Submariner Images Tag (shared for all non-operator images)"
     type: string
     label: Submariner Images Tag
@@ -136,9 +136,3 @@ 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,7 +397,6 @@ rules:
     resources:
       - configmaps
     verbs:
-      - create
       - get
       - list
       - watch
@@ -412,13 +411,11 @@ rules:
       - create
       - update
       - delete
-      - watch
+  - apiGroups:  # pods and services are looked up to figure out network settings
-  - apiGroups:  # pods, services and nodes are looked up to figure out network settings
       - ""
     resources:
       - pods
       - services
-      - nodes
     verbs:
       - get
       - list
@@ -439,21 +436,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 +456,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 +637,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:
@@ -706,29 +654,6 @@ 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:
@@ -737,15 +662,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 +708,6 @@ rules:
       - discovery.k8s.io
     resources:
       - endpointslices
-      - endpointslices/restricted
     verbs:
       - create
       - get
@@ -805,7 +720,6 @@ rules:
       - submariner.io
     resources:
       - "gateways"
-      - "globalingressips"
     verbs:
       - get
       - list

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