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 22:40:34 +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
10 changed files with 20 additions and 15 deletions
@@ -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
@@ -26,11 +26,11 @@ 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:
          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
@@ -21,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
@@ -4,7 +4,7 @@ name: Release Charts
 on:
  push:
    branches:
-      - devel
+      - release-0.9

 jobs:
  release:
@@ -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,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:
@@ -397,6 +397,7 @@ rules:
    resources:
      - configmaps
    verbs:
+      - create
      - get
      - list
      - watch
@@ -411,11 +412,13 @@ rules:
      - create
      - update
      - delete
-  - apiGroups:  # pods and services are looked up to figure out network settings
+      - watch
+  - apiGroups:  # pods, services and nodes are looked up to figure out network settings
      - ""
    resources:
      - pods
      - services
+      - nodes
    verbs:
      - get
      - list
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