Bump helm/chart-testing-action from 2.6.0 to 2.6.1

Bumps [helm/chart-testing-action](https://github.com/helm/chart-testing-action) from 2.6.0 to 2.6.1.
- [Release notes](https://github.com/helm/chart-testing-action/releases)
- [Commits](https://github.com/helm/chart-testing-action/compare/b43128a8b25298e1e7b043b78ea6613844e079b1...e6669bcd63d7cb57cb4380c33043eebe5d111992)

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

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

.github/dependabot.yml

@@ -10,8 +10,3 @@ updates:
     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 devel
-        if: ${{ github.base_ref != 'devel' }}
+      - name: Check that the PR targets release-0.13
+        if: ${{ github.base_ref != 'release-0.13' }}
         run: exit 1

.github/workflows/dependent-issues.yml

@@ -25,7 +25,7 @@ jobs:
     if: github.repository_owner == 'submariner-io'
     runs-on: ubuntu-latest
     steps:
-      - uses: z0al/dependent-issues@0fae07162bc9e0d8e116a133bd03686eed6efa21
+      - uses: z0al/dependent-issues@950226e7ca8fc43dc209a7febf67c655af3bdb43
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:

.github/workflows/e2e-full.yml

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

.github/workflows/e2e.yml

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

.github/workflows/flake_finder.yml

@@ -19,13 +19,13 @@ jobs:
         lighthouse: ['', 'lighthouse']
     steps:
       - name: Check out the repository
-        uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
 
       - name: Run E2E deployment and tests
-        uses: submariner-io/shipyard/gh-actions/e2e@devel
+        uses: submariner-io/shipyard/gh-actions/e2e@release-0.13
         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.13

.github/workflows/linting.yml

@@ -11,12 +11,12 @@ jobs:
     steps:
       - name: Get PR commits
         id: 'get-pr-commits'
-        uses: tim-actions/get-pr-commits@c64db31d359214d244884dd68f971a110b29ab83
+        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@d6d9770051dd6460679d1cab1dcaa8cffc5c2bbd
+        uses: tim-actions/commit-message-checker-with-regex@094fc16ff83d04e2ec73edb5eaf6aa267db33791
         with:
           commits: ${{ steps.get-pr-commits.outputs.commits }}
           pattern: '^(?!.*(apply suggestions from code review))'
@@ -24,7 +24,7 @@ jobs:
           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
+        uses: tim-actions/commit-message-checker-with-regex@094fc16ff83d04e2ec73edb5eaf6aa267db33791
         with:
           commits: ${{ steps.get-pr-commits.outputs.commits }}
           pattern: '^(?!fixup!)'
@@ -36,20 +36,20 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out the repository
-        uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
 
       - name: Set up Helm
-        uses: azure/setup-helm@217bf70cbd2e930ba2e81ba7e1de2f7faecc42ba
+        uses: azure/setup-helm@5119fcb9089d432beecbf79bb2c7915207344b78
         with:
           version: v3.6.0
 
       - name: Set up Python
-        uses: actions/setup-python@b55428b1882923874294fa556849718a1d7f2ca5
+        uses: actions/setup-python@65d7f2d534ac1bc67fcd62888c5f4f3d2cb2b236
         with:
           python-version: '3.x'
 
       - name: Set up helm/chart-testing
-        uses: helm/chart-testing-action@09ed88797198755e5031f25be13da255e7e33aad
+        uses: helm/chart-testing-action@e6669bcd63d7cb57cb4380c33043eebe5d111992
 
       - name: Run helm/chart-testing (lint)
         run: ct lint --config ct.yaml
@@ -59,7 +59,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out the repository
-        uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
         with:
           fetch-depth: 0
       - name: Run gitlint
@@ -70,7 +70,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out the repository
-        uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
 
       - name: Run helm-docs and verify docs are up-to-date
         run: make helm-docs
@@ -80,10 +80,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out the repository
-        uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
 
       - name: Run markdown-link-check
-        uses: gaurav-nelson/github-action-markdown-link-check@228fbf4ffb2a86a65314866e9b2322b519fd885f
+        uses: gaurav-nelson/github-action-markdown-link-check@d53a906aa6b22b8979d33bc86170567e619495ec
         with:
           config-file: ".markdownlinkcheck.json"
           check-modified-files-only: "yes"
@@ -94,7 +94,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out the repository
-        uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
       - name: Run markdownlint
         run: make markdownlint
 
@@ -103,6 +103,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out the repository
-        uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
       - name: Run yamllint
         run: make yamllint

.github/workflows/periodic.yml

@@ -12,16 +12,16 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out the repository
-        uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
 
       - name: Run markdown-link-check
-        uses: gaurav-nelson/github-action-markdown-link-check@228fbf4ffb2a86a65314866e9b2322b519fd885f
+        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@99b87c35610e986ad2034a7b0518a9b3ebea541b
+        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,7 +4,7 @@ name: Release Charts
 on:
   push:
     branches:
-      - devel
+      - release-0.13
 
 jobs:
   release:
@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
         with:
           fetch-depth: 0
 

.gitignore

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

.shipyard.e2e.ovn.yml

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

.shipyard.e2e.yml

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

Dockerfile.dapper

@@ -0,0 +1,18 @@
+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,6 +1,5 @@
-BASE_BRANCH ?= devel
+BASE_BRANCH ?= release-0.13
 export BASE_BRANCH
-export HELM_REPO_LOCATION=.
 
 ifneq (,$(DAPPER_HOST_ARCH))
 
@@ -11,18 +10,30 @@ PRELOAD_IMAGES := submariner-gateway submariner-operator submariner-route-agent
 include $(SHIPYARD_DIR)/Makefile.inc
 
 ifneq (,$(filter ovn,$(_using)))
-export SETTINGS = $(DAPPER_SOURCE)/.shipyard.e2e.ovn.yml
+CLUSTER_SETTINGS_FLAG = --settings $(DAPPER_SOURCE)/.shipyard.e2e.ovn.yml
 else
-export SETTINGS = $(DAPPER_SOURCE)/.shipyard.e2e.yml
+CLUSTER_SETTINGS_FLAG = --settings $(DAPPER_SOURCE)/.shipyard.e2e.yml
 endif
 
-export DEPLOYTOOL = helm
+override CLUSTERS_ARGS += $(CLUSTER_SETTINGS_FLAG)
+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.13.0-rc2
+CHARTS_VERSION=0.10.1
 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

deploy_helm

@@ -0,0 +1,76 @@
+# 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.13.0-rc2
+version: 0.6.0
 apiVersion: v2
-appVersion: 0.13.0-rc2
+appVersion: 0.6.0
 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.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)
+![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
 

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 "${SUBMARINER_BROKER_NS}" get secrets "${SUBMARINER_BROKER_NS}-client-token" -o jsonpath="{.data['ca\.crt']}")
-  $ SUBMARINER_BROKER_TOKEN=$(kubectl -n "${SUBMARINER_BROKER_NS}" get secrets "${SUBMARINER_BROKER_NS}-client-token" -o jsonpath="{.data.token}"|base64 --decode)
+  $ 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_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-k8s-broker/templates/svc-acct.yaml

@@ -8,12 +8,4 @@ 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.13.0-rc2
+version: 0.10.1
 apiVersion: v2
-appVersion: 0.13.0-rc2
+appVersion: 0.10.1
 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.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)
+![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
 
@@ -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.13.0-rc2"` |  |
+| gateway.image.tag | string | `"0.10.1"` |  |
 | 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.13.0-rc2"` |  |
+| operator.image.tag | string | `"0.10.1"` |  |
 | 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.13.0-rc2"` |  |
+| submariner.images.tag | string | `"0.10.1"` |  |
 | submariner.natEnabled | bool | `false` |  |
 | submariner.serviceCidr | string | `""` |  |
 | submariner.serviceDiscovery | bool | `true` |  |

submariner-operator/questions.yml

@@ -14,7 +14,7 @@ questions:
         type: string
         label: Submariner Operator Image Repository
       - variable: operator.image.tag
-        default: "0.13.0-rc2"
+        default: "0.10.1"
         description: "Submariner Operator Image Tag"
         type: string
         label: Submariner Operator Image Tag
@@ -32,7 +32,7 @@ questions:
         type: string
         label: Submariner Repository
       - variable: submariner.images.tag
-        default: "0.13.0-rc2"
+        default: "0.10.1"
         description: "Submariner Images Tag (shared for all non-operator images)"
         type: string
         label: Submariner Images Tag

submariner-operator/templates/rbac.yaml

@@ -162,17 +162,6 @@ 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,14 +8,6 @@ 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 }}
@@ -28,14 +20,6 @@ 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 }}
@@ -48,14 +32,6 @@ 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 }}
@@ -68,14 +44,6 @@ 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 }}
@@ -88,14 +56,6 @@ 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 }}
@@ -108,12 +68,4 @@ 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.13.0-rc2"
+    tag: "0.10.1"
 broker:
   server: example.k8s.apiserver
   token: test
@@ -37,7 +37,7 @@ leadership:
 operator:
   image:
     repository: quay.io/submariner/submariner-operator
-    tag: "0.13.0-rc2"
+    tag: "0.10.1"
     pullPolicy: IfNotPresent
   resources: {}
   tolerations: []
@@ -45,7 +45,7 @@ operator:
 gateway:
   image:
     repository: quay.io/submariner/submariner-gateway
-    tag: "0.13.0-rc2"
+    tag: "0.10.1"
 serviceAccounts:
   operator:
     create: true