Bump helm/chart-testing-action from 2.2.1 to 2.3.0

Bumps [helm/chart-testing-action](https://github.com/helm/chart-testing-action) from 2.2.1 to 2.3.0.
- [Release notes](https://github.com/helm/chart-testing-action/releases)
- [Commits](https://github.com/helm/chart-testing-action/compare/dae259e86a35ff09145c0805e2d7dd3f7207064a...09ed88797198755e5031f25be13da255e7e33aad)

---
updated-dependencies:
- dependency-name: helm/chart-testing-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

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

.github/dependabot.yml

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

.github/workflows/branch.yml

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

.github/workflows/dependent-issues.yml

@@ -17,7 +17,7 @@ on:
       - reopened
       - synchronize
   schedule:
-    - cron: '0 0/6 * * *' # every 6 hours
+    - cron: '0 0/6 * * *'  # every 6 hours
 
 jobs:
   check:

.github/workflows/e2e-full.yml

@@ -16,22 +16,21 @@ jobs:
       matrix:
         cable_driver: ['libreswan', 'wireguard', 'vxlan']
         globalnet: ['', 'globalnet']
-        k8s_version: ['1.23']
+        k8s_version: ['1.24']
         lighthouse: ['', 'lighthouse']
         include:
-          - k8s_version: '1.20'
-          - k8s_version: '1.21'
           - k8s_version: '1.22'
+          - k8s_version: '1.23'
     steps:
       - name: Check out the repository
         uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
 
       - name: Run E2E deployment and tests
-        uses: submariner-io/shipyard/gh-actions/e2e@release-0.12
+        uses: submariner-io/shipyard/gh-actions/e2e@devel
         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@devel

.github/workflows/e2e.yml

@@ -14,8 +14,8 @@ jobs:
         uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
 
       - name: Run E2E deployment and tests
-        uses: submariner-io/shipyard/gh-actions/e2e@release-0.12
+        uses: submariner-io/shipyard/gh-actions/e2e@devel
 
       - name: Post mortem
         if: failure()
-        uses: submariner-io/shipyard/gh-actions/post-mortem@release-0.12
+        uses: submariner-io/shipyard/gh-actions/post-mortem@devel

.github/workflows/flake_finder.yml

@@ -22,10 +22,10 @@ jobs:
         uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
 
       - name: Run E2E deployment and tests
-        uses: submariner-io/shipyard/gh-actions/e2e@release-0.12
+        uses: submariner-io/shipyard/gh-actions/e2e@devel
         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@devel

.github/workflows/linting.yml

@@ -39,17 +39,17 @@ jobs:
         uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
 
       - name: Set up Helm
-        uses: azure/setup-helm@18bc76811624f360dbd7f18c2d4ecb32c7b87bab
+        uses: azure/setup-helm@217bf70cbd2e930ba2e81ba7e1de2f7faecc42ba
         with:
           version: v3.6.0
 
       - name: Set up Python
-        uses: actions/setup-python@d09bd5e6005b175076f227b13d9730d56e9dcfcb
+        uses: actions/setup-python@b55428b1882923874294fa556849718a1d7f2ca5
         with:
           python-version: '3.x'
 
       - name: Set up helm/chart-testing
-        uses: helm/chart-testing-action@dae259e86a35ff09145c0805e2d7dd3f7207064a
+        uses: helm/chart-testing-action@09ed88797198755e5031f25be13da255e7e33aad
 
       - name: Run helm/chart-testing (lint)
         run: ct lint --config ct.yaml
@@ -105,8 +105,4 @@ jobs:
       - name: Check out the repository
         uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
       - name: Run yamllint
-        uses: ibiqlik/action-yamllint@81e214fd484713882ce4237cb7cd264d550856cf
+        run: make yamllint
-        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/release.yml

@@ -4,7 +4,7 @@ name: Release Charts
 on:
   push:
     branches:
-      - release-0.12
+      - devel
 
 jobs:
   release:

.gitignore

@@ -3,3 +3,4 @@
 .shflags
 *.tgz
 Makefile.dapper
+Dockerfile.*

.markdownlinkcheck.json

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

.shipyard.e2e.ovn.yml

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

.shipyard.e2e.yml

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

.submarinerbot.yaml

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

.yamllint.yml

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

Dockerfile.dapper

@@ -1,18 +0,0 @@
-ARG BASE_BRANCH
-FROM quay.io/submariner/shipyard-dapper-base:${BASE_BRANCH}
-
-ARG DAPPER_HOST_ARCH
-ENV HOST_ARCH=${DAPPER_HOST_ARCH} ARCH=${DAPPER_HOST_ARCH} \
-    DAPPER_ENV="REPO TAG QUAY_USERNAME QUAY_PASSWORD GITHUB_SHA MAKEFLAGS CLUSTERS_ARGS DEPLOY_ARGS E2E_ARGS RELEASE_ARGS" \
-    DAPPER_SOURCE=/go/src/github.com/submariner-io/submariner-charts DAPPER_DOCKER_SOCKET=true
-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/
-
-ENTRYPOINT ["/opt/shipyard/scripts/entry"]
-CMD ["sh"]

Makefile

@@ -1,5 +1,6 @@
-BASE_BRANCH ?= release-0.12
+BASE_BRANCH ?= devel
 export BASE_BRANCH
+export HELM_REPO_LOCATION=.
 
 ifneq (,$(DAPPER_HOST_ARCH))
 
@@ -10,30 +11,18 @@ PRELOAD_IMAGES := submariner-gateway submariner-operator submariner-route-agent
 include $(SHIPYARD_DIR)/Makefile.inc
 
 ifneq (,$(filter ovn,$(_using)))
-CLUSTER_SETTINGS_FLAG = --settings $(DAPPER_SOURCE)/.shipyard.e2e.ovn.yml
+export SETTINGS = $(DAPPER_SOURCE)/.shipyard.e2e.ovn.yml
 else
-CLUSTER_SETTINGS_FLAG = --settings $(DAPPER_SOURCE)/.shipyard.e2e.yml
+export SETTINGS = $(DAPPER_SOURCE)/.shipyard.e2e.yml
 endif
 
-override CLUSTERS_ARGS += $(CLUSTER_SETTINGS_FLAG)
+export DEPLOYTOOL = helm
-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.13.0-rc2
 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
-
-ifneq (,$(filter lighthouse,$(_using)))
-override DEPLOY_ARGS += --service_discovery
-endif
-
-ifneq (,$(filter globalnet,$(_using)))
-override DEPLOY_ARGS += --globalnet
-endif
-
 # Targets to make
 
 e2e: E2E_ARGS=cluster1 cluster2

README.md

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

ct.yaml

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

deploy_helm

@@ -1,76 +0,0 @@
-# shellcheck shell=bash
-# shellcheck source=scripts/shared/lib/source_only
-. "${BASH_SOURCE%/*}"/source_only
-
-### Constants ###
-
-readonly SUBMARINER_BROKER_NS=submariner-k8s-broker
-readonly SUBMARINER_PSK=$(LC_CTYPE=C tr -dc 'a-zA-Z0-9' < /dev/urandom | fold -w 64 | head -n 1)
-
-### Functions ###
-
-function deploytool_prereqs() {
-    helm version
-}
-
-function setup_broker() {
-    if kubectl get crd clusters.submariner.io > /dev/null 2>&1; then
-        echo "Submariner CRDs already exist, skipping broker creation..."
-    else
-        echo "Installing submariner broker..."
-        # shellcheck disable=SC2086 # Split on purpose
-        helm install "${SUBMARINER_BROKER_NS}" ./submariner-k8s-broker \
-             --create-namespace \
-             --kube-context "${cluster}" \
-             --namespace "${SUBMARINER_BROKER_NS}" \
-             ${deploytool_broker_args}
-    fi
-
-    submariner_broker_url=$(kubectl -n default get endpoints kubernetes -o jsonpath="{.subsets[0].addresses[0].ip}:{.subsets[0].ports[?(@.name=='https')].port}")
-    submariner_broker_ca=$(kubectl -n "${SUBMARINER_BROKER_NS}" get secrets -o jsonpath="{.items[?(@.metadata.annotations['kubernetes\.io/service-account\.name']=='${SUBMARINER_BROKER_NS}-client')].data['ca\.crt']}")
-    submariner_broker_token=$(kubectl -n "${SUBMARINER_BROKER_NS}" get secrets -o jsonpath="{.items[?(@.metadata.annotations['kubernetes\.io/service-account\.name']=='${SUBMARINER_BROKER_NS}-client')].data.token}"|base64 --decode)
-}
-
-function helm_install_subm() {
-    local crd_create=false
-    [[ "${cluster}" = "${broker}" ]] || crd_create=true
-
-    if kubectl wait --for=condition=Ready pods -l app=submariner-operator -n "${SUBM_NS}" --timeout=60s > /dev/null 2>&1; then
-        echo "Submariner already installed, skipping installation..."
-        return
-    fi
-
-    echo "Installing Submariner..."
-    # shellcheck disable=SC2086 # Split on purpose
-    helm --kube-context "${cluster}" install submariner-operator \
-        ./submariner-operator \
-        --create-namespace \
-        --namespace "${SUBM_NS}" \
-        --set ipsec.psk="${SUBMARINER_PSK}" \
-        --set broker.server="${submariner_broker_url}" \
-        --set broker.token="${submariner_broker_token}" \
-        --set broker.namespace="${SUBMARINER_BROKER_NS}" \
-        --set broker.ca="${submariner_broker_ca}" \
-        --set broker.globalnet="${globalnet}" \
-        --set submariner.serviceDiscovery="${service_discovery}" \
-        --set submariner.cableDriver="${cable_driver}" \
-        --set submariner.clusterId="${cluster}" \
-        --set submariner.clusterCidr="${cluster_CIDRs[$cluster]}" \
-        --set submariner.serviceCidr="${service_CIDRs[$cluster]}" \
-        --set submariner.globalCidr="${global_CIDRs[$cluster]}" \
-        --set serviceAccounts.globalnet.create="${globalnet}" \
-        --set serviceAccounts.lighthouseAgent.create="${service_discovery}" \
-        --set serviceAccounts.lighthouseCoreDns.create="${service_discovery}" \
-        --set submariner.natEnabled="false" \
-        --set operator.image.repository="localhost:5000/submariner-operator" \
-        --set operator.image.tag="local" \
-        --set operator.image.pullPolicy="IfNotPresent" \
-        --set submariner.images.repository="localhost:5000" \
-        --set submariner.images.tag="local" \
-        --set brokercrds.create="${crd_create}" \
-        ${deploytool_submariner_args}
-}
-
-function install_subm_all_clusters() {
-    run_subm_clusters helm_install_subm
-}

submariner-k8s-broker/Chart.yaml

@@ -1,8 +1,8 @@
 ---
 name: submariner-k8s-broker
-version: 0.6.0
+version: 0.13.0-rc2
 apiVersion: v2
-appVersion: 0.6.0
+appVersion: 0.13.0-rc2
 description: Submariner Kubernetes Broker
 keywords:
 home: https://submariner-io.github.io/

submariner-k8s-broker/README.md

@@ -1,6 +1,6 @@
 # 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)
+![Version: 0.13.0](https://img.shields.io/badge/Version-0.13.0-informational?style=flat-square) ![AppVersion: 0.13.0](https://img.shields.io/badge/AppVersion-0.13.0-informational?style=flat-square)
 
 Submariner Kubernetes Broker
 

submariner-k8s-broker/questions.yml

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

submariner-k8s-broker/templates/NOTES.txt

@@ -6,5 +6,5 @@ You can retrieve the server URL by running
 
 The broker client token and CA can be retrieved by running
 
-  $ SUBMARINER_BROKER_CA=$(kubectl -n {{ .Release.Namespace }} get secrets -o jsonpath="{.items[?(@.metadata.annotations['kubernetes\.io/service-account\.name']=='{{ template "submariner-k8s-broker.clientServiceAccountName" . }}')].data['ca\.crt']}")
+  $ SUBMARINER_BROKER_CA=$(kubectl -n "${SUBMARINER_BROKER_NS}" get secrets "${SUBMARINER_BROKER_NS}-client-token" -o jsonpath="{.data['ca\.crt']}")
-  $ SUBMARINER_BROKER_TOKEN=$(kubectl -n {{ .Release.Namespace }} get secrets -o jsonpath="{.items[?(@.metadata.annotations['kubernetes\.io/service-account\.name']=='{{ template "submariner-k8s-broker.clientServiceAccountName" . }}')].data.token}"|base64 --decode)
+  $ SUBMARINER_BROKER_TOKEN=$(kubectl -n "${SUBMARINER_BROKER_NS}" get secrets "${SUBMARINER_BROKER_NS}-client-token" -o jsonpath="{.data.token}"|base64 --decode)

submariner-k8s-broker/templates/svc-acct.yaml

@@ -8,4 +8,12 @@ metadata:
     release: {{ .Release.Name | quote }}
     chart: {{ template "submariner-k8s-broker.chart" . }}
     app: {{ template "submariner-k8s-broker.name" . }}
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ template "submariner-k8s-broker.clientServiceAccountName" . }}-token
+  annotations:
+    kubernetes.io/service-account.name: {{ template "submariner-k8s-broker.clientServiceAccountName" . }}
+type: kubernetes.io/service-account-token
 {{- end }}

submariner-operator/Chart.yaml

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

submariner-operator/README.md

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

submariner-operator/questions.yml

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

submariner-operator/templates/rbac.yaml

@@ -162,6 +162,17 @@ rules:
     - patch
     - update
     - watch
+- apiGroups:
+    - coordination.k8s.io
+  resources:
+    - leases
+  verbs:
+    - get
+    - list
+    - watch
+    - create
+    - update
+    - delete
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding

submariner-operator/templates/svc-acct.yaml

@@ -8,6 +8,14 @@ metadata:
     release: {{ .Release.Name | quote }}
     chart: {{ template "submariner.chart" . }}
     app: {{ template "submariner.name" . }}
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ template "submariner.operatorServiceAccountName" . }}-token
+  annotations:
+    kubernetes.io/service-account.name: {{ template "submariner.operatorServiceAccountName" . }}
+type: kubernetes.io/service-account-token
 {{- end }}
 ---
 {{- if .Values.serviceAccounts.gateway.create }}
@@ -20,6 +28,14 @@ metadata:
     release: {{ .Release.Name | quote }}
     chart: {{ template "submariner.chart" . }}
     app: {{ template "submariner.name" . }}
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ template "submariner.gatewayServiceAccountName" . }}-token
+  annotations:
+    kubernetes.io/service-account.name: {{ template "submariner.gatewayServiceAccountName" . }}
+type: kubernetes.io/service-account-token
 {{- end }}
 ---
 {{- if .Values.serviceAccounts.routeAgent.create }}
@@ -32,6 +48,14 @@ metadata:
     release: {{ .Release.Name | quote }}
     chart: {{ template "submariner.chart" . }}
     app: {{ template "submariner.name" . }}
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ template "submariner.routeAgentServiceAccountName" . }}-token
+  annotations:
+    kubernetes.io/service-account.name: {{ template "submariner.routeAgentServiceAccountName" . }}
+type: kubernetes.io/service-account-token
 {{- end }}
 ---
 {{- if .Values.serviceAccounts.globalnet.create }}
@@ -44,6 +68,14 @@ metadata:
     release: {{ .Release.Name | quote }}
     chart: {{ template "submariner.chart" . }}
     app: {{ template "submariner.name" . }}
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ template "submariner.globalnetServiceAccountName" . }}-token
+  annotations:
+    kubernetes.io/service-account.name: {{ template "submariner.globalnetServiceAccountName" . }}
+type: kubernetes.io/service-account-token
 {{- end }}
 ---
 {{- if .Values.serviceAccounts.lighthouseAgent.create }}
@@ -56,6 +88,14 @@ metadata:
     release: {{ .Release.Name | quote }}
     chart: {{ template "submariner.chart" . }}
     app: {{ template "submariner.name" . }}
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ template "submariner.lighthouseAgentServiceAccountName" . }}-token
+  annotations:
+    kubernetes.io/service-account.name: {{ template "submariner.lighthouseAgentServiceAccountName" . }}
+type: kubernetes.io/service-account-token
 {{- end }}
 ---
   {{- if .Values.serviceAccounts.lighthouseCoreDns.create }}
@@ -68,4 +108,12 @@ metadata:
     release: {{ .Release.Name | quote }}
     chart: {{ template "submariner.chart" . }}
     app: {{ template "submariner.name" . }}
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ template "submariner.lighthouseCoreDnsServiceAccountName" . }}-token
+  annotations:
+    kubernetes.io/service-account.name: {{ template "submariner.lighthouseCoreDnsServiceAccountName" . }}
+type: kubernetes.io/service-account-token
   {{- end }}

submariner-operator/values.yaml

@@ -14,7 +14,7 @@ submariner:
   coreDNSCustomConfig: {}
   images:
     repository: quay.io/submariner
-    tag: "0.10.1"
+    tag: "0.13.0-rc2"
 broker:
   server: example.k8s.apiserver
   token: test
@@ -37,7 +37,7 @@ leadership:
 operator:
   image:
     repository: quay.io/submariner/submariner-operator
-    tag: "0.10.1"
+    tag: "0.13.0-rc2"
     pullPolicy: IfNotPresent
   resources: {}
   tolerations: []
@@ -45,7 +45,7 @@ operator:
 gateway:
   image:
     repository: quay.io/submariner/submariner-gateway
-    tag: "0.10.1"
+    tag: "0.13.0-rc2"
 serviceAccounts:
   operator:
     create: true