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

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

.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

@@ -9,6 +9,6 @@ jobs:
     name: PR targets branch
     runs-on: ubuntu-latest
     steps:
-      - name: Check that the PR targets release-0.13
+      - name: Check that the PR targets release-0.12
-        if: ${{ github.base_ref != 'release-0.13' }}
+        if: ${{ github.base_ref != 'release-0.12' }}
         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@950226e7ca8fc43dc209a7febf67c655af3bdb43
+      - uses: z0al/dependent-issues@70a1b2d4ee1cdc743af33498bd0204123953a887
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:

.github/workflows/e2e-full.yml

@@ -19,18 +19,19 @@ jobs:
         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@8e5e7e5ab8b370d6c329ec480221332ada57f0ab
+        uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
 
       - name: Run E2E deployment and tests
-        uses: submariner-io/shipyard/gh-actions/e2e@release-0.13
+        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.13
+        uses: submariner-io/shipyard/gh-actions/post-mortem@release-0.12

.github/workflows/e2e.yml

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

.github/workflows/flake_finder.yml

@@ -19,13 +19,13 @@ jobs:
         lighthouse: ['', 'lighthouse']
     steps:
       - name: Check out the repository
-        uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab
+        uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
 
       - name: Run E2E deployment and tests
-        uses: submariner-io/shipyard/gh-actions/e2e@release-0.13
+        uses: submariner-io/shipyard/gh-actions/e2e@release-0.12
         with:
           using: ${{ matrix.cable_driver }} ${{ matrix.globalnet }} ${{ matrix.lighthouse }}
 
       - name: Post mortem
         if: failure()
-        uses: submariner-io/shipyard/gh-actions/post-mortem@release-0.13
+        uses: submariner-io/shipyard/gh-actions/post-mortem@release-0.12

.github/workflows/linting.yml

@@ -11,12 +11,12 @@ jobs:
     steps:
       - name: Get PR commits
         id: 'get-pr-commits'
-        uses: tim-actions/get-pr-commits@3efc1387ead42029a0d488ab98f24b7452dc3cde
+        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@e16b08b1a7f5cafeb1f8167de05bf1d40239eb5d
+        uses: tim-actions/commit-message-checker-with-regex@d6d9770051dd6460679d1cab1dcaa8cffc5c2bbd
         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@e16b08b1a7f5cafeb1f8167de05bf1d40239eb5d
+        uses: tim-actions/commit-message-checker-with-regex@d6d9770051dd6460679d1cab1dcaa8cffc5c2bbd
         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@8e5e7e5ab8b370d6c329ec480221332ada57f0ab
+        uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
 
       - name: Set up Helm
-        uses: azure/setup-helm@5119fcb9089d432beecbf79bb2c7915207344b78
+        uses: azure/setup-helm@18bc76811624f360dbd7f18c2d4ecb32c7b87bab
         with:
           version: v3.6.0
 
       - name: Set up Python
-        uses: actions/setup-python@bd6b4b6205c4dbad673328db7b31b7fab9e241c0
+        uses: actions/setup-python@dc73133d4da04e56a135ae2246682783cc7c7cb6
         with:
           python-version: '3.x'
 
       - name: Set up helm/chart-testing
-        uses: helm/chart-testing-action@e8788873172cb653a90ca2e819d79d65a66d4e76
+        uses: helm/chart-testing-action@5f16c27cf7a4fa9c776ff73734df3909b2b65127
 
       - 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@8e5e7e5ab8b370d6c329ec480221332ada57f0ab
+        uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
         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@8e5e7e5ab8b370d6c329ec480221332ada57f0ab
+        uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
 
       - 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@8e5e7e5ab8b370d6c329ec480221332ada57f0ab
+        uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
 
       - name: Run markdown-link-check
-        uses: gaurav-nelson/github-action-markdown-link-check@d53a906aa6b22b8979d33bc86170567e619495ec
+        uses: gaurav-nelson/github-action-markdown-link-check@9710f0fec812ce0a3b98bef4c9d842fc1f39d976
         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@8e5e7e5ab8b370d6c329ec480221332ada57f0ab
+        uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
       - name: Run markdownlint
         run: make markdownlint
 
@@ -103,6 +103,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out the repository
-        uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab
+        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@8e5e7e5ab8b370d6c329ec480221332ada57f0ab
+        uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
 
       - name: Run markdown-link-check
-        uses: gaurav-nelson/github-action-markdown-link-check@d53a906aa6b22b8979d33bc86170567e619495ec
+        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@433e51abf769039ee20ba1293a088ca19d573b7f
+        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:
-      - release-0.13
+      - release-0.12
 
 jobs:
   release:
@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab
+        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.yml

@@ -1,4 +1,5 @@
 ---
+cni: weave
 submariner: true
 nodes: control-plane worker
 clusters:

.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 ?= release-0.13
+BASE_BRANCH ?= release-0.12
 export BASE_BRANCH
 
 ifneq (,$(DAPPER_HOST_ARCH))

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

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/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.10.1"
-        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.10.1"
-        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"