Fix connectionHealthCheck

connectionHealthCheck in submariner CR is a nested field
but is being added as a variable. This means it is ignored
and the field isn't set correctly in gateway pods.

Signed-off-by: Vishal Thapar <5137689+vthapar@users.noreply.github.com>

.github/workflows/branch.yml

@@ -5,10 +5,10 @@ on:
   pull_request:
 
 jobs:
-  target_devel:
+  target_branch:
-    name: PR targets release-0.11
+    name: PR targets branch
     runs-on: ubuntu-latest
     steps:
-      - name: Check that the PR targets release-0.11
+      - name: Check that the PR targets devel
-        if: ${{ github.base_ref != 'release-0.11' }}
+        if: ${{ github.base_ref != 'devel' }}
         run: exit 1

.github/workflows/e2e-full.yml

@@ -16,22 +16,22 @@ jobs:
       matrix:
         cable_driver: ['libreswan', 'wireguard', 'vxlan']
         globalnet: ['', 'globalnet']
-        k8s_version: ['1.19']
+        k8s_version: ['1.17']
         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
 
       - name: Run E2E deployment and tests
-        uses: submariner-io/shipyard/gh-actions/e2e@release-0.11
+        uses: submariner-io/shipyard/gh-actions/e2e@devel
         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.11
+        uses: submariner-io/shipyard/gh-actions/post-mortem@devel

.github/workflows/e2e.yml

@@ -14,8 +14,8 @@ jobs:
         uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
 
       - name: Run E2E deployment and tests
-        uses: submariner-io/shipyard/gh-actions/e2e@release-0.11
+        uses: submariner-io/shipyard/gh-actions/e2e@devel
 
       - name: Post mortem
         if: failure()
-        uses: submariner-io/shipyard/gh-actions/post-mortem@release-0.11
+        uses: submariner-io/shipyard/gh-actions/post-mortem@devel

.github/workflows/flake_finder.yml

@@ -22,10 +22,10 @@ jobs:
         uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
 
       - name: Run E2E deployment and tests
-        uses: submariner-io/shipyard/gh-actions/e2e@release-0.11
+        uses: submariner-io/shipyard/gh-actions/e2e@devel
         with:
           using: ${{ matrix.cable_driver }} ${{ matrix.globalnet }} ${{ matrix.lighthouse }}
 
       - name: Post mortem
         if: failure()
-        uses: submariner-io/shipyard/gh-actions/post-mortem@release-0.11
+        uses: submariner-io/shipyard/gh-actions/post-mortem@devel

.github/workflows/release.yml

@@ -4,7 +4,7 @@ name: Release Charts
 on:
   push:
     branches:
-      - release-0.11
+      - devel
 
 jobs:
   release:

CODEOWNERS

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

CODEOWNERS.in

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

Makefile

@@ -1,4 +1,4 @@
-BASE_BRANCH ?= release-0.11
+BASE_BRANCH ?= devel
 export BASE_BRANCH
 
 ifneq (,$(DAPPER_HOST_ARCH))
@@ -21,7 +21,7 @@ override DEPLOY_ARGS += $(CLUSTER_SETTINGS_FLAG) --deploytool helm
 export DEPLOY_ARGS
 GH_URL=https://submariner-io.github.io/submariner-charts/charts
 CHARTS_DIR=charts
-CHARTS_VERSION=0.11.2
+CHARTS_VERSION=0.10.1
 HELM_DOCS_VERSION=0.15.0
 REPO_URL=$(shell git config remote.origin.url)
 

submariner-k8s-broker/crds/crd.yaml

@@ -1,333 +1,97 @@
-apiVersion: apiextensions.k8s.io/v1
+apiVersion: apiextensions.k8s.io/v1beta1
 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/v1
+apiVersion: apiextensions.k8s.io/v1beta1
 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/v1
+apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
   name: gateways.submariner.io
 spec:
   group: submariner.io
+  version: v1
   names:
     kind: Gateway
-    listKind: GatewayList
     plural: gateways
-    singular: gateway
   scope: Namespaced
-  versions:
+  additionalPrinterColumns:
-  - additionalPrinterColumns:
+    - name: ha-status
-    - description: High availability status of the Gateway
-      jsonPath: .status.haStatus
-      name: HA Status
       type: string
-    name: v1
+      description: High Availability Status of the Gateway
-    schema:
+      JSONPath: .status.haStatus
-      openAPIV3Schema:
+---
-        properties:
+apiVersion: apiextensions.k8s.io/v1beta1
-          apiVersion:
+kind: CustomResourceDefinition
-            description: 'APIVersion defines the versioned schema of this representation
+metadata:
-              of an object. Servers should convert recognized schemas to the latest
+  name: multiclusterservices.lighthouse.submariner.io
-              internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+spec:
-            type: string
+  group: lighthouse.submariner.io
-          kind:
+  version: v1
-            description: 'Kind is a string value representing the REST resource this
+  names:
-              object represents. Servers may infer this from the endpoint the client
+    kind: MultiClusterService
-              submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+    plural: multiclusterservices
-            type: string
+    singular: multiclusterservice
-          metadata:
+  scope: Namespaced
-            type: object
+  validation:
-          status:
+    openAPIV3Schema:
-            properties:
+      properties:
-              connections:
+        spec:
-                items:
+          properties:
-                  properties:
+            clusterServiceInfo:
-                    endpoint:
+              properties:
-                      properties:
+                clusterID:
-                        backend:
+                  type: "string"
-                          type: string
+                clusterDomain:
-                        backend_config:
+                  type: "string"
-                          additionalProperties:
+                serviceIP:
-                            type: string
+                  type: "string"
-                          type: object
+                port:
-                        cable_name:
+                  type: "integer"
-                          type: string
+---
-                        cluster_id:
+apiVersion: apiextensions.k8s.io/v1beta1
-                          type: string
+kind: CustomResourceDefinition
-                        healthCheckIP:
+metadata:
-                          type: string
+  name: serviceexports.lighthouse.submariner.io
-                        hostname:
+spec:
-                          type: string
+  group: lighthouse.submariner.io
-                        nat_enabled:
+  version: v2alpha1
-                          type: boolean
+  names:
-                        private_ip:
+    kind: ServiceExport
-                          type: string
+    plural: serviceexports
-                        public_ip:
+    singular: serviceexport
-                          type: string
+  scope: Namespaced
-                        subnets:
+---
-                          items:
+apiVersion: apiextensions.k8s.io/v1beta1
-                            type: string
+kind: CustomResourceDefinition
-                          type: array
+metadata:
-                      required:
+  name: serviceimports.lighthouse.submariner.io
-                      - backend
+spec:
-                      - cable_name
+  group: lighthouse.submariner.io
-                      - cluster_id
+  version: v2alpha1
-                      - hostname
+  names:
-                      - nat_enabled
+    kind: ServiceImport
-                      - private_ip
+    plural: serviceimports
-                      - public_ip
+    singular: serviceimport
-                      - subnets
+  scope: Namespaced
-                      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-operator/Chart.yaml

@@ -1,8 +1,8 @@
 ---
 name: submariner-operator
-version: 0.11.2
+version: 0.10.1
 apiVersion: v2
-appVersion: 0.11.2
+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.11.2](https://img.shields.io/badge/Version-0.11.2-informational?style=flat-square) ![AppVersion: 0.11.2](https://img.shields.io/badge/AppVersion-0.11.2-informational?style=flat-square)
+![Version: 0.10.1](https://img.shields.io/badge/Version-0.10.1-informational?style=flat-square) ![AppVersion: 0.10.1](https://img.shields.io/badge/AppVersion-0.10.1-informational?style=flat-square)
 
 Submariner enables direct networking between Pods and Services in different Kubernetes clusters
 
@@ -27,7 +27,7 @@ Submariner enables direct networking between Pods and Services in different Kube
 | broker.server | string | `"example.k8s.apiserver"` |  |
 | broker.token | string | `"test"` |  |
 | gateway.image.repository | string | `"quay.io/submariner/submariner-gateway"` |  |
-| gateway.image.tag | string | `"0.11.2"` |  |
+| gateway.image.tag | string | `"0.10.1"` |  |
 | ipsec.debug | bool | `false` |  |
 | ipsec.forceUDPEncaps | bool | `false` |  |
 | ipsec.ikePort | int | `500` |  |
@@ -39,7 +39,7 @@ Submariner enables direct networking between Pods and Services in different Kube
 | operator.affinity | object | `{}` |  |
 | operator.image.pullPolicy | string | `"IfNotPresent"` |  |
 | operator.image.repository | string | `"quay.io/submariner/submariner-operator"` |  |
-| operator.image.tag | string | `"0.11.2"` |  |
+| operator.image.tag | string | `"0.10.1"` |  |
 | operator.resources | object | `{}` |  |
 | operator.tolerations | list | `[]` |  |
 | rbac.create | bool | `true` |  |
@@ -64,7 +64,7 @@ Submariner enables direct networking between Pods and Services in different Kube
 | submariner.globalCidr | string | `""` |  |
 | submariner.healthcheckEnabled | bool | `true` |  |
 | submariner.images.repository | string | `"quay.io/submariner"` |  |
-| submariner.images.tag | string | `"0.11.2"` |  |
+| submariner.images.tag | string | `"0.10.1"` |  |
 | submariner.natEnabled | bool | `false` |  |
 | submariner.serviceCidr | string | `""` |  |
 | submariner.serviceDiscovery | bool | `true` |  |

submariner-operator/questions.yml

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

submariner-operator/templates/rbac.yaml

@@ -439,21 +439,6 @@ 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
@@ -474,29 +459,6 @@ 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
@@ -678,25 +640,14 @@ 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:
@@ -737,15 +688,6 @@ 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,6 @@ 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 }}
@@ -33,6 +32,6 @@ spec:
     maxPacketLossCount: 5
 {{- with .Values.submariner.coreDNSCustomConfig }}
   coreDNSCustomConfig:
-    configmapName: {{ .configmapName }}
+    configmapName: .configmapName
-    namespace: {{ .namespace }}
+    namespace: .namespace
 {{- end }}

submariner-operator/values.yaml

@@ -14,7 +14,7 @@ submariner:
   coreDNSCustomConfig: {}
   images:
     repository: quay.io/submariner
-    tag: "0.11.2"
+    tag: "0.10.1"
 broker:
   server: example.k8s.apiserver
   token: test
@@ -37,7 +37,7 @@ leadership:
 operator:
   image:
     repository: quay.io/submariner/submariner-operator
-    tag: "0.11.2"
+    tag: "0.10.1"
     pullPolicy: IfNotPresent
   resources: {}
   tolerations: []
@@ -45,7 +45,7 @@ operator:
 gateway:
   image:
     repository: quay.io/submariner/submariner-gateway
-    tag: "0.11.2"
+    tag: "0.10.1"
 serviceAccounts:
   operator:
     create: true