Mark the source directory as safe

See https://github.blog/2022-04-12-git-security-vulnerability-announced/
for context. git now refuses to handle repositories which don't belong
to the current user by default; such repositories need to be
explicitly marked as safe, in the global configuration for the current user.

This fixes the failing release job.

Signed-off-by: Tom Pantelis <tompantelis@gmail.com>

.github/workflows/branch.yml

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

.github/workflows/e2e-full.yml

@@ -16,22 +16,22 @@ jobs:
       matrix:
         cable_driver: ['libreswan', 'wireguard', 'vxlan']
         globalnet: ['', 'globalnet']
-        k8s_version: ['1.17']
+        k8s_version: ['1.23']
         lighthouse: ['', 'lighthouse']
         include:
-          - k8s_version: '1.18'
-          - k8s_version: '1.19'
           - 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.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@devel
+        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@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.12
 
       - name: Post mortem
         if: failure()
-        uses: submariner-io/shipyard/gh-actions/post-mortem@devel
+        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@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.12
         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.12

.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,12 +23,20 @@ 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
@@ -36,12 +44,12 @@ jobs:
           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,9 +103,9 @@ 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
+        uses: ibiqlik/action-yamllint@81e214fd484713882ce4237cb7cd264d550856cf
         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

.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.12
 
 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
 

.shipyard.e2e.ovn.yml

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

.shipyard.e2e.yml

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

CODEOWNERS

@@ -1 +1,3 @@
-* @mangelajo @Oats87 @skitt @sridhargaddam @tpantelis
+# Auto-generated, do not edit; see CODEOWNERS.in
+* @Oats87 @skitt @sridhargaddam @tpantelis
+*.md @dfarrell07 @Oats87 @skitt @sridhargaddam @tpantelis

CODEOWNERS.in

@@ -0,0 +1,5 @@
+@dfarrell07 *.md
+@Oats87 *
+@skitt *
+@sridhargaddam *
+@tpantelis *

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.12
 export BASE_BRANCH
 
 ifneq (,$(DAPPER_HOST_ARCH))
@@ -9,11 +9,10 @@ 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 = --cluster_settings $(DAPPER_SOURCE)/cluster_settings.ovn
+CLUSTER_SETTINGS_FLAG = --settings $(DAPPER_SOURCE)/.shipyard.e2e.ovn.yml
 else
-CLUSTER_SETTINGS_FLAG = --cluster_settings $(DAPPER_SOURCE)/cluster_settings
+CLUSTER_SETTINGS_FLAG = --settings $(DAPPER_SOURCE)/.shipyard.e2e.yml
 endif
 
 override CLUSTERS_ARGS += $(CLUSTER_SETTINGS_FLAG)
@@ -21,7 +20,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.7.0
+CHARTS_VERSION=0.10.1
 HELM_DOCS_VERSION=0.15.0
 REPO_URL=$(shell git config remote.origin.url)
 

cluster_settings

@@ -1,10 +0,0 @@
-. "${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

@@ -1,10 +0,0 @@
-. "${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" )

submariner-k8s-broker/crds/crd.yaml

@@ -1,97 +1,333 @@
-apiVersion: apiextensions.k8s.io/v1beta1
+apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   name: clusters.submariner.io
 spec:
   group: submariner.io
-  version: v1
   names:
     kind: Cluster
+    listKind: ClusterList
     plural: clusters
+    singular: cluster
   scope: Namespaced
+  versions:
+  - name: v1
+    schema:
+      openAPIV3Schema:
+        properties:
+          apiVersion:
+            description: 'APIVersion defines the versioned schema of this representation
+              of an object. Servers should convert recognized schemas to the latest
+              internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+            type: string
+          kind:
+            description: 'Kind is a string value representing the REST resource this
+              object represents. Servers may infer this from the endpoint the client
+              submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+            type: string
+          metadata:
+            type: object
+          spec:
+            properties:
+              cluster_cidr:
+                items:
+                  type: string
+                type: array
+              cluster_id:
+                type: string
+              color_codes:
+                items:
+                  type: string
+                type: array
+              global_cidr:
+                items:
+                  type: string
+                type: array
+              service_cidr:
+                items:
+                  type: string
+                type: array
+            required:
+            - cluster_cidr
+            - cluster_id
+            - color_codes
+            - global_cidr
+            - service_cidr
+            type: object
+        required:
+        - spec
+        type: object
+    served: true
+    storage: true
+status:
+  acceptedNames:
+    kind: ""
+    plural: ""
+  conditions: []
+  storedVersions: []
 ---
-apiVersion: apiextensions.k8s.io/v1beta1
+apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   name: endpoints.submariner.io
 spec:
   group: submariner.io
-  version: v1
   names:
     kind: Endpoint
+    listKind: EndpointList
     plural: endpoints
+    singular: endpoint
   scope: Namespaced
+  versions:
+  - name: v1
+    schema:
+      openAPIV3Schema:
+        properties:
+          apiVersion:
+            description: 'APIVersion defines the versioned schema of this representation
+              of an object. Servers should convert recognized schemas to the latest
+              internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+            type: string
+          kind:
+            description: 'Kind is a string value representing the REST resource this
+              object represents. Servers may infer this from the endpoint the client
+              submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+            type: string
+          metadata:
+            type: object
+          spec:
+            properties:
+              backend:
+                type: string
+              backend_config:
+                additionalProperties:
+                  type: string
+                type: object
+              cable_name:
+                type: string
+              cluster_id:
+                type: string
+              healthCheckIP:
+                type: string
+              hostname:
+                type: string
+              nat_enabled:
+                type: boolean
+              private_ip:
+                type: string
+              public_ip:
+                type: string
+              subnets:
+                items:
+                  type: string
+                type: array
+            required:
+            - backend
+            - cable_name
+            - cluster_id
+            - hostname
+            - nat_enabled
+            - private_ip
+            - public_ip
+            - subnets
+            type: object
+        required:
+        - spec
+        type: object
+    served: true
+    storage: true
+status:
+  acceptedNames:
+    kind: ""
+    plural: ""
+  conditions: []
+  storedVersions: []
 ---
-apiVersion: apiextensions.k8s.io/v1beta1
+apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   name: gateways.submariner.io
 spec:
   group: submariner.io
-  version: v1
   names:
     kind: Gateway
+    listKind: GatewayList
     plural: gateways
+    singular: gateway
   scope: Namespaced
-  additionalPrinterColumns:
+  versions:
-    - name: ha-status
+  - additionalPrinterColumns:
+    - description: High availability status of the Gateway
+      jsonPath: .status.haStatus
+      name: HA Status
       type: string
-      description: High Availability Status of the Gateway
+    name: v1
-      JSONPath: .status.haStatus
+    schema:
----
-apiVersion: apiextensions.k8s.io/v1beta1
-kind: CustomResourceDefinition
-metadata:
-  name: multiclusterservices.lighthouse.submariner.io
-spec:
-  group: lighthouse.submariner.io
-  version: v1
-  names:
-    kind: MultiClusterService
-    plural: multiclusterservices
-    singular: multiclusterservice
-  scope: Namespaced
-  validation:
       openAPIV3Schema:
         properties:
-        spec:
+          apiVersion:
+            description: 'APIVersion defines the versioned schema of this representation
+              of an object. Servers should convert recognized schemas to the latest
+              internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+            type: string
+          kind:
+            description: 'Kind is a string value representing the REST resource this
+              object represents. Servers may infer this from the endpoint the client
+              submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+            type: string
+          metadata:
+            type: object
+          status:
             properties:
-            clusterServiceInfo:
+              connections:
+                items:
                   properties:
-                clusterID:
+                    endpoint:
-                  type: "string"
+                      properties:
-                clusterDomain:
+                        backend:
-                  type: "string"
+                          type: string
-                serviceIP:
+                        backend_config:
-                  type: "string"
+                          additionalProperties:
-                port:
+                            type: string
-                  type: "integer"
+                          type: object
----
+                        cable_name:
-apiVersion: apiextensions.k8s.io/v1beta1
+                          type: string
-kind: CustomResourceDefinition
+                        cluster_id:
-metadata:
+                          type: string
-  name: serviceexports.lighthouse.submariner.io
+                        healthCheckIP:
-spec:
+                          type: string
-  group: lighthouse.submariner.io
+                        hostname:
-  version: v2alpha1
+                          type: string
-  names:
+                        nat_enabled:
-    kind: ServiceExport
+                          type: boolean
-    plural: serviceexports
+                        private_ip:
-    singular: serviceexport
+                          type: string
-  scope: Namespaced
+                        public_ip:
----
+                          type: string
-apiVersion: apiextensions.k8s.io/v1beta1
+                        subnets:
-kind: CustomResourceDefinition
+                          items:
-metadata:
+                            type: string
-  name: serviceimports.lighthouse.submariner.io
+                          type: array
-spec:
+                      required:
-  group: lighthouse.submariner.io
+                      - backend
-  version: v2alpha1
+                      - cable_name
-  names:
+                      - cluster_id
-    kind: ServiceImport
+                      - hostname
-    plural: serviceimports
+                      - nat_enabled
-    singular: serviceimport
+                      - private_ip
-  scope: Namespaced
+                      - public_ip
+                      - subnets
+                      type: object
+                    latency:
+                      description: LatencySpec describes the round trip time information
+                        in nanoseconds for a packet between the gateway pods of two
+                        clusters.
+                      properties:
+                        averageRTT:
+                          format: int64
+                          type: integer
+                        lastRTT:
+                          description: TODO This shall be deleted once the operator
+                            is using the latest. Using Optional to avoid validation
+                            errors when this field is not used.
+                          format: int64
+                          type: integer
+                        maxRTT:
+                          format: int64
+                          type: integer
+                        minRTT:
+                          format: int64
+                          type: integer
+                        stddevRTT:
+                          format: int64
+                          type: integer
+                      type: object
+                    latencyRTT:
+                      description: LatencySpec describes the round trip time information
+                        for a packet between the gateway pods of two clusters.
+                      properties:
+                        average:
+                          type: string
+                        last:
+                          type: string
+                        max:
+                          type: string
+                        min:
+                          type: string
+                        stdDev:
+                          type: string
+                      type: object
+                    status:
+                      type: string
+                    statusMessage:
+                      type: string
+                  required:
+                  - endpoint
+                  - status
+                  - statusMessage
+                  type: object
+                type: array
+              haStatus:
+                type: string
+              localEndpoint:
+                properties:
+                  backend:
+                    type: string
+                  backend_config:
+                    additionalProperties:
+                      type: string
+                    type: object
+                  cable_name:
+                    type: string
+                  cluster_id:
+                    type: string
+                  healthCheckIP:
+                    type: string
+                  hostname:
+                    type: string
+                  nat_enabled:
+                    type: boolean
+                  private_ip:
+                    type: string
+                  public_ip:
+                    type: string
+                  subnets:
+                    items:
+                      type: string
+                    type: array
+                required:
+                - backend
+                - cable_name
+                - cluster_id
+                - hostname
+                - nat_enabled
+                - private_ip
+                - public_ip
+                - subnets
+                type: object
+              statusFailure:
+                type: string
+              version:
+                type: string
+            required:
+            - connections
+            - haStatus
+            - localEndpoint
+            - statusFailure
+            - version
+            type: object
+        required:
+        - status
+        type: object
+    served: true
+    storage: true
+    subresources: {}
+status:
+  acceptedNames:
+    kind: ""
+    plural: ""
+  conditions: []
+  storedVersions: []
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition

submariner-k8s-broker/templates/rbac.yaml

@@ -16,7 +16,7 @@ rules:
   resources: ["*"]
   verbs: ["create", "get", "list", "watch", "patch", "update", "delete"]
 - apiGroups: ["discovery.k8s.io"]
-  resources: ["endpointslices"]
+  resources: ["endpointslices", "endpointslices/restricted"]
   verbs: ["create", "get", "list", "watch","patch", "update", "delete"]
 - apiGroups: ["multicluster.x-k8s.io"]
   resources: ["*"]

submariner-operator/Chart.yaml

@@ -1,8 +1,8 @@
 ---
 name: submariner-operator
-version: 0.7.0
+version: 0.10.1
 apiVersion: v2
-appVersion: 0.7.0
+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.7.0](https://img.shields.io/badge/Version-0.7.0-informational?style=flat-square) ![AppVersion: 0.7.0](https://img.shields.io/badge/AppVersion-0.7.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,8 +27,9 @@ 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.7.0"` |  |
+| gateway.image.tag | string | `"0.10.1"` |  |
 | ipsec.debug | bool | `false` |  |
+| ipsec.forceUDPEncaps | bool | `false` |  |
 | ipsec.ikePort | int | `500` |  |
 | ipsec.natPort | int | `4500` |  |
 | ipsec.psk | string | `""` |  |
@@ -38,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.7.0"` |  |
+| operator.image.tag | string | `"0.10.1"` |  |
 | operator.resources | object | `{}` |  |
 | operator.tolerations | list | `[]` |  |
 | rbac.create | bool | `true` |  |
@@ -58,10 +59,12 @@ Submariner enables direct networking between Pods and Services in different Kube
 | submariner.clusterCidr | string | `""` |  |
 | submariner.clusterId | string | `""` |  |
 | submariner.colorCodes | string | `"blue"` |  |
+| submariner.coreDNSCustomConfig | object | `{}` |  |
 | submariner.debug | bool | `false` |  |
 | submariner.globalCidr | string | `""` |  |
+| submariner.healthcheckEnabled | bool | `true` |  |
 | submariner.images.repository | string | `"quay.io/submariner"` |  |
-| submariner.images.tag | string | `"0.7.0"` |  |
+| submariner.images.tag | string | `"0.10.1"` |  |
 | submariner.natEnabled | bool | `false` |  |
 | submariner.serviceCidr | string | `""` |  |
 | submariner.serviceDiscovery | bool | `true` |  |

submariner-operator/crds/crd.yaml

@@ -1,10 +1,11 @@
 ---
-apiVersion: apiextensions.k8s.io/v1beta1
+apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
-  name: submariners.submariner.io
   annotations:
-    controller-gen.kubebuilder.io/version: v0.3.0
+    controller-gen.kubebuilder.io/version: v0.4.1
+  creationTimestamp: null
+  name: submariners.submariner.io
 spec:
   group: submariner.io
   names:
@@ -13,9 +14,9 @@ spec:
     plural: submariners
     singular: submariner
   scope: Namespaced
-  subresources:
+  versions:
-    status: {}
+  - name: v1alpha1
-  validation:
+    schema:
       openAPIV3Schema:
         description: Submariner is the Schema for the submariners API
         properties:
@@ -42,24 +43,51 @@ spec:
                 type: string
               brokerK8sCA:
                 type: string
+              brokerK8sInsecure:
+                type: boolean
               brokerK8sRemoteNamespace:
                 type: string
               cableDriver:
                 type: string
               ceIPSecDebug:
                 type: boolean
+              ceIPSecForceUDPEncaps:
+                type: boolean
               ceIPSecIKEPort:
                 type: integer
               ceIPSecNATTPort:
                 type: integer
               ceIPSecPSK:
                 type: string
+              ceIPSecPreferredServer:
+                type: boolean
               clusterCIDR:
                 type: string
               clusterID:
                 type: string
               colorCodes:
                 type: string
+              connectionHealthCheck:
+                properties:
+                  enabled:
+                    type: boolean
+                  intervalSeconds:
+                    description: The interval at which health check pings are sent.
+                    format: int64
+                    type: integer
+                  maxPacketLossCount:
+                    description: The maximum number of packets lost at which the health
+                      checker will mark the connection as down.
+                    format: int64
+                    type: integer
+                type: object
+              coreDNSCustomConfig:
+                properties:
+                  configMapName:
+                    type: string
+                  namespace:
+                    type: string
+                type: object
               customDomains:
                 items:
                   type: string
@@ -69,6 +97,12 @@ spec:
                 type: boolean
               globalCIDR:
                 type: string
+              imageOverrides:
+                additionalProperties:
+                  type: string
+                type: object
+              loadBalancerEnabled:
+                type: boolean
               namespace:
                 type: string
               natEnabled:
@@ -105,6 +139,17 @@ spec:
                 type: string
               colorCodes:
                 type: string
+              deploymentInfo:
+                properties:
+                  cloudProvider:
+                    type: string
+                  kubernetesType:
+                    type: string
+                  kubernetesTypeVersion:
+                    type: string
+                  kubernetesVersion:
+                    type: string
+                type: object
               gatewayDaemonSetStatus:
                 properties:
                   lastResourceVersion:
@@ -114,8 +159,8 @@ spec:
                   nonReadyContainerStates:
                     items:
                       description: ContainerState holds a possible state of container.
-                      Only one of its members may be specified. If none of them is
+                        Only one of its members may be specified. If none of them
-                      specified, the default one is ContainerStateWaiting.
+                        is specified, the default one is ContainerStateWaiting.
                       properties:
                         running:
                           description: Details about a running container
@@ -141,20 +186,21 @@ spec:
                               format: date-time
                               type: string
                             message:
-                            description: Message regarding the last termination of
+                              description: Message regarding the last termination
-                              the container
+                                of the container
                               type: string
                             reason:
                               description: (brief) reason from the last termination
                                 of the container
                               type: string
                             signal:
-                            description: Signal from the last termination of the container
+                              description: Signal from the last termination of the
+                                container
                               format: int32
                               type: integer
                             startedAt:
-                            description: Time at which previous execution of the container
+                              description: Time at which previous execution of the
-                              started
+                                container started
                               format: date-time
                               type: string
                           required:
@@ -164,18 +210,19 @@ spec:
                           description: Details about a waiting container
                           properties:
                             message:
-                            description: Message regarding why the container is not
+                              description: Message regarding why the container is
-                              yet running.
+                                not yet running.
                               type: string
                             reason:
-                            description: (brief) reason the container is not yet running.
+                              description: (brief) reason the container is not yet
+                                running.
                               type: string
                           type: object
                       type: object
                     type: array
                   status:
-                  description: DaemonSetStatus represents the current status of a
+                    description: DaemonSetStatus represents the current status of
-                    daemon set.
+                      a daemon set.
                     properties:
                       collisionCount:
                         description: Count of hash collisions for the DaemonSet. The
@@ -185,11 +232,11 @@ spec:
                         format: int32
                         type: integer
                       conditions:
-                      description: Represents the latest available observations of
+                        description: Represents the latest available observations
-                        a DaemonSet's current state.
+                          of a DaemonSet's current state.
                         items:
-                        description: DaemonSetCondition describes the state of a DaemonSet
+                          description: DaemonSetCondition describes the state of a
-                          at a certain point.
+                            DaemonSet at a certain point.
                           properties:
                             lastTransitionTime:
                               description: Last time the condition transitioned from
@@ -287,6 +334,10 @@ spec:
                               cable_name:
                                 type: string
                               cluster_id:
+                                maxLength: 63
+                                minLength: 1
+                                type: string
+                              healthCheckIP:
                                 type: string
                               hostname:
                                 type: string
@@ -310,10 +361,30 @@ spec:
                             - public_ip
                             - subnets
                             type: object
+                          latencyRTT:
+                            description: LatencySpec describes the round trip time
+                              information for a packet between the gateway pods of
+                              two clusters.
+                            properties:
+                              average:
+                                type: string
+                              last:
+                                type: string
+                              max:
+                                type: string
+                              min:
+                                type: string
+                              stdDev:
+                                type: string
+                            type: object
                           status:
                             type: string
                           statusMessage:
                             type: string
+                          usingIP:
+                            type: string
+                          usingNAT:
+                            type: boolean
                         required:
                         - endpoint
                         - status
@@ -333,6 +404,10 @@ spec:
                         cable_name:
                           type: string
                         cluster_id:
+                          maxLength: 63
+                          minLength: 1
+                          type: string
+                        healthCheckIP:
                           type: string
                         hostname:
                           type: string
@@ -379,8 +454,8 @@ spec:
                   nonReadyContainerStates:
                     items:
                       description: ContainerState holds a possible state of container.
-                      Only one of its members may be specified. If none of them is
+                        Only one of its members may be specified. If none of them
-                      specified, the default one is ContainerStateWaiting.
+                        is specified, the default one is ContainerStateWaiting.
                       properties:
                         running:
                           description: Details about a running container
@@ -406,20 +481,21 @@ spec:
                               format: date-time
                               type: string
                             message:
-                            description: Message regarding the last termination of
+                              description: Message regarding the last termination
-                              the container
+                                of the container
                               type: string
                             reason:
                               description: (brief) reason from the last termination
                                 of the container
                               type: string
                             signal:
-                            description: Signal from the last termination of the container
+                              description: Signal from the last termination of the
+                                container
                               format: int32
                               type: integer
                             startedAt:
-                            description: Time at which previous execution of the container
+                              description: Time at which previous execution of the
-                              started
+                                container started
                               format: date-time
                               type: string
                           required:
@@ -429,18 +505,19 @@ spec:
                           description: Details about a waiting container
                           properties:
                             message:
-                            description: Message regarding why the container is not
+                              description: Message regarding why the container is
-                              yet running.
+                                not yet running.
                               type: string
                             reason:
-                            description: (brief) reason the container is not yet running.
+                              description: (brief) reason the container is not yet
+                                running.
                               type: string
                           type: object
                       type: object
                     type: array
                   status:
-                  description: DaemonSetStatus represents the current status of a
+                    description: DaemonSetStatus represents the current status of
-                    daemon set.
+                      a daemon set.
                     properties:
                       collisionCount:
                         description: Count of hash collisions for the DaemonSet. The
@@ -450,11 +527,11 @@ spec:
                         format: int32
                         type: integer
                       conditions:
-                      description: Represents the latest available observations of
+                        description: Represents the latest available observations
-                        a DaemonSet's current state.
+                          of a DaemonSet's current state.
                         items:
-                        description: DaemonSetCondition describes the state of a DaemonSet
+                          description: DaemonSetCondition describes the state of a
-                          at a certain point.
+                            DaemonSet at a certain point.
                           properties:
                             lastTransitionTime:
                               description: Last time the condition transitioned from
@@ -535,8 +612,36 @@ spec:
                 required:
                 - mismatchedContainerImages
                 type: object
+              loadBalancerStatus:
+                properties:
+                  status:
+                    description: LoadBalancerStatus represents the status of a load-balancer.
+                    properties:
+                      ingress:
+                        description: Ingress is a list containing ingress points for
+                          the load-balancer. Traffic intended for the service should
+                          be sent to these ingress points.
+                        items:
+                          description: 'LoadBalancerIngress represents the status
+                            of a load-balancer ingress point: traffic intended for
+                            the service should be sent to an ingress point.'
+                          properties:
+                            hostname:
+                              description: Hostname is set for load-balancer ingress
+                                points that are DNS based (typically AWS load-balancers)
+                              type: string
+                            ip:
+                              description: IP is set for load-balancer ingress points
+                                that are IP based (typically GCE or OpenStack load-balancers)
+                              type: string
+                          type: object
+                        type: array
+                    type: object
+                type: object
               natEnabled:
                 type: boolean
+              networkPlugin:
+                type: string
               routeAgentDaemonSetStatus:
                 properties:
                   lastResourceVersion:
@@ -546,8 +651,8 @@ spec:
                   nonReadyContainerStates:
                     items:
                       description: ContainerState holds a possible state of container.
-                      Only one of its members may be specified. If none of them is
+                        Only one of its members may be specified. If none of them
-                      specified, the default one is ContainerStateWaiting.
+                        is specified, the default one is ContainerStateWaiting.
                       properties:
                         running:
                           description: Details about a running container
@@ -573,20 +678,21 @@ spec:
                               format: date-time
                               type: string
                             message:
-                            description: Message regarding the last termination of
+                              description: Message regarding the last termination
-                              the container
+                                of the container
                               type: string
                             reason:
                               description: (brief) reason from the last termination
                                 of the container
                               type: string
                             signal:
-                            description: Signal from the last termination of the container
+                              description: Signal from the last termination of the
+                                container
                               format: int32
                               type: integer
                             startedAt:
-                            description: Time at which previous execution of the container
+                              description: Time at which previous execution of the
-                              started
+                                container started
                               format: date-time
                               type: string
                           required:
@@ -596,18 +702,19 @@ spec:
                           description: Details about a waiting container
                           properties:
                             message:
-                            description: Message regarding why the container is not
+                              description: Message regarding why the container is
-                              yet running.
+                                not yet running.
                               type: string
                             reason:
-                            description: (brief) reason the container is not yet running.
+                              description: (brief) reason the container is not yet
+                                running.
                               type: string
                           type: object
                       type: object
                     type: array
                   status:
-                  description: DaemonSetStatus represents the current status of a
+                    description: DaemonSetStatus represents the current status of
-                    daemon set.
+                      a daemon set.
                     properties:
                       collisionCount:
                         description: Count of hash collisions for the DaemonSet. The
@@ -617,11 +724,11 @@ spec:
                         format: int32
                         type: integer
                       conditions:
-                      description: Represents the latest available observations of
+                        description: Represents the latest available observations
-                        a DaemonSet's current state.
+                          of a DaemonSet's current state.
                         items:
-                        description: DaemonSetCondition describes the state of a DaemonSet
+                          description: DaemonSetCondition describes the state of a
-                          at a certain point.
+                            DaemonSet at a certain point.
                           properties:
                             lastTransitionTime:
                               description: Last time the condition transitioned from
@@ -709,11 +816,10 @@ spec:
             - natEnabled
             type: object
         type: object
-  version: v1alpha1
-  versions:
-  - name: v1alpha1
     served: true
     storage: true
+    subresources:
+      status: {}
 status:
   acceptedNames:
     kind: ""
@@ -725,7 +831,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.3.0
+    controller-gen.kubebuilder.io/version: v0.4.1
   creationTimestamp: null
   name: servicediscoveries.submariner.io
 spec:
@@ -763,10 +869,19 @@ spec:
                 type: string
               brokerK8sCA:
                 type: string
+              brokerK8sInsecure:
+                type: boolean
               brokerK8sRemoteNamespace:
                 type: string
               clusterID:
                 type: string
+              coreDNSCustomConfig:
+                properties:
+                  configMapName:
+                    type: string
+                  namespace:
+                    type: string
+                type: object
               customDomains:
                 items:
                   type: string
@@ -797,6 +912,18 @@ spec:
             type: object
           status:
             description: ServiceDiscoveryStatus defines the observed state of ServiceDiscovery
+            properties:
+              deploymentInfo:
+                properties:
+                  cloudProvider:
+                    type: string
+                  kubernetesType:
+                    type: string
+                  kubernetesTypeVersion:
+                    type: string
+                  kubernetesVersion:
+                    type: string
+                type: object
             type: object
         type: object
     served: true

submariner-operator/questions.yml

@@ -13,7 +13,7 @@ questions:
     type: string
     label: Submariner Operator Image Repository
   - variable: operator.image.tag
-    default: "0.7.0"
+    default: "0.10.1"
     description: "Submariner Operator Image Tag"
     type: string
     label: Submariner Operator Image Tag
@@ -31,7 +31,7 @@ questions:
     type: string
     label: Submariner Repository
   - variable: submariner.images.tag
-    default: "0.7.0"
+    default: "0.10.1"
     description: "Submariner Images Tag (shared for all non-operator images)"
     type: string
     label: Submariner Images Tag
@@ -136,3 +136,9 @@ questions:
   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

@@ -439,6 +439,21 @@ rules:
     verbs:
       - get
       - list
+  - apiGroups:
+      - ""
+    resources:
+      - namespaces
+    verbs:
+      - get
+      - list
+      - watch
+  - apiGroups:
+      - monitoring.coreos.com
+    resources:
+      - servicemonitors
+    verbs:
+      - get
+      - create
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
@@ -459,6 +474,29 @@ roleRef:
   name: {{ template "submariner.fullname" . }}
 ---
 apiVersion: rbac.authorization.k8s.io/v1
+kind: Role
+metadata:
+  name: submariner-metrics-reader
+  namespace: {{ .Release.Namespace }}
+rules:
+  - apiGroups: [""]
+    resources: ["pods", "services", "endpoints"]
+    verbs: ["get", "list", "watch"]
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  name: read-submariner-metrics
+subjects:
+  - kind: ServiceAccount
+    name: prometheus-k8s
+    namespace: openshift-monitoring
+roleRef:
+  kind: Role
+  name: submariner-metrics-reader
+  apiGroup: rbac.authorization.k8s.io
+---
+apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
   name: {{ template "submariner.fullname" . }}:gateway
@@ -640,14 +678,25 @@ rules:
       - ""
     resources:
       - pods
-      - services
       - namespaces
       - nodes
+      - endpoints
     verbs:
       - get
       - list
       - watch
       - update
+  - apiGroups:
+      - ""
+    resources:
+      - services
+    verbs:
+      - create
+      - get
+      - list
+      - watch
+      - update
+      - delete
   - apiGroups:
       - submariner.io
     resources:
@@ -688,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

submariner-operator/templates/submariner.yaml

@@ -9,7 +9,9 @@ spec:
   brokerK8sApiServerToken: {{ .Values.broker.token }}
   brokerK8sCA: {{ .Values.broker.ca }}
   brokerK8sRemoteNamespace: {{ .Values.broker.namespace }}
+  brokerK8sInsecure: {{ .Values.broker.insecure }}
   ceIPSecDebug: {{ .Values.ipsec.debug }}
+  ceIPSecForceUDPEncaps: {{ .Values.ipsec.forceUDPEncaps }}
   ceIPSecIKEPort: {{ .Values.ipsec.ikePort }}
   ceIPSecNATTPort: {{ .Values.ipsec.natPort }}
   ceIPSecPSK: {{ .Values.ipsec.psk }}
@@ -25,3 +27,12 @@ spec:
   globalCIDR: "{{ .Values.submariner.globalCidr }}"
   serviceDiscoveryEnabled: {{ .Values.submariner.serviceDiscovery }}
   cableDriver: {{ .Values.submariner.cableDriver }}
+  connectionHealthCheck:
+    enabled: {{ .Values.submariner.healthcheckEnabled }}
+    intervalSeconds: 1
+    maxPacketLossCount: 5
+{{- with .Values.submariner.coreDNSCustomConfig }}
+  coreDNSCustomConfig:
+    configmapName: {{ .configmapName }}
+    namespace: {{ .namespace }}
+{{- end }}

submariner-operator/values.yaml

@@ -10,9 +10,11 @@ submariner:
   debug: false
   serviceDiscovery: true
   cableDriver: "libreswan"
+  healthcheckEnabled: true
+  coreDNSCustomConfig: {}
   images:
     repository: quay.io/submariner
-    tag: "0.7.0"
+    tag: "0.10.1"
 broker:
   server: example.k8s.apiserver
   token: test
@@ -25,6 +27,7 @@ rbac:
 ipsec:
   psk: ""
   debug: false
+  forceUDPEncaps: false
   ikePort: 500
   natPort: 4500
 leadership:
@@ -34,7 +37,7 @@ leadership:
 operator:
   image:
     repository: quay.io/submariner/submariner-operator
-    tag: "0.7.0"
+    tag: "0.10.1"
     pullPolicy: IfNotPresent
   resources: {}
   tolerations: []
@@ -42,7 +45,7 @@ operator:
 gateway:
   image:
     repository: quay.io/submariner/submariner-gateway
-    tag: "0.7.0"
+    tag: "0.10.1"
 serviceAccounts:
   operator:
     create: true