From 3051c8cd2280edabc9b0f1f125152ffd5101157a Mon Sep 17 00:00:00 2001 From: Thomas Vitale Date: Fri, 8 Sep 2023 17:55:20 +0200 Subject: [PATCH] Consolidate RBAC naming --- .github/workflows/release.yml | 2 +- .../config/{workload.yml => supply-chain-deliverable.yml} | 4 ++-- .../config/{deliverable.yml => supply-chain-workload.yml} | 4 ++-- test/integration/default/01-assert.yaml | 8 ++++---- test/integration/default/01-roles.yaml | 8 ++++---- 5 files changed, 13 insertions(+), 13 deletions(-) rename package/config/{workload.yml => supply-chain-deliverable.yml} (57%) rename package/config/{deliverable.yml => supply-chain-workload.yml} (58%) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e7a2e37..eedeeb4 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -18,6 +18,6 @@ jobs: registry-server: ghcr.io registry-username: ${{ github.actor }} image: ${{ github.repository }} - version: 0.2.0 + version: 0.2.1 secrets: pull-request-token: ${{ secrets.GH_ORG_PAT }} diff --git a/package/config/workload.yml b/package/config/supply-chain-deliverable.yml similarity index 57% rename from package/config/workload.yml rename to package/config/supply-chain-deliverable.yml index b61cac4..2776f46 100644 --- a/package/config/workload.yml +++ b/package/config/supply-chain-deliverable.yml @@ -2,9 +2,9 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: - name: workload + name: supply-chain-deliverable aggregationRule: clusterRoleSelectors: - matchLabels: - platform.kadras.io/aggregate-to-workload: "true" + platform.kadras.io/aggregate-to-supply-chain-deliverable: "true" rules: [] diff --git a/package/config/deliverable.yml b/package/config/supply-chain-workload.yml similarity index 58% rename from package/config/deliverable.yml rename to package/config/supply-chain-workload.yml index 1229ea7..faacc85 100644 --- a/package/config/deliverable.yml +++ b/package/config/supply-chain-workload.yml @@ -2,9 +2,9 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: - name: deliverable + name: supply-chain-workload aggregationRule: clusterRoleSelectors: - matchLabels: - platform.kadras.io/aggregate-to-deliverable: "true" + platform.kadras.io/aggregate-to-supply-chain-workload: "true" rules: [] diff --git a/test/integration/default/01-assert.yaml b/test/integration/default/01-assert.yaml index a11437e..5405ed1 100644 --- a/test/integration/default/01-assert.yaml +++ b/test/integration/default/01-assert.yaml @@ -2,11 +2,11 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: - name: workload + name: supply-chain-workload aggregationRule: clusterRoleSelectors: - matchLabels: - platform.kadras.io/aggregate-to-workload: "true" + platform.kadras.io/aggregate-to-supply-chain-workload: "true" rules: - apiGroups: [""] resources: ["configmaps"] @@ -16,11 +16,11 @@ rules: apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: - name: deliverable + name: supply-chain-deliverable aggregationRule: clusterRoleSelectors: - matchLabels: - platform.kadras.io/aggregate-to-deliverable: "true" + platform.kadras.io/aggregate-to-supply-chain-deliverable: "true" rules: - apiGroups: [""] resources: ["services"] diff --git a/test/integration/default/01-roles.yaml b/test/integration/default/01-roles.yaml index afd0013..05a6191 100644 --- a/test/integration/default/01-roles.yaml +++ b/test/integration/default/01-roles.yaml @@ -2,9 +2,9 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: - name: test-permissions-workload + name: test-supply-chain-workload labels: - platform.kadras.io/aggregate-to-workload: "true" + platform.kadras.io/aggregate-to-supply-chain-workload: "true" rules: #! Core @@ -16,9 +16,9 @@ rules: apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: - name: test-permissions-deliverable + name: test-supply-chain-deliverable labels: - platform.kadras.io/aggregate-to-deliverable: "true" + platform.kadras.io/aggregate-to-supply-chain-deliverable: "true" rules: #! Core