We no longer need the openshift client in the code because

1. For gathering metrics we make a request call and for that we can set the
openshift token an an environment variable.
2. We no longer gather namespace annotations, instead we are getting allocation
attributes from coldfront.

README.md

@@ -9,16 +9,14 @@ This was a fork of https://github.com/OCP-on-NERC/xdmod-openshift-scripts
 
 ## Usage
 
-In order to run the scripts, you need to run `oc login` or set the following environment variables:
+In order to run the scripts, you need to set the following environment variables:
 
-- `OPENSHIFT_TOKEN` for both scripts.
-- `OPENSHIFT_API_URL=https://api.shift.nerc.mghpcc.org:6443` for `merge.py`.
+- `OPENSHIFT_TOKEN` for `openshift_prometheus_metrics.py` when collecting metrics from thanos/prometheus.
+- Keycloak `CLIENT_ID` and `CLIENT_SECRET`, `COLDFRONT_URL` (defaults to MGHPCC coldfront) for `merge.py`.
 
 We are using the token for `xdmod-reader` service account in `xdmod-reader` namespace on nerc-prod cluster. You can extract the token with:
 `oc get secrets -n xdmod-reader --as system:admin xdmod-reader-token-m6s2m -o yaml | yq .data.token -r |base64 -d` .
 
-Note that if you are logged in with `oc login` then you don't need to manually set the OPENSHIFT_TOKEN or OPENSHIFT_API_URL.
-
 When running the scripts, there are two methods of specifying the OpenShift Prometheus
 endpoint. The first is through an environment variable:
 

openshift_metrics/openshift_prometheus_metrics.py

@@ -19,8 +19,6 @@
 import sys
 import json
 
-import openshift
-
 import utils
 
 
@@ -73,9 +71,6 @@ def main():
 
     token = os.environ.get("OPENSHIFT_TOKEN")
 
-    if token is None:
-        token = openshift.get_auth_token()
-
     metrics_dict = {}
     metrics_dict["start_date"] = report_start_date
     metrics_dict["end_date"] = report_end_date

openshift_metrics/utils.py

@@ -20,8 +20,6 @@
 import csv
 import requests
 
-import openshift
-
 
 # GPU types
 GPU_A100 = "nvidia.com/gpu_A100"

requirements.txt

@@ -1,2 +1 @@
 requests>=2.18.4
-openshift-client==1.0.21