From 6592903bee04339670b63bb94ca991915c0c5f4a Mon Sep 17 00:00:00 2001 From: Naved Ansari Date: Fri, 14 Feb 2025 13:52:59 -0500 Subject: [PATCH] Create the necessary resources to get metrics from nerc-ocp-test This includes a clusterrole, clusterrolebinding and a serviceaccount which I will use to collect prometheus metrics for invoicing. I also decided to move the serviceaccount creation to the cluster-scope app. --- .../core/serviceaccounts/xdmod-reader/kustomization.yaml | 0 .../core/serviceaccounts/xdmod-reader/serviceaccount.yaml | 0 cluster-scope/bundles/xdmod-reader/kustomization.yaml | 1 + cluster-scope/overlays/nerc-ocp-test/kustomization.yaml | 1 + xdmod-reader/overlays/nerc-ocp-prod/kustomization.yaml | 5 ----- 5 files changed, 2 insertions(+), 5 deletions(-) rename {xdmod-reader => cluster-scope}/base/core/serviceaccounts/xdmod-reader/kustomization.yaml (100%) rename {xdmod-reader => cluster-scope}/base/core/serviceaccounts/xdmod-reader/serviceaccount.yaml (100%) delete mode 100644 xdmod-reader/overlays/nerc-ocp-prod/kustomization.yaml diff --git a/xdmod-reader/base/core/serviceaccounts/xdmod-reader/kustomization.yaml b/cluster-scope/base/core/serviceaccounts/xdmod-reader/kustomization.yaml similarity index 100% rename from xdmod-reader/base/core/serviceaccounts/xdmod-reader/kustomization.yaml rename to cluster-scope/base/core/serviceaccounts/xdmod-reader/kustomization.yaml diff --git a/xdmod-reader/base/core/serviceaccounts/xdmod-reader/serviceaccount.yaml b/cluster-scope/base/core/serviceaccounts/xdmod-reader/serviceaccount.yaml similarity index 100% rename from xdmod-reader/base/core/serviceaccounts/xdmod-reader/serviceaccount.yaml rename to cluster-scope/base/core/serviceaccounts/xdmod-reader/serviceaccount.yaml diff --git a/cluster-scope/bundles/xdmod-reader/kustomization.yaml b/cluster-scope/bundles/xdmod-reader/kustomization.yaml index 71a7c7ec..b9819765 100644 --- a/cluster-scope/bundles/xdmod-reader/kustomization.yaml +++ b/cluster-scope/bundles/xdmod-reader/kustomization.yaml @@ -4,5 +4,6 @@ commonLabels: nerc.mghpcc.org/bundle: xdmod-reader resources: - ../../base/core/namespaces/xdmod-reader/ +- ../../base/core/serviceaccounts/xdmod-reader - ../../base/rbac.authorization.k8s.io/clusterrolebindings/xdmod-reader-permissions/ - ../../base/rbac.authorization.k8s.io/clusterroles/xdmod-permissions/ diff --git a/cluster-scope/overlays/nerc-ocp-test/kustomization.yaml b/cluster-scope/overlays/nerc-ocp-test/kustomization.yaml index f24ec235..fcaba478 100644 --- a/cluster-scope/overlays/nerc-ocp-test/kustomization.yaml +++ b/cluster-scope/overlays/nerc-ocp-test/kustomization.yaml @@ -35,6 +35,7 @@ resources: - ../../bundles/autopilot - ../../bundles/minio - ../../bundles/mongodb-operator +- ../../bundles/xdmod-reader components: - ../../components/nerc-oauth-github diff --git a/xdmod-reader/overlays/nerc-ocp-prod/kustomization.yaml b/xdmod-reader/overlays/nerc-ocp-prod/kustomization.yaml deleted file mode 100644 index 27783375..00000000 --- a/xdmod-reader/overlays/nerc-ocp-prod/kustomization.yaml +++ /dev/null @@ -1,5 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -namespace: xdmod-reader -resources: - - ../../base/core/serviceaccounts/xdmod-reader