fixing branch

redhat-manufacturing · Aug 8, 2023 · 9379417 · 9379417
2 parents 0284d24 + 560faf0
commit 9379417
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 14 deletions.
diff --git a/components/configs/rbac/overlays/hou-edge/aap-admins-group.yaml b/components/configs/rbac/overlays/hou-edge/aap-admins-group.yaml
@@ -3,4 +3,8 @@ apiVersion: user.openshift.io/v1
 metadata:
   name: aap-admins
 users:
-- cnorville90
+<<<<<<< HEAD
+- cnorville90
+=======
+- cnorville90
+>>>>>>> 560faf0c964f69e33e0facea9eabfcc34a7f7b5f
diff --git a/components/configs/rbac/overlays/hou-edge/aap-edit-ns-rolebinding.yaml b/components/configs/rbac/overlays/hou-edge/aap-edit-ns-rolebinding.yaml
@@ -0,0 +1,16 @@
+kind: RoleBinding
+metadata:
+  name: edit
+  namespace: aap
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: edit
+subjects:
+- apiGroup: rbac.authorization.k8s.io
+  kind: Group
+<<<<<<< HEAD:components/configs/rbac/overlays/hou-edge/lab-user-edit-ns-rolebinding.yaml
+  name: aap-admins
+=======
+  name: aap-admins
+>>>>>>> 560faf0c964f69e33e0facea9eabfcc34a7f7b5f:components/configs/rbac/overlays/hou-edge/aap-edit-ns-rolebinding.yaml
diff --git a/components/configs/rbac/overlays/hou-edge/kustomization.yaml b/components/configs/rbac/overlays/hou-edge/kustomization.yaml
@@ -5,6 +5,8 @@ bases:
   - ../../base
 
 resources:
+  - aap-admins-group.yaml
+  - aap-edit-ns-rolebinding.yaml
   - adhoc-ops-group.yaml
   - lab-cluster-admins-group.yaml
   - lab-cluster-admins-rolebinding.yaml

diff --git a/components/configs/rbac/overlays/hou-edge/lab-user-edit-ns-rolebinding.yaml b/components/configs/rbac/overlays/hou-edge/lab-user-edit-ns-rolebinding.yaml