Bump to 0.11.2

Signed-off-by: Mike Kolesnik <mkolesni@redhat.com>

.github/dependabot.yml

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

.github/workflows/branch.yml

@@ -5,10 +5,10 @@ on:
   pull_request:
 
 jobs:
-  target_branch:
+  target_devel:
-    name: PR targets branch
+    name: PR targets release-0.11
     runs-on: ubuntu-latest
     steps:
-      - name: Check that the PR targets devel
+      - name: Check that the PR targets release-0.11
-        if: ${{ github.base_ref != 'devel' }}
+        if: ${{ github.base_ref != 'release-0.11' }}
         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:
@@ -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@70a1b2d4ee1cdc743af33498bd0204123953a887
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:

.github/workflows/e2e-full.yml

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

.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@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
 
       - name: Run E2E deployment and tests
-        uses: submariner-io/shipyard/gh-actions/e2e@devel
+        uses: submariner-io/shipyard/gh-actions/e2e@release-0.11
 
       - name: Post mortem
         if: failure()
-        uses: submariner-io/shipyard/gh-actions/post-mortem@devel
+        uses: submariner-io/shipyard/gh-actions/post-mortem@release-0.11

.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@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
 
       - name: Run E2E deployment and tests
-        uses: submariner-io/shipyard/gh-actions/e2e@devel
+        uses: submariner-io/shipyard/gh-actions/e2e@release-0.11
         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.11

.github/workflows/linting.yml

@@ -11,7 +11,7 @@ jobs:
     steps:
       - name: Get PR commits
         id: 'get-pr-commits'
-        uses: tim-actions/get-pr-commits@c64db31d359214d244884dd68f971a110b29ab83
+        uses: tim-actions/get-pr-commits@55b867b9b28954e6f5c1a0fe2f729dc926c306d0
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
 
@@ -23,33 +23,25 @@ jobs:
           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@2541b1294d2704b0964813337f33b291d3f8596b
+        uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
 
       - name: Set up Helm
-        uses: azure/setup-helm@217bf70cbd2e930ba2e81ba7e1de2f7faecc42ba
+        uses: azure/setup-helm@18bc76811624f360dbd7f18c2d4ecb32c7b87bab
         with:
           version: v3.6.0
 
       - name: Set up Python
-        uses: actions/setup-python@98f2ad02fd48d057ee3b4d4f66525b231c3e52b6
+        uses: actions/setup-python@dc73133d4da04e56a135ae2246682783cc7c7cb6
         with:
           python-version: '3.x'
 
       - name: Set up helm/chart-testing
-        uses: helm/chart-testing-action@dae259e86a35ff09145c0805e2d7dd3f7207064a
+        uses: helm/chart-testing-action@5f16c27cf7a4fa9c776ff73734df3909b2b65127
 
       - name: Run helm/chart-testing (lint)
         run: ct lint --config ct.yaml
@@ -59,7 +51,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out the repository
-        uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
+        uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
         with:
           fetch-depth: 0
       - name: Run gitlint
@@ -70,7 +62,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out the repository
-        uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
+        uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
 
       - name: Run helm-docs and verify docs are up-to-date
         run: make helm-docs
@@ -80,10 +72,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out the repository
-        uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
+        uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
 
       - name: Run markdown-link-check
-        uses: gaurav-nelson/github-action-markdown-link-check@228fbf4ffb2a86a65314866e9b2322b519fd885f
+        uses: gaurav-nelson/github-action-markdown-link-check@9710f0fec812ce0a3b98bef4c9d842fc1f39d976
         with:
           config-file: ".markdownlinkcheck.json"
           check-modified-files-only: "yes"
@@ -94,7 +86,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out the repository
-        uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
+        uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
       - name: Run markdownlint
         run: make markdownlint
 
@@ -103,6 +95,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out the repository
-        uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
+        uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
       - name: Run yamllint
-        run: make yamllint
+        uses: ibiqlik/action-yamllint@ed2b6e911569708ed121c14b87d513860a7e36a7
+        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

@@ -12,16 +12,16 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out the repository
-        uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
+        uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
 
       - name: Run markdown-link-check
-        uses: gaurav-nelson/github-action-markdown-link-check@228fbf4ffb2a86a65314866e9b2322b519fd885f
+        uses: gaurav-nelson/github-action-markdown-link-check@9710f0fec812ce0a3b98bef4c9d842fc1f39d976
         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@97e6f902a416aac38834e23fa52e166aad0437d2
         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.11
 
 jobs:
   release:
@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
+        uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
         with:
           fetch-depth: 0
 

.markdownlinkcheck.json

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

.shipyard.e2e.ovn.yml

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

.shipyard.e2e.yml

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

.submarinerbot.yaml

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

.yamllint.yml

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

Dockerfile.dapper

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

Makefile

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

README.md

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

cluster_settings

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

cluster_settings.ovn

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

ct.yaml

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

submariner-k8s-broker/questions.yml

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

submariner-operator/Chart.yaml

@@ -1,8 +1,8 @@
 ---
 name: submariner-operator
-version: 0.10.1
+version: 0.11.2
 apiVersion: v2
-appVersion: 0.10.1
+appVersion: 0.11.2
 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.11.2](https://img.shields.io/badge/Version-0.11.2-informational?style=flat-square) ![AppVersion: 0.11.2](https://img.shields.io/badge/AppVersion-0.11.2-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.11.2"` |  |
 | 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.11.2"` |  |
 | 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.11.2"` |  |
 | submariner.natEnabled | bool | `false` |  |
 | submariner.serviceCidr | string | `""` |  |
 | submariner.serviceDiscovery | bool | `true` |  |

submariner-operator/questions.yml

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

@@ -14,7 +14,7 @@ submariner:
   coreDNSCustomConfig: {}
   images:
     repository: quay.io/submariner
-    tag: "0.10.1"
+    tag: "0.11.2"
 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.11.2"
     pullPolicy: IfNotPresent
   resources: {}
   tolerations: []
@@ -45,7 +45,7 @@ operator:
 gateway:
   image:
     repository: quay.io/submariner/submariner-gateway
-    tag: "0.10.1"
+    tag: "0.11.2"
 serviceAccounts:
   operator:
     create: true