update scripts.

Author: HumairAK

scripts/create_jsonnet_group.sh

@@ -8,31 +8,25 @@ SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 cd $SCRIPT_DIR
 APPS_DIR=$SCRIPT_DIR/../
 
-TMP=$(mktemp -d -t tmp.XXXXXXXXXX)
-
-jsonnet -m $TMP -c \
-  --ext-str GROUP \
-  --ext-code USERS \
-  jsonnet/group.jsonnet
-
-for src_file in `find $TMP -name '*.yaml'`
-do
-    # strip the tmp directory from the file name
-    file=${src_file#$TMP/}
-	dir=$(dirname "${file}")
-	mkdir -p "${APPS_DIR}/${dir}"
-	cat $src_file | gojsontoyaml > "${APPS_DIR}/${file}"
-done
-
-# init the kustomization.yaml file
-cd $APPS_DIR/cluster-scope/base/user.openshift.io/groups/${GROUP}/
-kustomize create --resources group.yaml
-
-# add group to common overlay
-cd $APPS_DIR/cluster-scope/overlays/prod/common/
-kustomize edit add resource ../../../base/user.openshift.io/groups/${GROUP}
-
-# cd $APPS_DIR
-# git add cluster-scope
-# git diff --cached
+echo apps dir is $APPS_DIR
 
+TMP=$(mktemp -d -t tmp.XXXXXXXXXX)
+dir = "cluster-scope/base/user.openshift.io/groups/" + name + "/";
+jsonnet --ext-str GROUP --ext-code USERS jsonnet/group.jsonnet
+
+#for src_file in `find $TMP -name '*.yaml'`
+#do
+#  # strip the tmp directory from the file name
+#  file=${src_file#$TMP/}
+#	dir=$(dirname "${file}")
+#	mkdir -p "${APPS_DIR}/${dir}"
+#	cat $src_file | gojsontoyaml > "${APPS_DIR}/${file}"
+#done
+#
+## init the kustomization.yaml file
+#cd $APPS_DIR/cluster-scope/base/user.openshift.io/groups/${GROUP}/
+#kustomize create --resources group.yaml
+#
+## add group to common overlay
+#cd $APPS_DIR/cluster-scope/overlays/prod/common/
+#kustomize edit add resource ../../../base/user.openshift.io/groups/${GROUP}

scripts/jinja/group.env

@@ -1,14 +1,10 @@
 local name = std.extVar('GROUP');
 local users = std.extVar('USERS');
-local dir  = "cluster-scope/base/user.openshift.io/groups/" + name + "/";
-
 {
-  [dir + "group.yaml"]: {
-    apiVersion: "user.openshift.io/v1",
-    kind: "Group",
-    metadata: {
-      name: name,
-    },
-    users: users,
-  }
+  apiVersion: "user.openshift.io/v1",
+  kind: "Group",
+  metadata: {
+    name: name,
+  },
+  users: users,
 }

scripts/jinja/group.yaml.jinja

@@ -4,10 +4,8 @@ local display_name = std.extVar('DISPLAY_NAME');
 local project_owner = std.extVar('PROJECT_OWNER');
 local onboarding_issue = std.extVar('ONBOARDING_ISSUE');
 local docs = std.extVar('DOCS');
-local dir  = "cluster-scope/base/core/namespaces/" + namespace + "/";
 
 {
-  [dir + "namespace.yaml"]: {
     apiVersion: "v1",
     kind: "Namespace",
     metadata: {
@@ -20,5 +18,4 @@ local dir  = "cluster-scope/base/core/namespaces/" + namespace + "/";
         'op1st/docs': docs,
       }
     }
-  }
-}
+  }

scripts/jinja/rbac.env

@@ -0,0 +1,21 @@
+local group = std.extVar('GROUP');
+
+{
+  "apiVersion": "rbac.authorization.k8s.io/v1",
+  "kind": "RoleBinding",
+  "metadata": {
+    "name": "namespace-admin-"+group
+  },
+  "roleRef": {
+    "apiGroup": "rbac.authorization.k8s.io",
+    "kind": "ClusterRole",
+    "name": "admin"
+  },
+  "subjects": [
+    {
+      "apiGroup": "rbac.authorization.k8s.io",
+      "kind": "Group",
+      "name": group
+    }
+  ]
+}