Name RBAC fields to match K8s requirements

The colon in these field names isn't allowed by K8s, and fails ct linting. Use the new names from submariner-operator, which have already been renamed to fix this. Signed-off-by: Daniel Farrell <dfarrell@redhat.com> (cherry picked from commit c8b09b5c31)
Add required apiVersion field to Chart.yaml
2026-09-20 23:50:36 +00:00 · 2021-06-29 11:26:41 +02:00 · 2021-06-29 11:26:41 +02:00 · 2021-06-29 11:26:41 +02:00 · 2021-04-30 09:49:39 +00:00
13 changed files with 24 additions and 44 deletions
@@ -6,7 +6,7 @@ labels: support
 ---

 <!--
-GitHub may not be the right place for support requests.
+GitHub may not the right place for support requests.

 You can also post your question on the [Submariner
 Slack](https://kubernetes.slack.com/archives/C010RJV694M) or the Submariner
@@ -1,13 +0,0 @@
-<!--  Thanks for sending a pull request!  Here are some tips for you:
-
-1. If this is your first time, please read our developer guide: https://submariner.io/development/
-2. Ensure you have added the appropriate tests for your PR: https://submariner.io/development/code-review/#test-new-functionality
-3. Read the code review guide to ease the review process: https://submariner.io/development/code-review/
-4. If the PR is unfinished, mark it as a draft: https://submariner.io/development/code-review/#mark-work-in-progress-prs-as-drafts
-5. If you are using CI to debug, use your private fork: https://submariner.io/development/code-review/#use-private-forks-for-debugging-prs-by-running-ci
-6. Add labels to the PR as appropriate.
-
-This template is based on the K8s/K8s template:
-
-https://github.com/kubernetes/kubernetes/blob/master/.github/PULL_REQUEST_TEMPLATE.md
-->
@@ -6,9 +6,9 @@ on:

 jobs:
  target_devel:
-    name: PR targets devel
+    name: PR targets release-0.9
    runs-on: ubuntu-latest
    steps:
-      - name: Check that the PR targets devel
-        if: ${{ github.base_ref != 'devel' }}
+      - name: Check that the PR targets release-0.9
+        if: ${{ github.base_ref != 'release-0.9' }}
        run: exit 1
@@ -12,24 +12,25 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        cable_driver: ['libreswan', 'wireguard', 'vxlan']
+        cable_driver: ['libreswan', 'wireguard']
        globalnet: ['', 'globalnet']
-        k8s_version: ['1.17']
+        k8s_version: ['1.17.17']
        lighthouse: ['', 'lighthouse']
        include:
-          - k8s_version: '1.18'
-          - k8s_version: '1.19'
-          - k8s_version: '1.20'
+          # Recentness of K8s versions are limited by kindest/node image releases
+          - k8s_version: 1.18.15
+          - k8s_version: 1.19.7
+          - k8s_version: 1.20.2
    steps:
      - name: Check out the repository
        uses: actions/checkout@v2

      - name: Run E2E deployment and tests
-        uses: submariner-io/shipyard/gh-actions/e2e@devel
+        uses: submariner-io/shipyard/gh-actions/e2e@release-0.9
        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.9
@@ -8,13 +8,12 @@ on:
 jobs:
  e2e:
    name: E2E
-    if: github.repository_owner == 'submariner-io'
    timeout-minutes: 30
    runs-on: ubuntu-latest
    strategy:
      fail-fast: false
      matrix:
-        cable_driver: ['libreswan', 'wireguard', 'vxlan']
+        cable_driver: ['libreswan', 'wireguard']
        globalnet: ['', 'globalnet']
        lighthouse: ['', 'lighthouse']
    steps:
@@ -22,10 +21,10 @@ jobs:
        uses: actions/checkout@v2

      - name: Run E2E deployment and tests
-        uses: submariner-io/shipyard/gh-actions/e2e@devel
+        uses: submariner-io/shipyard/gh-actions/e2e@release-0.9
        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.9
@@ -8,7 +8,6 @@ on:
 jobs:
  markdown-link-check-periodic:
    name: Markdown Links (all files)
-    if: github.repository_owner == 'submariner-io'
    runs-on: ubuntu-latest
    steps:
      - name: Check out the repository
@@ -4,12 +4,11 @@ name: Release Charts
 on:
  push:
    branches:
-      - devel
+      - release-0.9

 jobs:
  release:
    name: Release
-    if: github.repository_owner == 'submariner-io'
    runs-on: ubuntu-latest
    steps:
      - name: Checkout
@@ -1,5 +1,5 @@
 ARG BASE_BRANCH
-FROM quay.io/submariner/shipyard-dapper-base:${BASE_BRANCH}
+FROM quay.io/submariner/shipyard-dapper-base:release-0.9

 ARG DAPPER_HOST_ARCH
 ENV HOST_ARCH=${DAPPER_HOST_ARCH} ARCH=${DAPPER_HOST_ARCH} \
@@ -1,4 +1,4 @@
-BASE_BRANCH ?= devel
+BASE_BRANCH ?= release-0.9
 export BASE_BRANCH

 ifneq (,$(DAPPER_HOST_ARCH))
@@ -1,12 +1,5 @@
 # submariner-charts

-<!-- markdownlint-disable line-length -->
-[![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/4865/badge)](https://bestpractices.coreinfrastructure.org/projects/4865)
-[![Release Charts](https://github.com/submariner-io/submariner-charts/workflows/Release%20Charts/badge.svg)](https://github.com/submariner-io/submariner-charts/actions?query=workflow%3A%22Release+Charts%22)
-[![Periodic](https://github.com/submariner-io/submariner-charts/workflows/Periodic/badge.svg)](https://github.com/submariner-io/submariner-charts/actions?query=workflow%3APeriodic)
-[![Flake Finder](https://github.com/submariner-io/submariner-charts/workflows/Flake%20Finder/badge.svg)](https://github.com/submariner-io/submariner-charts/actions?query=workflow%3A%22Flake+Finder%22)
-<!-- markdownlint-enable line-length -->
-
 Please see the [Helm docs on Submariner's website](https://submariner.io/operations/deployment/helm/).

 ## Development workflow
@@ -1,6 +1,7 @@
 ---
 name: submariner-k8s-broker
 version: 0.6.0
+apiVersion: v2
 appVersion: 0.6.0
 description: Submariner Kubernetes Broker
 keywords:
@@ -2,7 +2,7 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
-  name: {{ template "submariner-k8s-broker.fullname" . }}:client
+  name: {{ template "submariner-k8s-broker.fullname" . }}-cluster
  labels:
    heritage: {{ .Release.Service | quote }}
    release: {{ .Release.Name | quote }}
@@ -25,13 +25,13 @@ rules:
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
-  name: {{ template "submariner-k8s-broker.fullname" . }}:client
+  name: {{ template "submariner-k8s-broker.fullname" . }}-cluster
 roleRef:
  apiGroup: rbac.authorization.k8s.io
  kind: Role
-  name: {{ template "submariner-k8s-broker.fullname" . }}:client
+  name: {{ template "submariner-k8s-broker.fullname" . }}-cluster
 subjects:
 - kind: ServiceAccount
  name: {{ template "submariner-k8s-broker.clientServiceAccountName" . }}
  namespace: {{ .Release.Namespace }}
-{{- end -}}
+{{- end -}}
@@ -1,6 +1,7 @@
 ---
 name: submariner-operator
 version: 0.7.0
+apiVersion: v2
 appVersion: 0.7.0
 description: Submariner enables direct networking between Pods and Services in different Kubernetes clusters
 keywords:
Author	SHA1	Message	Date
Daniel FarrellandStephen Kitt	fb66cc28b2	Name RBAC fields to match K8s requirements The colon in these field names isn't allowed by K8s, and fails ct linting. Use the new names from submariner-operator, which have already been renamed to fix this. Signed-off-by: Daniel Farrell <dfarrell@redhat.com> (cherry picked from commit `c8b09b5c31`)	2021-06-29 11:26:41 +02:00
Daniel FarrellandStephen Kitt	e13cffdb4d	Add required apiVersion field to Chart.yaml This field is required by standard chart schemas. It should be v2 for Charts that support Helm v3, as we do. Signed-off-by: Daniel Farrell <dfarrell@redhat.com> (cherry picked from commit `df86353f4b`)	2021-06-29 11:26:41 +02:00
Steve MattarandStephen Kitt	6a0c5f2c29	fix(rbac): add missing cluster roles to submariner-operator Signed-off-by: Steve Mattar <smattar@redhat.com> (cherry picked from commit `12c8e9b3ff`)	2021-06-29 11:26:41 +02:00
Automated Release	4126e0fb08	Update base image to use stable branch 'release-0.9' Signed-off-by: Automated Release <release@submariner.io>	2021-04-30 09:49:39 +00:00