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

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

.github/dependabot.yml

@@ -0,0 +1,12 @@
+---
+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 devel
+      - name: Check that the PR targets release-0.13
-        if: ${{ github.base_ref != 'devel' }}
+        if: ${{ github.base_ref != 'release-0.13' }}
         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@70a1b2d4ee1cdc743af33498bd0204123953a887
+      - uses: z0al/dependent-issues@0fae07162bc9e0d8e116a133bd03686eed6efa21
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:

.github/workflows/e2e-full.yml

@@ -16,22 +16,21 @@ jobs:
       matrix:
         cable_driver: ['libreswan', 'wireguard', 'vxlan']
         globalnet: ['', 'globalnet']
-        k8s_version: ['1.19']
+        k8s_version: ['1.23']
         lighthouse: ['', 'lighthouse']
         include:
-          - k8s_version: '1.20'
           - k8s_version: '1.21'
           - k8s_version: '1.22'
     steps:
       - name: Check out the repository
-        uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
+        uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
 
       - 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@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
+        uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
 
       - 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@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
+        uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
 
       - 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,7 +11,7 @@ jobs:
     steps:
       - name: Get PR commits
         id: 'get-pr-commits'
-        uses: tim-actions/get-pr-commits@55b867b9b28954e6f5c1a0fe2f729dc926c306d0
+        uses: tim-actions/get-pr-commits@c64db31d359214d244884dd68f971a110b29ab83
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
 
@@ -23,25 +23,33 @@ 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@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
+        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@dc73133d4da04e56a135ae2246682783cc7c7cb6
+        uses: actions/setup-python@d09bd5e6005b175076f227b13d9730d56e9dcfcb
         with:
           python-version: '3.x'
 
       - name: Set up helm/chart-testing
-        uses: helm/chart-testing-action@5f16c27cf7a4fa9c776ff73734df3909b2b65127
+        uses: helm/chart-testing-action@dae259e86a35ff09145c0805e2d7dd3f7207064a
 
       - name: Run helm/chart-testing (lint)
         run: ct lint --config ct.yaml
@@ -51,7 +59,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out the repository
-        uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
+        uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
         with:
           fetch-depth: 0
       - name: Run gitlint
@@ -62,7 +70,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out the repository
-        uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
+        uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
 
       - name: Run helm-docs and verify docs are up-to-date
         run: make helm-docs
@@ -72,10 +80,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out the repository
-        uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
+        uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
 
       - name: Run markdown-link-check
-        uses: gaurav-nelson/github-action-markdown-link-check@9710f0fec812ce0a3b98bef4c9d842fc1f39d976
+        uses: gaurav-nelson/github-action-markdown-link-check@228fbf4ffb2a86a65314866e9b2322b519fd885f
         with:
           config-file: ".markdownlinkcheck.json"
           check-modified-files-only: "yes"
@@ -86,7 +94,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out the repository
-        uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
+        uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
       - name: Run markdownlint
         run: make markdownlint
 
@@ -95,10 +103,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out the repository
-        uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
+        uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
       - name: Run yamllint
-        uses: ibiqlik/action-yamllint@ed2b6e911569708ed121c14b87d513860a7e36a7
+        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/periodic.yml

@@ -12,16 +12,16 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out the repository
-        uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
+        uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
 
       - name: Run markdown-link-check
-        uses: gaurav-nelson/github-action-markdown-link-check@9710f0fec812ce0a3b98bef4c9d842fc1f39d976
+        uses: gaurav-nelson/github-action-markdown-link-check@228fbf4ffb2a86a65314866e9b2322b519fd885f
         with:
           config-file: ".markdownlinkcheck.json"
 
       - name: Raise an Issue to report broken links
         if: ${{ failure() }}
-        uses: peter-evans/create-issue-from-file@97e6f902a416aac38834e23fa52e166aad0437d2
+        uses: peter-evans/create-issue-from-file@99b87c35610e986ad2034a7b0518a9b3ebea541b
         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@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
+        uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
         with:
           fetch-depth: 0
 

.markdownlinkcheck.json

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

.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

@@ -9,6 +9,8 @@ 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.13
 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://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

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-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.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: ""
-- 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

@@ -737,6 +737,15 @@ rules:
       - get
       - list
       - watch
+  - apiGroups:
+      - network.openshift.io
+    resources:
+      - service/externalips
+    verbs:
+      - create
+      - get
+      - list
+      - delete
 ---
 {{- end -}}
 apiVersion: rbac.authorization.k8s.io/v1