Merge branch 'm20k8sfix' into 'master'

Azure fix for M20 and M21

See merge request !430

app/k8s.py

@@ -33,10 +33,12 @@ def get_opa_config(namespace="osdu-services", name="opa-config", config_only=Tru
     try:
         api_response = v1.read_namespaced_config_map(namespace=namespace, name=name, pretty=pretty)
         if config_only:
-            if "config" in api_response.data:
-                return api_response.data["config"]
+            if "opa-config.yaml" in api_response.data:
+                return api_response.data["opa-config.yaml"]
             elif "config.yaml" in api_response.data:
                 return api_response.data["config.yaml"]
+            elif "config" in api_response.data:
+                return api_response.data["config"]
             else:
                 logger.error(f"Exception {api_response.data}")
                 return None