update: rbac things

redhat-na-ssa · Oct 31, 2024 · effe77a · effe77a
1 parent f15a32d
commit effe77a
Show file tree

Hide file tree

Showing 16 changed files with 25 additions and 21 deletions.
diff --git a/clusters/default/kustomization.yaml b/clusters/default/kustomization.yaml
@@ -10,6 +10,7 @@ resources:
 # - ../../components/cluster-configs/etcd-backup/overlays/default
 # - ../../components/cluster-configs/namespace-cleanup/overlays/sandbox
 
+- ../../components/cluster-configs/login/overlays/htpasswd
 - ../../components/cluster-configs/namespaces/overlays/default
 - ../../components/cluster-configs/rbac/overlays/no-self-provisioner
 

diff --git a/...overlays/custom/cluster-admins-group.yaml → ...ts/groups-basic/cluster-admins-group.yaml b/...overlays/custom/cluster-admins-group.yaml → ...ts/groups-basic/cluster-admins-group.yaml
diff --git a/...ys/custom/cluster-admins-rolebinding.yaml → ...ups-basic/cluster-admins-rolebinding.yaml b/...ys/custom/cluster-admins-rolebinding.yaml → ...ups-basic/cluster-admins-rolebinding.yaml
diff --git a/...verlays/custom/cluster-readers-group.yaml → ...s/groups-basic/cluster-readers-group.yaml b/...verlays/custom/cluster-readers-group.yaml → ...s/groups-basic/cluster-readers-group.yaml
diff --git a/...s/custom/cluster-readers-rolebinding.yaml → ...ps-basic/cluster-readers-rolebinding.yaml b/...s/custom/cluster-readers-rolebinding.yaml → ...ps-basic/cluster-readers-rolebinding.yaml
diff --git a/...s/rbac/overlays/custom/kustomization.yaml → ...omponents/groups-basic/kustomization.yaml b/...s/rbac/overlays/custom/kustomization.yaml → ...omponents/groups-basic/kustomization.yaml
@@ -1,5 +1,5 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
+apiVersion: kustomize.config.k8s.io/v1alpha1
+kind: Component
 
 resources:
   - cluster-admins-group.yaml

diff --git a/...rbac/overlays/workshop/kustomization.yaml → ...onents/groups-workshop/kustomization.yaml b/...rbac/overlays/workshop/kustomization.yaml → ...onents/groups-workshop/kustomization.yaml
@@ -1,8 +1,7 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
+apiVersion: kustomize.config.k8s.io/v1alpha1
+kind: Component
 
 resources:
-  - ../../base
   - workshop-admins-group.yaml
   - workshop-users-group.yaml
 

diff --git a/...rlays/workshop/workshop-admins-group.yaml → ...roups-workshop/workshop-admins-group.yaml b/...rlays/workshop/workshop-admins-group.yaml → ...roups-workshop/workshop-admins-group.yaml
diff --git a/...erlays/workshop/workshop-users-group.yaml → ...groups-workshop/workshop-users-group.yaml b/...erlays/workshop/workshop-users-group.yaml → ...groups-workshop/workshop-users-group.yaml
diff --git a/components/cluster-configs/rbac/overlays/default/kustomization.yaml b/components/cluster-configs/rbac/overlays/default/kustomization.yaml
@@ -1,5 +1,8 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 
+components:
+  - ../../components/groups-basic
+
 resources:
   - ../../base
diff --git a/...onents/cluster-configs/rbac/overlays/manual-user-config/exclude-cluster-reader-group.yaml b/...onents/cluster-configs/rbac/overlays/manual-user-config/exclude-cluster-reader-group.yaml
diff --git a/components/cluster-configs/rbac/overlays/manual-user-config/kustomization.yaml b/components/cluster-configs/rbac/overlays/manual-user-config/kustomization.yaml
diff --git a/components/cluster-configs/rbac/overlays/no-self-provisioner/kustomization.yaml b/components/cluster-configs/rbac/overlays/no-self-provisioner/kustomization.yaml
@@ -1,6 +1,9 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 
+components:
+  - ../../components/groups-basic
+
 resources:
   - ../../base
 

diff --git a/...r-config/exclude-cluster-admin-group.yaml → ...ts/fix-kubeadmin-cluster-admin/group.yaml b/...r-config/exclude-cluster-admin-group.yaml → ...ts/fix-kubeadmin-cluster-admin/group.yaml
@@ -1,5 +1,6 @@
-$patch: delete
 kind: Group
 apiVersion: user.openshift.io/v1
 metadata:
-  name: cluster-admins
+  name: rhods-admins
+users:
+  - 'b64:kube:admin'
diff --git a/...erators/rhods-operator/instance/components/fix-kubeadmin-cluster-admin/kustomization.yaml b/...erators/rhods-operator/instance/components/fix-kubeadmin-cluster-admin/kustomization.yaml
@@ -3,3 +3,4 @@ kind: Component
 
 resources:
   - rolebinding.yaml
+  # - group.yaml
diff --git a/scripts/library/ocp.sh b/scripts/library/ocp.sh
@@ -2,6 +2,16 @@
 
 # https://mirror.openshift.com/pub/openshift-v4
 
+ocp_add_admin_user(){
+  HT_USERNAME=${1:-admin}
+  HT_PASSWORD=${2:-$(genpass)}
+
+  htpasswd_ocp_get_file
+  htpasswd_add_user "${HT_USERNAME}" "${HT_PASSWORD}"
+  htpasswd_ocp_set_file
+  htpasswd_validate_user "${HT_USERNAME}" "${HT_PASSWORD}"
+}
+
 ocp_check_login(){
   oc whoami || return 1
   oc cluster-info | head -n1
Original file line number	Diff line number	Diff line change
Expand Up		@@ -3,3 +3,4 @@ kind: Component

		resources:
		- rolebinding.yaml
		# - group.yaml